Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/main' into CFWEB-17…
Browse files Browse the repository at this point in the history
…5-Angular-18-Update

# Conflicts:
#	package-lock.json
  • Loading branch information
Stefan Saring committed Aug 5, 2024
2 parents 7611e9c + 4fbcaed commit 33bbfea
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .reuse/dep5
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Upstream-Contact: Carl Zeiss AG
Source: https://github.com/ZEISS/angular-styleguide

# files by zeiss
Files: src/app/* src/assets/*.json src/environments/* src/model/* src/support/* src/*.ts src/*.scss src/*.html *.json *.md *.config *.js .gitignore .editorconfig .husky/* .npmrc .prettierignore .github/*
Files: src/app/* src/assets/*.json src/environments/* src/model/* src/support/* src/*.ts src/*.scss src/*.html *.json *.md *.config *.js .gitignore .editorconfig .husky/* .npmrc .prettierignore .github/* browserstack.yml documentation/*
Copyright: 2022 Carl Zeiss AG
License: MIT

Expand Down
2 changes: 1 addition & 1 deletion e2e-wdio/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"outDir": "../out-tsc/e2e",
"module": "commonjs",
"target": "es2020",
"types": ["node", "@wdio/globals/types", "@wdio/jasmine-framework"]
"types": ["node", "@wdio/globals/types", "@wdio/jasmine-framework", "jasmine"]
}
}
2 changes: 0 additions & 2 deletions e2e-wdio/wdio.conf.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ export const config: WebdriverIO.Config = {
// 5 instances get started at a time.
maxInstances: 5,
browserName: 'chrome',
//todo: remove with next dependency-update iteration
browserVersion: '122.0.6261.39',
acceptInsecureCerts: true,
'goog:chromeOptions': {
args: [
Expand Down
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,14 @@
"@playwright/test": "1.43.1",
"@types/jasmine": "5.1.4",
"@types/node": "20.10.5",
"@typescript-eslint/eslint-plugin": "^6.10.0",
"@typescript-eslint/parser": "^6.10.0",
"@wdio/cli": "8.26.3",
"@wdio/jasmine-framework": "8.26.3",
"@wdio/local-runner": "8.26.3",
"@wdio/spec-reporter": "8.26.3",
"@typescript-eslint/eslint-plugin": "8.0.0",
"@typescript-eslint/parser": "8.0.0",
"@wdio/cli": "8.39.1",
"@wdio/jasmine-framework": "8.39.1",
"@wdio/local-runner": "8.39.1",
"@wdio/spec-reporter": "8.39.0",
"browserstack-node-sdk": "1.31.23",
"chromedriver": "124.0.1",
"chromedriver": "127.0.1",
"eslint": "^8.57.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-jasmine": "4.1.3",
Expand All @@ -84,10 +84,10 @@
"prettier": "3.2.5",
"pretty-quick": "4.0.0",
"start-server-and-test": "2.0.3",
"stylelint": "15.11.0",
"stylelint-config-sass-guidelines": "10.0.0",
"stylelint-config-standard-scss": "11.1.0",
"stylelint-no-unsupported-browser-features": "7.0.0",
"stylelint": "16.8.1",
"stylelint-config-sass-guidelines": "12.0.0",
"stylelint-config-standard-scss": "13.1.0",
"stylelint-no-unsupported-browser-features": "8.0.1",
"ts-node": "10.9.2",
"typescript": "5.5.4",
"wdio-chromedriver-service": "8.1.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ describe('ProductDetailComponent', () => {
});
});

describe('decreaseProductNumber', () => {
describe('decreaseProductNumberOriginal', () => {
describe('when decrease called for original value', () => {
it('should keep original product number', () => {
component.decreaseProductNumber();
Expand Down

0 comments on commit 33bbfea

Please sign in to comment.