fix(toast): replace cancel with hide on hideDelay

closes #3558
angular · Jul 7, 2015 · 2b68713 · 2b68713
1 parent 7eefcfe
commit 2b68713
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/components/toast/toast.spec.js b/src/components/toast/toast.spec.js
@@ -16,7 +16,7 @@ describe('$mdToast service', function() {
     hasConfigMethods(['content', 'action', 'capsule', 'highlightAction', 'theme']);
 
     it('supports a basic toast', inject(function($mdToast, $rootScope, $timeout, $animate) {
-      var rejected = false;
+      var resolved = false;
       var parent = angular.element('<div>');
       $mdToast.show(
         $mdToast.simple({
@@ -25,8 +25,8 @@ describe('$mdToast service', function() {
           theme: 'some-theme',
           capsule: true
         })
-      ).catch(function() {
-        rejected = true;
+      ).then(function() {
+        resolved = true;
       });
       $rootScope.$digest();
       expect(parent.find('span').text()).toBe('Do something');
@@ -35,7 +35,7 @@ describe('$mdToast service', function() {
       $animate.triggerCallbacks();
       $timeout.flush();
       $animate.triggerCallbacks();
-      expect(rejected).toBe(true);
+      expect(resolved).toBe(true);
     }));
 
     it('supports dynamicly updating the content', inject(function($mdToast, $rootScope, $rootElement) {

diff --git a/src/core/services/interimElement/interimElement.js b/src/core/services/interimElement/interimElement.js
@@ -386,7 +386,7 @@ function InterimElementProvider() {
 
               function startHideTimeout() {
                 if (options.hideDelay) {
-                  hideTimeout = $timeout(service.cancel, options.hideDelay) ;
+                  hideTimeout = $timeout(service.hide, options.hideDelay) ;
                 }
               }
             },

diff --git a/src/core/services/interimElement/interimElement.spec.js b/src/core/services/interimElement/interimElement.spec.js
@@ -277,7 +277,7 @@ describe('$$interimElement service', function() {
       }));
 
       it('calls hide after hideDelay', inject(function($animate, $timeout, $rootScope) {
-        var hideSpy = spyOn(Service, 'cancel').and.callThrough();
+        var hideSpy = spyOn(Service, 'hide').and.callThrough();
         Service.show({hideDelay: 1000});
         expect(hideSpy).toHaveBeenCalled();
       }));