Skip to content
Snippets Groups Projects
Commit 8f9608b0 authored by OZGCloud's avatar OZGCloud
Browse files

Merge remote-tracking branch 'origin/master' into OZG-5665-xDomea-Bescheid-Dateien-Download

parents dbb9326c 512b4505
Branches
Tags
No related merge requests found
Showing
with 155 additions and 150 deletions
import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset' import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
import { defineConfig } from 'cypress' import { defineConfig } from 'cypress';
export default defineConfig({ export default defineConfig({
e2e: nxE2EPreset(__filename, { cypressDir: 'src' }) e2e: nxE2EPreset(__filename, { cypressDir: 'src' }),
}) });
import { getGreeting } from '../support/app.po' import { getGreeting } from '../support/app.po';
describe('admin-e2e', () => { describe('admin-e2e', () => {
beforeEach(() => cy.visit('/')) beforeEach(() => cy.visit('/'));
it('should display welcome message', () => { it('should display welcome message', () => {
// Custom command example, see `../support/commands.ts` file // Custom command example, see `../support/commands.ts` file
cy.login('my-email@something.com', 'myPassword') cy.login('my-email@something.com', 'myPassword');
// Function helper example, see `../support/app.po.ts` file // Function helper example, see `../support/app.po.ts` file
getGreeting().contains(/Welcome/) getGreeting().contains(/Welcome/);
}) });
}) });
export const getGreeting = () => cy.get('h1') export const getGreeting = () => cy.get('h1');
...@@ -14,14 +14,14 @@ ...@@ -14,14 +14,14 @@
declare namespace Cypress { declare namespace Cypress {
// eslint-disable-next-line @typescript-eslint/no-unused-vars // eslint-disable-next-line @typescript-eslint/no-unused-vars
interface Chainable<Subject> { interface Chainable<Subject> {
login(email: string, password: string): void login(email: string, password: string): void;
} }
} }
// -- This is a parent command -- // -- This is a parent command --
Cypress.Commands.add('login', (email, password) => { Cypress.Commands.add('login', (email, password) => {
console.log('Custom command example: Login', email, password) console.log('Custom command example: Login', email, password);
}) });
// //
// -- This is a child command -- // -- This is a child command --
// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... }) // Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
......
...@@ -14,4 +14,4 @@ ...@@ -14,4 +14,4 @@
// *********************************************************** // ***********************************************************
// Import commands.ts using ES2015 syntax: // Import commands.ts using ES2015 syntax:
import './commands' import './commands';
/* eslint-disable */ /* eslint-disable */
const esModules: string[] = ['@keycloak/keycloak-admin-client', 'url-join', 'url-template', 'camelize-ts']; const esModules: string[] = [
'@keycloak/keycloak-admin-client',
'url-join',
'url-template',
'camelize-ts',
];
export default { export default {
displayName: 'admin', displayName: 'admin',
preset: '../../jest.preset.js', preset: '../../jest.preset.js',
......
import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ApiRootLinkRel, ApiRootResource, ApiRootService } from '@alfa-client/api-root-shared';
import { RouterTestingModule } from '@angular/router/testing';
import { AppComponent } from './app.component';
import { import {
HasLinkPipe,
createEmptyStateResource,
createStateResource,
} from '@alfa-client/tech-shared';
import {
Mock,
existsAsHtmlElement, existsAsHtmlElement,
getElementFromFixture, getElementFromFixture,
mock, mock,
Mock,
notExistsAsHtmlElement, notExistsAsHtmlElement,
} from '@alfa-client/test-utils'; } from '@alfa-client/test-utils';
import { ApiRootLinkRel, ApiRootResource, ApiRootService } from '@alfa-client/api-root-shared'; import { ComponentFixture, TestBed } from '@angular/core/testing';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import {
createEmptyStateResource,
createStateResource,
HasLinkPipe,
} from '@alfa-client/tech-shared';
import { of } from 'rxjs';
import { createApiRootResource } from 'libs/api-root-shared/test/api-root';
import { MockComponent } from 'ng-mocks';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { NavigationComponent } from 'libs/admin-settings/src/lib/navigation/navigation.component'; import { RouterTestingModule } from '@angular/router/testing';
import { AuthenticationService } from 'authentication'; import { AuthenticationService } from 'authentication';
import { NavigationComponent } from 'libs/admin-settings/src/lib/navigation/navigation.component';
import { createApiRootResource } from 'libs/api-root-shared/test/api-root';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { MockComponent } from 'ng-mocks';
import { of } from 'rxjs';
import { UserProfileButtonContainerComponent } from '../common/user-profile-button-container/user-profile.button-container.component'; import { UserProfileButtonContainerComponent } from '../common/user-profile-button-container/user-profile.button-container.component';
import { UnavailablePageComponent } from '../pages/unavailable/unavailable-page/unavailable-page.component'; import { UnavailablePageComponent } from '../pages/unavailable/unavailable-page/unavailable-page.component';
import { AppComponent } from './app.component';
describe('AppComponent', () => { describe('AppComponent', () => {
let component: AppComponent; let component: AppComponent;
......
import { ApiRootLinkRel, ApiRootResource, ApiRootService } from '@alfa-client/api-root-shared'; import { ApiRootLinkRel, ApiRootResource, ApiRootService } from '@alfa-client/api-root-shared';
import { Component, OnInit } from '@angular/core';
import { Observable } from 'rxjs';
import { StateResource } from '@alfa-client/tech-shared'; import { StateResource } from '@alfa-client/tech-shared';
import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { AuthenticationService } from 'libs/authentication/src/lib/authentication.service'; import { AuthenticationService } from 'libs/authentication/src/lib/authentication.service';
import { Observable } from 'rxjs';
@Component({ @Component({
selector: 'app-root', selector: 'app-root',
......
import { Route } from '@angular/router'; import { Route } from '@angular/router';
import { PostfachPageComponent } from '../pages/postfach/postfach-page/postfach-page.component';
import { OrganisationseinheitPageComponent } from '../pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component'; import { OrganisationseinheitPageComponent } from '../pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component';
import { PostfachPageComponent } from '../pages/postfach/postfach-page/postfach-page.component';
export const appRoutes: Route[] = [ export const appRoutes: Route[] = [
{ {
......
...@@ -6,9 +6,9 @@ import { ...@@ -6,9 +6,9 @@ import {
} from '@alfa-client/test-utils'; } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { UserProfileButtonContainerComponent } from './user-profile.button-container.component';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { AuthenticationService } from 'authentication'; import { AuthenticationService } from 'authentication';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { UserProfileButtonContainerComponent } from './user-profile.button-container.component';
describe('UserProfileButtonContainerComponent', () => { describe('UserProfileButtonContainerComponent', () => {
let component: UserProfileButtonContainerComponent; let component: UserProfileButtonContainerComponent;
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
export const environment = { export const environment = {
production: false, production: false,
environmentUrl: '' environmentUrl: '',
}; };
/* /*
......
import { loadEnvironment } from '@alfa-client/environment-shared'; import { loadEnvironment } from '@alfa-client/environment-shared';
import { enableProdMode } from '@angular/core'; import { enableProdMode } from '@angular/core';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { AppModule } from './app/app.module';
import { isNil } from 'lodash-es'; import { isNil } from 'lodash-es';
import { AppModule } from './app/app.module';
import { environment } from './environments/environment'; import { environment } from './environments/environment';
loadEnvironment(environment.environmentUrl).then((env) => { loadEnvironment(environment.environmentUrl).then((env) => {
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
# #
apiVersion: v1 apiVersion: v1
appVersion: "1.0" appVersion: '1.0'
description: A Helm chart for Admin Client description: A Helm chart for Admin Client
name: admin-client name: admin-client
version: 0.0.0-MANAGED-BY-JENKINS version: 0.0.0-MANAGED-BY-JENKINS
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment