Skip to content

Commit a012137

Browse files
authored
Merge pull request #5058 from IgniteUI/mkirova/ng-8-update-fix-leaks
Check if memory leak fix resolves issue with test that timeout in travis.
2 parents 1766869 + 49e36b3 commit a012137

File tree

54 files changed

+75
-470
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+75
-470
lines changed

.travis.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,11 @@ before_script:
1717
# more heap mem per https://github.com/angular/angular-cli/issues/12645, https://github.com/npm/npm/issues/12238#issuecomment-367147962
1818
- export NODE_OPTIONS="--max_old_space_size=4096"
1919
- npm install -g gulp
20-
- npm install -g istanbul-combine
2120
script:
2221
- npm run lint:lib
2322
- ng build igniteui-angular --prod
2423
- npm run build:style
25-
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:lib:others; fi
26-
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:lib:grid; fi
27-
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:lib:tgrid; fi
28-
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:lib:hgrid; fi
29-
- if [ -z "${TRAVIS_TAG}" ]; then istanbul-combine -d coverage -p none -r lcov -r html coverage/hierarchical-grid/coverage-final.json coverage/tree-grid/coverage-final.json coverage/non-grid/coverage-final.json coverage/grid/coverage-final.json; fi
24+
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:lib; fi
3025
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:schematics; fi
3126
- if [ -z "${TRAVIS_TAG}" ] && [ "${TRAVIS_REPO_SLUG}" == "IgniteUI/igniteui-angular" ]; then cat ./coverage/lcov.info | coveralls; fi
3227

azure-pipelines.yml

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,42 +7,17 @@ steps:
77
env:
88
AZURE_PIPELINES: "true"
99

10-
- script: sudo npm install -g istanbul-combine
11-
displayName: 'Install coverage combiner'
12-
env:
13-
AZURE_PIPELINES: "true"
14-
1510
- script: npm run lint:lib
1611
displayName: 'Run lint'
1712

1813
- script: npm run build:lib
1914
displayName: 'Build source code and styles'
2015

21-
- script: npm run test:lib:azure:others
16+
- script: npm run test:lib:azure
2217
displayName: 'Run non-grid tests'
2318
env:
2419
NODE_OPTIONS: "--max_old_space_size=4096"
2520

26-
- script: npm run test:lib:azure:grid
27-
displayName: 'Run grid tests'
28-
env:
29-
NODE_OPTIONS: "--max_old_space_size=4096"
30-
31-
- script: npm run test:lib:azure:tgrid
32-
displayName: 'Run tree grid tests'
33-
env:
34-
NODE_OPTIONS: "--max_old_space_size=4096"
35-
36-
- script: npm run test:lib:azure:hgrid
37-
displayName: 'Run hierarchical grid tests'
38-
env:
39-
NODE_OPTIONS: "--max_old_space_size=4096"
40-
41-
- script: istanbul-combine -d coverage -p none -r lcov -r cobertura coverage/hierarchical-grid/coverage-final.json coverage/tree-grid/coverage-final.json coverage/non-grid/coverage-final.json coverage/grid/coverage-final.json
42-
displayName: 'Combine coverage results'
43-
env:
44-
AZURE_PIPELINES: "true"
45-
4621
- script: cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
4722
condition: and(succeeded(), eq(variables['system.teamProject'], 'igniteui-angular'))
4823
displayName: 'Code coverage @ Coveralls'

package.json

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,6 @@
1010
"e2e": "ng e2e",
1111
"test:lib": "ng test igniteui-angular --watch=false --no-progress --code-coverage",
1212
"test:lib:azure": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.azure.conf.js",
13-
"test:lib:grid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.grid.conf.js",
14-
"test:lib:tgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.tree-grid.conf.js",
15-
"test:lib:hgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.hierarchical-grid.conf.js",
16-
"test:lib:others": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.non-grid.conf.js",
17-
"test:lib:azure:grid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.azure.grid.conf.js",
18-
"test:lib:azure:tgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.azure.tree-grid.conf.js",
19-
"test:lib:azure:hgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.azure.hierarchical-grid.conf.js",
20-
"test:lib:azure:others": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.azure.non-grid.conf.js",
2113
"test:lib:watch": "ng test igniteui-angular",
2214
"test:schematics": "ts-node --project projects/igniteui-angular/migrations/tsconfig.json ./node_modules/jasmine/bin/jasmine.js ./projects/igniteui-angular/migrations/**/*.spec.ts ./projects/igniteui-angular/schematics/**/*.spec.ts",
2315
"build:lib": "ng build igniteui-angular --prod && gulp build-style",
@@ -93,7 +85,6 @@
9385
"karma-coverage-istanbul-reporter": "~2.0.4",
9486
"karma-jasmine": "~2.0.1",
9587
"karma-jasmine-html-reporter": "~1.4.0",
96-
"karma-jasmine-spec-tags": "^1.1.0",
9788
"karma-junit-reporter": "^1.2.0",
9889
"karma-spec-reporter": "~0.0.32",
9990
"lunr": "^2.3.5",

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

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

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

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

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

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

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

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

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

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

projects/igniteui-angular/karma.hierarchical-grid.conf.js

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

0 commit comments

Comments
 (0)