Skip to content

Commit

Permalink
chore: fix CI errors
Browse files Browse the repository at this point in the history
  • Loading branch information
maxime1992 committed Feb 19, 2020
1 parent b8890b8 commit 26d1982
Show file tree
Hide file tree
Showing 4 changed files with 1,032 additions and 2,154 deletions.
7 changes: 6 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
sudo: false

dist: trusty
dist: bionic

language: node_js
node_js:
Expand All @@ -11,12 +11,17 @@ addons:
apt:
packages:
- libgconf-2-4
chrome: stable

cache:
directories:
- ~/.cache
- node_modules

before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH="$HOME/.yarn/bin:$PATH"

install:
- yarn --frozen-lockfile --non-interactive --no-progress

Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"lib:build:prod": "yarn run ng build --project ngx-sub-form",
"lib:build:watch": "yarn run lib:build:prod --watch",
"lib:test:watch": "yarn run ng test --project ngx-sub-form",
"lib:test:ci": "yarn run ng test --project ngx-sub-form --watch false",
"lib:test:ci": "yarn run ng test --project ngx-sub-form --watch false --browsers=ChromeHeadless",
"------------------ Quick Commands ------------------": "",
"lint:fix": "yarn demo:lint:fix && yarn prettier:write",
"semantic-release": "semantic-release",
Expand Down Expand Up @@ -55,9 +55,9 @@
"zone.js": "0.10.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "0.900.2",
"@angular-devkit/build-ng-packagr": "0.900.2",
"@angular/cli": "9.0.2",
"@angular-devkit/build-angular": "0.900.1",
"@angular-devkit/build-ng-packagr": "0.900.1",
"@angular/cli": "9.0.1",
"@angular/compiler-cli": "9.0.1",
"@angular/language-service": "9.0.1",
"@bahmutov/add-typescript-to-cypress": "2.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,10 @@ describe(`NgxAutomaticRootFormComponent`, () => {
componentFixture.detectChanges();

setTimeout(() => {
expect(vehicleUpdatedSpy).toHaveBeenCalledWith(getNewCorrectValues());
// todo: after upgrading to ng 9 + all the deps the following
// is typed from chai instead of jasmine and it triggers errors
// it shouldn't block the new release though
(expect(vehicleUpdatedSpy) as any).toHaveBeenCalledWith(getNewCorrectValues());
done();
}, 0);
});
Expand All @@ -125,13 +128,19 @@ describe(`NgxAutomaticRootFormComponent`, () => {
componentFixture.detectChanges();

setTimeout(() => {
expect(vehicleUpdatedSpy).not.toHaveBeenCalled();
// todo: after upgrading to ng 9 + all the deps the following
// is typed from chai instead of jasmine and it triggers errors
// it shouldn't block the new release though
(expect(vehicleUpdatedSpy) as any).not.toHaveBeenCalled();

componentForm.formGroupControls.crewMemberCount.setValue(MAX_CREW_MEMBER_COUNT);
// shouldn't require to call `componentForm.manualSave()`!

setTimeout(() => {
expect(vehicleUpdatedSpy).toHaveBeenCalledWith({
// todo: after upgrading to ng 9 + all the deps the following
// is typed from chai instead of jasmine and it triggers errors
// it shouldn't block the new release though
(expect(vehicleUpdatedSpy) as any).toHaveBeenCalledWith({
...getNewIncorrectValues(),
crewMemberCount: MAX_CREW_MEMBER_COUNT,
});
Expand Down
Loading

0 comments on commit 26d1982

Please sign in to comment.