Skip to content

Commit ea94d5d

Browse files
author
James Salas
committed
fix: rxjs conflicting type signatures
1 parent 5ac5d15 commit ea94d5d

File tree

5 files changed

+247
-258
lines changed

5 files changed

+247
-258
lines changed

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
"babel-jest": "23.4.2",
5252
"codelyzer": "4.4.2",
5353
"husky": "1.1.3",
54-
"jest": "23.4.1",
55-
"jest-junit": "5.1.0",
56-
"jest-preset-angular": "6.0.0",
54+
"jest": "23.6.0",
55+
"jest-junit": "5.2.0",
56+
"jest-preset-angular": "6.0.2",
5757
"jest-zone-patch": "0.0.8",
5858
"lerna": "3.4.3",
5959
"lint-staged": "7.2.0",
@@ -63,7 +63,7 @@
6363
"redux": "4.0.0",
6464
"redux-logger": "2.10.2",
6565
"rimraf": "2.6.2",
66-
"rxjs": "6.2.1",
66+
"rxjs": "6.3.3",
6767
"tsickle": "0.32.1",
6868
"tslib": "1.9.3",
6969
"tslint": "5.11.0",

packages/example-app/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"redux": "^4.0.1",
3333
"redux-logger": "^3.0.1",
3434
"redux-observable": "^1.0.0",
35-
"rxjs": "6.2.1",
35+
"rxjs": "^6.3.3",
3636
"zone.js": "^0.8.9"
3737
},
3838
"devDependencies": {
@@ -45,7 +45,7 @@
4545
"@types/ramda": "^0.24.18",
4646
"@types/redux-logger": "^3.0.0",
4747
"jest": "^23.6.0",
48-
"jest-preset-angular": "^6.0.2",
48+
"jest-preset-angular": "6.0.2",
4949
"protractor": "^5.4.1",
5050
"ts-node": "^7.0.1",
5151
"typescript": ">=3.1.1 < 3.2"

packages/example-app/src/app/animals/animal-list/component.spec.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ import { By } from '@angular/platform-browser';
44
import { CoreModule } from '../../core/module';
55
import { AnimalType } from '../model';
66
import { AnimalListComponent } from './component';
7+
import {
8+
BrowserDynamicTestingModule,
9+
platformBrowserDynamicTesting,
10+
} from '@angular/platform-browser-dynamic/testing';
711

812
@Component({ selector: 'zoo-animal', template: '' })
913
class MockAnimalComponent {
@@ -13,6 +17,12 @@ class MockAnimalComponent {
1317

1418
describe('AnimalListComponent', () => {
1519
beforeEach(async(() => {
20+
TestBed.resetTestEnvironment();
21+
TestBed.initTestEnvironment(
22+
BrowserDynamicTestingModule,
23+
platformBrowserDynamicTesting(),
24+
);
25+
1626
TestBed.configureTestingModule({
1727
declarations: [AnimalListComponent, MockAnimalComponent],
1828
imports: [CoreModule],

packages/example-app/src/app/component.spec.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
11
import { async, TestBed } from '@angular/core/testing';
22
import { RouterTestingModule } from '@angular/router/testing';
33
import { AppComponent } from './component';
4+
import {
5+
platformBrowserDynamicTesting,
6+
BrowserDynamicTestingModule,
7+
} from '@angular/platform-browser-dynamic/testing';
48

59
describe('AppComponent', () => {
610
beforeEach(async(() => {
11+
TestBed.resetTestEnvironment();
12+
TestBed.initTestEnvironment(
13+
BrowserDynamicTestingModule,
14+
platformBrowserDynamicTesting(),
15+
);
16+
717
TestBed.configureTestingModule({
818
declarations: [AppComponent],
919
imports: [RouterTestingModule],

0 commit comments

Comments
 (0)