Skip to content

fix(): the last PR messed some test. Fixing that. #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 10, 2016
Merged

fix(): the last PR messed some test. Fixing that. #66

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 21 additions & 15 deletions src/components/sidenav/sidenav.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ function waitOnEvent(fixture: ComponentFixture,
// Wait for the animation end.
let completer = PromiseWrapper.completer();
let component: any = fixture.debugElement.query(by).componentInstance;
component[propertyName].subscribe(completer.resolve);
component[propertyName].subscribe(() => {
completer.resolve();
});
return completer.promise;
}

Expand All @@ -59,16 +61,18 @@ export function main() {
.then((f) => {
fixture = f;
testComponent = fixture.debugElement.componentInstance;

fixture.detectChanges();
return wait(1);
}).then((f) => {
let openButtonElement = fixture.debugElement.query(By.css('.open'));
openButtonElement.nativeElement.click();
})
.then((_: any) => { wait(1); })
.then((_: any) => {
fixture.detectChanges();
return wait(1);
}).then((_: any) => {
expect(testComponent.openStartCount).toBe(1);
expect(testComponent.openCount).toBe(0);
})
.then((_: any) => waitOnEvent(fixture, By.directive(MdSidenav), 'onOpen'))
.then((_: any) => { return waitOnEvent(fixture, By.directive(MdSidenav), 'onOpen'); })
.then((_: any) => {
expect(testComponent.openStartCount).toBe(1);
expect(testComponent.openCount).toBe(1);
Expand All @@ -83,6 +87,8 @@ export function main() {
// Close it.
let closeButtonElement = fixture.debugElement.query(By.css('.close'));
closeButtonElement.nativeElement.click();
fixture.detectChanges();
return wait(1);
})
.then((_: any) => wait(1))
.then((_: any) => {
Expand All @@ -91,7 +97,7 @@ export function main() {
expect(testComponent.closeStartCount).toBe(1);
expect(testComponent.closeCount).toBe(0);
})
.then((_: any) => waitOnEvent(fixture, By.directive(MdSidenav), 'onClose'))
.then((_: any) => { return waitOnEvent(fixture, By.directive(MdSidenav), 'onClose'); })
.then((_: any) => fixture.detectChanges())
.then((_: any) => {
expect(testComponent.openStartCount).toBe(1);
Expand Down Expand Up @@ -123,7 +129,7 @@ export function main() {
promise = sidenav.open();
promise.then((_: any) => called = true);
})
.then((_: any) => wait(1))
.then((_: any) => { return wait(1); })
.then((_: any) => fixture.detectChanges())
.then((_: any) => {
expect(called).toBe(false);
Expand All @@ -136,7 +142,7 @@ export function main() {
promise = sidenav.close();
promise.then((_: any) => called = true);
})
.then((_: any) => wait(1))
.then((_: any) => { return wait(1); })
.then((_: any) => fixture.detectChanges())
.then((_: any) => {
expect(called).toBe(false);
Expand All @@ -160,7 +166,7 @@ export function main() {
promise = sidenav.open();
expect(sidenav.open()).toBe(promise);
})
.then((_: any) => wait(1))
.then((_: any) => { return wait(1); })
.then((_: any) => {
fixture.detectChanges();
return promise;
Expand Down Expand Up @@ -195,10 +201,10 @@ export function main() {
openCancelled = true;
});
})
.then((_: any) => wait(1))
.then((_: any) => { return wait(1); })
.then((_: any) => fixture.detectChanges())
// We need to wait for the browser to start the transition.
.then((_: any) => wait(50))
.then((_: any) => { return wait(50); })
.then((_: any) => {
closePromise = sidenav.close().then((_: any) => {
closeCalled = true;
Expand Down Expand Up @@ -237,7 +243,7 @@ export function main() {
/** First, open it. */
openPromise = sidenav.open();
})
.then((_: any) => wait(1))
.then((_: any) => { return wait(1); })
.then((_: any) => {
fixture.detectChanges();
return openPromise;
Expand All @@ -251,10 +257,10 @@ export function main() {
closeCancelled = true;
});
})
.then((_: any) => wait(1))
.then((_: any) => { return wait(1); })
.then((_: any) => fixture.detectChanges())
// We need to wait for the browser to start the transition.
.then((_: any) => wait(50))
.then((_: any) => { return wait(50); })
.then((_: any) => {
openPromise = sidenav.open().then((_: any) => {
openCalled = true;
Expand Down