Skip to content

fix: TT-263 random tests #698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 11, 2021
Merged

fix: TT-263 random tests #698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ module.exports = function (config) {
config.set({
basePath: '',
frameworks: ['jasmine', '@angular-devkit/build-angular'],
files: [
'node_modules/jquery/dist/jquery.js',
'node_modules/datatables.net/js/jquery.dataTables.js',
],
files: ['node_modules/jquery/dist/jquery.js', 'node_modules/datatables.net/js/jquery.dataTables.js'],
plugins: [
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('@angular-devkit/build-angular/plugins/karma'),
require('karma-jasmine-html-reporter'),
require('karma-spec-reporter'),
require('karma-coverage-istanbul-reporter')

require('karma-coverage-istanbul-reporter'),
],
client: {
clearContext: false // leave Jasmine Spec Runner output visible in browser
clearContext: false,
jasmine: {
random: true,
seed: '90967',
}, // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
dir: require('path').join(__dirname, './coverage/time-tracker'),
Expand All @@ -29,8 +29,8 @@ module.exports = function (config) {
statements: 80,
lines: 80,
branches: 80,
functions: 80
}
functions: 80,
},
},
reporters: ['spec', 'kjhtml'],
specReporter: {
Expand All @@ -39,7 +39,7 @@ module.exports = function (config) {
suppressFailed: false,
suppressPassed: false,
suppressSkipped: true,
showSpecTiming: false
showSpecTiming: false,
},

port: 9876,
Expand All @@ -48,6 +48,6 @@ module.exports = function (config) {
autoWatch: true,
browsers: ['Chrome'],
singleRun: false,
restartOnFileChange: true
restartOnFileChange: true,
});
};
25 changes: 19 additions & 6 deletions src/app/modules/shared/feature-toggles/filters/feature-filter-provider.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,36 @@ import { FeatureFilterModel } from './feature-filter.model';
import { TargetingFilterParameters } from './targeting/targeting-feature-filter-parameters';
import { TargetingFeatureFilterModel } from './targeting/targeting-feature-filter.model';


@Injectable({
providedIn: 'root',
})
export class FeatureFilterProvider {

constructor(private userService: AzureAdB2CService) { }
constructor(private userService: AzureAdB2CService) {}

getFilterFromConfiguration(featureFilterConfiguration: FeatureFilterConfiguration): FeatureFilterModel {
const featureName = featureFilterConfiguration.name;
switch (featureName) {
case FeatureFilterTypes.TARGETING: {
let username: string;
let group: string;
if (this.userService) {
try {
username = this.userService.getUserEmail();
group = this.userService.getUserGroup();
} catch (error) {
username = '[email protected]';
group = 'fake-group';
}
}

const appContext = {
username: this.userService.getUserEmail(),
group: this.userService.getUserGroup()
username,
group,
};
const filter = new TargetingFeatureFilterModel(featureFilterConfiguration.parameters as TargetingFilterParameters, appContext);
const filter = new TargetingFeatureFilterModel(
featureFilterConfiguration.parameters as TargetingFilterParameters,
appContext
);
return filter;
}
default: {
Expand Down