chore(tests): update to jasmine 2.x

Closes #3469
Implements #3458

Author: Foxandxss

Diff for: misc/test-lib/helpers.js

@@ -1,25 +1,57 @@
 // jasmine matcher for expecting an element to have a css class
 // https://github.com/angular/angular.js/blob/master/test/matchers.js
 beforeEach(function() {
-  this.addMatchers({
-    toHaveClass: function(cls) {
-      this.message = function() {
-        return "Expected '" + this.actual + "'" + (this.isNot ? ' not ' : ' ') + "to have class '" + cls + "'.";
-      };
+  jasmine.addMatchers({
+    toHaveClass: function(util, customEqualityTesters) {
+      return {
+        compare: function(actual, expected) {
+          var result = {
+            pass: actual.hasClass(expected)
+          };
 
-      return this.actual.hasClass(cls);
+          if (result.pass) {
+            result.message = 'Expected "' + actual + '" not to have the "' + expected + '" class.';
+          } else {
+            result.message = 'Expected "' + actual + '" to have the "' + expected + '" class.';
+          }
+
+          return result;
+        }
+      }
     },
-    toBeHidden: function () {
-      var element = angular.element(this.actual);
-      return element.hasClass('ng-hide') ||
-        element.css('display') == 'none';
+    toBeHidden: function(util, customEqualityTesters) {
+      return {
+        compare: function(actual) {
+          var result = {
+            pass: actual.hasClass('ng-hide') || actual.css('display') === 'none'
+          };
+
+          if (result.pass) {
+            result.message = 'Expected "' + actual + '" not to be hidden';
+          } else {
+            result.message = 'Expected "' + actual + '" to be hidden';
+          }
+
+          return result;
+        }
+      }
     },
-    toHaveFocus: function () {
-      this.message = function () {
-        return 'Expected \'' + angular.mock.dump(this.actual) + '\' to have focus';
-      };
+    toHaveFocus: function(util, customEqualityTesters) {
+      return {
+        compare: function(actual) {
+          var result = {
+            pass: document.activeElement === actual[0]
+          };
+
+          if (result.pass) {
+            result.message = 'Expected "' + actual + '" not to have focus';
+          } else {
+            result.message = 'Expected "' + actual + '" to have focus';
+          }
 
-      return document.activeElement === this.actual[0];
+          return result;
+        }
+      }
     }
   });
 });

Diff for: package.json

@@ -22,11 +22,12 @@
     "grunt-html2js": "^0.3.0",
     "grunt-karma": "^0.10.1",
     "grunt-ngdocs": "~0.1.1",
+    "jasmine-core": "^2.2.0",
     "karma": "^0.12.31",
     "karma-chrome-launcher": "^0.1.7",
     "karma-coverage": "^0.2.7",
     "karma-firefox-launcher": "^0.1.4",
-    "karma-jasmine": "^0.1.5",
+    "karma-jasmine": "^0.3.5",
     "node-markdown": "0.1.1",
     "semver": "^4.3.3",
     "shelljs": "^0.4.0"

Diff for: src/buttons/test/buttons.spec.js

@@ -201,7 +201,7 @@ describe('buttons', function () {
         expect(btns.eq(1)).not.toHaveClass('active');
 
         btns.eq(0).click();
-        expect($scope.model).toEqual(undefined);
+        expect($scope.model).toBeNull();
         expect(btns.eq(1)).not.toHaveClass('active');
         expect(btns.eq(0)).not.toHaveClass('active');
       });
@@ -225,4 +225,4 @@ describe('buttons', function () {
       });
     });
   });
-});
+});

Diff for: src/carousel/test/carousel.spec.js

@@ -262,7 +262,7 @@ describe('carousel', function() {
       testSlideActive(2);
       $interval.flush(scope.interval);
       testSlideActive(0);
-      spyOn($interval, 'cancel').andCallThrough();
+      spyOn($interval, 'cancel').and.callThrough();
       scope.$destroy();
       expect($interval.cancel).toHaveBeenCalled();
     });
@@ -396,17 +396,17 @@ describe('carousel', function() {
       });
 
       it('issue 1414 - should not continue running timers after scope is destroyed', function() {
-        spyOn(scope, 'next').andCallThrough();
+        spyOn(scope, 'next').and.callThrough();
         scope.interval = 2000;
         scope.$digest();
 
         $interval.flush(scope.interval);
-        expect(scope.next.calls.length).toBe(1);
+        expect(scope.next.calls.count()).toBe(1);
 
         scope.$destroy();
 
         $interval.flush(scope.interval);
-        expect(scope.next.calls.length).toBe(1);
+        expect(scope.next.calls.count()).toBe(1);
       });
     });
   });

Diff for: src/collapse/test/collapse.spec.js

