Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix style issues and improve test files #76

Merged
merged 2 commits into from
Oct 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/angular-sdk-components/tests/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

const config = {
baseUrl: 'http://localhost:3500/portal',
baseEmbedUrl: 'http://localhost:3500/embedded',
apps: {
mediaCo: {
rep: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const common = require('../../../common');

test.beforeEach(async ({ page }) => {
await page.setViewportSize({ width: 1920, height: 1080 });
await page.goto('http://localhost:3500/portal', { waitUntil: 'networkidle' });
await page.goto(config.config.baseUrl, { waitUntil: 'networkidle' });
});

test.describe('E2E test', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const caseHistoryTabVisible = true;

test.beforeEach(async ({ page }) => {
await page.setViewportSize({ width: 1920, height: 1080 });
await page.goto('http://localhost:3500/portal', { waitUntil: 'networkidle' });
await page.goto(config.config.baseUrl, { waitUntil: 'networkidle' });
});

test.describe('E2E test', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const common = require('../../../common');

test.beforeEach(async ({ page }) => {
await page.setViewportSize({ width: 1920, height: 1080 });
await page.goto('http://localhost:3500/portal', { waitUntil: 'networkidle' });
await page.goto(config.config.baseUrl, { waitUntil: 'networkidle' });
});

test.describe('E2E test', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const common = require('../../../common');

test.beforeEach(async ({ page }) => {
await page.setViewportSize({ width: 1920, height: 1080 });
await page.goto('http://localhost:3500/portal', { waitUntil: 'networkidle' });
await page.goto(config.config.baseUrl, { waitUntil: 'networkidle' });
});

test.describe('E2E test', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const common = require('../../../common');

test.beforeEach(async ({ page }) => {
await page.setViewportSize({ width: 1920, height: 1080 });
await page.goto('http://localhost:3500/portal', { waitUntil: 'networkidle' });
await page.goto(config.config.baseUrl, { waitUntil: 'networkidle' });
});

test.describe('E2E test', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const common = require('../../../common');

test.beforeEach(async ({ page }) => {
await page.setViewportSize({ width: 1920, height: 1080 });
await page.goto('http://localhost:3500/portal', { waitUntil: 'networkidle' });
await page.goto(config.config.baseUrl, { waitUntil: 'networkidle' });
});

test.describe('E2E test', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const common = require('../../../common');

test.beforeEach(async ({ page }) => {
await page.setViewportSize({ width: 1920, height: 1080 });
await page.goto('http://localhost:3500/portal', { waitUntil: 'networkidle' });
await page.goto(config.config.baseUrl, { waitUntil: 'networkidle' });
});

test.describe('E2E test', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const isVisible = true;

test.beforeEach(async ({ page }) => {
await page.setViewportSize({ width: 1920, height: 1080 });
await page.goto('http://localhost:3500/portal', { waitUntil: 'networkidle' });
await page.goto(config.config.baseUrl, { waitUntil: 'networkidle' });
});

test.describe('E2E test', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const isVisible = true;

test.beforeEach(async ({ page }) => {
await page.setViewportSize({ width: 1920, height: 1080 });
await page.goto('http://localhost:3500/portal', { waitUntil: 'networkidle' });
await page.goto(config.config.baseUrl, { waitUntil: 'networkidle' });
});

test.describe('E2E test', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const isVisible = true;

test.beforeEach(async ({ page }) => {
await page.setViewportSize({ width: 1920, height: 1080 });
await page.goto('http://localhost:3500/portal', { waitUntil: 'networkidle' });
await page.goto(config.config.baseUrl, { waitUntil: 'networkidle' });
});

test.describe('E2E test', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const isVisible = true;

test.beforeEach(async ({ page }) => {
await page.setViewportSize({ width: 1920, height: 1080 });
await page.goto('http://localhost:3500/portal', { waitUntil: 'networkidle' });
await page.goto(config.config.baseUrl, { waitUntil: 'networkidle' });
});

test.describe('E2E test', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const isVisible = true;

test.beforeEach(async ({ page }) => {
await page.setViewportSize({ width: 1920, height: 1080 });
await page.goto('http://localhost:3500/portal', { waitUntil: 'networkidle' });
await page.goto(config.config.baseUrl, { waitUntil: 'networkidle' });
});

test.describe('E2E test', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const isVisible = true;

test.beforeEach(async ({ page }) => {
await page.setViewportSize({ width: 1920, height: 1080 });
await page.goto('http://localhost:3500/portal', { waitUntil: 'networkidle' });
await page.goto(config.config.baseUrl, { waitUntil: 'networkidle' });
});

test.describe('E2E test', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const isVisible = true;

test.beforeEach(async ({ page }) => {
await page.setViewportSize({ width: 1920, height: 1080 });
await page.goto('http://localhost:3500/portal', { waitUntil: 'networkidle' });
await page.goto(config.config.baseUrl, { waitUntil: 'networkidle' });
});

test.describe('E2E test', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const isVisible = true;

test.beforeEach(async ({ page }) => {
await page.setViewportSize({ width: 1920, height: 1080 });
await page.goto('http://localhost:3500/portal', { waitUntil: 'networkidle' });
await page.goto(config.config.baseUrl, { waitUntil: 'networkidle' });
});

test.describe('E2E test', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const isVisible = true;

test.beforeEach(async ({ page }) => {
await page.setViewportSize({ width: 1920, height: 1080 });
await page.goto('http://localhost:3500/portal', { waitUntil: 'networkidle' });
await page.goto(config.config.baseUrl, { waitUntil: 'networkidle' });
});

test.describe('E2E test', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const isVisible = true;

test.beforeEach(async ({ page }) => {
await page.setViewportSize({ width: 1920, height: 1080 });
await page.goto('http://localhost:3500/portal', { waitUntil: 'networkidle' });
await page.goto(config.config.baseUrl, { waitUntil: 'networkidle' });
});

test.describe('E2E test', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const isVisible = true;

test.beforeEach(async ({ page }) => {
await page.setViewportSize({ width: 1920, height: 1080 });
await page.goto('http://localhost:3500/portal', { waitUntil: 'networkidle' });
await page.goto(config.config.baseUrl, { waitUntil: 'networkidle' });
});

test.describe('E2E test', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const isVisible = true;

test.beforeEach(async ({ page }) => {
await page.setViewportSize({ width: 1920, height: 1080 });
await page.goto('http://localhost:3500/portal', { waitUntil: 'networkidle' });
await page.goto(config.config.baseUrl, { waitUntil: 'networkidle' });
});

test.describe('E2E test', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const isVisible = true;

test.beforeEach(async ({ page }) => {
await page.setViewportSize({ width: 1920, height: 1080 });
await page.goto('http://localhost:3500/portal', { waitUntil: 'networkidle' });
await page.goto(config.config.baseUrl, { waitUntil: 'networkidle' });
});

test.describe('E2E test', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const isVisible = true;

test.beforeEach(async ({ page }) => {
await page.setViewportSize({ width: 1920, height: 1080 });
await page.goto('http://localhost:3500/portal', { waitUntil: 'networkidle' });
await page.goto(config.config.baseUrl, { waitUntil: 'networkidle' });
});

test.describe('E2E test', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const common = require('../../../common');

test.beforeEach(async ({ page }) => {
await page.setViewportSize({ width: 1720, height: 1080 });
await page.goto('http://localhost:3500/portal', { waitUntil: 'networkidle' });
await page.goto(config.config.baseUrl, { waitUntil: 'networkidle' });
});

test.describe('E2E test', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
const { test } = require('@playwright/test');
const common = require('../../common');
const config = require('../../config');

test.beforeEach(async ({ page }) => {
await page.setViewportSize({ width: 1920, height: 1080 });
await page.goto('http://localhost:3500/embedded', { waitUntil: 'networkidle' });
await page.goto(config.config.baseEmbedUrl, { waitUntil: 'networkidle' });
});

test.describe('E2E test', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
</mat-list>
</div>
<div style="height: 100%">
<mat-list>
<mat-list-item *ngFor="let page of navPages$">
<div class="flex-box" (click)="navPanelButtonClick(page)">
<mat-list *ngFor="let page of navPages$">
<mat-list-item (click)="navPanelButtonClick(page)">
<div class="flex-box">
<img class="psdk-nav-svg-icon" src="{{ page.iconName }}" />
<span class="psdk-nav-button-span">{{ localizedVal(page.pyLabel, localeCategory) }}</span>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ $natural-ease: cubic-bezier(0.4, 0.6, 0.1, 1) !default;
}

.psdk-appshell-nav {
z-index: 3;
z-index: 199;
position: fixed;
display: flex;
flex-direction: column;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<div class="appshell-top">
<div *ngIf="bShowAppShell$ && portalTemplate !== 'wss'">
<component-mapper name="NavBar" [props]="{ pConn$, appName$, pages$, caseTypes$, portalTemplate }"></component-mapper>
<component-mapper name="NavBar" [props]="{ pConn$, appName$, pages$, caseTypes$ }"></component-mapper>
</div>
<div *ngIf="bShowAppShell$ && portalTemplate === 'wss'">
<component-mapper name="WssNavBar" [props]="{ pConn$, appName$, homePage: pages$[0], pages$: links, caseTypes$, portalTemplate }"></component-mapper>
<component-mapper name="WssNavBar" [props]="{ pConn$, appName$, homePage: pages$[0], pages$: links, caseTypes$ }"></component-mapper>
</div>
<div [ngClass]="{'appshell-main' : portalTemplate !== 'wss',
'appshell-main-wss' : portalTemplate === 'wss' }">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@

.psdk-nav-portal-app {
font-size: 1.5rem;
color: #d9d9d9;
}

.psdk-appshell-nav {
Expand Down
Loading