Permalink
Browse files

Switch to updated version of keystone-nightwatch-e2e (#3866)

* Switch to updated version of keystone-nightwatch-e2e

* Additional KNE version bump

* Debug KNE bump

* One more

* Final version bump (removes debugging)
  • Loading branch information...
1 parent 16452e3 commit 633a55e4a32cb5ded8de198f92082754b9890d66 @jstockwin jstockwin committed on GitHub Jan 10, 2017
Showing with 3 additions and 313 deletions.
  1. +1 −1 package.json
  2. +0 −134 test/e2e/adminUI/nightwatch-no-process.json
  3. +0 −134 test/e2e/adminUI/nightwatch.json
  4. +0 −42 test/e2e/globals.js
  5. +2 −2 test/e2e/server.js
View
@@ -108,7 +108,7 @@
"eslint-plugin-react": "6.9.0",
"istanbul": "0.4.5",
"keystone-email": "1.0.5",
- "keystone-nightwatch-e2e": "0.1.18",
+ "keystone-nightwatch-e2e": "0.2.5",
"mocha": "3.2.0",
"must": "0.13.2",
"proxyquire": "1.7.10",
@@ -1,134 +0,0 @@
-{
- "src_folders": [
- "test/e2e/adminUI/tests"
- ],
- "output_folder": "reports",
- "custom_commands_path": "",
- "custom_assertions_path": "",
- "page_objects_path": ["${PAGE_OBJECTS_PATH}"],
- "globals_path": "test/e2e/globals.js",
- "selenium": {
- "start_process": false,
- "server_path": "${SELENIUM_SERVER}",
- "log_path": "",
- "host": "127.0.0.1",
- "port": 4444,
- "cli_args": {
- "webdriver.chrome.driver": "",
- "webdriver.ie.driver": ""
- }
- },
- "test_settings": {
- "default": {
- "launch_url": "http://localhost",
- "selenium_host": "127.0.0.1",
- "selenium_port": 4444,
- "silent": true,
- "disable_colors": false,
- "screenshots": {
- "enabled": false,
- "path": ""
- },
- "desiredCapabilities": {
- "browserName": "firefox",
- "javascriptEnabled": true,
- "acceptSslCerts": true
- },
- "exclude": [
- "test/e2e/adminUI/tests/group006Fields/commonFieldTestUtils.js",
- "test/e2e/adminUI/tests/group999FixMe/*"
- ]
- },
- "saucelabs-travis": {
- "selenium_host": "ondemand.saucelabs.com",
- "selenium_port": 80,
- "username": "${SAUCE_USERNAME}",
- "access_key": "${SAUCE_ACCESS_KEY}",
- "use_ssl": false,
- "startConnect": false,
- "silent": true,
- "output": true,
- "screenshots": {
- "enabled": false,
- "on_failure": true,
- "path": ""
- },
- "desiredCapabilities": {
- "name": "test-firefox",
- "browserName": "firefox",
- "tunnel-identifier": "${TRAVIS_JOB_NUMBER}"
- },
- "selenium": {
- "start_process": false
- }
- },
- "saucelabs-local": {
- "selenium_host": "ondemand.saucelabs.com",
- "selenium_port": 80,
- "username": "${SAUCE_USERNAME}",
- "access_key": "${SAUCE_ACCESS_KEY}",
- "use_ssl": false,
- "silent": true,
- "output": true,
- "screenshots": {
- "enabled": false,
- "on_failure": true,
- "path": ""
- },
- "desiredCapabilities": {
- "name": "test-firefox",
- "browserName": "firefox"
- },
- "selenium": {
- "start_process": false
- }
- },
- "chrome": {
- "desiredCapabilities": {
- "browserName": "chrome",
- "javascriptEnabled": true,
- "acceptSslCerts": true
- }
- },
- "chrome-win32": {
- "desiredCapabilities": {
- "browserName": "chrome",
- "javascriptEnabled": true,
- "acceptSslCerts": true
- },
- "cli_args": {
- "webdriver.chrome.driver": "test/e2e/drivers/chrome/win32/chromedriver.exe"
- }
- },
- "chrome-mac32": {
- "desiredCapabilities": {
- "browserName": "chrome",
- "javascriptEnabled": true,
- "acceptSslCerts": true
- },
- "cli_args": {
- "webdriver.chrome.driver": "test/e2e/drivers/chrome/mac32/chromedriver"
- }
- },
- "chrome-linux64": {
- "desiredCapabilities": {
- "browserName": "chrome",
- "javascriptEnabled": true,
- "acceptSslCerts": true
- },
- "cli_args": {
- "webdriver.chrome.driver": "test/e2e/drivers/chrome/linux64/chromedriver"
- }
- },
- "chrome-linux32": {
- "desiredCapabilities": {
- "browserName": "chrome",
- "javascriptEnabled": true,
- "acceptSslCerts": true
- },
- "cli_args": {
- "webdriver.chrome.driver": "test/e2e/drivers/chrome/linux32/chromedriver"
- }
- }
- }
-}
@@ -1,134 +0,0 @@
-{
- "src_folders": [
- "test/e2e/adminUI/tests"
- ],
- "output_folder": "reports",
- "custom_commands_path": "",
- "custom_assertions_path": "",
- "page_objects_path": ["${PAGE_OBJECTS_PATH}"],
- "globals_path": "test/e2e/globals.js",
- "selenium": {
- "start_process": true,
- "server_path": "${SELENIUM_SERVER}",
- "log_path": "",
- "host": "127.0.0.1",
- "port": 4444,
- "cli_args": {
- "webdriver.chrome.driver": "",
- "webdriver.ie.driver": ""
- }
- },
- "test_settings": {
- "default": {
- "launch_url": "http://localhost",
- "selenium_host": "127.0.0.1",
- "selenium_port": 4444,
- "silent": true,
- "disable_colors": false,
- "screenshots": {
- "enabled": false,
- "path": ""
- },
- "desiredCapabilities": {
- "browserName": "firefox",
- "javascriptEnabled": true,
- "acceptSslCerts": true
- },
- "exclude": [
- "test/e2e/adminUI/tests/group006Fields/commonFieldTestUtils.js",
- "test/e2e/adminUI/tests/group999FixMe/*"
- ]
- },
- "saucelabs-travis": {
- "selenium_host": "ondemand.saucelabs.com",
- "selenium_port": 80,
- "username": "${SAUCE_USERNAME}",
- "access_key": "${SAUCE_ACCESS_KEY}",
- "use_ssl": false,
- "startConnect": false,
- "silent": true,
- "output": true,
- "screenshots": {
- "enabled": false,
- "on_failure": true,
- "path": ""
- },
- "desiredCapabilities": {
- "name": "test-firefox",
- "browserName": "firefox",
- "tunnel-identifier": "${TRAVIS_JOB_NUMBER}"
- },
- "selenium": {
- "start_process": false
- }
- },
- "saucelabs-local": {
- "selenium_host": "ondemand.saucelabs.com",
- "selenium_port": 80,
- "username": "${SAUCE_USERNAME}",
- "access_key": "${SAUCE_ACCESS_KEY}",
- "use_ssl": false,
- "silent": true,
- "output": true,
- "screenshots": {
- "enabled": false,
- "on_failure": true,
- "path": ""
- },
- "desiredCapabilities": {
- "name": "test-firefox",
- "browserName": "firefox"
- },
- "selenium": {
- "start_process": false
- }
- },
- "chrome": {
- "desiredCapabilities": {
- "browserName": "chrome",
- "javascriptEnabled": true,
- "acceptSslCerts": true
- }
- },
- "chrome-win32": {
- "desiredCapabilities": {
- "browserName": "chrome",
- "javascriptEnabled": true,
- "acceptSslCerts": true
- },
- "cli_args": {
- "webdriver.chrome.driver": "test/e2e/drivers/chrome/win32/chromedriver.exe"
- }
- },
- "chrome-mac32": {
- "desiredCapabilities": {
- "browserName": "chrome",
- "javascriptEnabled": true,
- "acceptSslCerts": true
- },
- "cli_args": {
- "webdriver.chrome.driver": "test/e2e/drivers/chrome/mac32/chromedriver"
- }
- },
- "chrome-linux64": {
- "desiredCapabilities": {
- "browserName": "chrome",
- "javascriptEnabled": true,
- "acceptSslCerts": true
- },
- "cli_args": {
- "webdriver.chrome.driver": "test/e2e/drivers/chrome/linux64/chromedriver"
- }
- },
- "chrome-linux32": {
- "desiredCapabilities": {
- "browserName": "chrome",
- "javascriptEnabled": true,
- "acceptSslCerts": true
- },
- "cli_args": {
- "webdriver.chrome.driver": "test/e2e/drivers/chrome/linux32/chromedriver"
- }
- }
- }
-}
View
@@ -1,42 +0,0 @@
-module.exports = {
- // this controls whether to abort the test execution when an assertion failed and skip the rest
- // it's being used in waitFor commands and expect assertions
- abortOnAssertionFailure : true,
- // this will overwrite the default polling interval (currently 500ms) for waitFor commands
- // and expect assertions that use retry
- waitForConditionPollInterval : 300,
- // default timeout value in milliseconds for waitFor commands and implicit waitFor value for
- // expect assertions
- waitForConditionTimeout : 60000,
- // this will cause waitFor commands on elements to throw an error if multiple
- // elements are found using the given locate strategy and selector
- throwOnMultipleElementsReturned : true,
- // controls the timeout time for async hooks. Expects the done() callback to be invoked within this time
- // or an error is thrown
- asyncHookTimeout : 10000,
- defaultPauseTimeout : 1000,
- 'default' : {
- },
- 'saucelabs' : {
- },
- before : function(cb) {
- cb();
- },
- beforeEach : function(browser, cb) {
- cb();
- },
- after : function(cb) {
- cb();
- },
- afterEach : function(browser, cb) {
- cb();
- },
- reporter : function(results, cb) {
- //console.log(results);
- cb();
- },
- keyStroke: {
- enterKey: ['\uE006'],
- downArrowKey: ['\uE015']
- },
-};
View
@@ -9,8 +9,8 @@ var path = require('path');
var keystoneNightwatchE2e = require('keystone-nightwatch-e2e');
// Set app-specific env for nightwatch session
-process.env['SELENIUM_SERVER'] = keystoneNightwatchE2e.seleniumPath;
-process.env['PAGE_OBJECTS_PATH'] = keystoneNightwatchE2e.pageObjectsPath;
+process.env.KNE_TEST_PATHS = 'test/e2e/adminUI/tests';
+process.env.KNE_EXCLUDE_TEST_PATHS = 'test/e2e/adminUI/tests/group006Fields/commonFieldTestUtils.js,test/e2e/adminUI/tests/group999FixMe/*';
// determine the mongo uri and database name
var dbName = '/e2e' + (process.env.KEYSTONEJS_PORT || 3000);

0 comments on commit 633a55e

Please sign in to comment.