Merge branch 'master' into fix-315

.travis.yml

@@ -27,5 +27,5 @@ before_script:
 script:
   - meteor create --bare test
   - cd test
-  - meteor npm i --save selenium-webdriver@3.6.0 chromedriver@2.36.0 simpl-schema
+  - meteor npm i --save selenium-webdriver@3.6.0 chromedriver@2.36.0 simpl-schema chai
   - METEOR_PACKAGE_DIRS="../" TEST_BROWSER_DRIVER=chrome meteor test-packages --once --driver-package meteortesting:mocha ../

lib/exposure/testing/client.js

@@ -1,3 +1,4 @@
+import { assert } from 'chai';
 import Demo, {
     DemoMethod,
     DemoPublication

lib/exposure/testing/units/units.js

@@ -1,3 +1,4 @@
+import { assert } from 'chai';
 import restrictFields from '../../lib/restrictFields.js';
 import enforceMaxLimit from '../../lib/enforceMaxLimit.js';
 import cleanBody from '../../lib/cleanBody.js';

lib/graphql/testing/astToBody.test.js

@@ -1,3 +1,4 @@
+import { assert } from 'chai';
 import astToBody, { Symbols } from '../lib/astToBody';
 import ast from './ast.js';
 

lib/graphql/testing/astToQuery.test.js

@@ -1,3 +1,4 @@
+import { assert } from 'chai';
 import { Symbols } from '../lib/astToBody';
 
 import astToQuery, {

lib/links/tests/main.js

@@ -1,3 +1,4 @@
+import { assert } from 'chai';
 //import {
 //    PostCollection,
 //    CategoryCollection,

lib/namedQuery/testing/client.test.js

@@ -1,3 +1,4 @@
+import { assert } from 'chai';
 import postListExposure from './bootstrap/queries/postListExposure.js';
 import postListExposureScoped from './bootstrap/queries/postListExposureScoped';
 import userListScoped from './bootstrap/queries/userListScoped';

lib/namedQuery/testing/server.test.js

@@ -1,3 +1,4 @@
+import { assert } from 'chai';
 import {
     postList,
     postListCached,

lib/query/counts/testing/client.test.js

@@ -1,3 +1,4 @@
+import { assert } from 'chai';
 import { Tracker } from 'meteor/tracker';
 import PostsCollection from './bootstrap/collection.test';
 import NamedQuery, {

lib/query/lib/recursiveCompose.js

@@ -41,14 +41,14 @@ function compose(node, userId, config) {
                 }
 
                 const cursor = accessor.find(filters, options, userId);
-                if (config && config.scoped) {
+                if (config.scoped) {
                     patchCursor(cursor, getNodeNamespace(node));
                 }
                 return cursor;
             }
         },
 
-        children: _.map(node.collectionNodes, n => compose(n, userId))
+        children: _.map(node.collectionNodes, n => compose(n, userId, config))
     }
 }
 

lib/query/testing/client.test.js

@@ -1,3 +1,4 @@
+import { assert } from 'chai';
 import { createQuery } from 'meteor/cultofcoders:grapher';
 import './reducers.client.test';
 import './security.client.test';

lib/query/testing/link-cache/server.test.js

@@ -1,3 +1,4 @@
+import { assert } from 'chai';
 import createFixtures from './fixtures';
 import { createQuery } from 'meteor/cultofcoders:grapher';
 import {

lib/query/testing/metaFilters.server.test.js

@@ -1,3 +1,4 @@
+import { assert } from 'chai';
 import { createQuery } from 'meteor/cultofcoders:grapher';
 
 describe('Hypernova - $meta filters', function () {

lib/query/testing/reducers.client.test.js

@@ -1,3 +1,4 @@
+import { assert } from 'chai';
 import { createQuery } from 'meteor/cultofcoders:grapher';
 import waitForHandleToBeReady from './lib/waitForHandleToBeReady';
 

lib/query/testing/reducers.server.test.js

@@ -1,3 +1,4 @@
+import { assert } from 'chai';
 import { createQuery } from 'meteor/cultofcoders:grapher';
 import Authors from './bootstrap/authors/collection';
 import Comments from './bootstrap/comments/collection';

lib/query/testing/security.client.test.js

@@ -1,3 +1,4 @@
+import { assert } from 'chai';
 import { createQuery } from 'meteor/cultofcoders:grapher';
 import waitForHandleToBeReady from './lib/waitForHandleToBeReady';
 

lib/query/testing/server.test.js

@@ -1,3 +1,4 @@
+import { assert } from 'chai';
 import { createQuery } from 'meteor/cultofcoders:grapher';
 import dot from 'dot-object';
 import Comments from './bootstrap/comments/collection.js';

package.js

@@ -31,7 +31,7 @@ Package.onUse(function(api) {
         'reywood:publish-composite@1.5.2',
         'dburles:mongo-collection-instances@0.3.5',
         'herteby:denormalize@0.6.5',
-        'peerlibrary:subscription-scope@0.1.0',
+        'peerlibrary:subscription-scope@0.4.0',
     ];
 
     api.use(packages);
@@ -50,14 +50,14 @@ Package.onTest(function(api) {
         'reywood:publish-composite@1.5.2',
         'dburles:mongo-collection-instances@0.3.5',
         'herteby:denormalize@0.6.5',
-        'peerlibrary:subscription-scope@0.1.0',
+        'peerlibrary:subscription-scope@0.4.0',
         'mongo',
     ];
 
     api.use(packages);
     api.use('tracker');
 
-    api.use(['cultofcoders:mocha', 'practicalmeteor:chai']);
+    api.use(['meteortesting:mocha']);
 
     // LINKS
     api.addFiles('lib/links/tests/main.js', 'server');