diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c59f33dff..a0a3425c3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -64,7 +64,7 @@ jobs: run: npm test - name: Build app for smoke tests - run: npm run app-build:smoke + run: npm run app-build - name: Run app smoke tests run: npm run test:smoke:build diff --git a/package.json b/package.json index d6a47964f..c15b329f3 100644 --- a/package.json +++ b/package.json @@ -31,8 +31,6 @@ "app-package": "npm run package --prefix packages/insomnia-app", "app-bump-version": "npm run bump-version --prefix packages/insomnia-app", "preinstall": "node ./scripts/check-version.js", - "app-build:smoke": "cross-env npm run app-build", - "app-package:smoke": "cross-env npm run app-package", "test:smoke:dev": "npm run test:dev --prefix packages/insomnia-smoke-test", "test:smoke:build": "npm run test:build --prefix packages/insomnia-smoke-test", "test:smoke:package": "npm run test:package --prefix packages/insomnia-smoke-test", diff --git a/packages/insomnia-smoke-test/README.md b/packages/insomnia-smoke-test/README.md index 69ff9276e..1c9a83ad4 100644 --- a/packages/insomnia-smoke-test/README.md +++ b/packages/insomnia-smoke-test/README.md @@ -49,14 +49,14 @@ It's possible to run the smoke tests for: For `build`: ```shell -npm run app-build:smoke # Transpile js bundle +npm run app-build # Transpile js bundle npm run test:smoke:build # Run tests ``` For `package`: ```shell -npm run app-package:smoke # Build executable in /packages/insomnia-app/dist +npm run app-package # Build executable in /packages/insomnia-app/dist npm run test:smoke:package # Run tests ``` diff --git a/packages/insomnia-smoke-test/playwright/paths.ts b/packages/insomnia-smoke-test/playwright/paths.ts index 389a3e8e8..ac2a995c3 100644 --- a/packages/insomnia-smoke-test/playwright/paths.ts +++ b/packages/insomnia-smoke-test/playwright/paths.ts @@ -25,7 +25,7 @@ const electronBinary = path.join('node_modules', '.bin', process.platform === 'w export const executablePath = bundleType() === 'package' ? insomniaBinary : electronBinary; -// NOTE: main.min.js is built by app-build:smoke in /build and also by the watcher in /app +// NOTE: main.min.js is built by app-build in /build and also by the watcher in /app export const mainPath = path.join(bundleType() === 'dev' ? 'app' : 'build', 'main.min.js'); export const cwd = path.resolve(__dirname, '..', '..', 'insomnia-app'); @@ -40,12 +40,12 @@ if (bundleType() === 'dev' && !hasMainBeenBuilt) { } if (bundleType() === 'build' && !hasMainBeenBuilt) { console.error(`ERROR: ${mainPath} not found at ${path.resolve(cwd, mainPath)} - Have you run "npm run app-build:smoke"?`); + Have you run "npm run app-build"?`); exit(1); } if (bundleType() === 'package' && !hasBinaryBeenBuilt) { console.error(`ERROR: ${insomniaBinary} not found at ${path.resolve(cwd, insomniaBinary)} - Have you run "npm run app-package:smoke"?`); + Have you run "npm run app-package"?`); exit(1); } if (process.env.DEBUG) {