Skip to content

Commit 55d86cb

Browse files
committed
fix test
1 parent 5c1500b commit 55d86cb

File tree

5 files changed

+14
-19
lines changed

5 files changed

+14
-19
lines changed

.github/shared-actions/windows-bazel-test/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ runs:
3232
# * symlink_prefix=/: Needed as otherwise we will create unix symlinks in the Windows host.
3333
- run: |
3434
${{inputs.command}} \
35-
--//e2e/legacy-cli:enable_native_windows_testing=true \
35+
--//tests/legacy-cli:enable_native_windows_testing=true \
3636
--test_env="NG_E2E_RUNNER_WSL_ROOT=${{steps.init_wsl.outputs.wsl_root_path}}" \
3737
--test_env="NG_E2E_RUNNER_WSL_UNC_BASE=${{steps.init_wsl.outputs.wsl_root_unc_path}}" \
3838
--test_env="NG_E2E_RUNNER_WINDOWS_CMD=${{steps.init_wsl.outputs.cmd_path}}" \

tests/legacy-cli/e2e.bzl

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -126,23 +126,18 @@ def _e2e_tests(name, runner, windows_node_repo, **kwargs):
126126
toolchains = toolchains + ["@npm//@angular/build-tooling/bazel/browsers/chromium:toolchain_alias"]
127127
data = data + ["@npm//@angular/build-tooling/bazel/browsers/chromium"]
128128

129-
windows_node_files = [
129+
windows_test_files = [
130130
"@%s//:node_files" % windows_node_repo,
131131
"@%s//:npm_files" % windows_node_repo,
132132
"@%s//:bin/npm.cmd" % windows_node_repo,
133+
"@org_chromium_chromedriver_windows//:metadata",
134+
"@org_chromium_chromium_windows//:metadata",
133135
]
134136

135137
# In Windows native testing mode, add Windows dependencies. Those are not
136138
# available by default as we technically execute inside Linux/WSL.
137-
toolchains = select({
138-
"//e2e/legacy-cli:native_windows_testing": toolchains + [
139-
"@org_chromium_chromedriver_windows//:metadata",
140-
"@org_chromium_chromium_windows//:metadata",
141-
],
142-
"//conditions:default": toolchains,
143-
})
144139
data = select({
145-
"//e2e/legacy-cli:native_windows_testing": data + windows_node_files,
140+
"//tests/legacy-cli:native_windows_testing": data + windows_test_files,
146141
"//conditions:default": data,
147142
})
148143

tests/legacy-cli/e2e/setup/003-windows-wsl-prep.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,8 @@ export default async function () {
2222
// Expose Git binary in path. Node is already exposes via the NPM directory.
2323
// These global tools are used by e2e tests.
2424
process.env['PATH'] = [process.env.PATH, windowsMode.gitBinaryDirForWindows].join(path.delimiter);
25+
26+
process.env.CHROME_BIN = windowsMode?.windowsChromiumPath;
27+
process.env.CHROME_PATH = windowsMode?.windowsChromiumPath;
28+
process.env.CHROMEDRIVER_BIN = windowsMode?.windowsChromedriverPath;
2529
}

tests/legacy-cli/e2e/tests/commands/completion/completion-prompt.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
execWithEnv,
1111
silentNpm,
1212
} from '../../../utils/process';
13+
import { isWindowsTestMode } from '../../../utils/wsl';
1314

1415
const AUTOCOMPLETION_PROMPT = /Would you like to enable autocompletion\?/;
1516
const DEFAULT_ENV = Object.freeze({
@@ -30,7 +31,7 @@ const testRegistry = getGlobalVariable('package-registry');
3031
export default async function () {
3132
// Windows Cmd and Powershell do not support autocompletion. Run a different set of tests to
3233
// confirm autocompletion skips the prompt appropriately.
33-
if (process.platform === 'win32') {
34+
if (isWindowsTestMode()) {
3435
await windowsTests();
3536
return;
3637
}

tests/legacy-cli/e2e_runner.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import { findFreePort } from './e2e/utils/network';
1212
import { extractFile } from './e2e/utils/tar';
1313
import { realpathSync } from 'node:fs';
1414
import { PkgInfo } from './e2e/utils/packages';
15-
import { isWindowsTestMode } from './e2e/utils/wsl';
1615

1716
Error.stackTraceLimit = Infinity;
1817

@@ -207,19 +206,15 @@ setGlobalVariable('argv', argv);
207206
setGlobalVariable('package-manager', argv['package-manager']);
208207
setGlobalVariable('bazel-test-working-dir', process.cwd());
209208

210-
const windowsMode = isWindowsTestMode();
211-
212209
// Use the chrome supplied by bazel or the puppeteer chrome and webdriver-manager driver outside.
213210
// This is needed by karma-chrome-launcher, protractor etc.
214211
// https://github.com/karma-runner/karma-chrome-launcher#headless-chromium-with-puppeteer
215212
//
216213
// Resolve from relative paths to absolute paths within the bazel runfiles tree
217214
// so subprocesses spawned in a different working directory can still find them.
218-
process.env.CHROME_BIN = windowsMode?.windowsChromiumPath ?? path.resolve(process.env.CHROME_BIN!);
219-
process.env.CHROME_PATH =
220-
windowsMode?.windowsChromiumPath ?? path.resolve(process.env.CHROME_PATH!);
221-
process.env.CHROMEDRIVER_BIN =
222-
windowsMode?.windowsChromedriverPath ?? path.resolve(process.env.CHROMEDRIVER_BIN!);
215+
process.env.CHROME_BIN = path.resolve(process.env.CHROME_BIN!);
216+
process.env.CHROME_PATH = path.resolve(process.env.CHROME_PATH!);
217+
process.env.CHROMEDRIVER_BIN = path.resolve(process.env.CHROMEDRIVER_BIN!);
223218

224219
// Find free ports sequentially, reducing the risk of collisions.
225220
// Note for Windows test mode on CI: Verdaccio runs inside WSL, so we

0 commit comments

Comments
 (0)