Skip to content

Commit 1d4e227

Browse files
committed
fix unit test runs
1 parent 45df73c commit 1d4e227

File tree

4 files changed

+45
-11
lines changed

4 files changed

+45
-11
lines changed

.github/workflows/pull-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
npm ci && \
2323
npm run lint && \
2424
npm run spellcheck && \
25-
# npm run test:ci && \
25+
npm run test:ci && \
2626
npm run build:prod
2727
env:
2828
CI: true

projects/code-editor/karma.conf.js

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// Karma configuration file, see link for more information
22
// https://karma-runner.github.io/1.0/config/configuration-file.html
33

4+
var path = require('path');
5+
46
module.exports = function (config) {
57
config.set({
68
basePath: '',
@@ -10,15 +12,34 @@ module.exports = function (config) {
1012
require('karma-chrome-launcher'),
1113
require('karma-jasmine-html-reporter'),
1214
require('karma-coverage-istanbul-reporter'),
13-
require('@angular-devkit/build-angular/plugins/karma'),
15+
require('@angular-devkit/build-angular/plugins/karma')
16+
],
17+
files: [
18+
{
19+
pattern: './../../node_modules/monaco-editor/min/**/*.js',
20+
watched: false,
21+
included: false,
22+
served: true
23+
},
24+
{
25+
pattern: './../../node_modules/monaco-editor/min/**/*.css',
26+
watched: false,
27+
included: false,
28+
served: true
29+
}
1430
],
31+
proxies: {
32+
'/assets/monaco/':
33+
'/absolute' + path.resolve('./node_modules/monaco-editor/min/')
34+
},
35+
1536
client: {
16-
clearContext: false, // leave Jasmine Spec Runner output visible in browser
37+
clearContext: false // leave Jasmine Spec Runner output visible in browser
1738
},
1839
coverageIstanbulReporter: {
1940
dir: require('path').join(__dirname, '../../coverage'),
2041
reports: ['html', 'lcovonly'],
21-
fixWebpackSourcePaths: true,
42+
fixWebpackSourcePaths: true
2243
},
2344
reporters: ['progress', 'kjhtml'],
2445
port: 9876,
@@ -34,9 +55,9 @@ module.exports = function (config) {
3455
'--headless',
3556
'--disable-gpu',
3657
// Without a remote debugging port, Google Chrome exits immediately.
37-
'--remote-debugging-port=9222',
38-
],
39-
},
40-
},
58+
'--remote-debugging-port=9222'
59+
]
60+
}
61+
}
4162
});
4263
};

projects/code-editor/src/lib/code-editor/code-editor.component.spec.ts

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ComponentFixture, TestBed } from '@angular/core/testing';
1+
import { ComponentFixture, TestBed, fakeAsync } from '@angular/core/testing';
22

33
import { CodeEditorComponent } from './code-editor.component';
44
import { CodeEditorService } from '../services/code-editor.service';
@@ -9,12 +9,25 @@ import { CodeEditorModule } from '../code-editor.module';
99
describe('CodeEditorComponent', () => {
1010
let component: CodeEditorComponent;
1111
let fixture: ComponentFixture<CodeEditorComponent>;
12+
let codeEditorService: CodeEditorService;
1213

1314
beforeEach(() => {
1415
TestBed.configureTestingModule({
15-
imports: [CodeEditorModule.forRoot()],
16+
imports: [CodeEditorModule.forRoot({ baseUrl: 'assets/monaco' })],
17+
providers: [
18+
CodeEditorService,
19+
TypescriptDefaultsService,
20+
JavascriptDefaultsService
21+
]
1622
});
1723

24+
codeEditorService = TestBed.inject(CodeEditorService);
25+
spyOn(codeEditorService, 'createEditor').and.stub();
26+
spyOn(codeEditorService, 'createModel').and.returnValue({
27+
onDidChangeContent: () => {},
28+
dispose: () => {}
29+
} as any);
30+
1831
fixture = TestBed.createComponent(CodeEditorComponent);
1932
component = fixture.componentInstance;
2033
fixture.detectChanges();

projects/code-editor/src/lib/services/code-editor.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export class CodeEditorService {
2525
readonly typingsWorkerUrl: string;
2626

2727
typingsLoaded = new Subject<TypingsInfo>();
28-
loaded = new BehaviorSubject<{ monaco: any } | null>(null);
28+
loaded = new BehaviorSubject<{ monaco: any } | null>({ monaco: null });
2929

3030
loadingTypings = new BehaviorSubject<boolean>(false);
3131

0 commit comments

Comments
 (0)