@@ -107,4 +107,4 @@ describe('collapse directive', function () {
     });
 
   });
-});
+});

Diff for: src/datepicker/test/datepicker.spec.js

@@ -942,20 +942,20 @@ describe('datepicker directive', function () {
     });
 
     it('executes the dateDisabled expression for each visible day plus one for validation', function() {
-      expect($rootScope.dateDisabledHandler.calls.length).toEqual(42 + 1);
+      expect($rootScope.dateDisabledHandler.calls.count()).toEqual(42 + 1);
     });
 
     it('executes the dateDisabled expression for each visible month plus one for validation', function() {
-      $rootScope.dateDisabledHandler.reset();
+      $rootScope.dateDisabledHandler.calls.reset();
       clickTitleButton();
-      expect($rootScope.dateDisabledHandler.calls.length).toEqual(12 + 1);
+      expect($rootScope.dateDisabledHandler.calls.count()).toEqual(12 + 1);
     });
 
     it('executes the dateDisabled expression for each visible year plus one for validation', function() {
       clickTitleButton();
-      $rootScope.dateDisabledHandler.reset();
+      $rootScope.dateDisabledHandler.calls.reset();
       clickTitleButton();
-      expect($rootScope.dateDisabledHandler.calls.length).toEqual(20 + 1);
+      expect($rootScope.dateDisabledHandler.calls.count()).toEqual(20 + 1);
     });
   });
 
@@ -967,20 +967,20 @@ describe('datepicker directive', function () {
     });
 
     it('executes the customClass expression for each visible day plus one for validation', function() {
-      expect($rootScope.customClassHandler.calls.length).toEqual(42);
+      expect($rootScope.customClassHandler.calls.count()).toEqual(42);
     });
 
     it('executes the customClass expression for each visible month plus one for validation', function() {
-      $rootScope.customClassHandler.reset();
+      $rootScope.customClassHandler.calls.reset();
       clickTitleButton();
-      expect($rootScope.customClassHandler.calls.length).toEqual(12);
+      expect($rootScope.customClassHandler.calls.count()).toEqual(12);
     });
 
     it('executes the customClass expression for each visible year plus one for validation', function() {
       clickTitleButton();
-      $rootScope.customClassHandler.reset();
+      $rootScope.customClassHandler.calls.reset();
       clickTitleButton();
-      expect($rootScope.customClassHandler.calls.length).toEqual(20);
+      expect($rootScope.customClassHandler.calls.count()).toEqual(20);
     });
   });
 
@@ -1316,13 +1316,13 @@ describe('datepicker directive', function () {
           expect(dropdownEl).toBeHidden();
           expect(document.activeElement.tagName).toBe('INPUT');
         });
-        
+
         it('stops the ESC key from propagating if the dropdown is open, but not when closed', function() {
           expect(dropdownEl).not.toBeHidden();
 
           dropdownEl.find('button').eq(0).focus();
           expect(document.activeElement.tagName).toBe('BUTTON');
-          
+
           var documentKey = -1;
           var getKey = function(evt) { documentKey = evt.which; };
           $document.bind('keydown', getKey);
@@ -1331,10 +1331,10 @@ describe('datepicker directive', function () {
           $rootScope.$digest();
           expect(dropdownEl).toBeHidden();
           expect(documentKey).toBe(-1);
-          
+
           triggerKeyDown(inputEl, 'esc');
           expect(documentKey).toBe(27);
-          
+
           $document.unbind('keydown', getKey);
         });
       });
