Skip to content

B
baas-ide
Unverified Commit ff67e32b authored by David Disu's avatar David Disu Committed by GitHub
Browse files
Options

Merge pull request #597 from ethereum/fix-debugger

Update E2E commands to support windows.
parents 1af1b7a9 afec3b9b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 57 deletions
apps/remix-ide/ci/browser_tests_chrome.sh
View file @ ff67e32b
...@@ -13,11 +13,11 @@ npm run remixd & ...@@ -13,11 +13,11 @@ npm run remixd &
sleep 5 sleep 5
npx nx build remix-ide-e2e npm run build:e2e
TESTFILES=$(circleci tests glob "dist/apps/remix-ide-e2e/src/tests/**/*.test.js" | circleci tests split --split-by=timings) TESTFILES=$(circleci tests glob "dist/apps/remix-ide-e2e/src/tests/**/*.test.js" | circleci tests split --split-by=timings)
for TESTFILE in $TESTFILES; do for TESTFILE in $TESTFILES; do
npx nx e2e remix-ide-e2e --filePath=$TESTFILE --env=chrome || TEST_EXITCODE=1 npx nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js $TESTFILE --env=chrome || TEST_EXITCODE=1
done done
echo "$TEST_EXITCODE" echo "$TEST_EXITCODE"
......
apps/remix-ide/ci/browser_tests_firefox.sh
View file @ ff67e32b
...@@ -13,11 +13,11 @@ npm run remixd & ...@@ -13,11 +13,11 @@ npm run remixd &
sleep 5 sleep 5
npx nx build remix-ide-e2e npm run build:e2e
TESTFILES=$(circleci tests glob "dist/apps/remix-ide-e2e/src/tests/**/*.test.js" | circleci tests split --split-by=timings) TESTFILES=$(circleci tests glob "dist/apps/remix-ide-e2e/src/tests/**/*.test.js" | circleci tests split --split-by=timings)
for TESTFILE in $TESTFILES; do for TESTFILE in $TESTFILES; do
npx nx e2e remix-ide-e2e --filePath=$TESTFILE --env=firefox || TEST_EXITCODE=1 npx nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js $TESTFILE --env=firefox || TEST_EXITCODE=1
done done
echo "$TEST_EXITCODE" echo "$TEST_EXITCODE"
......
apps/remix-ide/ci/browser_tests_run_deploy.sh
View file @ ff67e32b
...@@ -11,7 +11,7 @@ npm run serve & ...@@ -11,7 +11,7 @@ npm run serve &
sleep 5 sleep 5
npx nx build remix-ide-e2e npm run build:e2e
npm run nightwatch_local_runAndDeploy || TEST_EXITCODE=1 npm run nightwatch_local_runAndDeploy || TEST_EXITCODE=1
echo "$TEST_EXITCODE" echo "$TEST_EXITCODE"
......
package.json
View file @ ff67e32b
This diff is collapsed.
workspace.json
View file @ ff67e32b
...@@ -100,23 +100,6 @@ ...@@ -100,23 +100,6 @@
"sourceRoot": "apps/remix-ide-e2e/src", "sourceRoot": "apps/remix-ide-e2e/src",
"projectType": "application", "projectType": "application",
"architect": { "architect": {
"build": {
"builder": "@nrwl/workspace:run-commands",
"options": {
"commands": [
"tsc -p apps/remix-ide-e2e/tsconfig.e2e.json"
]
}
},
"e2e": {
"builder": "@nrwl/workspace:run-commands",
"options": {
"commands": [
"TEST_SCRIPT='node_modules/.bin/nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js'; if [ {args.env} != undefined ]; then TEST_SCRIPT=${TEST_SCRIPT}' --env {args.env}'; else TEST_SCRIPT=${TEST_SCRIPT}' --env chrome'; fi; if [ {args.filePath} != undefined ]; then TEST_SCRIPT=${TEST_SCRIPT}' {args.filePath}'; fi; eval $TEST_SCRIPT;"
],
"parallel": false
}
},
"lint": { "lint": {
"builder": "@nrwl/linter:lint", "builder": "@nrwl/linter:lint",
"options": { "options": {
...@@ -145,11 +128,7 @@ ...@@ -145,11 +128,7 @@
"test": { "test": {
"builder": "@nrwl/workspace:run-commands", "builder": "@nrwl/workspace:run-commands",
"options": { "options": {
"commands": [ "commands": ["npm-run-all test"],
{
"command": "./../../node_modules/.bin/npm-run-all test"
}
],
"cwd": "libs/remix-analyzer" "cwd": "libs/remix-analyzer"
} }
}, },
...@@ -183,11 +162,7 @@ ...@@ -183,11 +162,7 @@
"test": { "test": {
"builder": "@nrwl/workspace:run-commands", "builder": "@nrwl/workspace:run-commands",
"options": { "options": {
"commands": [ "commands": ["npm-run-all test"],
{
"command": "./../../node_modules/.bin/npm-run-all test"
}
],
"cwd": "libs/remix-astwalker" "cwd": "libs/remix-astwalker"
} }
}, },
...@@ -221,11 +196,7 @@ ...@@ -221,11 +196,7 @@
"test": { "test": {
"builder": "@nrwl/workspace:run-commands", "builder": "@nrwl/workspace:run-commands",
"options": { "options": {
"commands": [ "commands": ["npm-run-all test"],
{
"command": "./../../node_modules/.bin/npm-run-all test"
}
],
"cwd": "libs/remix-debug" "cwd": "libs/remix-debug"
} }
}, },
...@@ -270,11 +241,7 @@ ...@@ -270,11 +241,7 @@
"test": { "test": {
"builder": "@nrwl/workspace:run-commands", "builder": "@nrwl/workspace:run-commands",
"options": { "options": {
"commands": [ "commands": ["npm-run-all test"],
{
"command": "./../../node_modules/.bin/npm-run-all test"
}
],
"cwd": "libs/remix-lib" "cwd": "libs/remix-lib"
} }
}, },
...@@ -308,11 +275,7 @@ ...@@ -308,11 +275,7 @@
"test": { "test": {
"builder": "@nrwl/workspace:run-commands", "builder": "@nrwl/workspace:run-commands",
"options": { "options": {
"commands": [ "commands": ["npm-run-all test"],
{
"command": "./../../node_modules/.bin/npm-run-all test"
}
],
"cwd": "libs/remix-simulator" "cwd": "libs/remix-simulator"
} }
}, },
...@@ -357,11 +320,7 @@ ...@@ -357,11 +320,7 @@
"test": { "test": {
"builder": "@nrwl/workspace:run-commands", "builder": "@nrwl/workspace:run-commands",
"options": { "options": {
"commands": [ "commands": ["npm-run-all test"],
{
"command": "./../../node_modules/.bin/npm-run-all test"
}
],
"cwd": "libs/remix-solidity" "cwd": "libs/remix-solidity"
} }
}, },
...@@ -443,11 +402,7 @@ ...@@ -443,11 +402,7 @@
"test": { "test": {
"builder": "@nrwl/workspace:run-commands", "builder": "@nrwl/workspace:run-commands",
"options": { "options": {
"commands": [ "commands": ["npm-run-all test"],
{
"command": "./../../node_modules/.bin/npm-run-all test"
}
],
"cwd": "libs/remix-url-resolver" "cwd": "libs/remix-url-resolver"
} }
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment