desktop-master-git2
bunsenstraat 3 months ago
parent ce91d361bd
commit a17d5470b9
  1. 4
      apps/remixdesktop/package.json
  2. 2
      apps/remixdesktop/run_git_ui_isogit_tests.sh
  3. 2
      apps/remixdesktop/src/plugins/compilerLoader.ts
  4. 2
      apps/remixdesktop/src/plugins/isoGitPlugin.ts
  5. 8
      apps/remixdesktop/test/nighwatch.app.ts
  6. 2
      apps/remixdesktop/test/tests/app/git-ui.test.ts
  7. 2
      apps/remixdesktop/test/tests/app/git-ui_3.test.ts
  8. 2
      apps/remixdesktop/test/tests/app/git-ui_4.test.ts
  9. 2
      apps/remixdesktop/test/tests/app/github_3.test.ts

@ -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": {

@ -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"

@ -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))

@ -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() {

@ -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";

@ -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 = {}
}

@ -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 = {}
}

@ -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 = {}
}

@ -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 = {

Loading…
Cancel
Save