From 4a7ef6d637bc05d9080d42156e7ac8f40267c889 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20M=C3=BCller?= Date: Sat, 26 Jun 2021 14:33:58 +0200 Subject: [PATCH] Adjusting some frontend tests --- Frontend/karma.conf.js | 59 ++++++++-------- Frontend/src/app/app.component.spec.ts | 6 +- Frontend/src/app/app.component.ts | 5 +- Frontend/src/app/app.module.ts | 2 +- Frontend/src/app/app.routing.ts | 12 ++-- .../registration.component.spec.ts | 65 ++++++++++++----- .../auth/signin/signin.component.spec.ts | 65 ++++++++++++----- .../copyright/copyright.component.css | 24 +++++++ .../copyright/copyright.component.html | 8 ++- .../hot-deals-widget.component.spec.ts | 69 ++++++++++++++----- .../kunden/kunden.component.spec.ts | 64 ++++++++++++----- .../product-details.component.spec.ts | 5 ++ .../product-list.component.spec.ts | 3 +- .../product-list/product-list.component.ts | 2 +- .../profile/profile.component.spec.ts | 25 ------- .../top-bar/top-bar.component.spec.ts | 59 +++++++++++----- .../app/pages/imprint/imprint.component.html | 7 +- .../landingpage/landingpage.component.ts | 3 +- .../app/pages/privacy/privacy.component.html | 7 +- .../profile/profile.component.css | 0 .../profile/profile.component.html | 0 .../pages/profile/profile.component.spec.ts | 47 +++++++++++++ .../profile/profile.component.ts | 0 Frontend/src/app/services/api.service.ts | 2 +- 24 files changed, 370 insertions(+), 169 deletions(-) delete mode 100644 Frontend/src/app/components/profile/profile.component.spec.ts rename Frontend/src/app/{components => pages}/profile/profile.component.css (100%) rename Frontend/src/app/{components => pages}/profile/profile.component.html (100%) create mode 100644 Frontend/src/app/pages/profile/profile.component.spec.ts rename Frontend/src/app/{components => pages}/profile/profile.component.ts (100%) diff --git a/Frontend/karma.conf.js b/Frontend/karma.conf.js index 74211c5..4a72f2c 100644 --- a/Frontend/karma.conf.js +++ b/Frontend/karma.conf.js @@ -2,32 +2,35 @@ // https://karma-runner.github.io/1.0/config/configuration-file.html module.exports = function (config) { - config.set({ - basePath: '', - frameworks: ['jasmine', '@angular-devkit/build-angular'], - plugins: [ - require('karma-jasmine'), - require('karma-firefox-launcher'), - require('karma-chrome-launcher'), - require('karma-jasmine-html-reporter'), - require('karma-coverage-istanbul-reporter'), - require('@angular-devkit/build-angular/plugins/karma') - ], - client: { - clearContext: false // leave Jasmine Spec Runner output visible in browser - }, - coverageIstanbulReporter: { - dir: require('path').join(__dirname, './coverage/Betterzon'), - reports: ['html', 'lcovonly', 'text-summary'], - fixWebpackSourcePaths: true - }, - reporters: ['progress', 'kjhtml'], - port: 9876, - colors: true, - logLevel: config.LOG_INFO, - autoWatch: true, - browsers: ['Firefox'], - singleRun: false, - restartOnFileChange: true - }); + config.set({ + basePath: '', + frameworks: ['jasmine', '@angular-devkit/build-angular'], + plugins: [ + require('karma-jasmine'), + require('karma-firefox-launcher'), + require('karma-chrome-launcher'), + require('karma-jasmine-html-reporter'), + require('karma-coverage-istanbul-reporter'), + require('@angular-devkit/build-angular/plugins/karma') + ], + client: { + clearContext: false, // leave Jasmine Spec Runner output visible in browser + jasmine: { + random: false + } + }, + coverageIstanbulReporter: { + dir: require('path').join(__dirname, './coverage/Betterzon'), + reports: ['html', 'lcovonly', 'text-summary'], + fixWebpackSourcePaths: true + }, + reporters: ['progress', 'kjhtml'], + port: 9876, + colors: true, + logLevel: config.LOG_INFO, + autoWatch: true, + browsers: ['Firefox'], + singleRun: false, + restartOnFileChange: true + }); }; diff --git a/Frontend/src/app/app.component.spec.ts b/Frontend/src/app/app.component.spec.ts index a309d0b..702527d 100644 --- a/Frontend/src/app/app.component.spec.ts +++ b/Frontend/src/app/app.component.spec.ts @@ -1,8 +1,8 @@ import {TestBed} from '@angular/core/testing'; import {AppComponent} from './app.component'; -import {RouterTestingModule} from "@angular/router/testing"; -import {NgcCookieConsentConfig, NgcCookieConsentModule} from "ngx-cookieconsent"; -import {FormsModule} from "@angular/forms"; +import {RouterTestingModule} from '@angular/router/testing'; +import {NgcCookieConsentConfig, NgcCookieConsentModule} from 'ngx-cookieconsent'; +import {FormsModule} from '@angular/forms'; // For cookie consent module testing const cookieConfig: NgcCookieConsentConfig = { diff --git a/Frontend/src/app/app.component.ts b/Frontend/src/app/app.component.ts index f65d28c..0941258 100644 --- a/Frontend/src/app/app.component.ts +++ b/Frontend/src/app/app.component.ts @@ -1,7 +1,7 @@ import {Component, OnDestroy, OnInit} from '@angular/core'; import {NgcCookieConsentService, NgcInitializeEvent, NgcNoCookieLawEvent, NgcStatusChangeEvent} from 'ngx-cookieconsent'; import {Subscription} from 'rxjs'; -import {ApiService} from "./services/api.service"; +import {ApiService} from './services/api.service'; @Component({ @@ -26,8 +26,7 @@ export class AppComponent implements OnInit, OnDestroy { username?: string; constructor( - private ccService: NgcCookieConsentService, - private api: ApiService + private ccService: NgcCookieConsentService ) { } diff --git a/Frontend/src/app/app.module.ts b/Frontend/src/app/app.module.ts index 153ae2c..246d159 100644 --- a/Frontend/src/app/app.module.ts +++ b/Frontend/src/app/app.module.ts @@ -38,7 +38,7 @@ import { CopyrightComponent } from './components/copyright/copyright.component'; import { GreetingInfoSliderComponent } from './components/greeting-info-slider/greeting-info-slider.component'; import { KundenComponent } from './components/kunden/kunden.component'; import { AboutUsComponent } from './components/about-us/about-us.component'; -import { ProfileComponent } from './components/profile/profile.component'; +import { ProfileComponent } from './pages/profile/profile.component'; import { ProfilePageComponent } from './pages/profile-page/profile-page.component'; // For cookie popup diff --git a/Frontend/src/app/app.routing.ts b/Frontend/src/app/app.routing.ts index 2e13ded..0582366 100644 --- a/Frontend/src/app/app.routing.ts +++ b/Frontend/src/app/app.routing.ts @@ -9,10 +9,10 @@ import {ProductSearchPageComponent} from './pages/product-search-page/product-se import {PageNotFoundPageComponent} from './pages/page-not-found-page/page-not-found-page.component'; import {ImprintComponent} from './pages/imprint/imprint.component'; import {PrivacyComponent} from './pages/privacy/privacy.component'; -import {SigninComponent} from "./components/auth/signin/signin.component"; -import {RegistrationComponent} from "./components/auth/registration/registration.component"; -import {ProfileComponent} from "./components/profile/profile.component"; -import {ProfilePageComponent} from "./pages/profile-page/profile-page.component"; +import {SigninComponent} from './components/auth/signin/signin.component'; +import {RegistrationComponent} from './components/auth/registration/registration.component'; +import {ProfileComponent} from './pages/profile/profile.component'; +import {ProfilePageComponent} from './pages/profile-page/profile-page.component'; const routes: Routes = [ {path: '', component: LandingpageComponent, pathMatch: 'full'}, @@ -22,8 +22,8 @@ const routes: Routes = [ {path: 'datenschutz', component: PrivacyComponent}, {path: 'signin', component: SigninComponent}, {path: 'registration', component: RegistrationComponent}, - {path: "product-detail", component: ProductDetailPageComponent}, - {path: "profile", component: ProfilePageComponent}, + {path: 'product-detail', component: ProductDetailPageComponent}, + {path: 'profile', component: ProfilePageComponent}, {path: '**', component: PageNotFoundPageComponent} ]; diff --git a/Frontend/src/app/components/auth/registration/registration.component.spec.ts b/Frontend/src/app/components/auth/registration/registration.component.spec.ts index 6c3a576..bc8f6fe 100644 --- a/Frontend/src/app/components/auth/registration/registration.component.spec.ts +++ b/Frontend/src/app/components/auth/registration/registration.component.spec.ts @@ -1,25 +1,54 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import {ComponentFixture, TestBed} from '@angular/core/testing'; -import { RegistrationComponent } from './registration.component'; +import {RegistrationComponent} from './registration.component'; +import {AbstractMockObservableService} from '../../../mocks/mock.service'; +import {ApiService} from '../../../services/api.service'; +import {FormBuilder, FormControl, Validators} from '@angular/forms'; +import {Router} from '@angular/router'; + +class MockApiService extends AbstractMockObservableService { + registerUser(username: string, password: string, email: string): any { + this.content = []; + return this; + } +} describe('RegistrationComponent', () => { - let component: RegistrationComponent; - let fixture: ComponentFixture; + let component: RegistrationComponent; + let fixture: ComponentFixture; + let mockService; + let formBuilder: FormBuilder; + const router = { + navigate: jasmine.createSpy('navigate'), + routerState: jasmine.createSpy('routerState') + }; - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ RegistrationComponent ] - }) - .compileComponents(); - }); + beforeEach(async () => { + mockService = new MockApiService(); + await TestBed.configureTestingModule({ + declarations: [RegistrationComponent], + providers: [{provide: ApiService, useValue: mockService}, {provide: Router, useValue: router}, FormBuilder] + }) + .compileComponents(); + }); - beforeEach(() => { - fixture = TestBed.createComponent(RegistrationComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(RegistrationComponent); + component = fixture.componentInstance; + formBuilder = TestBed.get(FormBuilder); + component.form = formBuilder.group({ + recipientTypes: new FormControl( + { + value: ['mock'], + disabled: true + }, + Validators.required + ) + }); + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/Frontend/src/app/components/auth/signin/signin.component.spec.ts b/Frontend/src/app/components/auth/signin/signin.component.spec.ts index b19d8bf..813162a 100644 --- a/Frontend/src/app/components/auth/signin/signin.component.spec.ts +++ b/Frontend/src/app/components/auth/signin/signin.component.spec.ts @@ -1,25 +1,54 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import {ComponentFixture, TestBed} from '@angular/core/testing'; -import { SigninComponent } from './signin.component'; +import {SigninComponent} from './signin.component'; +import {AbstractMockObservableService} from '../../../mocks/mock.service'; +import {ApiService} from '../../../services/api.service'; +import {FormBuilder, FormControl, Validators} from '@angular/forms'; +import {Router} from '@angular/router'; + +class MockApiService extends AbstractMockObservableService { + loginUser(username: string, password: string): any { + this.content = []; + return this; + } +} describe('SigninComponent', () => { - let component: SigninComponent; - let fixture: ComponentFixture; + let component: SigninComponent; + let fixture: ComponentFixture; + let mockService; + let formBuilder: FormBuilder; + const router = { + navigate: jasmine.createSpy('navigate'), + routerState: jasmine.createSpy('routerState') + }; - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ SigninComponent ] - }) - .compileComponents(); - }); + beforeEach(async () => { + mockService = new MockApiService(); + await TestBed.configureTestingModule({ + declarations: [SigninComponent], + providers: [{provide: ApiService, useValue: mockService}, {provide: Router, useValue: router}, FormBuilder] + }) + .compileComponents(); + }); - beforeEach(() => { - fixture = TestBed.createComponent(SigninComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(SigninComponent); + component = fixture.componentInstance; + formBuilder = TestBed.get(FormBuilder); + component.loginForm = formBuilder.group({ + recipientTypes: new FormControl( + { + value: ['mock'], + disabled: true + }, + Validators.required + ) + }); + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/Frontend/src/app/components/copyright/copyright.component.css b/Frontend/src/app/components/copyright/copyright.component.css index e69de29..81713a1 100644 --- a/Frontend/src/app/components/copyright/copyright.component.css +++ b/Frontend/src/app/components/copyright/copyright.component.css @@ -0,0 +1,24 @@ +#imprintSection { + right: 1em; + bottom: 1em; + width: 100%; + text-align: right; + padding-right: 1em; + grid-area: right; +} + +#imprintSection a { + color: white; + text-decoration: none; +} + +#copyright { + display: grid; + grid-template-areas: + 'left center right'; + grid-template-columns: 30% 40% 30%; +} + +#copyright-text { + grid-area: center; +} diff --git a/Frontend/src/app/components/copyright/copyright.component.html b/Frontend/src/app/components/copyright/copyright.component.html index a9545ed..ce09033 100644 --- a/Frontend/src/app/components/copyright/copyright.component.html +++ b/Frontend/src/app/components/copyright/copyright.component.html @@ -1,3 +1,7 @@ -
-
Copyright © Betterzon 2021
+
+
Copyright © Betterzon 2021
+
diff --git a/Frontend/src/app/components/hot-deals-widget/hot-deals-widget.component.spec.ts b/Frontend/src/app/components/hot-deals-widget/hot-deals-widget.component.spec.ts index 9826e63..b9bec22 100644 --- a/Frontend/src/app/components/hot-deals-widget/hot-deals-widget.component.spec.ts +++ b/Frontend/src/app/components/hot-deals-widget/hot-deals-widget.component.spec.ts @@ -1,25 +1,58 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import {ComponentFixture, TestBed} from '@angular/core/testing'; -import { HotDealsWidgetComponent } from './hot-deals-widget.component'; +import {HotDealsWidgetComponent} from './hot-deals-widget.component'; +import {AbstractMockObservableService} from '../../mocks/mock.service'; +import {ApiService} from '../../services/api.service'; +import {ActivatedRoute, convertToParamMap, Router} from '@angular/router'; +import {Observable, of} from 'rxjs'; + +class MockApiService extends AbstractMockObservableService { + getBestDeals(): any { + this.content = []; + return this; + } + + getProductsByIds(): any { + this.content = []; + return this; + } +} + +class ActivatedRouteMock { + public paramMap = of(convertToParamMap({ + testId: 'abc123', + anotherId: 'd31e8b48-7309-4c83-9884-4142efdf7271', + })); +} describe('HotDealsWidgetComponent', () => { - let component: HotDealsWidgetComponent; - let fixture: ComponentFixture; + let component: HotDealsWidgetComponent; + let fixture: ComponentFixture; + let mockService; + const router = { + navigate: jasmine.createSpy('navigate'), + routerState: jasmine.createSpy('routerState') + }; - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ HotDealsWidgetComponent ] - }) - .compileComponents(); - }); + beforeEach(async () => { + mockService = new MockApiService(); + await TestBed.configureTestingModule({ + declarations: [HotDealsWidgetComponent], + providers: [{provide: ApiService, useValue: mockService}, {provide: Router, useValue: router}, { + provide: ActivatedRoute, + useValue: ActivatedRouteMock + }] + }) + .compileComponents(); + }); - beforeEach(() => { - fixture = TestBed.createComponent(HotDealsWidgetComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(HotDealsWidgetComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/Frontend/src/app/components/kunden/kunden.component.spec.ts b/Frontend/src/app/components/kunden/kunden.component.spec.ts index 3977b33..b413c12 100644 --- a/Frontend/src/app/components/kunden/kunden.component.spec.ts +++ b/Frontend/src/app/components/kunden/kunden.component.spec.ts @@ -1,25 +1,53 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import {ComponentFixture, TestBed} from '@angular/core/testing'; -import { KundenComponent } from './kunden.component'; +import {KundenComponent} from './kunden.component'; +import {AbstractMockObservableService} from '../../mocks/mock.service'; +import {ApiService} from '../../services/api.service'; +import {ActivatedRoute, convertToParamMap, Router} from '@angular/router'; +import {of} from 'rxjs'; + +class MockApiService extends AbstractMockObservableService { + getProducts(): any { + this.content = []; + return this; + } +} + +class ActivatedRouteMock { + public paramMap = of(convertToParamMap({ + testId: 'abc123', + anotherId: 'd31e8b48-7309-4c83-9884-4142efdf7271', + })); +} describe('KundenComponent', () => { - let component: KundenComponent; - let fixture: ComponentFixture; + let component: KundenComponent; + let fixture: ComponentFixture; + let mockService; + const router = { + navigate: jasmine.createSpy('navigate'), + routerState: jasmine.createSpy('routerState') + }; - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ KundenComponent ] - }) - .compileComponents(); - }); + beforeEach(async () => { + mockService = new MockApiService(); + await TestBed.configureTestingModule({ + declarations: [KundenComponent], + providers: [{provide: ApiService, useValue: mockService}, {provide: Router, useValue: router}, { + provide: ActivatedRoute, + useValue: ActivatedRouteMock + }] + }) + .compileComponents(); + }); - beforeEach(() => { - fixture = TestBed.createComponent(KundenComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(KundenComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/Frontend/src/app/components/product-details/product-details.component.spec.ts b/Frontend/src/app/components/product-details/product-details.component.spec.ts index bcd489d..02c06f0 100644 --- a/Frontend/src/app/components/product-details/product-details.component.spec.ts +++ b/Frontend/src/app/components/product-details/product-details.component.spec.ts @@ -58,6 +58,11 @@ class MockApiService extends AbstractMockObservableService { this.content = [vendor]; return this; } + + getSessionInfoFromLocalStorage(): any { + this.content = []; + return this; + } } describe('ProductDetailsComponent', () => { diff --git a/Frontend/src/app/components/product-list/product-list.component.spec.ts b/Frontend/src/app/components/product-list/product-list.component.spec.ts index 46b10a1..f399543 100644 --- a/Frontend/src/app/components/product-list/product-list.component.spec.ts +++ b/Frontend/src/app/components/product-list/product-list.component.spec.ts @@ -70,7 +70,8 @@ describe('ProductListComponent', () => { last_modified: new Date(), manufacturer_id: 1, selling_rank: '1', - category_id: 1 + category_id: 1, + price: 0 }; component.clickedProduct(product); diff --git a/Frontend/src/app/components/product-list/product-list.component.ts b/Frontend/src/app/components/product-list/product-list.component.ts index 1f1bdd3..aab4ac1 100644 --- a/Frontend/src/app/components/product-list/product-list.component.ts +++ b/Frontend/src/app/components/product-list/product-list.component.ts @@ -79,7 +79,7 @@ export class ProductListComponent implements OnInit { this.getPrices(); }); } - + clickedProduct(product: Product): void { this.router.navigate([('/product/' + product.product_id)]); } diff --git a/Frontend/src/app/components/profile/profile.component.spec.ts b/Frontend/src/app/components/profile/profile.component.spec.ts deleted file mode 100644 index e88012e..0000000 --- a/Frontend/src/app/components/profile/profile.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { ProfileComponent } from './profile.component'; - -describe('ProfileComponent', () => { - let component: ProfileComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ ProfileComponent ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(ProfileComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/Frontend/src/app/components/top-bar/top-bar.component.spec.ts b/Frontend/src/app/components/top-bar/top-bar.component.spec.ts index 7d3acaf..42907b5 100644 --- a/Frontend/src/app/components/top-bar/top-bar.component.spec.ts +++ b/Frontend/src/app/components/top-bar/top-bar.component.spec.ts @@ -1,25 +1,48 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import {ComponentFixture, TestBed} from '@angular/core/testing'; -import { TopBarComponent } from './top-bar.component'; +import {TopBarComponent} from './top-bar.component'; +import {FormBuilder} from '@angular/forms'; +import {ApiService} from '../../services/api.service'; +import {Router} from '@angular/router'; +import {AbstractMockObservableService} from '../../mocks/mock.service'; + +class MockApiService extends AbstractMockObservableService { + getUserInfo(): any { + this.content = []; + return this; + } + + getSessionInfoFromLocalStorage(): any { + this.content = []; + return this; + } +} describe('TopBarComponent', () => { - let component: TopBarComponent; - let fixture: ComponentFixture; + let component: TopBarComponent; + let fixture: ComponentFixture; + let mockService; + const router = { + navigate: jasmine.createSpy('navigate'), + routerState: jasmine.createSpy('routerState') + }; - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ TopBarComponent ] - }) - .compileComponents(); - }); + beforeEach(async () => { + mockService = new MockApiService(); + await TestBed.configureTestingModule({ + declarations: [TopBarComponent], + providers: [{provide: ApiService, useValue: mockService}, {provide: Router, useValue: router}] + }) + .compileComponents(); + }); - beforeEach(() => { - fixture = TestBed.createComponent(TopBarComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(TopBarComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/Frontend/src/app/pages/imprint/imprint.component.html b/Frontend/src/app/pages/imprint/imprint.component.html index 840716f..fa4e2eb 100644 --- a/Frontend/src/app/pages/imprint/imprint.component.html +++ b/Frontend/src/app/pages/imprint/imprint.component.html @@ -1,5 +1,5 @@ - -
+ +

Impressum

Angaben gemäß § 5 TMG

@@ -56,4 +56,5 @@ derartige Inhalte umgehend entfernen.

- + + diff --git a/Frontend/src/app/pages/landingpage/landingpage.component.ts b/Frontend/src/app/pages/landingpage/landingpage.component.ts index cf3deac..db007a2 100644 --- a/Frontend/src/app/pages/landingpage/landingpage.component.ts +++ b/Frontend/src/app/pages/landingpage/landingpage.component.ts @@ -12,8 +12,7 @@ export class LandingpageComponent implements OnInit { isLoggedIn = false; constructor( - private router: Router, - private api: ApiService + private router: Router ) { } diff --git a/Frontend/src/app/pages/privacy/privacy.component.html b/Frontend/src/app/pages/privacy/privacy.component.html index 29c167f..5317e00 100644 --- a/Frontend/src/app/pages/privacy/privacy.component.html +++ b/Frontend/src/app/pages/privacy/privacy.component.html @@ -1,5 +1,5 @@ - -
+ +

Datenschutz­erklärung

1. Datenschutz auf einen Blick

Allgemeine Hinweise

@@ -405,4 +405,5 @@ von Font Awesome unter: https://fontawesome.com/privacy.

- + + diff --git a/Frontend/src/app/components/profile/profile.component.css b/Frontend/src/app/pages/profile/profile.component.css similarity index 100% rename from Frontend/src/app/components/profile/profile.component.css rename to Frontend/src/app/pages/profile/profile.component.css diff --git a/Frontend/src/app/components/profile/profile.component.html b/Frontend/src/app/pages/profile/profile.component.html similarity index 100% rename from Frontend/src/app/components/profile/profile.component.html rename to Frontend/src/app/pages/profile/profile.component.html diff --git a/Frontend/src/app/pages/profile/profile.component.spec.ts b/Frontend/src/app/pages/profile/profile.component.spec.ts new file mode 100644 index 0000000..1fe50b1 --- /dev/null +++ b/Frontend/src/app/pages/profile/profile.component.spec.ts @@ -0,0 +1,47 @@ +import {ComponentFixture, TestBed} from '@angular/core/testing'; + +import {ProfileComponent} from './profile.component'; +import {AbstractMockObservableService} from '../../mocks/mock.service'; +import {ApiService} from '../../services/api.service'; + +class MockApiService extends AbstractMockObservableService { + getUserInfo(): any { + this.content = []; + return this; + } + + getPriceAlarms(): any { + this.content = []; + return this; + } + + getProductsByIds(): any { + this.content = []; + return this; + } +} + +describe('ProfileComponent', () => { + let component: ProfileComponent; + let fixture: ComponentFixture; + let mockService; + + beforeEach(async () => { + mockService = new MockApiService(); + await TestBed.configureTestingModule({ + declarations: [ProfileComponent], + providers: [{provide: ApiService, useValue: mockService}] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ProfileComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/Frontend/src/app/components/profile/profile.component.ts b/Frontend/src/app/pages/profile/profile.component.ts similarity index 100% rename from Frontend/src/app/components/profile/profile.component.ts rename to Frontend/src/app/pages/profile/profile.component.ts diff --git a/Frontend/src/app/services/api.service.ts b/Frontend/src/app/services/api.service.ts index 4839482..789d955 100644 --- a/Frontend/src/app/services/api.service.ts +++ b/Frontend/src/app/services/api.service.ts @@ -106,7 +106,7 @@ export class ApiService { let asin = ''; // Check if the parameter is a link or an asin - const linkRegex: RegExp = /^http[s]{0,1}:\/\/.*\/dp\/(.[^\/]*)\/{0,1}.*$/; + const linkRegex: RegExp = /^http[s]?:\/\/.*\/dp\/(.[^\/]*)\/?.*$/; const matches = linkRegex.exec(asinOrLink); if (matches) { // param is a link, extract asin