Skip to content

Commit c95f2cd

Browse files
committed
chore(tests): fix wrong types in tests
1 parent b7534f1 commit c95f2cd

File tree

7 files changed

+76
-55
lines changed

7 files changed

+76
-55
lines changed

package-lock.json

Lines changed: 29 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,9 @@
3131
"@angular/platform-browser": "~10.0.12",
3232
"@angular/platform-browser-dynamic": "~10.0.12",
3333
"@angular/router": "~10.0.12",
34-
"core-js": "^3.6.5",
35-
"rxjs": "~6.6.2",
34+
"rxjs": "~6.5.5",
3635
"tslib": "^2.0.0",
37-
"zone.js": "~0.11.1"
36+
"zone.js": "~0.10.3"
3837
},
3938
"devDependencies": {
4039
"@angular-devkit/build-angular": "~0.1000.7",
@@ -45,9 +44,9 @@
4544
"@fortawesome/fontawesome-free": "^5.14.0",
4645
"@semantic-release/changelog": "^5.0.1",
4746
"@semantic-release/git": "^9.0.0",
48-
"@types/jasmine": "~3.5.13",
49-
"@types/jasminewd2": "~2.0.8",
50-
"@types/node": "^14.6.0",
47+
"@types/jasmine": "~3.5.0",
48+
"@types/jasminewd2": "~2.0.3",
49+
"@types/node": "^12.11.1",
5150
"codecov": "^3.7.2",
5251
"codelyzer": "^6.0.0",
5352
"copyfiles": "^2.3.0",
@@ -63,10 +62,9 @@
6362
"ng-packagr": "^10.0.0",
6463
"prettier": "^2.1.1",
6564
"protractor": "~7.0.0",
66-
"ts-node": "~9.0.0",
67-
"tsickle": "^0.39.1",
65+
"ts-node": "~8.3.0",
6866
"tslint": "~6.1.0",
69-
"typescript": "^3.9.0"
67+
"typescript": "^3.9.5"
7068
},
7169
"husky": {
7270
"hooks": {

projects/ng-sortgrid-demo/src/test.ts

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,25 @@
11
// This file is required by karma.conf.js and loads recursively all the .spec and framework files
22

3+
import 'zone.js/dist/zone';
34
import 'zone.js/dist/zone-testing';
45
import { getTestBed } from '@angular/core/testing';
5-
import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
6+
import {
7+
BrowserDynamicTestingModule,
8+
platformBrowserDynamicTesting
9+
} from '@angular/platform-browser-dynamic/testing';
610

7-
declare const require: any;
11+
declare const require: {
12+
context(path: string, deep?: boolean, filter?: RegExp): {
13+
keys(): string[];
14+
<T>(id: string): T;
15+
};
16+
};
817

918
// First, initialize the Angular testing environment.
10-
getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
19+
getTestBed().initTestEnvironment(
20+
BrowserDynamicTestingModule,
21+
platformBrowserDynamicTesting()
22+
);
1123
// Then we find all the tests.
1224
const context = require.context('./', true, /\.spec\.ts$/);
1325
// And load the modules.

projects/ng-sortgrid/src/lib/mutliselect/ngsg-selection.service.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ describe('NgsgSelectionService', () => {
122122
const event = new KeyboardEvent('keyup', {
123123
key: 'Meta'
124124
});
125-
const itemOne = { node: 'Foo' };
126-
const itemTwo = { node: 'Bar' };
125+
const itemOne = { node: 'Foo' } as any;
126+
const itemTwo = { node: 'Bar' } as any;
127127
const items = [itemOne, itemTwo];
128128
const group = 'groupOne';
129129
const item = 'Some element' as any;

projects/ng-sortgrid/src/lib/ngsg-item.directive.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {NgsgElementsHelper} from './helpers/element/ngsg-elements.helper';
1313
describe('NgsgItemDirective', () => {
1414
let sut: NgsgItemDirective;
1515

16-
const elementRef = {nativeElement: {}};
16+
const elementRef = {nativeElement: {}} as any;
1717
const ngsgSortService = createSpyObj<NgsgSortService>('ngsgSortService', ['initSort', 'sort', 'endSort']);
1818
const ngsgSelectionService = createSpyObj<NgsgSelectionService>('ngsgSelectionService', [
1919
'selectElementIfNoSelection',
@@ -70,7 +70,7 @@ describe('NgsgItemDirective', () => {
7070
target: {
7171
matches: () => true
7272
}
73-
};
73+
} as any;
7474
sut.dragStart(event);
7575
expect(ngsgSelectionService.selectElementIfNoSelection).toHaveBeenCalledWith(sortGroup, event.target);
7676
});
@@ -184,7 +184,7 @@ describe('NgsgItemDirective', () => {
184184
const group = 'test-group';
185185
const element = {originalIndex};
186186
NgsgElementsHelper.findIndex = () => originalIndex;
187-
ngsgStore.getSelectedItems.and.returnValue([element]);
187+
ngsgStore.getSelectedItems.and.returnValue([element] as any);
188188
sut.ngSortGridGroup = group;
189189

190190
sut.clicked();

projects/ng-sortgrid/src/lib/sort/sort/ngsg-sort.service.spec.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ describe('NgsgSortService', () => {
3333
const dragElement = {originalIndex: 0, node: firstElement} as any;
3434
const dropElement = middleElement as any;
3535

36-
ngsgStore.getFirstSelectItem.and.returnValue({originalIndex: 0});
37-
ngsgStore.getSelectedItems.and.returnValue([dragElement]);
36+
ngsgStore.getFirstSelectItem.and.returnValue({originalIndex: 0} as any);
37+
ngsgStore.getSelectedItems.and.returnValue([dragElement] as any);
3838
const insertBeforeSpy = spyOn(dropElement.parentNode, 'insertBefore');
3939
NgsgElementsHelper.findIndex = () => 1;
4040

@@ -52,7 +52,7 @@ describe('NgsgSortService', () => {
5252
const dragElement = {originalIndex: 2, node: lastElement} as any;
5353
const dropElement = middleElement as any;
5454

55-
ngsgStore.getFirstSelectItem.and.returnValue({originalIndex: 2});
55+
ngsgStore.getFirstSelectItem.and.returnValue({originalIndex: 2} as any);
5656
ngsgStore.getSelectedItems.and.returnValue([dragElement]);
5757
const insertBeforeSpy = spyOn(dropElement.parentNode, 'insertBefore');
5858
NgsgElementsHelper.findIndex = () => 1;
@@ -65,7 +65,7 @@ describe('NgsgSortService', () => {
6565

6666
it('should remove the placeholder class on all selected elements if the sort ends', () => {
6767
const group = 'test-group';
68-
const selectedItems = [{node: 'ItemOne'}, {node: 'ItemTwo'}];
68+
const selectedItems = [{node: 'ItemOne'}, {node: 'ItemTwo'}] as any;
6969
ngsgStore.getSelectedItems.and.returnValue(selectedItems);
7070

7171
sut.initSort(group);
@@ -77,7 +77,7 @@ describe('NgsgSortService', () => {
7777

7878
it('should add the dropped class on all selected elements if the sort ends', () => {
7979
const group = 'test-group';
80-
const selectedItems = [{node: 'ItemOne'}, {node: 'ItemTwo'}];
80+
const selectedItems = [{node: 'ItemOne'}, {node: 'ItemTwo'}] as any;
8181
ngsgStore.getSelectedItems.and.returnValue(selectedItems);
8282

8383
sut.initSort(group);
@@ -89,7 +89,7 @@ describe('NgsgSortService', () => {
8989

9090
it('should remove the selected class on all selected elements if the sort ends', () => {
9191
const group = 'test-group';
92-
const selectedItems = [{node: 'ItemOne'}, {node: 'ItemTwo'}];
92+
const selectedItems = [{node: 'ItemOne'}, {node: 'ItemTwo'}] as any;
9393
ngsgStore.getSelectedItems.and.returnValue(selectedItems);
9494

9595
sut.initSort(group);

projects/ng-sortgrid/src/test.ts

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,25 @@
11
// This file is required by karma.conf.js and loads recursively all the .spec and framework files
22

3-
import 'core-js/es7/reflect';
43
import 'zone.js/dist/zone';
54
import 'zone.js/dist/zone-testing';
65
import { getTestBed } from '@angular/core/testing';
7-
import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
6+
import {
7+
BrowserDynamicTestingModule,
8+
platformBrowserDynamicTesting
9+
} from '@angular/platform-browser-dynamic/testing';
810

9-
declare const require: any;
11+
declare const require: {
12+
context(path: string, deep?: boolean, filter?: RegExp): {
13+
keys(): string[];
14+
<T>(id: string): T;
15+
};
16+
};
1017

1118
// First, initialize the Angular testing environment.
12-
getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
19+
getTestBed().initTestEnvironment(
20+
BrowserDynamicTestingModule,
21+
platformBrowserDynamicTesting()
22+
);
1323
// Then we find all the tests.
1424
const context = require.context('./', true, /\.spec\.ts$/);
1525
// And load the modules.

0 commit comments

Comments
 (0)