Skip to content

Commit a29f57c

Browse files
authored
Merge branch 'main' into mod/tor/missingJsDirectoryinBuild
2 parents 4fa741a + 62fc5fd commit a29f57c

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

.storybook/main.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ const config: StorybookConfig = {
1414
docs: {
1515
autodocs: 'tag'
1616
},
17-
webpackFinal: async (config) => {
17+
webpackFinal: async config => {
1818
if (config.resolve?.alias) {
1919
config.resolve.alias['@pega/auth/lib/sdk-auth-manager'] = path.resolve(__dirname, '../__mocks__/authManager.tsx');
2020
}
2121

2222
return config;
23-
},
23+
}
2424
};
2525
export default config;

.storybook/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"resolveJsonModule": true,
77
"emitDecoratorMetadata": false
88
},
9-
"exclude": ["../src/test.ts", "../src/**/*.spec.ts"],
9+
"exclude": ["../src/test.ts", "../src/**/*.spec.ts", "../src/app/_components/custom-constellation/**"],
1010
"include": ["../src/**/*", "./preview.ts", "../__mocks__/*"],
1111
"files": ["./typings.d.ts"]
1212
}

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"build:prod": "npm run _internal-check-node-version && run-p -l fix _internal-build-prod-only",
99
"build:prod:ci": "npm run _internal-check-node-version && npm run clean && npm run _internal-install-sdk && npm run build:prod",
1010
"start-dev": "ng serve --port 3500",
11-
"start-dev-https": "ng serve --port 3500 --ssl --ssl-key private.key --ssl-cert private.pem",
11+
"start-dev-https": "ng serve --port 3500 --ssl --ssl-key ./keys/sdk-a.key --ssl-cert ./keys/sdk-a.crt",
1212
"start-prod": "http-server ./dist -c-1 --port 3500 --gzip --brotli --cors --proxy http://localhost:3500?",
13-
"start-prod-https": "http-server ./dist -c-1 --ssl --cert private.pem --key private.key --port 3500 --gzip --brotli --cors --proxy https://localhost:3500?",
13+
"start-prod-https": "http-server ./dist -c-1 --ssl --cert ./keys/sdk-a.crt --key ./keys/sdk-a.key --port 3500 --gzip --brotli --cors --proxy https://localhost:3500?",
1414
"clean": "echo \"cleaning...\" && npx shx --yes rm -rf ./dist/** ./node_modules ./.angular/cache",
1515
"lint": "run-p -cl lint:*",
1616
"lint:es": "eslint --color --cache --cache-location node_modules/.cache/eslint/ src",

playwright.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const { devices } = require('@playwright/test');
1212
* @type {import('@playwright/test').PlaywrightTestConfig}
1313
*/
1414
const config = {
15-
testDir: './tests',
15+
testDir: './tests/e2e',
1616
/* Maximum time one test can run for. */
1717
timeout: 120 * 1000,
1818
expect: {

tests/e2e/DigV2/ComplexFields/DataReference.spec.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,20 +229,20 @@ test.describe('E2E test', () => {
229229
await selectProducts.click();
230230
await page.getByRole('option', { name: 'Mobile' }).click();
231231
await selectProducts.click();
232-
await page.getByRole('option', { name: 'Telivision' }).click();
232+
await page.getByRole('option', { name: 'Television' }).click();
233233
await expect(selectProducts).toBeVisible();
234234

235235
await page.locator('button:has-text("Next")').click();
236236

237237
assignment = page.locator('app-default-form');
238238

239239
await expect(assignment.locator('td >> text="Mobile"')).toBeVisible();
240-
await expect(assignment.locator('td >> text="Telivision"')).toBeVisible();
240+
await expect(assignment.locator('td >> text="Television"')).toBeVisible();
241241

242242
await page.locator('button:has-text("Previous")').click();
243243

244244
await expect(page.locator('mat-chip-row:has-text("Mobile")')).toBeVisible();
245-
await expect(page.locator('mat-chip-row:has-text("Telivision")')).toBeVisible();
245+
await expect(page.locator('mat-chip-row:has-text("Television")')).toBeVisible();
246246

247247
let deleteProduct = await page.locator('mat-chip-row:has-text("Mobile")');
248248
await deleteProduct.locator('button:has-text("cancel")').click();
@@ -253,7 +253,7 @@ test.describe('E2E test', () => {
253253

254254
await page.locator('button:has-text("Previous")').click();
255255

256-
deleteProduct = await page.locator('mat-chip-row:has-text("Telivision")');
256+
deleteProduct = await page.locator('mat-chip-row:has-text("Television")');
257257
await deleteProduct.locator('button:has-text("cancel")').click();
258258

259259
/** Checkbox group mode type test */

0 commit comments

Comments
 (0)