diff --git a/apps/remixdesktop/package.json b/apps/remixdesktop/package.json index 41590157cc..1f1fe2d264 100644 --- a/apps/remixdesktop/package.json +++ b/apps/remixdesktop/package.json @@ -29,8 +29,8 @@ "installRipGrepMacOXarm64": "rm -rf node_modules/@vscode/ripgrep/bin && npm_config_arch=arm64 node node_modules/@vscode/ripgrep/lib/postinstall.js", "postinstall": "electron-builder install-app-deps", "test": "yarn run build:e2e && nightwatch --config build-e2e/remixdesktop/test/nighwatch.app.js", - "test:isogit": "yarn run test --useIsoGit", - "test:offline": "yarn run test --useOffline --test build-e2e/remixdesktop/test/tests/app/offline.test.js", + "test:isogit": "yarn run test --use-isogit", + "test:offline": "yarn run test --use-offline --test build-e2e/remixdesktop/test/tests/app/offline.test.js", "build:e2e": "tsc -p tsconfig.e2e.json" }, "devDependencies": { diff --git a/apps/remixdesktop/run_git_ui_isogit_tests.sh b/apps/remixdesktop/run_git_ui_isogit_tests.sh index d47be23523..4e082ce11e 100755 --- a/apps/remixdesktop/run_git_ui_isogit_tests.sh +++ b/apps/remixdesktop/run_git_ui_isogit_tests.sh @@ -4,7 +4,7 @@ TEST_EXITCODE=0 yarn run build:e2e && node ./splice_tests.js TESTFILES=$(node ./splice_tests.js | grep -i 'git' | circleci tests split --split-by=timings) for TESTFILE in $TESTFILES; do - yarn run test --useIsoGit --test ./build-e2e/remixdesktop/test/tests/app/${TESTFILE} || TEST_EXITCODE=1 + yarn run test --use-isogit --test ./build-e2e/remixdesktop/test/tests/app/${TESTFILE} || TEST_EXITCODE=1 done echo "$TEST_EXITCODE" diff --git a/apps/remixdesktop/src/plugins/compilerLoader.ts b/apps/remixdesktop/src/plugins/compilerLoader.ts index 846ab4641f..9a74931543 100644 --- a/apps/remixdesktop/src/plugins/compilerLoader.ts +++ b/apps/remixdesktop/src/plugins/compilerLoader.ts @@ -12,7 +12,7 @@ export const baseURLWasm = 'https://binaries.soliditylang.org/wasm' const appExpress = express() // used in e2e tests -const useOffline = process.argv.includes('--useOffline'); +const useOffline = process.argv.includes('--use-offline'); console.log('cacheDir', cacheDir) appExpress.use(express.static(cacheDir)) diff --git a/apps/remixdesktop/src/plugins/isoGitPlugin.ts b/apps/remixdesktop/src/plugins/isoGitPlugin.ts index 886eeb531e..d319aa2270 100644 --- a/apps/remixdesktop/src/plugins/isoGitPlugin.ts +++ b/apps/remixdesktop/src/plugins/isoGitPlugin.ts @@ -13,7 +13,7 @@ const profile: Profile = { description: 'isogit plugin', } // used in e2e tests -const useIsoGit = process.argv.includes('--useIsoGit'); +const useIsoGit = process.argv.includes('--use-isogit'); export class IsoGitPlugin extends ElectronBasePlugin { clients: IsoGitPluginClient[] = [] constructor() { diff --git a/apps/remixdesktop/test/nighwatch.app.ts b/apps/remixdesktop/test/nighwatch.app.ts index c3e4b709f0..5c34abd683 100644 --- a/apps/remixdesktop/test/nighwatch.app.ts +++ b/apps/remixdesktop/test/nighwatch.app.ts @@ -3,8 +3,8 @@ import fs from 'fs'; -const useIsoGit = process.argv.includes('--useIsoGit'); -const useOffline = process.argv.includes('--useOffline'); +const useIsoGit = process.argv.includes('--use-isogit'); +const useOffline = process.argv.includes('--use-offline'); // Function to read JSON file synchronously function readJSONFileSync(filename: string): any { @@ -71,8 +71,8 @@ module.exports = { // Check if running on CircleCI or locally let args = process.env.CIRCLECI ? ["--e2e"] : ["--e2e-local"]; - if(useIsoGit) args = [...args, '--useIsoGit']; - if(useOffline) args = [...args, '--useOffline']; + if(useIsoGit) args = [...args, '--use-isogit']; + if(useOffline) args = [...args, '--use-offline']; // Set display size const windowSize = "--window-size=1000,1000"; diff --git a/apps/remixdesktop/test/tests/app/git-ui.test.ts b/apps/remixdesktop/test/tests/app/git-ui.test.ts index 777f7d8631..813c31da44 100644 --- a/apps/remixdesktop/test/tests/app/git-ui.test.ts +++ b/apps/remixdesktop/test/tests/app/git-ui.test.ts @@ -193,7 +193,7 @@ const tests = { .waitForElementVisible('*[data-id="treeViewLitreeViewItemtest2.txt"]') }, } -const useIsoGit = process.argv.includes('--useIsoGit'); +const useIsoGit = process.argv.includes('--use-isogit'); if (process.platform.startsWith('win')) { module.exports = {} } diff --git a/apps/remixdesktop/test/tests/app/git-ui_3.test.ts b/apps/remixdesktop/test/tests/app/git-ui_3.test.ts index 0872d93b27..6fb96951ff 100644 --- a/apps/remixdesktop/test/tests/app/git-ui_3.test.ts +++ b/apps/remixdesktop/test/tests/app/git-ui_3.test.ts @@ -145,7 +145,7 @@ const tests = { } -const useIsoGit = process.argv.includes('--useIsoGit'); +const useIsoGit = process.argv.includes('--use-isogit'); if (process.platform.startsWith('win')) { module.exports = {} } diff --git a/apps/remixdesktop/test/tests/app/git-ui_4.test.ts b/apps/remixdesktop/test/tests/app/git-ui_4.test.ts index 962a0b3ccb..521462122d 100644 --- a/apps/remixdesktop/test/tests/app/git-ui_4.test.ts +++ b/apps/remixdesktop/test/tests/app/git-ui_4.test.ts @@ -192,7 +192,7 @@ const tests = { }, } -const useIsoGit = process.argv.includes('--useIsoGit'); +const useIsoGit = process.argv.includes('--use-isogit'); if (process.platform.startsWith('win')) { module.exports = {} } diff --git a/apps/remixdesktop/test/tests/app/github_3.test.ts b/apps/remixdesktop/test/tests/app/github_3.test.ts index 9c95fdc99c..12542bb86f 100644 --- a/apps/remixdesktop/test/tests/app/github_3.test.ts +++ b/apps/remixdesktop/test/tests/app/github_3.test.ts @@ -1,6 +1,6 @@ import { NightwatchBrowser } from "nightwatch" -const useIsoGit = process.argv.includes('--useIsoGit'); +const useIsoGit = process.argv.includes('--use-isogit'); let commitCount = 0 let branchCount = 0 const tests = {