Skip to content
This repository was archived by the owner on Aug 1, 2021. It is now read-only.

Commit 60c6b60

Browse files
fixed tests and added incomplete greek translation
1 parent 3a112a3 commit 60c6b60

9 files changed

Lines changed: 83 additions & 76 deletions

File tree

src/Frontend/Jp.AdminUI/karma.conf.js

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,48 +3,40 @@
33

44
module.exports = function (config) {
55
config.set({
6-
basePath: './',
7-
frameworks: ['jasmine', '@angular/cli'],
6+
basePath: '',
7+
frameworks: ['jasmine', '@angular-devkit/build-angular'],
88
plugins: [
99
require('karma-jasmine'),
1010
require('karma-chrome-launcher'),
1111
require('karma-jasmine-html-reporter'),
1212
require('karma-coverage-istanbul-reporter'),
13-
require('@angular/cli/plugins/karma')
13+
require('@angular-devkit/build-angular/plugins/karma')
1414
],
1515
client:{
1616
clearContext: false // leave Jasmine Spec Runner output visible in browser
1717
},
1818
files: [
1919
{ pattern: './src/test.ts', watched: false },
2020
{ pattern: 'src/assets/**/*', watched: false, included: false, served: true },
21+
{ pattern: 'src/assets/i18n/*.json', watched: false, included: false, served: true },
2122
],
2223
proxies: {
2324
'/assets/': '/base/src/assets/'
2425
},
25-
preprocessors: {
26-
'./src/test.ts': ['@angular/cli']
27-
},
28-
mime: {
29-
'text/x-typescript': ['ts','tsx']
26+
angularCli: {
27+
environment: 'dev'
3028
},
3129
coverageIstanbulReporter: {
32-
reports: [ 'html', 'lcovonly' ],
30+
reports: ['html', 'lcovonly', 'text-summary'],
3331
fixWebpackSourcePaths: true
3432
},
35-
angularCli: {
36-
environment: 'dev'
37-
},
3833
reporters: ['progress', 'kjhtml'],
3934
port: 9876,
4035
colors: true,
4136
logLevel: config.LOG_INFO,
4237
autoWatch: true,
4338
browsers: ['Chrome'],
4439
singleRun: false,
45-
captureTimeout: 60000, // it was already there
46-
browserDisconnectTimeout : 60000,
47-
browserDisconnectTolerance : 1,
48-
browserNoActivityTimeout : 60000 //by default 10000
40+
restartOnFileChange: true
4941
});
5042
};

src/Frontend/Jp.AdminUI/src/app/core/settings/settings.service.spec.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
import { TestBed, async, inject } from "@angular/core/testing";
44
import { SettingsService } from "./settings.service";
55
import { HttpClientModule } from "@angular/common/http";
6+
import { OAuthModule } from 'angular-oauth2-oidc';
7+
import { VersionService } from '@shared/services/version.service';
68

79
describe("Service: Settings", () => {
810
beforeEach(() => {
911
TestBed.configureTestingModule({
10-
imports: [HttpClientModule],
11-
providers: [SettingsService]
12+
imports: [HttpClientModule, OAuthModule.forRoot()],
13+
providers: [SettingsService, VersionService]
1214
});
1315
});
1416

src/Frontend/Jp.AdminUI/src/app/shared/layout/footer/footer.component.spec.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@ import { FooterComponent } from "./footer.component";
55

66
import { SettingsService } from "@core/settings/settings.service";
77
import { HttpClientModule } from "@angular/common/http";
8+
import { OAuthModule } from 'angular-oauth2-oidc';
9+
import { VersionService } from '@shared/services/version.service';
810

911
describe("Component: Footer", () => {
1012

1113
beforeEach(() => {
1214
TestBed.configureTestingModule({
13-
imports: [HttpClientModule],
14-
providers: [SettingsService]
15+
imports: [HttpClientModule, OAuthModule.forRoot()],
16+
providers: [SettingsService, VersionService]
1517
}).compileComponents();
1618
});
1719

src/Frontend/Jp.AdminUI/src/app/shared/layout/offsidebar/offsidebar.component.spec.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import { ThemesService } from "@core/themes/themes.service";
1010
import { TranslatorService } from "@core/translator/translator.service";
1111
import { SharedModule } from "@shared/shared.module";
1212
import { createTranslateLoader } from "../../../app.module";
13+
import { OAuthModule } from 'angular-oauth2-oidc';
14+
import { VersionService } from '@shared/services/version.service';
1315

1416
describe("Component: Offsidebar", () => {
1517

@@ -24,9 +26,10 @@ describe("Component: Offsidebar", () => {
2426
}
2527
}),
2628
HttpClientModule,
27-
SharedModule
29+
SharedModule,
30+
OAuthModule.forRoot()
2831
],
29-
providers: [SettingsService, ThemesService, TranslatorService]
32+
providers: [SettingsService, ThemesService, TranslatorService, VersionService]
3033
}).compileComponents();
3134
});
3235

src/Frontend/Jp.AdminUI/src/app/shared/layout/sidebar/sidebar.component.spec.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,21 @@ import { RouterModule, Router } from "@angular/router";
66
import { MenuService } from "@core/menu/menu.service";
77
import { SettingsService } from "@core/settings/settings.service";
88
import { HttpClientModule } from "@angular/common/http";
9+
import { OAuthModule } from 'angular-oauth2-oidc';
10+
import { VersionService } from '@shared/services/version.service';
911

1012
describe("Component: Sidebar", () => {
1113
let mockRouter = {
1214
navigate: jasmine.createSpy("navigate")
1315
};
1416
beforeEach(() => {
1517
TestBed.configureTestingModule({
16-
imports: [HttpClientModule],
18+
imports: [HttpClientModule, OAuthModule.forRoot()],
1719
providers: [
1820
MenuService,
1921
SettingsService,
20-
{ provide: Router, useValue: mockRouter }
22+
{ provide: Router, useValue: mockRouter },
23+
VersionService
2124
]
2225
}).compileComponents();
2326
});

src/Frontend/Jp.AdminUI/src/app/shared/layout/sidebar/userblock/userblock.component.spec.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import { SettingsService } from "@core/settings/settings.service";
88
import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from "@angular/platform-browser-dynamic/testing";
99
import { AppComponent } from "../../../../app.component";
1010
import { HttpClientModule } from "@angular/common/http";
11+
import { OAuthModule } from 'angular-oauth2-oidc';
12+
import { VersionService } from '@shared/services/version.service';
1113

1214
describe("Component: Userblock", () => {
1315

@@ -17,8 +19,8 @@ describe("Component: Userblock", () => {
1719
platformBrowserDynamicTesting());
1820

1921
TestBed.configureTestingModule({
20-
imports: [HttpClientModule],
21-
providers: [UserblockService, SettingsService]
22+
imports: [HttpClientModule, OAuthModule.forRoot()],
23+
providers: [UserblockService, SettingsService, VersionService]
2224
});
2325
});
2426

src/Frontend/Jp.AdminUI/src/assets/i18n/el.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
"settings": "Ρυθμίσεις"
99
},
1010
"general": {
11-
"add": "Add",
12-
"api-resource": "Protected Resources",
13-
"clients": "Clients",
14-
"copy": "Copy",
15-
"details": "Details",
16-
"edit": "Edit",
17-
"empty": "Empty",
18-
"goback": "Go Back",
19-
"identity-resource": "Identity Resources",
20-
"loading": "Loading, please wait!",
21-
"persisted-grants": "Persisted Grants",
11+
"add": "Προσθήκη",
12+
"api-resource": "Προστατευμένοι Πόροι",
13+
"clients": "Εφαρμογές Πελάτη",
14+
"copy": "Αντιγραφή",
15+
"details": "Λεπτομέρειες",
16+
"edit": "Επεξεργασία",
17+
"empty": "Άδειο",
18+
"goback": "Πίσω",
19+
"identity-resource": "Πόροι Identity",
20+
"loading": "Παρακαλώ περίμενετε να φορτωθεί!",
21+
"persisted-grants": "Αποθηκευμένες Εξουσιοδοτήσεις",
2222
"remove": "Remove",
2323
"revoke": "Revoke",
2424
"roles": "Roles",

src/Frontend/Jp.AdminUI/src/tsconfig.spec.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
{
2-
"extends": "../tsconfig.json",
3-
"compilerOptions": {
4-
"outDir": "../out-tsc/spec",
5-
"baseUrl": "./",
6-
"module": "commonjs",
7-
"target": "es5",
2+
"extends": "../tsconfig.json",
3+
"compilerOptions": {
4+
"outDir": "./out-tsc/spec",
85
"types": [
96
"jasmine",
107
"node"
118
]
129
},
1310
"files": [
14-
"test.ts"
11+
"test.ts",
12+
"polyfills.ts"
1513
],
1614
"include": [
1715
"**/*.spec.ts",
Lines changed: 37 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,40 @@
11
{
2-
"compileOnSave": false,
3-
"compilerOptions": {
4-
"baseUrl": "./",
5-
"outDir": "./dist/out-tsc",
6-
"mapRoot": "./dist/out-tsc",
7-
"sourceMap": true,
8-
"declaration": false,
9-
"moduleResolution": "node",
10-
"emitDecoratorMetadata": true,
11-
"experimentalDecorators": true,
12-
"target": "es5",
13-
"typeRoots": [
14-
"node_modules/@types"
15-
],
16-
"lib": [
17-
"es2017",
18-
"dom"
19-
],
20-
"paths": {
21-
"@shared/*": [
22-
"src/app/shared/*"
23-
],
24-
"@app/*": [
25-
"src/app/panel/*"
26-
],
27-
"@core/*": [
28-
"src/app/core/*"
29-
],
30-
"@env/*": [
31-
"src/environments/*"
32-
]
33-
}
2+
"compileOnSave": false,
3+
"compilerOptions": {
4+
"baseUrl": "./",
5+
"outDir": "./dist/out-tsc",
6+
"sourceMap": true,
7+
"declaration": false,
8+
"downlevelIteration": true,
9+
"experimentalDecorators": true,
10+
"module": "esnext",
11+
"moduleResolution": "node",
12+
"importHelpers": true,
13+
"target": "es2015",
14+
"typeRoots": [
15+
"node_modules/@types"
16+
],
17+
"lib": [
18+
"es2018",
19+
"dom"
20+
],
21+
"paths": {
22+
"@shared/*": [
23+
"src/app/shared/*"
24+
],
25+
"@app/*": [
26+
"src/app/panel/*"
27+
],
28+
"@core/*": [
29+
"src/app/core/*"
30+
],
31+
"@env/*": [
32+
"src/environments/*"
33+
]
3434
}
35+
},
36+
"angularCompilerOptions": {
37+
"fullTemplateTypeCheck": true,
38+
"strictInjectionParameters": true
39+
}
3540
}

0 commit comments

Comments
 (0)