Skip to content

Commit 5240b74

Browse files
committed
fix: TT-263 random tests fixed
1 parent c3d61f8 commit 5240b74

File tree

2 files changed

+30
-17
lines changed

2 files changed

+30
-17
lines changed

karma.conf.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ module.exports = function (config) {
55
config.set({
66
basePath: '',
77
frameworks: ['jasmine', '@angular-devkit/build-angular'],
8-
files: [
9-
'node_modules/jquery/dist/jquery.js',
10-
'node_modules/datatables.net/js/jquery.dataTables.js',
11-
],
8+
files: ['node_modules/jquery/dist/jquery.js', 'node_modules/datatables.net/js/jquery.dataTables.js'],
129
plugins: [
1310
require('karma-jasmine'),
1411
require('karma-chrome-launcher'),
1512
require('@angular-devkit/build-angular/plugins/karma'),
1613
require('karma-jasmine-html-reporter'),
1714
require('karma-spec-reporter'),
18-
require('karma-coverage-istanbul-reporter')
19-
15+
require('karma-coverage-istanbul-reporter'),
2016
],
2117
client: {
22-
clearContext: false // leave Jasmine Spec Runner output visible in browser
18+
clearContext: false,
19+
jasmine: {
20+
random: true,
21+
seed: '90967',
22+
}, // leave Jasmine Spec Runner output visible in browser
2323
},
2424
coverageIstanbulReporter: {
2525
dir: require('path').join(__dirname, './coverage/time-tracker'),
@@ -29,8 +29,8 @@ module.exports = function (config) {
2929
statements: 80,
3030
lines: 80,
3131
branches: 80,
32-
functions: 80
33-
}
32+
functions: 80,
33+
},
3434
},
3535
reporters: ['spec', 'kjhtml'],
3636
specReporter: {
@@ -39,7 +39,7 @@ module.exports = function (config) {
3939
suppressFailed: false,
4040
suppressPassed: false,
4141
suppressSkipped: true,
42-
showSpecTiming: false
42+
showSpecTiming: false,
4343
},
4444

4545
port: 9876,
@@ -48,6 +48,6 @@ module.exports = function (config) {
4848
autoWatch: true,
4949
browsers: ['Chrome'],
5050
singleRun: false,
51-
restartOnFileChange: true
51+
restartOnFileChange: true,
5252
});
5353
};

src/app/modules/shared/feature-toggles/filters/feature-filter-provider.service.ts

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,36 @@ import { FeatureFilterModel } from './feature-filter.model';
66
import { TargetingFilterParameters } from './targeting/targeting-feature-filter-parameters';
77
import { TargetingFeatureFilterModel } from './targeting/targeting-feature-filter.model';
88

9-
109
@Injectable({
1110
providedIn: 'root',
1211
})
1312
export class FeatureFilterProvider {
14-
15-
constructor(private userService: AzureAdB2CService) { }
13+
constructor(private userService: AzureAdB2CService) {}
1614

1715
getFilterFromConfiguration(featureFilterConfiguration: FeatureFilterConfiguration): FeatureFilterModel {
1816
const featureName = featureFilterConfiguration.name;
1917
switch (featureName) {
2018
case FeatureFilterTypes.TARGETING: {
19+
let username: string;
20+
let group: string;
21+
if (this.userService) {
22+
try {
23+
username = this.userService.getUserEmail();
24+
group = this.userService.getUserGroup();
25+
} catch (error) {
26+
username = '[email protected]';
27+
group = 'fake-group';
28+
}
29+
}
30+
2131
const appContext = {
22-
username: this.userService.getUserEmail(),
23-
group: this.userService.getUserGroup()
32+
username,
33+
group,
2434
};
25-
const filter = new TargetingFeatureFilterModel(featureFilterConfiguration.parameters as TargetingFilterParameters, appContext);
35+
const filter = new TargetingFeatureFilterModel(
36+
featureFilterConfiguration.parameters as TargetingFilterParameters,
37+
appContext
38+
);
2639
return filter;
2740
}
2841
default: {

0 commit comments

Comments
 (0)