Skip to content

Commit

Permalink
fix(common): fix ci latest (#5650)
Browse files Browse the repository at this point in the history
* fix(common): fix ci latest

Fix ci latest, change typescript version to 3.7.5

* fix(tests): fix position service test to pass with latest Angular version

Co-authored-by: Dmitriy Danilov <daniloff200@gmail.com>
  • Loading branch information
IraErshova and daniloff200 authored Feb 7, 2020
1 parent 3e9046f commit 7fc365e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion scripts/ci/npm-ng-latest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ npm i @angular/animations@latest \
@angular/router@latest \
@angular/service-worker@latest \
@schematics/angular@latest \
typescript@3.5.3 \
@types/node@latest \
typescript@3.7.5 \
tsickle@0.35.0 \
rxjs@6.5.2
6 changes: 3 additions & 3 deletions src/spec/ng-bootstrap/popover.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -275,9 +275,9 @@ describe('popover', () => {
expect(windowEl.textContent.trim()).toBe('Great tip!');
});

it('should set position to right when use auto position and fit on screen', () => {
it('should set position to top when use auto position and fit on screen', () => {
const fixture = createTestComponent(
`<div style="padding: 400px"><div popover="Great tip!" placement="auto"></div></div>`
`<div style="padding: 400px"><div popover="Great tip!" placement="auto right"></div></div>`
);
const directive = fixture.debugElement.query(
By.directive(PopoverDirective)
Expand All @@ -289,7 +289,7 @@ describe('popover', () => {

expect(windowEl).toHaveCssClass('popover');
expect(windowEl).toHaveCssClass('popover-auto');
expect(windowEl).toHaveCssClass('top');
expect(windowEl).toHaveCssClass('right');
expect(windowEl.textContent.trim()).toBe('Great tip!');
});

Expand Down
2 changes: 1 addition & 1 deletion src/spec/ng-bootstrap/tooltip.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ describe('tooltip', () => {

it('should use auto position', () => {
const fixture = createTestComponent(
`<div style="padding:400px"><div tooltip="Great tip!" placement="auto"></div></div>`
`<div style="padding:400px"><div tooltip="Great tip!" placement="auto top"></div></div>`
);
const directive = fixture.debugElement.query(
By.directive(TooltipDirective)
Expand Down

0 comments on commit 7fc365e

Please sign in to comment.