Skip to content

Commit d6fe8d9

Browse files
alan-agius4dgp1130
authored andcommitted
test: move chrome driver path login inside the protractor config check
The chrome driver path is only needed when protractor config is available. (cherry picked from commit 6c9e388)
1 parent 029e578 commit d6fe8d9

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

tests/legacy-cli/e2e/tests/misc/cli-exit-interop.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export default async function () {
1818
await setRegistry(false);
1919
await createProjectFromAsset('13.0-project', true);
2020

21-
// A missing stylesheet error will trigger the stuck process issue with v12 when building
21+
// A missing stylesheet error will trigger the stuck process issue with v13 when building
2222
await moveFile('src/styles.css', 'src/styles.scss');
2323
await expectToFail(() => noSilentNg('build'));
2424

tests/legacy-cli/e2e/utils/project.ts

+9-8
Original file line numberDiff line numberDiff line change
@@ -191,17 +191,18 @@ export async function useCIChrome(projectDir: string = ''): Promise<void> {
191191
const karmaConf = path.join(projectDir, 'karma.conf.js');
192192

193193
const chromePath = require('puppeteer').executablePath();
194-
const protractorPath = require.resolve('protractor');
195-
const webdriverUpdatePath = require.resolve('webdriver-manager/selenium/update-config.json', {
196-
paths: [protractorPath],
197-
});
198-
const webdriverUpdate = JSON.parse(await readFile(webdriverUpdatePath)) as {
199-
chrome: { last: string };
200-
};
201-
const chromeDriverPath = webdriverUpdate.chrome.last;
202194

203195
// Use Puppeteer in protractor if a config is found on the project.
204196
if (fs.existsSync(protractorConf)) {
197+
const protractorPath = require.resolve('protractor');
198+
const webdriverUpdatePath = require.resolve('webdriver-manager/selenium/update-config.json', {
199+
paths: [protractorPath],
200+
});
201+
const webdriverUpdate = JSON.parse(await readFile(webdriverUpdatePath)) as {
202+
chrome: { last: string };
203+
};
204+
const chromeDriverPath = webdriverUpdate.chrome.last;
205+
205206
await replaceInFile(
206207
protractorConf,
207208
`browserName: 'chrome'`,

0 commit comments

Comments
 (0)