chore(folder-structure): Fixes for tests

dotansimha · dotansimha · commit c8889107347c · 2016-11-10T15:48:02.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -6,10 +6,13 @@ cache:
     - node_modules
 node_js:
   # use same node version as meteor does
-  - "5"
+  - "6"
 services:
   - mongodb
 before_install: curl https://install.meteor.com | /bin/sh
 before_script:
   # remove unused node modules from cache
-  - "npm prune"
+  - npm prune
+  - npm install -g webpack@^1.12.9 eslint@^1.10.3
+  - npm install
+  - npm run test
diff --git a/dist/angular-meteor.js b/dist/angular-meteor.js
@@ -103,12 +103,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	// legacy
 	// lib
-
-
 	var name = 'angular-meteor';
 
 	// new
-
 	exports.default = name;
 
 
@@ -611,9 +608,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	'use strict';
 
-	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; }; /*global
-	                                                                                                                                                                                                                                                   angular, _, Tracker, EJSON, FS, Mongo
-	                                                                                                                                                                                                                                                   */
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; /*global
+	                                                                                                                                                                                                                                                                               angular, _, Tracker, EJSON, FS, Mongo
+	                                                                                                                                                                                                                                                                               */
 
 	var _underscore = __webpack_require__(2);
 
@@ -1358,7 +1355,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	    }, true);
 
 	    this.unregisterAutoDestroy = $rootScope.$on('$destroy', function () {
-	      if (self && self.stop) self.pop();
+	      if (self && self.stop) self.stop();
 	    });
 	  };
 
@@ -1716,7 +1713,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  var _this = this;
 
 	  // Used to store method's caller
-	  var caller = undefined;
+	  var caller = void 0;
 
 	  this._mixins = [];
 	  // Apply mixins automatically on specified contexts
