Merge pull request #205 from aeleftheriadis/feature/fix-e2e-tests

Added Greek translation and fixed Frontend tests and configuration

Author: brunobritodev

src/Frontend/Jp.AdminUI/.vscode/launch.json

@@ -4,7 +4,18 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
-        
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Launch Program",
+      "program": "${workspaceFolder}/node_modules/protractor/bin/protractor",
+      "args":["${workspaceFolder}/e2e/protractor.conf.js"],
+      "preLaunchTask": "npm: e2e",
+      "outFiles": [
+        "${workspaceFolder}/dist/out-tsc/**/*.js"
+      ]
+    },
+
         {
             "type": "chrome",
             "request": "launch",
@@ -13,4 +24,4 @@
             "webRoot": "${workspaceFolder}"
           }
     ]
-}
+}

src/Frontend/Jp.AdminUI/.vscode/tasks.json

@@ -0,0 +1,17 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "type": "npm",
+            "script": "e2e",
+            "problemMatcher": []
+        },
+        {
+          "type": "npm",
+          "script": "start",
+          "problemMatcher": []
+      },
+    ]
+}

src/Frontend/Jp.AdminUI/e2e/app.e2e-spec.ts

@@ -11,7 +11,7 @@ describe("jpproject WebApp", function () {
 
   it("should display sign-in page", () => {
     page.navigateTo();
-    expect(page.getParagraphText()).toEqual("SIGN IN TO CONTINUE.");
+    expect(page.getButtonText()).toEqual("Login");
     expect(page.getUrl()).toContain("/login");
   });
 });

src/Frontend/Jp.AdminUI/e2e/app.po.ts

@@ -9,7 +9,7 @@ export class JpProjectWebAppPage {
         return browser.getCurrentUrl();
     }
 
-    getParagraphText() {
-        return element(by.css("login-container text-center py-2")).getText();
+    getButtonText() {
+        return element(by.css(".login-container .card-body .mt-3")).getText();
     }
 }

…c/Frontend/Jp.AdminUI/protractor.conf.js …ontend/Jp.AdminUI/e2e/protractor.conf.jssrc/Frontend/Jp.AdminUI/protractor.conf.js renamed to src/Frontend/Jp.AdminUI/e2e/protractor.conf.js src/Frontend/Jp.AdminUI/protractor.conf.js renamed to src/Frontend/Jp.AdminUI/e2e/protractor.conf.js

@@ -4,9 +4,9 @@
 const { SpecReporter } = require('jasmine-spec-reporter');
 
 exports.config = {
-  allScriptsTimeout: 11000,
+  allScriptsTimeout: 30000,
   specs: [
-    './e2e/**/*.e2e-spec.ts'
+    './*.e2e-spec.ts'
   ],
   capabilities: {
     'browserName': 'chrome'

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

@@ -2,6 +2,8 @@
   "extends": "../tsconfig.json",
   "compilerOptions": {
     "outDir": "../out-tsc/e2e",
+    "mapRoot": "../out-tsc/e2e",
+    "sourceMap": true,
     "baseUrl": "./",
     "module": "commonjs",
     "target": "es5",

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

@@ -3,48 +3,40 @@
 
 module.exports = function (config) {
   config.set({
-    basePath: './',
-    frameworks: ['jasmine', '@angular/cli'],
+    basePath: '',
+    frameworks: ['jasmine', '@angular-devkit/build-angular'],
     plugins: [
       require('karma-jasmine'),
       require('karma-chrome-launcher'),
       require('karma-jasmine-html-reporter'),
       require('karma-coverage-istanbul-reporter'),
-      require('@angular/cli/plugins/karma')
+      require('@angular-devkit/build-angular/plugins/karma')
     ],
     client:{
       clearContext: false // leave Jasmine Spec Runner output visible in browser
     },
     files: [
       { pattern: './src/test.ts', watched: false },
       { pattern: 'src/assets/**/*', watched: false, included: false, served: true },
+      { pattern: 'src/assets/i18n/*.json', watched: false, included: false, served: true },
     ],
     proxies: {
       '/assets/': '/base/src/assets/'
     },
-    preprocessors: {
-      './src/test.ts': ['@angular/cli']
-    },
-    mime: {
-      'text/x-typescript': ['ts','tsx']
+    angularCli: {
+      environment: 'dev'
     },
     coverageIstanbulReporter: {
-      reports: [ 'html', 'lcovonly' ],
+      reports: ['html', 'lcovonly', 'text-summary'],
       fixWebpackSourcePaths: true
     },
-    angularCli: {
-      environment: 'dev'
-    },
     reporters: ['progress', 'kjhtml'],
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
     autoWatch: true,
     browsers: ['Chrome'],
     singleRun: false,
-    captureTimeout: 60000, // it was already there
-    browserDisconnectTimeout : 60000,
-    browserDisconnectTolerance : 1,
-    browserNoActivityTimeout : 60000 //by default 10000
+    restartOnFileChange: true
   });
 };

src/Frontend/Jp.AdminUI/package-lock.json

@@ -11,6 +11,7 @@
     "build": "ng build --prod",
     "test": "ng test",
     "lint": "ng lint",
+    "lintfix": "ng lint --fix=true",
     "modernizr": "modernizr -c modernizr-config.json -d src/modernizr.js",
     "postinstall": "node ./node_modules/protractor/bin/webdriver-manager update",
     "e2e": "ng e2e",
@@ -116,6 +117,6 @@
     "ts-node": "^8.3.0",
     "tslint": "^5.14.0",
     "typescript": ">=3.4.0 <3.5.0",
-    "webdriver-manager": "12.1.5"
+    "webdriver-manager": "12.1.7"
   }
 }

src/Frontend/Jp.AdminUI/package.json

@@ -3,12 +3,14 @@
 import { TestBed, async, inject } from "@angular/core/testing";
 import { SettingsService } from "./settings.service";
 import { HttpClientModule } from "@angular/common/http";
+import { OAuthModule } from 'angular-oauth2-oidc';
+import { VersionService } from '@shared/services/version.service';
 
 describe("Service: Settings", () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [SettingsService]
+      imports: [HttpClientModule, OAuthModule.forRoot()],
+      providers: [SettingsService, VersionService]
     });
   });