diff --git a/ci/browser_tests.sh b/ci/browser_tests.sh index aa7c886022..f25dac4ac9 100755 --- a/ci/browser_tests.sh +++ b/ci/browser_tests.sh @@ -21,8 +21,8 @@ else fi SC_VERSION="4.5.1" SAUCECONNECT_URL="https://saucelabs.com/downloads/sc-$SC_VERSION-$OS.$FILEFORMAT" -SAUCECONNECT_USERNAME="chriseth" -SAUCECONNECT_ACCESSKEY="b781828a-9e9c-43d8-89d4-2fbb879595ca" +SAUCECONNECT_USERNAME="yanneth" +SAUCECONNECT_ACCESSKEY="1f5a4560-b02b-41aa-b52b-f033aad30870" BUILD_ID=${CIRCLE_BUILD_NUM:-${TRAVIS_JOB_NUMBER}} echo "$BUILD_ID" SAUCECONNECT_JOBIDENTIFIER="browsersolidity_tests_${BUILD_ID}" diff --git a/index.html b/index.html index 554d742f06..117071c463 100644 --- a/index.html +++ b/index.html @@ -29,7 +29,6 @@ Remix - Ethereum IDE - @@ -56,7 +55,7 @@ return params } const defaultVersion = window.location.hostname === 'remix.ethereum.org' ? '0.7.7' : '0.8.0' - let version = urlParams().appVersion ? urlParams().appVersion : defaultVersion + let versionToLoad = urlParams().appVersion ? urlParams().appVersion : defaultVersion let assets = { '0.8.0': ['https://use.fontawesome.com/releases/v5.8.1/css/all.css', 'assets/css/pygment_trac.css'], @@ -66,11 +65,11 @@ '0.7.7': 'assets/js/0.7.7/app.js', // commit 7b5c7ae3de935e0ccc32eadfd83bf7349478491e '0.8.0': 'build/app.js' } - for (let k in assets[version]) { + for (let k in assets[versionToLoad]) { let app = document.createElement('link') app.setAttribute('rel', 'stylesheet') - app.setAttribute('href', assets[version][k]) - if (assets[version][k] === 'https://use.fontawesome.com/releases/v5.8.1/css/all.css') { + app.setAttribute('href', assets[versionToLoad][k]) + if (assets[versionToLoad][k] === 'https://use.fontawesome.com/releases/v5.8.1/css/all.css') { app.setAttribute('integrity', 'sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf') app.setAttribute('crossorigin', 'anonymous') } @@ -78,7 +77,7 @@ } window.onload = () => { let app = document.createElement('script') - app.setAttribute('src', versions[version]) + app.setAttribute('src', versions[versionToLoad]) document.body.appendChild(app) } diff --git a/nightwatch.js b/nightwatch.js index ea6737fce3..046dfa2c28 100644 --- a/nightwatch.js +++ b/nightwatch.js @@ -16,8 +16,8 @@ module.exports = { 'selenium_host': 'ondemand.saucelabs.com', 'selenium_port': 80, 'silent': true, - 'username': 'chriseth', - 'access_key': 'b781828a-9e9c-43d8-89d4-2fbb879595ca', + 'username': 'yanneth', + 'access_key': '1f5a4560-b02b-41aa-b52b-f033aad30870', 'use_ssl': false, 'globals': { 'waitForConditionTimeout': 10000, @@ -78,7 +78,7 @@ module.exports = { 'selenium_port': 4444, 'selenium_host': 'localhost', 'desiredCapabilities': { - 'browserName': 'firefox', + 'browserName': 'chrome', 'javascriptEnabled': true, 'acceptSslCerts': true }