From 40a26468449d083a813c717194e2ab13f46c92f4 Mon Sep 17 00:00:00 2001 From: Kyle Shockey Date: Tue, 9 Jan 2018 15:41:47 -0600 Subject: [PATCH] Use json-server to serve test specs in test:ci:e2e --- package.json | 4 ++-- test/e2e/cbt-globals.js | 3 ++- test/e2e/globals.js | 3 ++- test/e2e/pages/main.js | 2 +- test/e2e/scenarios/informationContainer.js | 18 +++++++++--------- test/e2e/scenarios/models.js | 4 ++-- test/e2e/scenarios/operations/pet.js | 4 ++-- test/e2e/scenarios/operations/store.js | 4 ++-- test/e2e/scenarios/operations/user.js | 4 ++-- test/e2e/scenarios/schemeContainer.js | 4 ++-- test/e2e/scenarios/topbar.js | 4 ++-- 11 files changed, 28 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index 80f38dc3..75422975 100644 --- a/package.json +++ b/package.json @@ -31,13 +31,13 @@ "test": "npm run lint:errors && npm run test:nodejs", "test:ci": "npm-run-all lint:errors test:nodejs test:ci:e2e", "test:browser": "karma start --config karma.conf.js", - "test:ci:e2e": "if [ \"$ENABLE_CI_E2E\" = \"true\" ]; then npm-run-all --parallel -r hot-server test:e2e:mock-api test:e2e:all:cbt; else exit 0; fi", + "test:ci:e2e": "if [ \"$ENABLE_CI_E2E\" = \"true\" ]; then npm-run-all --parallel -r test:e2e:mock-api test:e2e:all:cbt; else exit 0; fi", "test:coverage": "nyc npm run test:nodejs", "test:e2e": "npm-run-all --parallel -r hot-server test:e2e:mock-api test:e2e:all", "test:e2e:all": "sleep 3 && nightwatch test/e2e/scenarios/ --config test/e2e/nightwatch.json", "test:e2e:all:cbt": "sleep 3 && nightwatch test/e2e/scenarios/ --config test/e2e/nightwatch-cbt.json", "test:e2e:initial-render": "nightwatch test/e2e/scenarios/ --config test/e2e/nightwatch.json --group initial-render", - "test:e2e:mock-api": "json-server --watch test/e2e/db.json --port 3204", + "test:e2e:mock-api": "json-server --static test/e2e/specs --watch test/e2e/db.json --port 3204", "test:nodejs": "mocha --recursive --compilers js:babel-core/register test/core test/components test/bugs test/swagger-ui-dist-package test/xss", "watch": "webpack --config webpack-watch.config.js --watch --progress" }, diff --git a/test/e2e/cbt-globals.js b/test/e2e/cbt-globals.js index 0c951afe..655ada3f 100644 --- a/test/e2e/cbt-globals.js +++ b/test/e2e/cbt-globals.js @@ -3,7 +3,8 @@ var cbt = require("cbt_tunnels") module.exports = { - baseUrl: "http://swagger-ui-ci-asset-deployment-test.surge.sh", + baseAppUrl: "http://swagger-ui-ci-asset-deployment-test.surge.sh", + specPath: "http://local:3204/petstore.json", beforeEach: function(done) { console.log("Starting up tunnel") diff --git a/test/e2e/globals.js b/test/e2e/globals.js index 5ee3ab20..316d442e 100644 --- a/test/e2e/globals.js +++ b/test/e2e/globals.js @@ -1,5 +1,6 @@ var cbt = require("cbt_tunnels") module.exports = { - baseUrl: "http://localhost:3200" + baseAppUrl: "http://localhost:3200", + specPath: "http://localhost:3200/test-specs/petstore.json" } diff --git a/test/e2e/pages/main.js b/test/e2e/pages/main.js index 04e77545..79a949c3 100644 --- a/test/e2e/pages/main.js +++ b/test/e2e/pages/main.js @@ -20,7 +20,7 @@ module.exports = { version: { selector: ".version" }, - baseUrl: { + baseAppUrl: { selector: ".base-url" }, mainUrl: { diff --git a/test/e2e/scenarios/informationContainer.js b/test/e2e/scenarios/informationContainer.js index bda9fee5..b80e31e7 100644 --- a/test/e2e/scenarios/informationContainer.js +++ b/test/e2e/scenarios/informationContainer.js @@ -2,19 +2,19 @@ describe("render informationContainer", function () { let mainPage let informationContainer beforeEach(function (client, done) { - + mainPage = client - .url(client.globals.baseUrl) + .url(client.globals.baseAppUrl) .page.main() client.waitForElementVisible(".download-url-input", 5000) .pause(5000) .clearValue(".download-url-input") - .setValue(".download-url-input", client.globals.baseUrl + "/test-specs/petstore.json") + .setValue(".download-url-input", client.globals.specPath) .click("button.download-url-button") .pause(1000) informationContainer = mainPage.section.informationContainer - + done() }) @@ -28,9 +28,9 @@ describe("render informationContainer", function () { informationContainer.waitForElementVisible("@title", 5000) .assert.containsText("@title", "Swagger Petstore") .assert.containsText("@version", "1.0.0") - .assert.containsText("@baseUrl", "[ Base URL: localhost:3204/ ]") - .assert.attributeEquals("@mainUrl", "href", client.globals.baseUrl + "/test-specs/petstore.json") - .assert.containsText("@mainUrlContent", client.globals.baseUrl + "/test-specs/petstore.json") + .assert.containsText("@baseAppUrl", "[ Base URL: localhost:3204/ ]") + .assert.attributeEquals("@mainUrl", "href", client.globals.specPath) + .assert.containsText("@mainUrlContent", client.globals.specPath) .assert.containsText("@description", "This is a sample server Petstore server. You can find out more about Swagger at http://swagger.io or on irc.freenode.net, #swagger. For this sample, you can use the api key special-key to test the authorization filters.") .assert.attributeEquals("@swaggerUrl", "href", "http://swagger.io/") .assert.attributeEquals("@swaggerircUrl", "href", "http://swagger.io/irc/") @@ -42,7 +42,7 @@ describe("render informationContainer", function () { .assert.containsText("@contactDevLink", "Contact the developer") .assert.attributeEquals("@aboutSwaggerLink", "href", "http://swagger.io/") .assert.containsText("@aboutSwaggerLink", "Find out more about Swagger") - + client.end() }) -}) \ No newline at end of file +}) diff --git a/test/e2e/scenarios/models.js b/test/e2e/scenarios/models.js index 50296b36..cbdf20af 100644 --- a/test/e2e/scenarios/models.js +++ b/test/e2e/scenarios/models.js @@ -3,12 +3,12 @@ describe("Render Model Wrapper", function () { beforeEach(function (client, done) { mainPage = client - .url(client.globals.baseUrl) + .url(client.globals.baseAppUrl) .page.main() client.waitForElementVisible(".download-url-input", 5000) .pause(5000) .clearValue(".download-url-input") - .setValue(".download-url-input", client.globals.baseUrl + "/test-specs/petstore.json") + .setValue(".download-url-input", client.globals.specPath) .click("button.download-url-button") .pause(1000) diff --git a/test/e2e/scenarios/operations/pet.js b/test/e2e/scenarios/operations/pet.js index 915e4620..a533e2e5 100644 --- a/test/e2e/scenarios/operations/pet.js +++ b/test/e2e/scenarios/operations/pet.js @@ -3,13 +3,13 @@ describe("render pet api container", function () { let apiWrapper beforeEach(function (client, done) { mainPage = client - .url(client.globals.baseUrl) + .url(client.globals.baseAppUrl) .page.main() client.waitForElementVisible(".download-url-input", 5000) .pause(5000) .clearValue(".download-url-input") - .setValue(".download-url-input", client.globals.baseUrl + "/test-specs/petstore.json") + .setValue(".download-url-input", client.globals.specPath) .click("button.download-url-button") .pause(1000) diff --git a/test/e2e/scenarios/operations/store.js b/test/e2e/scenarios/operations/store.js index 34b1938e..5051adf5 100644 --- a/test/e2e/scenarios/operations/store.js +++ b/test/e2e/scenarios/operations/store.js @@ -3,13 +3,13 @@ describe("render store api container", function(){ let apiWrapper beforeEach( function(client, done){ mainPage = client - .url(client.globals.baseUrl) + .url(client.globals.baseAppUrl) .page.main() client.waitForElementVisible(".download-url-input", 5000) .pause(3000) .clearValue(".download-url-input") - .setValue(".download-url-input", client.globals.baseUrl + "/test-specs/petstore.json") + .setValue(".download-url-input", client.globals.specPath) .click("button.download-url-button") .pause(1000) diff --git a/test/e2e/scenarios/operations/user.js b/test/e2e/scenarios/operations/user.js index cb53fd7d..8b5af1bb 100644 --- a/test/e2e/scenarios/operations/user.js +++ b/test/e2e/scenarios/operations/user.js @@ -3,13 +3,13 @@ describe("render user api container", function(){ let apiWrapper beforeEach( function(client, done){ mainPage = client - .url(client.globals.baseUrl) + .url(client.globals.baseAppUrl) .page.main() client.waitForElementVisible(".download-url-input", 5000) .pause(5000) .clearValue(".download-url-input") - .setValue(".download-url-input", client.globals.baseUrl + "/test-specs/petstore.json") + .setValue(".download-url-input", client.globals.specPath) .click("button.download-url-button") .pause(1000) diff --git a/test/e2e/scenarios/schemeContainer.js b/test/e2e/scenarios/schemeContainer.js index a78e1069..488ca0d4 100644 --- a/test/e2e/scenarios/schemeContainer.js +++ b/test/e2e/scenarios/schemeContainer.js @@ -4,7 +4,7 @@ describe("Render scheme", function () { beforeEach(function (client, done) { mainPage = client - .url(client.globals.baseUrl) + .url(client.globals.baseAppUrl) .page.main() schemeContainer = mainPage.section.schemeContainer @@ -12,7 +12,7 @@ describe("Render scheme", function () { client.waitForElementVisible(".download-url-input", 5000) .pause(5000) .clearValue(".download-url-input") - .setValue(".download-url-input", client.globals.baseUrl + "/test-specs/petstore.json") + .setValue(".download-url-input", client.globals.specPath) .click("button.download-url-button") .pause(1000) diff --git a/test/e2e/scenarios/topbar.js b/test/e2e/scenarios/topbar.js index 2218b461..f521ea5e 100644 --- a/test/e2e/scenarios/topbar.js +++ b/test/e2e/scenarios/topbar.js @@ -18,7 +18,7 @@ describe("initial render", function () { beforeEach(function (client, done) { mainPage = client - .url(client.globals.baseUrl) + .url(client.globals.baseAppUrl) .page.main() topbar = mainPage.section.topbar @@ -26,7 +26,7 @@ describe("initial render", function () { client.waitForElementVisible(".download-url-input", 10000) .pause(5000) .clearValue(".download-url-input") - .setValue(".download-url-input", client.globals.baseUrl + "/test-specs/petstore.json") + .setValue(".download-url-input", client.globals.specPath) .click("button.download-url-button") .pause(1000)