Skip to content

Commit 1596902

Browse files
devversionthePunderWoman
authored andcommitted
build: move jasmine seed generation logic to karma config (angular#46798)
The jasmine seed generator is only used in a single karma configuration file. Used by the legacy build and the Saucelabs/ZoneJS Karma jobs. We should move the separate script code directly into the config to make it clear that the seed generation is not used elsewhere, and to simplify the Starlark code. PR Close angular#46798
1 parent 9f9e4f2 commit 1596902

File tree

4 files changed

+4
-23
lines changed

4 files changed

+4
-23
lines changed

karma-js.conf.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,19 @@
77
*/
88

99
const browserProvidersConf = require('./browser-providers.conf');
10-
const {generateSeed} = require('./tools/jasmine-seed-generator');
1110
const {hostname} = require('os');
1211

12+
const seed = process.env.JASMINE_RANDOM_SEED || String(Math.random()).slice(-5);
13+
console.info(`Jasmine random seed: ${seed}`);
14+
1315
module.exports = function(config) {
1416
const conf = {
1517
frameworks: ['jasmine'],
1618

1719
client: {
1820
jasmine: {
1921
random: true,
20-
seed: generateSeed('karma-js.conf'),
22+
seed,
2123
},
2224
captureConsole: true,
2325
},

packages/zone.js/test/karma_test.bzl

-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ def karma_test(name, env_srcs, env_deps, env_entry_point, test_srcs, test_deps,
9999
configuration_env_vars = ["KARMA_WEB_TEST_MODE"],
100100
data = [
101101
"//:browser-providers.conf.js",
102-
"//tools:jasmine-seed-generator.js",
103102
],
104103
static_files = [
105104
":assets/sample.json",

tools/defaults.bzl

-1
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,6 @@ def karma_web_test_suite(name, **kwargs):
372372
deps = deps,
373373
data = data + [
374374
"//:browser-providers.conf.js",
375-
"//tools:jasmine-seed-generator.js",
376375
],
377376
karma = "//tools/saucelabs:karma-saucelabs",
378377
tags = tags + [

tools/jasmine-seed-generator.js

-19
This file was deleted.

0 commit comments

Comments
 (0)