Skip to content

Commit a63bbee

Browse files
kdinevgeorgianastasovrandriovaMayaKirovaMKirova
authored
chore(*): getting rid of jasmine-spec-tags (#12206)
* chore(*): updating angular/core and cli deps * chore(*): updating other deps * chore(*): updating typescript * chore(*): fixing package version * chore(deps): removing ^ from typedoc version * chore(*): fixing indentation in dd tests * chore(*): updating dependencies * chore(*): updating tests.ts * chore(*): updating dependencies * fix(excel-exporter): export correct number of rows#12086 (#12121) * fix(excel-exporter): export correct number of rows#12086 * fix(excel-exporter): fix total rowCount with multi col headers#12086 * fix(excel-exporter): fix spacing#12086 * fix(i18n): Updating Grid localization for all languages - 14.1.x * fix(igxGrid): Fix end edit with Enter when trigger is blur by moving it to more common place. (#12101) Co-authored-by: MKirova <MKirova@DEV-MKIROVA> Co-authored-by: Deyan Kamburov <[email protected]> * fix(radio): focus nativeElement (#12151) * chore(*): updating dependencies * Select falsy values via ngModel - 14.1.x (#12096) * test(simple-combo): should select falsy values with "writeValue" method * fix(simple-combo): select falsy values with "writeValue" method * refactor(simple-combo): use 'const' for hasSelection variable * test(selectionService): should add items with falsy itemID except undefined * fix(selectionService): add items with falsy itemID except undefined * test(combos): should select falsy values except "undefined" * fix(combos): select falsy values except "undefined" * fix(combos): display and select "null" in dropdown * test(selectionService): removing an outdated test * fix(selectionService): removing throw error check * fix(combos): additional checks for nullish values * chore(combos): add comment for template check * chore(remoteNWindService): remove debugger * test(combos): should remove undefined from array of primitive data * fix(combos): remove undefined from array of primitive data * fix(combos): remove undefined in data setter * fix(simple-combo): show all items in dropdown * chore(combo-pipes): add comment for grouping pipe * test(simple-combo): should not select null, undefined, '' in template form * fix(simple-combo): not select null, undefined, '' in template form * fix(simple-combo): not select null, undefined, '' in reactive form * fix(simple-combo): not select null, undefined, '' from dropdown in reactive form Co-authored-by: Teodosia Hristodorova <[email protected]> * chore(cypress): migrating to cypress 10 * chore(*): fixing tests configure-suite * chore(*): fixing the typedoc tsconfig * chore(*): updating dependencies * chore(*): updating @angular/core @angular/cli * chore(*): reverting jasmine and jasmine-core ver * test(d&d): fixing async tests * chore(d&d): removing fdescribe * chore(*): fixing grid and d&d tests * chore(*): fingers crossed this fixes EVERYTHING * chore(*): waitForAsync not imported * test(hgrid): fixing global failure for tests * test(migrations): fixing tsUtils typing * test(migrations): fixing bufferencoding typing * chore(*): two hands fingers crossed... * chore(*): getting rid of jasmine-spec-tags * chore(*): adding node 18.x to execution matrix * ci(azure-pipelines): changing karma conf * test(hgrid): optimizing hgrid selection tests * chore(*): removing fdescribe * chore(*): increasing jasmine timeout again * chore(*): updating types versions * test(perf): disabling performance tests * chore(*): trying something out * chore(*): returning parallel * test(hgrid): speeding up hgrid tests * test(hgrid): adding DEBOUNCE_TIME to two tests * test(hgrid): adding a common describe * test(hgrid): fixing a failing test * chore(*): ofc forgot the fdescribe * chore(*): fixing indentation * chore(*): increasing a timeout Co-authored-by: Georgi Anastasov <[email protected]> Co-authored-by: Rumyana Andriova <[email protected]> Co-authored-by: Maya <[email protected]> Co-authored-by: MKirova <MKirova@DEV-MKIROVA> Co-authored-by: Deyan Kamburov <[email protected]> Co-authored-by: Zdravko Kolev <[email protected]> Co-authored-by: Silvia Ivanova <[email protected]> Co-authored-by: Riva Ivanova <[email protected]> Co-authored-by: Teodosia Hristodorova <[email protected]>
1 parent 91218fa commit a63bbee

File tree

12 files changed

+1391
-1431
lines changed

12 files changed

+1391
-1431
lines changed

.github/workflows/nodejs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
strategy:
1818
matrix:
19-
node-version: [14.x, 16.x]
19+
node-version: [14.x, 16.x, 18.x]
2020

2121
steps:
2222
- name: Checkout

package-lock.json

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

package.json

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"e2e": "ng e2e",
1111
"test:lib": "ng test igniteui-angular --watch=false --no-progress --code-coverage",
1212
"test:lib:perf": "ng test igniteui-angular --watch=false --no-progress --karma-config=./projects/igniteui-angular/karma.test-perf.conf.js",
13-
"test:lib:azure": "ng test igniteui-angular --watch=false --no-progress --karma-config=./projects/igniteui-angular/karma.azure.conf.js",
13+
"test:lib:azure": "ng test igniteui-angular --watch=false --no-progress",
1414
"test:lib:grid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.grid.conf.js",
1515
"test:lib:tgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.tree-grid.conf.js",
1616
"test:lib:hgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.hierarchical-grid.conf.js",
@@ -68,10 +68,8 @@
6868
"fflate": "^0.7.3",
6969
"hammerjs": "^2.0.8",
7070
"igniteui-trial-watermark": "^1.0.3",
71-
"karma-parallel": "^0.3.1",
7271
"lodash-es": "^4.17.21",
7372
"rxjs": "^6.6.7",
74-
"setimmediate": "^1.0.5",
7573
"tslib": "^2.3.0",
7674
"uuid": "^8.3.0",
7775
"zone.js": "~0.11.4"
@@ -88,9 +86,9 @@
8886
"@angular/compiler-cli": "^14.2.6",
8987
"@angular/language-service": "^14.2.6",
9088
"@angularclass/hmr": "^2.1.3",
91-
"@cypress/schematic": "^1.6.0",
89+
"@cypress/schematic": "^2.2.0",
9290
"@types/estree": "^0.0.50",
93-
"@types/jasmine": "^3.10.2",
91+
"@types/jasmine": "^4.3.0",
9492
"@types/jasminewd2": "^2.0.10",
9593
"@types/node": "^18.11.0",
9694
"@types/sass-true": "^6.0.2",
@@ -119,13 +117,13 @@
119117
"igniteui-sassdoc-theme": "^1.1.4",
120118
"igniteui-theming": "^1.0.0-release",
121119
"igniteui-webcomponents": "^3.3.0",
122-
"jasmine": "^3.99.0",
123-
"jasmine-core": "~3.8.0",
120+
"jasmine": "^4.4.0",
121+
"jasmine-core": "~4.4.0",
124122
"karma": "^6.3.11",
125123
"karma-chrome-launcher": "~3.1.0",
126124
"karma-coverage": "^2.0.3",
127125
"karma-jasmine": "~5.1.0",
128-
"karma-jasmine-spec-tags": "~1.3.0",
126+
"karma-parallel": "^0.3.1",
129127
"karma-spec-reporter": "^0.0.34",
130128
"ng-packagr": "^14.1.0",
131129
"postcss-scss": "^4.0.3",

projects/igniteui-angular/karma.azure.conf.js

Lines changed: 0 additions & 48 deletions
This file was deleted.

projects/igniteui-angular/karma.conf.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
module.exports = function (config) {
55
config.set({
66
basePath: '',
7-
frameworks: ['parallel', 'jasmine', 'jasmine-spec-tags', '@angular-devkit/build-angular'],
7+
frameworks: ['parallel', 'jasmine', '@angular-devkit/build-angular'],
88
files: [
99
{ pattern: '../../node_modules/hammerjs/hammer.min.js', watched: false },
1010
{ pattern: '../../node_modules/hammer-simulator/index.js', watched: false },
@@ -16,7 +16,6 @@ module.exports = function (config) {
1616
'karma-jasmine',
1717
'karma-coverage',
1818
'karma-chrome-launcher',
19-
'karma-jasmine-spec-tags',
2019
'karma-spec-reporter',
2120
'@angular-devkit/build-angular/plugins/karma'
2221
],

projects/igniteui-angular/karma.watch.conf.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
module.exports = function (config) {
55
config.set({
66
basePath: '',
7-
frameworks: ['jasmine', 'jasmine-spec-tags', '@angular-devkit/build-angular'],
7+
frameworks: ['jasmine', '@angular-devkit/build-angular'],
88
files: [
99
{ pattern: '../../node_modules/hammerjs/hammer.min.js', watched: false },
1010
{ pattern: '../../node_modules/hammer-simulator/index.js', watched: false },
1111
{ pattern: './test.css', watched: false },
1212
{ pattern: '../../dist/igniteui-angular/styles/igniteui-angular.css', watched: false }
1313
],
1414
plugins: [
15-
require('karma-jasmine'),
16-
require('karma-chrome-launcher'),
17-
require('karma-jasmine-spec-tags'),
18-
require('@angular-devkit/build-angular/plugins/karma')
15+
'karma-jasmine',
16+
'karma-chrome-launcher',
17+
'karma-spec-reporter',
18+
'@angular-devkit/build-angular/plugins/karma'
1919
],
2020
client: {
2121
clearContext: false, // leave Jasmine Spec Runner output visible in browser
@@ -25,7 +25,7 @@ module.exports = function (config) {
2525
tagPrefix: '#',
2626
skipTags: 'perf'
2727
},
28-
reporters: ['progress'],
28+
reporters: ['spec'],
2929
specReporter: {
3030
suppressSkipped: true,
3131
suppressErrorSummary: false,

projects/igniteui-angular/src/lib/grids/grid/grid.component.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2458,7 +2458,8 @@ describe('IgxGrid Component Tests #grid', () => {
24582458
}));
24592459
});
24602460

2461-
describe('IgxGrid - Performance tests #perf', () => {
2461+
// TODO: Enable performance tests again
2462+
xdescribe('IgxGrid - Performance tests #perf', () => {
24622463
const MAX_RAW_RENDER = 1967; // two average diffs from 7.3 rendering performance
24632464
const MAX_GROUPED_RENDER = 1500;
24642465
const MAX_VER_SCROLL_O = 220;

projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid-api.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export class IgxHierarchicalGridAPIService extends GridBaseAPIService<GridType>
4242
}
4343

4444
public getChildGrids(inDepth?: boolean) {
45-
const allChildren = [];
45+
const allChildren: GridType [] = [];
4646
this.childGrids.forEach((layoutMap) => {
4747
layoutMap.forEach((grid) => {
4848
allChildren.push(grid);

0 commit comments

Comments
 (0)