fix(isOpen): fix isOpen attribute that when set would break this module

Closes #14
mattlewis92 · Jun 23, 2016 · fe5516d · fe5516d
1 parent 63dbfe9
commit fe5516d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/src/confirm.directive.ts b/src/confirm.directive.ts
@@ -120,7 +120,7 @@ export class Confirm implements OnDestroy, OnChanges, OnInit {
   /**
    * Will emit when the popover is opened or closed
    */
-  @Output() isOpenChange: EventEmitter<any> = new EventEmitter();
+  @Output() isOpenChange: EventEmitter<any> = new EventEmitter(true);
 
   /**
    * An expression that is called when the confirm button is clicked.
@@ -164,10 +164,7 @@ export class Confirm implements OnDestroy, OnChanges, OnInit {
    * @private
    */
   ngOnInit(): void {
-    // needed because of https://github.com/angular/angular/issues/6005
-    setTimeout(() => {
-      this.isOpenChange.emit(false);
-    });
+    this.isOpenChange.emit(false);
   }
 
   /**

diff --git a/test/angular2-bootstrap-confirm.spec.ts b/test/angular2-bootstrap-confirm.spec.ts
@@ -376,7 +376,9 @@ describe('bootstrap confirm', () => {
       createPopoverContainer().then((fixture) => {
         setTimeout(() => { // let isOpenChange be called with false
           clickFixture();
-          expect(fixture.componentInstance.isOpen).toEqual(true);
+          setTimeout(() => {
+            expect(fixture.componentInstance.isOpen).toEqual(true);
+          });
         });
       });
     }));
@@ -385,9 +387,13 @@ describe('bootstrap confirm', () => {
       createPopoverContainer().then((fixture) => {
         setTimeout(() => { // let isOpenChange be called with false
           clickFixture();
-          expect(fixture.componentInstance.isOpen).toEqual(true);
-          clickFixture();
-          expect(fixture.componentInstance.isOpen).toEqual(false);
+          setTimeout(() => { // ugly set timeouts are required because isOpen is async
+            expect(fixture.componentInstance.isOpen).toEqual(true);
+            clickFixture();
+            setTimeout(() => {
+              expect(fixture.componentInstance.isOpen).toEqual(false);
+            });
+          });
         });
       });
     }));