OZG-7021 Refactoring

alfa-client/apps/info/Jenkinsfile

@@ -39,7 +39,7 @@ pipeline {
             sh 'npm cache verify'
             sh 'npm install'
             sh 'npx nx run info:test'
-            // TODO: Is Sonar necessary?
+            sh 'npx nx run info:test -- --runInBand --codeCoverage --coverageReporters=lcov --testResultsProcessor=jest-sonar-reporter && npx sonar-scanner'
 
             IMAGE_TAG = generateImageTag()
 
@@ -52,8 +52,8 @@ pipeline {
 
             loginToDockerRegistry()
 
-            sh "INPUT_TAGS=${IMAGE_TAG} INPUT_IMAGES=docker.ozg-sh.de/info-client-by npx nx container info --configuration=by"
-            sh "INPUT_TAGS=${IMAGE_TAG} INPUT_IMAGES=docker.ozg-sh.de/info-client-sh npx nx container info --configuration=sh"
+            sh "INPUT_TAGS=${IMAGE_TAG} INPUT_IMAGES=docker.ozg-sh.de/info-client-by npx nx container info --configuration=production-by"
+            sh "INPUT_TAGS=${IMAGE_TAG} INPUT_IMAGES=docker.ozg-sh.de/info-client-sh npx nx container info --configuration=production-sh"
           }
         }
       }

alfa-client/apps/info/project.json

@@ -38,7 +38,7 @@
         }
       },
       "configurations": {
-        "by": {
+        "production-by": {
           "fileReplacements": [
             {
               "replace": "apps/info/src/pages/accessibility/accessibility-page.component.ts",
@@ -59,7 +59,7 @@
           ],
           "outputHashing": "all"
         },
-        "sh": {
+        "production-sh": {
           "fileReplacements": [
             {
               "replace": "apps/info/src/pages/accessibility/accessibility-page.component.ts",

alfa-client/apps/info/sonar-project.properties

+#
+# Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
+# Ministerpräsidenten des Landes Schleswig-Holstein
+# Staatskanzlei
+# Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+#
+# Lizenziert unter der EUPL, Version 1.2 oder - sobald
+# diese von der Europäischen Kommission genehmigt wurden -
+# Folgeversionen der EUPL ("Lizenz");
+# Sie dürfen dieses Werk ausschließlich gemäß
+# dieser Lizenz nutzen.
+# Eine Kopie der Lizenz finden Sie hier:
+#
+# https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+#
+# Sofern nicht durch anwendbare Rechtsvorschriften
+# gefordert oder in schriftlicher Form vereinbart, wird
+# die unter der Lizenz verbreitete Software "so wie sie
+# ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+# ausdrücklich oder stillschweigend - verbreitet.
+# Die sprachspezifischen Genehmigungen und Beschränkungen
+# unter der Lizenz sind dem Lizenztext zu entnehmen.
+#
+
+sonar.projectKey=info-client
+sonar.sources=src
+sonar.tests=src
+sonar.test.inclusions=**/*.spec.ts
+sonar.exclusions=**/node_modules/**
+sonar.inclusions=**/*.ts, **/*.scss, **/*.html
+sonar.javascript.lcov.reportPaths=coverage/**/lcov.info
+sonar.sourceEncoding=UTF-8
+sonar.projectName=Info Client
\ No newline at end of file

alfa-client/apps/info/src/app/app.component.html

-<header class="flex items-center justify-between border-b border-b-ozggray-300 bg-white px-9 py-2" data-test-id="admin-header">
+<header class="flex items-center justify-between border-b border-b-ozggray-300 bg-white px-9 py-2" data-test-id="info-header">
   <a
     class="w-20 rounded border-2 border-transparent p-1 outline-2 outline-offset-2 hover:border-primary focus-visible:border-gray-200 focus-visible:outline-focus"
     aria-label="OZG-Cloud Information"
@@ -11,13 +11,4 @@
   <main class="flex-auto bg-background-50">
     <router-outlet></router-outlet>
   </main>
-  <!-- <footer class="ozg-prose">
-    <nav>
-      <ul class="flex flex-row flex-wrap justify-center gap-9">
-        <li><a routerLink="/barrierefreiheit">Barrierefreiheit</a></li>
-        <li><a routerLink="/datenschutzerklarrung">Datenschutzerklärung</a></li>
-        <li><a routerLink="/impressum">Impressum</a></li>
-      </ul>
-    </nav>
-  </footer> -->
 </div>

alfa-client/apps/info/src/app/app.component.spec.ts

-import { TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { provideRouter } from '@angular/router';
 import { AppComponent } from './app.component';
 
 describe('AppComponent', () => {
+  let component: AppComponent;
+  let fixture: ComponentFixture<AppComponent>;
+
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [AppComponent, RouterTestingModule],
+      imports: [AppComponent],
+      providers: [provideRouter([])],
     }).compileComponents();
+
+    fixture = TestBed.createComponent(AppComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
   });
 
-  it(`should have as title 'info'`, () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.componentInstance;
-    expect(app.title).toEqual('info');
+  it('should create', () => {
+    expect(component).toBeTruthy();
   });
 });

alfa-client/apps/info/src/app/app.component.ts

@@ -8,6 +8,4 @@ import { OzgLogoIconComponent } from '@ods/system';
   selector: 'app-root',
   templateUrl: './app.component.html',
 })
-export class AppComponent {
-  title = 'info';
-}
+export class AppComponent {}

alfa-client/apps/info/src/app/app.routes.ts

@@ -12,9 +12,4 @@ export const appRoutes: Route[] = [
     component: AccessibilityPageComponent,
     title: 'Barrierefreiheit',
   },
-  // {
-  //   path: 'datenschutzerklaerung',
-  //   component: DataPolicyComponent,
-  //   title: 'Datenschutz Erklärung',
-  // },
 ];

alfa-client/apps/info/src/pages/accessibility/accessibility-page-by.component.spec.ts

+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { AccessibilityPageComponent } from './accessibility-page-by.component';
+
+describe('AccessibilityPageComponent', () => {
+  let component: AccessibilityPageComponent;
+  let fixture: ComponentFixture<AccessibilityPageComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [AccessibilityPageComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(AccessibilityPageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

alfa-client/apps/info/src/pages/accessibility/accessibility-page-sh.component.spec.ts

+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { AccessibilityPageComponent } from './accessibility-page-sh.component';
+
+describe('AccessibilityPageComponent', () => {
+  let component: AccessibilityPageComponent;
+  let fixture: ComponentFixture<AccessibilityPageComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [AccessibilityPageComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(AccessibilityPageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

alfa-client/apps/info/src/test-setup.ts

-globalThis.ngJest = {
-  testEnvironmentOptions: {
-    errorOnUnknownElements: true,
-    errorOnUnknownProperties: true,
-  },
-};
 import 'jest-preset-angular/setup-jest';
+
+import { getTestBed } from '@angular/core/testing';
+import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
+
+getTestBed().resetTestEnvironment();
+getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
+  teardown: { destroyAfterEach: false },
+});