@@ -1731,7 +1731,7 @@ describe('datepicker directive', function () {
         var $body = $document.find('body'),
             bodyLength = $body.children().length,
             elm = angular.element(
-              '<div><input datepicker-popup ng-model="date" datepicker-append-to-body="true"></input></div>'
+              '<div><input datepicker-popup ng-model="date" datepicker-append-to-body="true" /></div>'
             );
         $compile(elm)($rootScope);
         $rootScope.$digest();
@@ -1744,7 +1744,7 @@ describe('datepicker directive', function () {
             bodyLength = $body.children().length,
             isolatedScope = $rootScope.$new(),
             elm = angular.element(
-              '<input datepicker-popup ng-model="date" datepicker-append-to-body="true"></input>'
+              '<input datepicker-popup ng-model="date" datepicker-append-to-body="true" />'
             );
         $compile(elm)(isolatedScope);
         isolatedScope.$digest();

Diff for: src/modal/test/modal.spec.js

@@ -27,60 +27,107 @@ describe('$modal', function () {
   }));
 
   beforeEach(function () {
-    this.addMatchers({
+    jasmine.addMatchers({
+      toBeResolvedWith: function(util, customEqualityTesters) {
+        return {
+          compare: function(promise, expected) {
+            promise.then(function(result) {
+              expect(result).toEqual(expected);
 
-      toBeResolvedWith: function(value) {
-        var resolved;
-        this.message = function() {
-          return 'Expected "' + angular.mock.dump(resolved) + '" to be resolved with "' + value + '".';
-        };
-        this.actual.then(function(result){
-          resolved = result;
-        });
-        $rootScope.$digest();
+              if (result === expected) {
+                result.message = 'Expected "' + angular.mock.dump(result) + '" not to be resolved with "' + expected + '".';
+              } else {
+                result.message = 'Expected "' + angular.mock.dump(result) + '" to be resolved with "' + expected + '".';
+              }
+            });
 
-        return resolved === value;
-      },
+            $rootScope.$digest();
 
-      toBeRejectedWith: function(value) {
-        var rejected;
-        this.message = function() {
-          return 'Expected "' + angular.mock.dump(rejected) + '" to be rejected with "' + value + '".';
+            return {pass: true};
+          }
         };
-        this.actual.then(angular.noop, function(reason){
-          rejected = reason;
-        });
-        $rootScope.$digest();
-
-        return rejected === value;
       },
+      toBeRejectedWith: function(util, customEqualityTesters) {
+        return {
+          compare: function(promise, expected) {
+            var result = {};
 
-      toHaveModalOpenWithContent: function(content, selector) {
+            promise.then(function() {
 
-        var contentToCompare, modalDomEls = this.actual.find('body > div.modal > div.modal-dialog > div.modal-content');
+            }, function(result) {
+              expect(result).toEqual(expected);
 
-        this.message = function() {
-          return '"Expected "' + angular.mock.dump(modalDomEls) + '" to be open with "' + content + '".';
-        };
+              if (result === expected) {
+                result.message = 'Expected "' + angular.mock.dump(result) + '" not to be rejected with "' + expected + '".';
+              } else {
+                result.message = 'Expected "' + angular.mock.dump(result) + '" to be rejected with "' + expected + '".';
+              }
+            });
 
-        contentToCompare = selector ? modalDomEls.find(selector) : modalDomEls;
-        return modalDomEls.css('display') === 'block' &&  contentToCompare.html() == content;
+            $rootScope.$digest();
+
+            return {pass: true};
+          }
+        };
       },
+      toHaveModalOpenWithContent: function(util, customEqualityTesters) {
+        return {
+          compare: function(actual, content, selector) {
+            var contentToCompare, modalDomEls = actual.find('body > div.modal > div.modal-dialog > div.modal-content');
+
+            contentToCompare = selector ? modalDomEls.find(selector) : modalDomEls;
 
-      toHaveModalsOpen: function(noOfModals) {
+            var result = {
+              pass: modalDomEls.css('display') === 'block' && contentToCompare.html() === content
+            };
 
-        var modalDomEls = this.actual.find('body > div.modal');
-        return modalDomEls.length === noOfModals;
+            if (result.pass) {
+              result.message = '"Expected "' + angular.mock.dump(modalDomEls) + '" not to be open with "' + content + '".';
+            } else {
+              result.message = '"Expected "' + angular.mock.dump(modalDomEls) + '" to be open with "' + content + '".';
+            }
+
+            return result;
+          }
+        };
       },
+      toHaveModalsOpen: function(util, customEqualityTesters) {
+        return {
+          compare: function(actual, expected) {
+            var modalDomEls = actual.find('body > div.modal');
+
+            var result = {
+              pass: util.equals(modalDomEls.length, expected, customEqualityTesters)
+            };
 
-      toHaveBackdrop: function() {
+            if (result.pass) {
+              result.message = 'Expected "' + angular.mock.dump(modalDomEls) + '" not to have "' + expected + '" modals opened.';
+            } else {
+              result.message = 'Expected "' + angular.mock.dump(modalDomEls) + '" to have "' + expected + '" modals opened.';
+            }
 
-        var backdropDomEls = this.actual.find('body > div.modal-backdrop');
-        this.message = function() {
-          return 'Expected "' + angular.mock.dump(backdropDomEls) + '" to be a backdrop element".';
+            return result;
+          }
         };
+      },
+      toHaveBackdrop: function(util, customEqualityTesters) {
+        return {
+          compare: function(actual, expected) {
+            var backdropDomEls = actual.find('body > div.modal-backdrop');
+
+            var result = {
+              pass: util.equals(backdropDomEls.length, 1, customEqualityTesters)
+            };
 
-        return backdropDomEls.length === 1;
+            if (result.pass) {
+              result.message = 'Expected "' + angular.mock.dump(backdropDomEls) + '" not to be a backdrop element".';
+            } else {
+              result.message = 'Expected "' + angular.mock.dump(backdropDomEls) + '" to be a backdrop element".';
+            }
+
+            return result;
+          }
+        };
       }
     });
   });