Skip to content

Commit

Permalink
Fix Angular tests
Browse files Browse the repository at this point in the history
  • Loading branch information
valentinpalkovic committed Dec 12, 2023
1 parent c16c125 commit 205a339
Show file tree
Hide file tree
Showing 9 changed files with 153 additions and 877 deletions.
29 changes: 0 additions & 29 deletions code/frameworks/angular/__vitest.config.ts

This file was deleted.

31 changes: 0 additions & 31 deletions code/frameworks/angular/jest.config.js

This file was deleted.

4 changes: 2 additions & 2 deletions code/frameworks/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
"webpack": "5"
},
"devDependencies": {
"@analogjs/vite-plugin-angular": "^0.2.24",
"@angular-devkit/architect": "^0.1700.5",
"@angular-devkit/build-angular": "^17.0.5",
"@angular-devkit/core": "^17.0.5",
Expand All @@ -80,8 +81,7 @@
"@types/cross-spawn": "^6.0.2",
"@types/tmp": "^0.2.3",
"cross-spawn": "^7.0.3",
"jest": "^29.7.0",
"jest-preset-angular": "^13.0.1",
"jsdom": "^23.0.1",
"tmp": "^0.2.1",
"typescript": "^5.3.2",
"webpack": "5",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { vi, describe, afterEach, it, expect } from 'vitest';
import { LoggerApi } from '@angular-devkit/core/src/logger';
import { take } from 'rxjs/operators';

const { runCompodoc } = require('./run-compodoc');
import { runCompodoc } from './run-compodoc';

const mockRunScript = vi.fn();

Expand Down
1 change: 1 addition & 0 deletions code/frameworks/angular/src/client/docs/compodoc.test.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { describe, it, expect } from 'vitest';
import { extractType, setCompodocJson } from './compodoc';
import { CompodocJson, Decorator } from './types';

Expand Down
10 changes: 10 additions & 0 deletions code/frameworks/angular/src/test-setup.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// eslint-disable-next-line import/no-extraneous-dependencies
import '@analogjs/vite-plugin-angular/setup-vitest';

import {
BrowserDynamicTestingModule,
platformBrowserDynamicTesting,
} from '@angular/platform-browser-dynamic/testing';
import { getTestBed } from '@angular/core/testing';

getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
4 changes: 2 additions & 2 deletions code/frameworks/angular/tsconfig.spec.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"types": ["webpack-env", "jest", "node"],
"types": ["webpack-env", "node"],
"typeRoots": ["../../node_modules/@types", "node_modules/@types"],
"allowJs": true
},
"include": ["**/*.test.ts", "**/*.d.ts", "setup-jest.ts"]
"include": ["**/*.test.ts", "**/*.d.ts"]
}
13 changes: 6 additions & 7 deletions code/frameworks/angular/vitest.config.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
/* eslint-disable import/no-extraneous-dependencies */
import { defineConfig, mergeConfig } from 'vitest/config';
import { sep, posix } from 'path';
import { createVuePlugin } from 'vite-plugin-vue2';
import { vitestCommonConfig } from '../../vitest.workspace';

export default mergeConfig(
vitestCommonConfig,
defineConfig({
export default defineConfig(({ mode }) => {
return mergeConfig(vitestCommonConfig, {
test: {
setupFiles: ['src/test-setup.ts'],
environment: 'jsdom',

name: __dirname.split(sep).slice(-2).join(posix.sep),
},
plugins: [createVuePlugin()],
})
);
});
});
Loading

0 comments on commit 205a339

Please sign in to comment.