Merge remote-tracking branch 'origin/master'

Author: Urigo

.docs/angular-meteor/client/views/steps/tutorial.step_19.tpl

@@ -127,6 +127,7 @@ Package.onUse(function(api) {
   api.use('DEPENDENCY_NAME', where); // Dependencies
 
   api.addFiles('FILE_NAME', where); // Files in use
+});   
 ```
 
 Now, just fill the information inside the file, according to the package information, the `bower.json` could be helpful to fill missing information you can't find.
@@ -157,6 +158,7 @@ Package.onUse(function(api) {
   api.use('stevezhu:[email protected]', where); // Surprised?! Read the bower.json file!
 
   api.addFiles('src/angularjs-dropdown-multiselect.js', where); // Files in use
+});   
 ```
 
 **Important Notes:**

package.js

@@ -71,6 +71,11 @@ Package.onTest(function(api) {
     'tests/integration/angular-meteor-session-spec.js',
     'tests/integration/angular-meteor-diff-array-spec.js',
     'tests/integration/angular-meteor-collection-spec.js',
-    'tests/integration/angular-meteor-utils-spec.js'
+    'tests/integration/angular-meteor-utils-spec.js',
+    'tests/integration/test_collections.js'
   ], 'client');
+
+  api.addFiles([
+    'tests/integration/test_collections.js'
+  ], 'server');
 });

tests/integration/angular-meteor-collection-spec.js

@@ -115,4 +115,78 @@ describe('$meteorCollection service', function() {
       expect(meteorArray).toEqualCollection(MyCollection);
     });
   });
+
+  describe('observe server changes', function() {
+
+    beforeEach(function() {
+      // Cleaning up after each test.
+      bigCollection.find({}).forEach(function(doc) {
+        bigCollection.remove(doc._id);
+      });
+
+      for (var i = 0; i < 100; i++) {
+        bigCollection.insert({count: i});
+      }
+    });
+
+    it('$apply executed twice', function() {
+
+      var $ngCol = $meteorCollection(bigCollection);
+
+      expect($rootScope.$apply).toHaveBeenCalled();
+
+      expect($ngCol).toEqualCollection(bigCollection);
+
+      // No matter how much elements MyCollection contains
+      // $rootScope.$apply should be called twice.
+      expect($rootScope.$apply.calls.count()).toEqual(2);
+
+    });
+
+    it('push updates from client handled correctly', function() {
+
+      $rootScope.limit = 10;
+      var $ngCol = $meteorCollection(function() {
+        return bigCollection.find({}, {
+          limit: $rootScope.getReactively('limit')
+        });
+      });
+      spyOn($ngCol, 'save');
+
+      // Adds docs on the client.
+      for (var i = 100; i < 106; i++) {
+        $ngCol.push({count: i});
+      }
+
+      $timeout.flush();
+
+      expect($ngCol.length).toEqual(10);
+      expect($ngCol.save).toHaveBeenCalled();
+      expect($ngCol.save.calls.count()).toEqual(6);
+    });
+
+    it('remove updates from client handled correctly', function() {
+
+      $rootScope.limit = 10;
+      var $ngCol = $meteorCollection(function() {
+        return bigCollection.find({}, {
+          limit: $rootScope.getReactively('limit')
+        });
+      });
+      spyOn($ngCol, 'remove').and.callThrough();
+
+      // Removes last two docs on the client.
+      $ngCol.pop();
+      $ngCol.pop();
+
+      $timeout.flush();
+
+      // Size should stay at 10 after removing because
+      // limit is set.
+      expect($ngCol.length).toEqual(10);
+      expect($ngCol.remove).toHaveBeenCalled();
+      expect($ngCol.remove.calls.count()).toEqual(2);
+    });
+
+  });
 });

tests/integration/test_collections.js

@@ -0,0 +1,9 @@
+bigCollection = new Meteor.Collection('bigCollection');
+bigCollection.allow({
+    remove: function() {
+        return true;
+    },
+    insert: function() {
+        return true;
+    }
+});