Skip to content
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
4 changes: 3 additions & 1 deletion libs/btp/splitter/test-setup.ts
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
import 'jest-preset-angular/setup-jest';
import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone';

setupZoneTestEnv();
4 changes: 3 additions & 1 deletion libs/cdk/data-source/test-setup.ts
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
import 'jest-preset-angular/setup-jest';
import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone';

setupZoneTestEnv();
4 changes: 3 additions & 1 deletion libs/cdk/forms/test-setup.ts
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
import 'jest-preset-angular/setup-jest';
import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone';

setupZoneTestEnv();
4 changes: 3 additions & 1 deletion libs/cdk/utils/test-setup.ts
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
import 'jest-preset-angular/setup-jest';
import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone';

setupZoneTestEnv();
4 changes: 3 additions & 1 deletion libs/core/avatar-group/test-setup.ts
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
import 'jest-preset-angular/setup-jest';
import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone';

setupZoneTestEnv();
2 changes: 1 addition & 1 deletion libs/core/select/select.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ describe('SelectComponent', () => {
it('should throw an error when using a non-function comparator', fakeAsync(() => {
instance.useNullComparator();

expect(() => fixtureCompare.detectChanges()).toThrowError();
expect(() => fixtureCompare.detectChanges()).toThrow();
}));
});
});
Expand Down
4 changes: 2 additions & 2 deletions libs/core/tile/directives/tile.directives.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,13 @@ describe('TileDirectives', () => {
expect(component.profileImg.nativeElement.className).toContain('fd-tile__profile-img');
expect(component.profileImg.nativeElement.id).toContain('fd-profileTile-');
expect(component.profileImg.nativeElement.style.getPropertyValue('background-image')).toContain(
'url(https://picsum.photos/60/60)'
'url("https://picsum.photos/60/60")'
);
expect(component.container.nativeElement.className).toContain('fd-tile-container');
expect(component.container.nativeElement.className).toContain('fd-tile-container--list');
expect(component.backgroundImg.nativeElement.className).toContain('fd-tile__background-img');
expect(component.backgroundImg.nativeElement.style.getPropertyValue('background-image')).toContain(
'url(https://picsum.photos/60/60)'
'url("https://picsum.photos/60/60")'
);
component.actionClose.buildComponentCssClass();
expect(component.actionClose.elementRef.nativeElement.className).toContain('fd-tile__action-close');
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,12 @@ function getImport(file: StackblitzFileObject): string {
@Injectable()
export class StackblitzService {
main: string;
styles: string;
styles = `
@use '@angular/cdk/overlay-prebuilt' as *;

body {
font-family: '72', sans-serif;
}`;
tsconfig: string;
angular: string;
packageJson: string;
Expand All @@ -56,16 +61,14 @@ export class StackblitzService {

constructor() {
zip(
getAsset('./stackblitz/example-stack/styles.scss'),
getAsset('./stackblitz/example-stack/tsconfig.json'),
getAsset('./stackblitz/example-stack/angular.json'),
getAsset('./stackblitz/example-stack/package.json'),
getAsset('./stackblitz/example-stack/stackblitzrc')
)
.pipe(
first(),
tap(([styles, tsconfig, angular, packageJson, stackblitzrc]) => {
this.styles = styles;
tap(([tsconfig, angular, packageJson, stackblitzrc]) => {
this.tsconfig = tsconfig;
this.angular = angular;
this.packageJson = this._setDependencies(packageJson);
Expand Down
4 changes: 3 additions & 1 deletion libs/i18n/src/test-setup.ts
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
import 'jest-preset-angular/setup-jest';
import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone';

setupZoneTestEnv();
4 changes: 3 additions & 1 deletion libs/moment-adapter/src/test-setup.ts
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
import 'jest-preset-angular/setup-jest';
import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone';

setupZoneTestEnv();
4 changes: 3 additions & 1 deletion libs/nx-plugin/src/test-setup.ts
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
import 'jest-preset-angular/setup-jest';
import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone';

setupZoneTestEnv();
2 changes: 1 addition & 1 deletion libs/platform/form/input/input.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ describe('InputComponent Unit Tests', () => {
component.type = 'invalid' as any;
expect(() => {
component.ngOnInit(); // This line checks the init process and validates the input type
}).toThrowError('Input type invalid is not supported');
}).toThrow('Input type invalid is not supported');
});

it('should accept various input values', () => {
Expand Down
5 changes: 2 additions & 3 deletions libs/platform/panel/panel.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -194,12 +194,11 @@ describe('Simple PanelComponent', () => {
toggleButton.click();
fixture.detectChanges();
expect(changeEvent).toBeDefined();
expect(onExpandChangeSpy).toBeCalledTimes(1);
expect(changeEvent!.payload).toBe(false);
expect(onExpandChangeSpy).toHaveBeenCalledTimes(1); // Use toHaveBeenCalledTimes

toggleButton.click();
fixture.detectChanges();
expect(onExpandChangeSpy).toBeCalledTimes(2);
expect(onExpandChangeSpy).toHaveBeenCalledTimes(2); // Use toHaveBeenCalledTimes
expect(changeEvent!.payload).toBe(true);

expect(changeEvent instanceof PanelExpandChangeEvent).toBe(true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ describe('VariantManagementComponent', () => {

component.variants = mockVariants;

expect(setVariantSpy).toBeCalledTimes(1);
expect(setVariantSpy).toHaveBeenCalledTimes(1);
expect(setVariantSpy).toHaveBeenLastCalledWith(selectedVariantItem);

expect(setVariantEventSpy).toBeCalledTimes(1);
expect(setVariantEventSpy).toHaveBeenCalledTimes(1);
expect(setVariantEventSpy).toHaveBeenLastCalledWith(selectedVariantItem);
});

Expand Down
62 changes: 32 additions & 30 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@
"dependencies": {
"@angular-eslint/eslint-plugin-template": "20.0.0",
"@angular-eslint/template-parser": "20.0.0",
"@angular/animations": "20.0.2",
"@angular/cdk": "20.0.2",
"@angular/common": "20.0.2",
"@angular/compiler": "20.0.2",
"@angular/core": "20.0.2",
"@angular/forms": "20.0.2",
"@angular/platform-browser": "20.0.2",
"@angular/platform-browser-dynamic": "20.0.2",
"@angular/router": "20.0.2",
"@angular/animations": "20.1.3",
"@angular/cdk": "20.1.0",
"@angular/common": "20.1.3",
"@angular/compiler": "20.1.3",
"@angular/core": "20.1.3",
"@angular/forms": "20.1.3",
"@angular/platform-browser": "20.1.3",
"@angular/platform-browser-dynamic": "20.1.3",
"@angular/router": "20.1.3",
"@fundamental-styles/cx": "0.40.1",
"@nx/angular": "21.2.0",
"@nx/angular": "21.3.9",
"@sap-theming/theming-base-content": "11.31.1",
"@stackblitz/sdk": "1.9.0",
"@swc/helpers": "0.5.11",
Expand All @@ -76,30 +76,30 @@
},
"devDependencies": {
"@actions/core": "1.10.1",
"@angular-devkit/build-angular": "20.0.1",
"@angular-devkit/core": "20.0.1",
"@angular-devkit/schematics": "20.0.1",
"@angular-devkit/build-angular": "20.1.3",
"@angular-devkit/core": "20.1.3",
"@angular-devkit/schematics": "20.1.3",
"@angular/cli": "~20.0.0",
"@angular/compiler-cli": "20.0.2",
"@angular/language-service": "20.0.2",
"@angular/compiler-cli": "20.1.3",
"@angular/language-service": "20.1.3",
"@commitlint/cli": "18.6.1",
"@commitlint/config-conventional": "18.6.1",
"@jsdevtools/npm-publish": "3.0.1",
"@nx/devkit": "21.2.0",
"@nx/eslint": "21.2.0",
"@nx/eslint-plugin": "21.2.0",
"@nx/jest": "21.2.0",
"@nx/js": "21.2.0",
"@nx/plugin": "21.2.0",
"@nx/workspace": "21.2.0",
"@nx/devkit": "21.3.9",
"@nx/eslint": "21.3.9",
"@nx/eslint-plugin": "21.3.9",
"@nx/jest": "21.3.9",
"@nx/js": "21.3.9",
"@nx/plugin": "21.3.9",
"@nx/workspace": "21.3.9",
"@sap-ui/common-css": "0.40.1",
"@schematics/angular": "20.0.1",
"@schematics/angular": "20.1.3",
"@swc-node/register": "1.9.2",
"@swc/cli": "0.6.0",
"@swc/core": "1.5.7",
"@types/google.visualization": "0.0.71",
"@types/jasmine": "5.1.3",
"@types/jest": "29.5.14",
"@types/jest": "30.0.0",
"@types/lodash-es": "4.17.6",
"@types/marked": "5.0.2",
"@types/node": "22.10.2",
Expand Down Expand Up @@ -129,19 +129,21 @@
"eslint-plugin-markdown": "3.0.0",
"eslint-plugin-prefer-arrow": "1.2.3",
"fast-glob": "3.3.1",
"fs-extra": "^11.3.0",
"husky": "8.0.2",
"jasmine-core": "4.5.0",
"jasmine-marbles": "0.9.2",
"jasmine-spec-reporter": "7.0.0",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"jest": "30.0.5",
"jest-environment-jsdom": "30.0.5",
"jest-environment-node": "^29.4.1",
"jest-extended": "4.0.2",
"jest-preset-angular": "14.6.0",
"jest-preset-angular": "15.0.0",
"jest-util": "30.0.5",
"jsonc-eslint-parser": "^2.1.0",
"lerna": "^8.1.9",
"lint-staged": "15.1.0",
"ng-packagr": "20.0.0",
"ng-packagr": "20.1.0",
"ngx-cva-test-suite": "2.0.0",
"postcss-preset-env": "9.3.0",
"postcss-url": "10.1.3",
Expand All @@ -150,7 +152,7 @@
"semver": "7.6.3",
"standard-version": "9.5.0",
"through2": "4.0.2",
"ts-jest": "29.1.0",
"ts-jest": "29.4.0",
"ts-node": "10.9.2",
"tsconfig-paths": "4.1.0",
"typedoc": "0.25.3",
Expand All @@ -163,7 +165,7 @@
"webdriverio": "7.27.0"
},
"resolutions": {
"nx": "21.2.0"
"nx": "21.3.9"
},
"lint-staged": {
"*.properties": [
Expand Down
Loading