From 214e634aa521357aa2bd25c9f5b613e6111b7097 Mon Sep 17 00:00:00 2001 From: yann300 Date: Wed, 16 Mar 2022 10:53:46 +0100 Subject: [PATCH] fix disabled --- apps/remix-ide-e2e/src/checkGroupTests.js | 2 +- apps/remix-ide-e2e/src/select_tests.sh | 2 +- apps/remix-ide/ci/browser_test.sh | 2 +- apps/remix-ide/ci/browser_tests_plugin_api.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/remix-ide-e2e/src/checkGroupTests.js b/apps/remix-ide-e2e/src/checkGroupTests.js index bc833723a1..bb26940d1d 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: true') + const disabled = content.includes('\'@disabled\': true') || 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 05fa3ce3c8..65fa5c1656 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: true" "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/ci/browser_test.sh b/apps/remix-ide/ci/browser_test.sh index 745dd87b04..f9385198b5 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: true" "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 426e16a6a5..ab94f74a31 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: true" "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