Skip to content

Commit c9608f5

Browse files
alan-agius4angular-robot[bot]
authored andcommitted
Revert "fixup! test: run legacy-cli e2e tests via bazel"
This reverts commit 9e57770.
1 parent b11d3f6 commit c9608f5

File tree

3 files changed

+67
-18
lines changed

3 files changed

+67
-18
lines changed

packages/angular_devkit/build_angular/src/builders/karma/index.ts

-6
Original file line numberDiff line numberDiff line change
@@ -222,12 +222,6 @@ function getBuiltInKarmaConfig(
222222
logLevel: karma.constants.LOG_INFO,
223223
autoWatch: true,
224224
browsers: ['Chrome'],
225-
customLaunchers: {
226-
ChromeHeadlessNoSandbox: {
227-
base: 'ChromeHeadless',
228-
flags: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage'],
229-
},
230-
},
231225
restartOnFileChange: true,
232226
};
233227
}

tests/legacy-cli/e2e/assets/13.0-project/karma.conf.js

+1-12
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,7 @@ module.exports = function (config) {
3737
colors: true,
3838
logLevel: config.LOG_INFO,
3939
autoWatch: true,
40-
browsers: ['ChromeHeadlessNoSandbox'],
41-
customLaunchers: {
42-
ChromeHeadlessNoSandbox: {
43-
base: 'ChromeHeadless',
44-
flags: [
45-
'--no-sandbox',
46-
'--headless',
47-
'--disable-gpu',
48-
'--disable-dev-shm-usage',
49-
],
50-
}
51-
},
40+
browsers: ['Chrome'],
5241
singleRun: false,
5342
restartOnFileChange: true
5443
});

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

+66
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,45 @@ export function useCIDefaults(projectName = 'test-project'): Promise<void> {
187187
});
188188
}
189189

190+
const KARMA_CONF_DEFAULT = `
191+
module.exports = function (config) {
192+
config.set({
193+
basePath: '',
194+
frameworks: ['jasmine', '@angular-devkit/build-angular'],
195+
plugins: [
196+
require('karma-jasmine'),
197+
require('karma-chrome-launcher'),
198+
require('karma-jasmine-html-reporter'),
199+
require('karma-coverage'),
200+
require('@angular-devkit/build-angular/plugins/karma')
201+
],
202+
client: {
203+
jasmine: {},
204+
clearContext: false // leave Jasmine Spec Runner output visible in browser
205+
},
206+
jasmineHtmlReporter: {
207+
suppressAll: true // removes the duplicated traces
208+
},
209+
coverageReporter: {
210+
dir: require('path').join(__dirname, './coverage/$PROJECT_NAME$'),
211+
subdir: '.',
212+
reporters: [
213+
{ type: 'html' },
214+
{ type: 'text-summary' }
215+
]
216+
},
217+
reporters: ['progress', 'kjhtml'],
218+
port: 9876,
219+
colors: true,
220+
logLevel: config.LOG_INFO,
221+
autoWatch: true,
222+
browsers: ['Chrome'],
223+
singleRun: false,
224+
restartOnFileChange: true
225+
});
226+
};
227+
`;
228+
190229
export async function useCIChrome(projectName: string, projectDir = ''): Promise<void> {
191230
const protractorConf = path.join(projectDir, 'protractor.conf.js');
192231
if (fs.existsSync(protractorConf)) {
@@ -206,11 +245,38 @@ export async function useCIChrome(projectName: string, projectDir = ''): Promise
206245
);
207246
}
208247

248+
const karmaConf = path.join(projectDir, 'karma.conf.js');
249+
250+
// Create one with default config if it doesn't exist
251+
if (!fs.existsSync(karmaConf)) {
252+
await writeFile(karmaConf, KARMA_CONF_DEFAULT.replace('$PROJECT_NAME$', projectName));
253+
}
254+
209255
// Update to use the headless sandboxed chrome
256+
await replaceInFile(
257+
karmaConf,
258+
/browsers:.*\]\s*,/,
259+
`
260+
browsers: ['ChromeHeadlessNoSandbox'],
261+
customLaunchers: {
262+
ChromeHeadlessNoSandbox: {
263+
base: 'ChromeHeadless',
264+
flags: [
265+
'--no-sandbox',
266+
'--headless',
267+
'--disable-gpu',
268+
'--disable-dev-shm-usage',
269+
],
270+
}
271+
},
272+
`,
273+
);
274+
210275
return updateJsonFile('angular.json', (workspaceJson) => {
211276
const project = workspaceJson.projects[projectName];
212277
const appTargets = project.targets || project.architect;
213278
appTargets.test.options.browsers = 'ChromeHeadlessNoSandbox';
279+
appTargets.test.options.karmaConfig = karmaConf;
214280
});
215281
}
216282

0 commit comments

Comments
 (0)