fix: Legacy modules tests not passing

DAB0mB · DAB0mB · commit 504952e5b299 · 2016-02-21T01:09:33.000+02:00
diff --git a/dist/angular-meteor.js b/dist/angular-meteor.js
@@ -602,7 +602,7 @@
 	  // Returns a callback which fulfills promise
 	  this.fulfill = function (deferred, boundError, boundResult) {
 	    return function (err, result) {
-	      if (err) deferred.reject(boundError === null ? err : boundError);else if (typeof boundResult == "function") deferred.resolve(boundResult === null ? result : boundResult(result));else deferred.resolve(boundResult === null ? result : boundResult);
+	      if (err) deferred.reject(boundError == null ? err : boundError);else if (typeof boundResult == "function") deferred.resolve(boundResult == null ? result : boundResult(result));else deferred.resolve(boundResult == null ? result : boundResult);
 	    };
 	  };
 
diff --git a/src/modules/angular-meteor-utils.js b/src/modules/angular-meteor-utils.js
@@ -58,11 +58,11 @@ angularMeteorUtils.service('$meteorUtils', [
     this.fulfill = function(deferred, boundError, boundResult) {
       return function(err, result) {
         if (err)
-          deferred.reject(boundError === null ? err : boundError);
+          deferred.reject(boundError == null ? err : boundError);
         else if (typeof boundResult == "function")
-          deferred.resolve(boundResult === null ? result : boundResult(result));
+          deferred.resolve(boundResult == null ? result : boundResult(result));
         else
-          deferred.resolve(boundResult === null ? result : boundResult);
+          deferred.resolve(boundResult == null ? result : boundResult);
       };
     };
 
diff --git a/tests/integration/pre1.3/angular-meteor-collection-spec.js b/tests/integration/pre1.3/angular-meteor-collection-spec.js
@@ -497,12 +497,14 @@ describe('$meteorCollection service', function() {
     });
 
     it('push updates from client handled correctly', function() {
-      $rootScope.limit = 10;
+      var $scope = $rootScope.$new();
+      $scope.limit = 10;
       var $ngCol = $meteorCollection(function() {
         return DummyCollection.find({}, {
-          limit: $rootScope.getReactively('limit') // TODO is not a function
+          limit: $scope.getReactively('limit')
         });
-      });
+      // A collection with no name can't be found so we'll need to pass it
+      }, false, DummyCollection);
       spyOn($ngCol, 'save');
 
       // Adds docs on the client.
@@ -517,12 +519,14 @@ describe('$meteorCollection service', function() {
     });
 
     it('remove updates from client handled correctly', function() {
-      $rootScope.limit = 10;
+      var $scope = $rootScope.$new();
+      $scope.limit = 10;
       var $ngCol = $meteorCollection(function() {
         return DummyCollection.find({}, {
-          limit: $rootScope.getReactively('limit') // TODO is not a function
+          limit: $scope.getReactively('limit')
         });
-      });
+      // A collection with no name can't be found so we'll need to pass it
+      }, false, DummyCollection);
       spyOn($ngCol, 'remove').and.callThrough();
 
       // Removes last two docs on the client.
diff --git a/tests/package.js b/tests/package.js
@@ -51,12 +51,12 @@ Package.onTest(function(api) {
     'integration/pre1.3/angular-meteor-get-updates-spec.js',
     'integration/pre1.3/angular-meteor-diff-array-spec.js',
     'integration/pre1.3/angular-meteor-camera-spec.js',
-    // 'integration/pre1.3/angular-meteor-collection-spec.js' // contains two failing tests (check todo)
+    'integration/pre1.3/angular-meteor-collection-spec.js',
     'integration/pre1.3/angular-meteor-methods-spec.js',
     'integration/pre1.3/angular-meteor-object-spec.js',
     'integration/pre1.3/angular-meteor-session-spec.js',
     'integration/pre1.3/angular-meteor-stopper-spec.js',
-    'integration/pre1.3/angular-meteor-subscribe-spec.js'
-    // 'integration/pre1.3/angular-meteor-utils-spec.js' // contains three failing tests
+    'integration/pre1.3/angular-meteor-subscribe-spec.js',
+    'integration/pre1.3/angular-meteor-utils-spec.js'
   ], 'client');
 });
