diff --git a/apps/remix-ide-e2e/src/checkGroupTests.js b/apps/remix-ide-e2e/src/checkGroupTests.js index dba67a920e..bc833723a1 100644 --- a/apps/remix-ide-e2e/src/checkGroupTests.js +++ b/apps/remix-ide-e2e/src/checkGroupTests.js @@ -6,7 +6,7 @@ fs.readdirSync(testFolder).forEach(file => { const content = fs.readFileSync(testFolder + file, 'utf8') const matches = content.match(/group\d+/g) if (matches) { - const disabled = content.includes('@disabled') + const disabled = content.includes('@disabled: true') if (!disabled) { console.log(`WARNING ${file} has group tests but is not disabled`) } diff --git a/apps/remix-ide-e2e/src/select_tests.sh b/apps/remix-ide-e2e/src/select_tests.sh index 4cd3f36c00..05fa3ce3c8 100644 --- a/apps/remix-ide-e2e/src/select_tests.sh +++ b/apps/remix-ide-e2e/src/select_tests.sh @@ -26,7 +26,7 @@ do done npm run build:e2e PS3='Select a test or command: ' -TESTFILES=( $(grep -IRiL "disabled" "dist/apps/remix-ide-e2e/src/tests" | grep "\.spec\|\.test\|plugin_api" | sort ) ) +TESTFILES=( $(grep -IRiL "@disabled: true" "dist/apps/remix-ide-e2e/src/tests" | grep "\.spec\|\.test\|plugin_api" | sort ) ) # declare -p TESTFILES TESTFILES+=("list") diff --git a/apps/remix-ide-e2e/src/tests/stress.editor.ts b/apps/remix-ide-e2e/src/tests/stressEditor.test.ts similarity index 100% rename from apps/remix-ide-e2e/src/tests/stress.editor.ts rename to apps/remix-ide-e2e/src/tests/stressEditor.test.ts diff --git a/apps/remix-ide-e2e/src/tests/url.test.ts b/apps/remix-ide-e2e/src/tests/url.test.ts index df5b772638..b104ddf42e 100644 --- a/apps/remix-ide-e2e/src/tests/url.test.ts +++ b/apps/remix-ide-e2e/src/tests/url.test.ts @@ -108,14 +108,14 @@ module.exports = { 'Should load json files from link passed in remix URL': function (browser: NightwatchBrowser) { browser - .url('http://localhost:8080/#optimize=false&runs=200&evmVersion=null&version=soljson-v0.6.12+commit.27d51765.js&url=https://raw.githubusercontent.com/EthVM/evm-source-verification/main/contracts/1/0x011e5846975c6463a8c6337eecf3cbf64e328884/input.json') + .url('http://127.0.0.1:8080/#optimize=false&runs=200&evmVersion=null&version=soljson-v0.6.12+commit.27d51765.js&url=https://raw.githubusercontent.com/EthVM/evm-source-verification/main/contracts/1/0x011e5846975c6463a8c6337eecf3cbf64e328884/input.json') .refresh() .pause(5000) .waitForElementPresent('*[data-id="workspacesSelect"] option[value="code-sample"]') .openFile('@openzeppelin') .openFile('@openzeppelin/contracts') .openFile('@openzeppelin/contracts/access') - .openFile('@openzeppelin/contracts/access/AccessCdsfdsfdsfsdontrol.sol') + .openFile('@openzeppelin/contracts/access/AccessControl.sol') .openFile('contracts') .openFile('contracts/governance') .openFile('contracts/governance/UnionGovernor.sol') diff --git a/apps/remix-ide/ci/browser_test.sh b/apps/remix-ide/ci/browser_test.sh index 00a4158c86..745dd87b04 100755 --- a/apps/remix-ide/ci/browser_test.sh +++ b/apps/remix-ide/ci/browser_test.sh @@ -15,7 +15,7 @@ sleep 5 npm run build:e2e -TESTFILES=$(grep -IRiL "disabled" "dist/apps/remix-ide-e2e/src/tests" | grep "\.spec\|\.test" | sort | circleci tests split ) +TESTFILES=$(grep -IRiL "@disabled: true" "dist/apps/remix-ide-e2e/src/tests" | grep "\.spec\|\.test" | sort | circleci tests split ) for TESTFILE in $TESTFILES; do npx nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js $TESTFILE --env=$1 || TEST_EXITCODE=1 done diff --git a/apps/remix-ide/ci/browser_tests_plugin_api.sh b/apps/remix-ide/ci/browser_tests_plugin_api.sh index 282b979c98..426e16a6a5 100755 --- a/apps/remix-ide/ci/browser_tests_plugin_api.sh +++ b/apps/remix-ide/ci/browser_tests_plugin_api.sh @@ -14,7 +14,7 @@ sleep 5 npm run build:e2e -TESTFILES=$(grep -IRiL "disabled" "dist/apps/remix-ide-e2e/src/tests" | grep "plugin_api" | sort | circleci tests split ) +TESTFILES=$(grep -IRiL "@disabled: true" "dist/apps/remix-ide-e2e/src/tests" | grep "plugin_api" | sort | circleci tests split ) for TESTFILE in $TESTFILES; do npx nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js $TESTFILE --env=chrome || TEST_EXITCODE=1 done