@@ -1762,12 +1759,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	  // Extend prototype with the defined mixins
 	  this._extend = function (obj, options) {
 	    var _$defaults = _underscore2.default.defaults({}, options, {
-	      pattern: /.*/ });
-
-	    var pattern = _$defaults.pattern;
-	    var context = _$defaults.context;
-	    // The patterns of the keys which will be filtered
-
+	      pattern: /.*/ }),
+	        pattern = _$defaults.pattern,
+	        context = _$defaults.context;
 
 	    var mixins = _this._mixins.map(function (mixin) {
 	      // Filtering the keys by the specified pattern
@@ -1886,7 +1880,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	  // Calls Meteor.autorun() which will be digested after each run and automatically destroyed
 	  $$Core.autorun = function (fn) {
-	    var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
+	    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
 	    fn = this.$bindToContext($Mixer.caller, fn);
 
@@ -1989,7 +1983,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	  // Stops a process once the scope has been destroyed
 	  $$Core.$$autoStop = function (stoppable) {
-	    var removeListener = undefined;
+	    var removeListener = void 0;
 	    var baseStop = stoppable.stop.bind(stoppable);
 
 	    // Once the process has been stopped the destroy event listener will be removed
@@ -2184,7 +2178,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	 */
 	.factory(Reactive, ['$parse', _utils.utils, _mixer.Mixer, function ($parse, $$utils, $Mixer) {
 	  function $$Reactive() {
-	    var vm = arguments.length <= 0 || arguments[0] === undefined ? this : arguments[0];
+	    var vm = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this;
 
 	    // Helps us track changes made in the view model
 	    vm.$$dependencies = {};
@@ -2323,7 +2317,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	      Tracker.nonreactive(function () {
 	        // If a cursor, observe its changes and update acoordingly
 	        if ($$utils.isCursor(model)) {
-	          var modelData = undefined;
+	          var modelData = void 0;
 
 	          if (angular.isUndefined(vm[k])) {
 	            _this3.$$setValHelper(vm, k, [], false);
@@ -2354,8 +2348,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	            activeObservation.stop();
 	          });*/
 	        } else {
-	            _this3.$$handleNonCursor(vm, k, model);
-	          }
+	          _this3.$$handleNonCursor(vm, k, model);
+	        }
 
 	        // Notify change and update the view model
 	        _this3.$$changed(vm, k);
@@ -2367,7 +2361,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  $$Reactive.$$setValHelper = function (vm, k, v) {
 	    var _this4 = this;
 
-	    var watch = arguments.length <= 3 || arguments[3] === undefined ? true : arguments[3];
+	    var watch = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
 
 	    // If set, reactives property
 	    if (watch) {
diff --git a/dist/angular-meteor.min.js b/dist/angular-meteor.min.js
diff --git a/dist/angular-meteor.min.js.map b/dist/angular-meteor.min.js.map
diff --git a/tests/.meteor/.gitignore b/tests/.meteor/.gitignore
@@ -0,0 +1 @@
+local
diff --git a/tests/.meteor/.id b/tests/.meteor/.id
@@ -0,0 +1,7 @@
+# This file contains a token that is unique to your project.
+# Check it into your repository along with the rest of this directory.
+# It can be used for purposes such as:
+#   - ensuring you don't accidentally deploy one app on top of another
+#   - providing package authors with aggregated statistics
+
+8j36d8isg0tfvhy1rn
diff --git a/tests/.meteor/packages b/tests/.meteor/packages
@@ -5,29 +5,30 @@
 # but you can also edit it by hand.
 
 meteor-base@1.0.4             # Packages every Meteor app needs to have
-mongo@1.1.12                   # The database Meteor supports right now
-reactive-var@1.0.10            # Reactive variable for tracker
-jquery@1.11.9                  # Helpful client-side library
-tracker@1.1.0                 # Meteor's client-side reactive programming library
+mongo@1.1.14                   # The database Meteor supports right now
+reactive-var@1.0.11            # Reactive variable for tracker
+jquery@1.11.10                  # Helpful client-side library
+tracker@1.1.1                 # Meteor's client-side reactive programming library
 
-standard-minifier-css@1.2.0   # CSS minifier run for production mode
-standard-minifier-js@1.2.0    # JS minifier run for production mode
-es5-shim@4.6.14                # ECMAScript 5 compatibility for older browsers.
-ecmascript@0.5.8              # Enable ECMAScript2015+ syntax in app code
+standard-minifier-css@1.3.2   # CSS minifier run for production mode
+standard-minifier-js@1.2.1    # JS minifier run for production mode
+es5-shim@4.6.15                # ECMAScript 5 compatibility for older browsers.
+ecmascript@0.5.9              # Enable ECMAScript2015+ syntax in app code
 shell-server@0.2.1            # Server-side component of the `meteor shell` command
 
 insecure@1.0.7                # Allow all DB writes from clients (for prototyping)
 
-check
-ejson
-session
-mongo-id
-diff-sequence
-observe-sequence
+check@1.2.4
+ejson@1.0.13
+session@1.1.7
+mongo-id@1.0.6
+diff-sequence@1.0.7
+observe-sequence@1.0.14
 dburles:mongo-collection-instances@0.3.4
-# NB: order below is important. 
+# NB: order below is important.
 practicalmeteor:mocha
 dispatch:mocha-phantomjs
 angular:angular-mocks@1.4.7
 practicalmeteor:sinon
 practicalmeteor:chai
+babel-runtime
diff --git a/tests/.meteor/release b/tests/.meteor/release
@@ -1 +1 @@
-METEOR@1.4.1.1
+METEOR@1.4.2.1
diff --git a/tests/.meteor/versions b/tests/.meteor/versions
@@ -0,0 +1,81 @@
+allow-deny@1.0.5
+angular:angular@1.5.3_1
+angular:angular-mocks@1.5.3_1
+autoupdate@1.3.12
+babel-compiler@6.13.0
+babel-runtime@1.0.0
+base64@1.0.10
+binary-heap@1.0.10
+blaze@2.2.0
+blaze-tools@1.0.10
+boilerplate-generator@1.0.11
+caching-compiler@1.1.9
+caching-html-compiler@1.0.7
+callback-hook@1.0.10
+check@1.2.4
+coffeescript@1.11.1_3
+dburles:mongo-collection-instances@0.3.5
+ddp@1.2.5
+ddp-client@1.3.2
+ddp-common@1.2.8
+ddp-server@1.3.12
+deps@1.0.12
+diff-sequence@1.0.7
+dispatch:mocha-phantomjs@0.1.7
+dispatch:phantomjs-tests@0.0.5
+ecmascript@0.6.0
+ecmascript-runtime@0.3.15
+ejson@1.0.13
+es5-shim@4.6.15
+geojson-utils@1.0.10
+hot-code-push@1.0.4
+html-tools@1.0.11
+htmljs@1.0.11
+http@1.2.10
+id-map@1.0.9
+insecure@1.0.7
+jquery@1.11.10
+lai:collection-extensions@0.2.1_1
+livedata@1.0.18
+logging@1.1.16
+meteor@1.6.0
+meteor-base@1.0.4
+minifier-css@1.2.15
+minifier-js@1.2.15
+minimongo@1.0.18
+modules@0.7.7
+modules-runtime@0.7.7
+mongo@1.1.14
+mongo-id@1.0.6
+npm-mongo@2.2.11_2
+observe-sequence@1.0.14
+ordered-dict@1.0.9
+practicalmeteor:chai@2.1.0_1
+practicalmeteor:loglevel@1.2.0_2
+practicalmeteor:mocha@2.4.5_6
+practicalmeteor:mocha-core@1.0.1
+practicalmeteor:sinon@1.14.1_2
+promise@0.8.8
+random@1.0.10
+reactive-dict@1.1.8
+reactive-var@1.0.11
+reload@1.1.11
+retry@1.0.9
+routepolicy@1.0.12
+session@1.1.7
+shell-server@0.2.1
+spacebars@1.0.13
+spacebars-compiler@1.0.13
+standard-minifier-css@1.3.2
+standard-minifier-js@1.2.1
+templating@1.2.15
+templating-compiler@1.2.15
+templating-runtime@1.2.15
+templating-tools@1.0.5
+tmeasday:test-reporter-helpers@0.2.1
+tracker@1.1.1
+ui@1.0.12
+underscore@1.0.10
+url@1.0.11
+webapp@1.3.12
+webapp-hashing@1.0.9
diff --git a/tests/package.json b/tests/package.json
@@ -6,7 +6,7 @@
   },
   "dependencies": {
     "angular": "^1.5.8",
-    "angular-meteor": "file:../",
-    "meteor-node-stubs": "~0.2.0"
+    "angular-meteor": "../",
+    "meteor-node-stubs": "^0.2.3"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`},`
`7`	`7`	`"dependencies": {`
`8`	`8`	`"angular": "^1.5.8",`
`9`		`- "angular-meteor": "file:../",`
`10`		`- "meteor-node-stubs": "~0.2.0"`
	`9`	`+ "angular-meteor": "../",`
	`10`	`+ "meteor-node-stubs": "^0.2.3"`
`11`	`11`	`}`
`12`	`12`	`}`