Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

Update nightwatch conf & upgrade selenium v3 -> v4

ZachTRiceb790d76c79ba
diff --git a/.gitignore b/.gitignore
index 167bfb53a..8f68e2d74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@ options
*.log
# Nightwatch stuff
e2e/reports
+e2e/screens
*.jar
# Config
/config/*
diff --git a/e2e/features/animation/gif-test.js b/e2e/features/animation/gif-test.js
index f8fede256..be964a344 100644
--- a/e2e/features/animation/gif-test.js
+++ b/e2e/features/animation/gif-test.js
@@ -20,13 +20,13 @@ module.exports = {
localSelectors.animationWidget,
TIME_LIMIT,
() => {
- client.click(localSelectors.createGifIcon).pause(1000)
+ client.click(localSelectors.createGifIcon).pause(2000)
client.expect.element(askDialog).to.be.present
client
.useCss()
.click(paletteDialogOkButton)
- .pause(1000)
- client.click(localSelectors.createGifButton).pause(1000)
+ .pause(2000)
+ client.click(localSelectors.createGifButton).pause(2000)
client.waitForElementVisible(
localSelectors.gifResults,
TIME_LIMIT,
@@ -52,12 +52,12 @@ module.exports = {
localSelectors.animationWidget,
TIME_LIMIT,
() => {
- client.click(localSelectors.createGifIcon).pause(1000)
+ client.click(localSelectors.createGifIcon).pause(2000)
client.useCss().assert.containsText(articeRotationResetButton, '-18')
client
.useCss()
.click(rotationDialogOkButton)
- .pause(1000)
+ .pause(2000)
client.useCss().assert.containsText(articeRotationResetButton, '0')
}
)
@@ -70,7 +70,7 @@ module.exports = {
localSelectors.animationWidget,
TIME_LIMIT,
() => {
- client.click(localSelectors.createGifIcon).pause(1000)
+ client.click(localSelectors.createGifIcon).pause(2000)
client.waitForElementVisible(
localSelectors.createGifButton,
TIME_LIMIT,
@@ -97,7 +97,7 @@ module.exports = {
client.assert.ok('#wv-checkbox-gif') // checkbox is checked
client
.click(localSelectors.gifPreviewEndResolutionOption500)
- .pause(1000)
+ .pause(2000)
client.assert.value(
localSelectors.gifPreviewEndResolutionSelector,
'2'
diff --git a/nightwatch.conf.js b/nightwatch.conf.js
index b6ec13107..8683b57cd 100644
--- a/nightwatch.conf.js
+++ b/nightwatch.conf.js
@@ -3,66 +3,110 @@ const chromedriver = require('./node_modules/chromedriver')
const geckodriver = require('geckodriver')
const files = './e2e/features'
+const chromePath = chromedriver.path
+console.log(chromedriver.version)
+console.log('testing')
+console.log(chromePath)
module.exports = {
output_folder: 'e2e/reports',
globals_path: 'e2e/globals.js',
custom_assertions_path: ['e2e/custom-assertions'],
src_folders: files,
- selenium: {
- start_process: true,
- server_path: seleniumServer.path,
- port: 4444,
- check_process_delay: 10000,
- cli_args: {
- 'webdriver.chrome.driver': chromedriver.path,
- 'webdriver.gecko.driver': geckodriver.path,
- 'webdriver.firefox.profile': 'nightwatch',
- 'webdriver.gecko.profile': 'nightwatch'
- }
+ test_workers: {
+ enabled: true,
+ workers: 'auto'
},
test_settings: {
default: {
+ disable_error_log: false,
launch_url: 'http://localhost',
selenium_port: 4444,
selenium_host: 'localhost',
- marionette: true
+
+ screenshots: {
+ enabled: false,
+ path: 'e2e/screens',
+ on_failure: true
+ },
+
+ desiredCapabilities: {
+ browserName: 'chromeHeadless'
+ },
+
+ webdriver: {
+ start_process: true,
+ server_path: ''
+ }
+ },
+ selenium_server: {
+ selenium: {
+ start_process: true,
+ port: 4444,
+ server_path: seleniumServer.path, // Leave empty if @nightwatch/selenium-server is installed
+ command: 'standalone', // Selenium 4 only
+ check_process_delay: 10000,
+ cli_args: {
+ 'webdriver.chrome.driver': chromedriver.path,
+ 'webdriver.gecko.driver': geckodriver.path,
+ 'webdriver.firefox.profile': 'nightwatch',
+ 'webdriver.gecko.profile': 'nightwatch'
+ }
+ },
+ webdriver: {
+ start_process: false,
+ default_path_prefix: '/wd/hub'
+ }
},
chrome: {
+ extends: 'selenium_server',
desiredCapabilities: {
browserName: 'chrome',
- 'goog:chromeOptions': {
- w3c: false,
+ chromeOptions: {
+ w3c: true,
prefs: { 'profile.managed_default_content_settings.notifications': 1 }
}
}
},
chromeHeadless: {
+ extends: 'selenium_server',
desiredCapabilities: {
browserName: 'chrome',
- 'goog:chromeOptions': {
- w3c: false,
+ chromeOptions: {
+ w3c: true,
prefs: { 'profile.managed_default_content_settings.notifications': 1 },
- args: ['headless', 'no-sandbox', 'disable-gpu']
+ args: [
+ '--no-sandbox',
+ '--disable-gpu',
+ '--headless'
+ ]
}
}
},
chromeLocalStorageDisabled: {
+ extends: 'selenium_server',
desiredCapabilities: {
browserName: 'chrome',
- 'goog:chromeOptions': {
- w3c: false,
+ chromeOptions: {
+ w3c: true,
prefs: { 'profile.managed_default_content_settings.notifications': 1 },
- args: ['headless', 'no-sandbox', 'disable-gpu', 'disable-local-storage']
+ args: [
+ '--no-sandbox',
+ '--disable-gpu',
+ '--headless',
+ '--disable-local-storage'
+ ]
}
}
},
firefox: {
+ extends: 'selenium_server',
desiredCapabilities: {
browserName: 'firefox',
javascriptEnabled: true
}
},
firefoxHeadless: {
+ extends: 'selenium_server',
desiredCapabilities: {
browserName: 'firefox',
javascriptEnabled: true,
@@ -72,6 +116,7 @@ module.exports = {
}
},
firefoxLocalStorageDisabled: {
+ extends: 'selenium_server',
desiredCapabilities: {
browserName: 'firefox',
javascriptEnabled: true,
diff --git a/package-lock.json b/package-lock.json
index fbbc9e64a..001e2f8e0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -129,7 +129,7 @@
"run-script-os": "^1.1.5",
"sass": "^1.57.1",
"sass-loader": "^13.2.0",
- "selenium-server-standalone-jar": "^3.141.59",
+ "selenium-server-standalone-jar": "^4.7.1",
"shelljs": "^0.8.5",
"showdown": "^2.1.0",
"stylelint": "^14.16.1",
@@ -5110,30 +5110,6 @@
"readable-stream": "^3.4.0"
}
},
- "node_modules/bl/node_modules/buffer": {
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
- "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
- "dev": true,
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/feross"
- },
- {
- "type": "patreon",
- "url": "https://www.patreon.com/feross"
- },
- {
- "type": "consulting",
- "url": "https://feross.org/support"
- }
- ],
- "dependencies": {
- "base64-js": "^1.3.1",
- "ieee754": "^1.1.13"
- }
- },
"node_modules/bl/node_modules/readable-stream": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
@@ -5427,6 +5403,30 @@
"node-int64": "^0.4.0"
}
},
+ "node_modules/buffer": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+ "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/feross"
+ },
+ {
+ "type": "patreon",
+ "url": "https://www.patreon.com/feross"
+ },
+ {
+ "type": "consulting",
+ "url": "https://feross.org/support"
+ }
+ ],
+ "dependencies": {
+ "base64-js": "^1.3.1",
+ "ieee754": "^1.1.13"
+ }
+ },
"node_modules/buffer-crc32": {
"version": "0.2.13",
"resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
@@ -17961,9 +17961,9 @@
"dev": true
},
"node_modules/selenium-server-standalone-jar": {
- "version": "3.141.59",
- "resolved": "https://registry.npmjs.org/selenium-server-standalone-jar/-/selenium-server-standalone-jar-3.141.59.tgz",
- "integrity": "sha512-gh7LagmKMkthQZo0q9qrDSWy+ISYnCUhOUW6IyRQIMGdg8Os/uMfChTDO17DYzxKmNIDx/h6+yfBj34QYALycw==",
+ "version": "4.7.1",
+ "resolved": "https://registry.npmjs.org/selenium-server-standalone-jar/-/selenium-server-standalone-jar-4.7.1.tgz",
+ "integrity": "sha512-2X66E4yd/HbMxjyg6b/K6wRMuggN98kbNSgEFyhH3nDVXBmapfM43+GCqd3w9RFN+K3zQDcje7w9Ab1AncDzSQ==",
"dev": true
},
"node_modules/selenium-webdriver": {
@@ -24663,16 +24663,6 @@
"readable-stream": "^3.4.0"
},
"dependencies": {
- "buffer": {
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
- "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
- "dev": true,
- "requires": {
- "base64-js": "^1.3.1",
- "ieee754": "^1.1.13"
- }
- },
"readable-stream": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
@@ -24896,6 +24886,16 @@
"node-int64": "^0.4.0"
}
},
+ "buffer": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+ "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+ "dev": true,
+ "requires": {
+ "base64-js": "^1.3.1",
+ "ieee754": "^1.1.13"
+ }
+ },
"buffer-crc32": {
"version": "0.2.13",
"resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
@@ -34138,9 +34138,9 @@
"dev": true
},
"selenium-server-standalone-jar": {
- "version": "3.141.59",
- "resolved": "https://registry.npmjs.org/selenium-server-standalone-jar/-/selenium-server-standalone-jar-3.141.59.tgz",
- "integrity": "sha512-gh7LagmKMkthQZo0q9qrDSWy+ISYnCUhOUW6IyRQIMGdg8Os/uMfChTDO17DYzxKmNIDx/h6+yfBj34QYALycw==",
+ "version": "4.7.1",
+ "resolved": "https://registry.npmjs.org/selenium-server-standalone-jar/-/selenium-server-standalone-jar-4.7.1.tgz",
+ "integrity": "sha512-2X66E4yd/HbMxjyg6b/K6wRMuggN98kbNSgEFyhH3nDVXBmapfM43+GCqd3w9RFN+K3zQDcje7w9Ab1AncDzSQ==",
"dev": true
},
"selenium-webdriver": {
diff --git a/package.json b/package.json
index 6ec63ce8d..732fc6e0b 100644
--- a/package.json
+++ b/package.json
@@ -134,7 +134,7 @@
"run-script-os": "^1.1.5",
"sass": "^1.57.1",
"sass-loader": "^13.2.0",
- "selenium-server-standalone-jar": "^3.141.59",
+ "selenium-server-standalone-jar": "^4.7.1",
"shelljs": "^0.8.5",
"showdown": "^2.1.0",
"stylelint": "^14.16.1",