fixup! fix($http): correct behavior

Author: Narretz

src/ngMock/angular-mocks.js

@@ -1379,7 +1379,7 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) {
       if (!$browser && timeout) {
         if (timeout.then) {
           timeout.then(function() {
-            handlePrematureEnd(timeout.$$timeoutId >= 0 ? 'timeout' : 'abort');
+            handlePrematureEnd(angular.isDefined(timeout.$$timeoutId) ? 'timeout' : 'abort');
           });
         } else {
           $timeout(function() {

test/ng/httpSpec.js

@@ -1929,35 +1929,41 @@ describe('$http', function() {
         var onFulfilled = jasmine.createSpy('onFulfilled');
         var onRejected = jasmine.createSpy('onRejected').and.callFake(function(response) {
           expect(response.xhrStatus).toBe('timeout');
-          callback();
         });
 
         $httpBackend.expect('GET', '/some').respond(200);
 
-        $http({method: 'GET', url: '/some', timeout: 10}).then(onFulfilled, onRejected);
+        $http({
+          method: 'GET',
+          url: '/some',
+          timeout: 10
+        }).then(onFulfilled, onRejected);
 
         $timeout.flush(100);
 
         expect(onFulfilled).not.toHaveBeenCalled();
-        expect(callback).toHaveBeenCalled();
+        expect(onRejected).toHaveBeenCalled();
       }));
 
 
       it('should reject promise when timeout promise resolves', inject(function($timeout) {
         var onFulfilled = jasmine.createSpy('onFulfilled');
         var onRejected = jasmine.createSpy('onRejected').and.callFake(function(response) {
           expect(response.xhrStatus).toBe('timeout');
-          callback();
         });
 
         $httpBackend.expect('GET', '/some').respond(200);
 
-        $http({method: 'GET', url: '/some', timeout: $timeout(noop, 10)}).then(onFulfilled, onRejected);
+        $http({
+          method: 'GET',
+          url: '/some',
+          timeout: $timeout(noop, 10)
+        }).then(onFulfilled, onRejected);
 
         $timeout.flush(100);
 
         expect(onFulfilled).not.toHaveBeenCalled();
-        expect(callback).toHaveBeenCalled();
+        expect(onRejected).toHaveBeenCalled();
       }));
     });