Merge pull request #65 from SimonSimCity/forked-mocha-core

Update MochaJS to latest version

README.md

@@ -93,7 +93,10 @@ You can export TEST_BROWSER_VISIBLE=1 to show the Electron window while tests ru
 
 **PhantomJS**
 
+Support for PhantomJS has been deprecated because it's development is suspended. If you still want to use it you need to downgrade the dependency on `meteortesting:mocha-core` to `1.0.1`. For more information on why it got suspended, please take a look at [the repository](https://github.com/ariya/phantomjs)
+
 ```bash
+$ meteor add meteortesting:mocha-core@1.0.1
 $ meteor npm i --save-dev phantomjs-prebuilt
 $ TEST_BROWSER_DRIVER=phantomjs meteor test --once --driver-package meteortesting:mocha
 ```

package/.versions

@@ -17,7 +17,7 @@ meteortesting:browser-tests@1.0.0
 meteortesting:mocha@1.0.0
 modules@0.11.3
 modules-runtime@0.9.1
-practicalmeteor:mocha-core@1.0.1
+meteortesting:mocha-core@1.0.1
 promise@0.10.1
 routepolicy@1.0.13
 underscore@1.0.10

package/client.js

@@ -1,5 +1,5 @@
 /* global Package: false */
-import { mocha } from 'meteor/practicalmeteor:mocha-core';
+import { mocha } from 'meteor/meteortesting:mocha-core';
 import prepForHTMLReporter from './prepForHTMLReporter';
 import './browser-shim';
 

package/package.js

@@ -3,13 +3,13 @@ Package.describe({
   summary: 'Run Meteor package or app tests with Mocha',
   git: 'https://github.com/meteortesting/meteor-mocha.git',
   documentation: '../README.md',
-  version: '1.0.0',
+  version: '1.0.1',
   testOnly: true,
 });
 
 Package.onUse(function onUse(api) {
   api.use([
-    'practicalmeteor:mocha-core@1.0.0',
+    'meteortesting:mocha-core@1.0.1 || 5.2.0',
     'ecmascript@0.3.0',
     'lmieulet:meteor-coverage@1.1.4 || 2.0.1',
   ]);

package/server.js

@@ -1,5 +1,5 @@
 /* global Package */
-import { mochaInstance } from 'meteor/practicalmeteor:mocha-core';
+import { mochaInstance } from 'meteor/meteortesting:mocha-core';
 import { startBrowser } from 'meteor/meteortesting:browser-tests';
 
 import setArgs from './runtimeArgs';

test.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 echo "Placing root files into dummy_app for testing"
+mkdir -p tests/dummy_app/packages/meteor-mocha
 rsync -av ./package/ tests/dummy_app/packages/meteor-mocha
 cd tests/dummy_app/
 meteor npm install

tests/dummy_app/.meteor/.finished-upgraders

@@ -13,3 +13,6 @@ notices-for-facebook-graph-api-2
 1.3.0-split-minifiers-package
 1.4.0-remove-old-dev-bundle-link
 1.4.1-add-shell-server-package
+1.4.3-split-account-service-packages
+1.5-add-dynamic-import-package
+1.7-split-underscore-from-meteor-base

tests/dummy_app/.meteor/packages

@@ -4,20 +4,22 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-meteor-base@1.0.4             # Packages every Meteor app needs to have
-mobile-experience@1.0.4       # Packages for a great mobile UX
-mongo@1.1.14                   # The database Meteor supports right now
+meteor-base@1.4.0             # Packages every Meteor app needs to have
+mobile-experience@1.0.5       # Packages for a great mobile UX
+mongo@1.5.0                   # The database Meteor supports right now
 blaze-html-templates@1.0.4 # Compile .html files into Meteor Blaze views
 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
+tracker@1.2.0                 # Meteor's client-side reactive programming library
 
-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.6.1              # Enable ECMAScript2015+ syntax in app code
-shell-server@0.2.1            # Server-side component of the `meteor shell` command
+standard-minifier-css@1.4.1   # CSS minifier run for production mode
+standard-minifier-js@2.3.4    # JS minifier run for production mode
+es5-shim@4.8.0                # ECMAScript 5 compatibility for older browsers.
+ecmascript@0.11.1              # Enable ECMAScript2015+ syntax in app code
+shell-server@0.3.1            # Server-side component of the `meteor shell` command
 
 autopublish@1.0.7             # Publish all data to the clients (for prototyping)
 insecure@1.0.7                # Allow all DB writes from clients (for prototyping)
 meteortesting:mocha
+dynamic-import
+underscore

tests/dummy_app/.meteor/release

@@ -1 +1 @@
-METEOR@1.4.2.7
+METEOR@1.7.0.4

tests/dummy_app/.meteor/versions

@@ -1,75 +1,81 @@
-allow-deny@1.0.5
+allow-deny@1.1.0
 autopublish@1.0.7
-autoupdate@1.2.11
-babel-compiler@6.14.1
-babel-runtime@1.0.1
-base64@1.0.10
+autoupdate@1.4.1
+babel-compiler@7.1.1
+babel-runtime@1.2.4
+base64@1.0.11
 binary-heap@1.0.10
-blaze@2.3.0
-blaze-html-templates@1.1.0
+blaze@2.3.2
+blaze-html-templates@1.1.2
 blaze-tools@1.0.10
-boilerplate-generator@1.0.11
-caching-compiler@1.1.9
-caching-html-compiler@1.1.0
-callback-hook@1.0.10
-check@1.2.5
-ddp@1.2.5
-ddp-client@1.2.9
-ddp-common@1.2.8
-ddp-server@1.2.10
+boilerplate-generator@1.5.0
+caching-compiler@1.1.12
+caching-html-compiler@1.1.3
+callback-hook@1.1.0
+check@1.3.1
+ddp@1.4.0
+ddp-client@2.3.3
+ddp-common@1.4.0
+ddp-server@2.2.0
 deps@1.0.12
-diff-sequence@1.0.7
-ecmascript@0.6.3
-ecmascript-runtime@0.3.15
-ejson@1.0.13
-es5-shim@4.6.15
-fastclick@1.0.13
+diff-sequence@1.1.0
+dynamic-import@0.4.1
+ecmascript@0.11.1
+ecmascript-runtime@0.7.0
+ecmascript-runtime-client@0.7.2
+ecmascript-runtime-server@0.7.1
+ejson@1.1.0
+es5-shim@4.8.0
 geojson-utils@1.0.10
 hot-code-push@1.0.4
 html-tools@1.0.11
 htmljs@1.0.11
-http@1.1.8
-id-map@1.0.9
+http@1.4.1
+id-map@1.1.0
 insecure@1.0.7
-jquery@1.11.10
-launch-screen@1.0.12
+jquery@1.11.11
+launch-screen@1.1.1
 livedata@1.0.18
-logging@1.1.17
-meteor@1.6.1
-meteor-base@1.0.4
-meteortesting:browser-tests@0.1.1
-meteortesting:mocha@0.4.3
-minifier-css@1.2.16
-minifier-js@1.2.17
-minimongo@1.0.20
-mobile-experience@1.0.4
+lmieulet:meteor-coverage@2.0.2
+logging@1.1.20
+meteor@1.9.2
+meteor-base@1.4.0
+meteortesting:browser-tests@1.0.0
+meteortesting:mocha@1.0.1
+meteortesting:mocha-core@5.2.0_1
+minifier-css@1.3.1
+minifier-js@2.3.5
+minimongo@1.4.4
+mobile-experience@1.0.5
 mobile-status-bar@1.0.14
-modules@0.7.9
-modules-runtime@0.7.9
-mongo@1.1.15
-mongo-id@1.0.6
-npm-mongo@2.2.16_1
-observe-sequence@1.0.15
-ordered-dict@1.0.9
-practicalmeteor:mocha-core@1.0.1
-promise@0.8.8
-random@1.0.10
+modern-browsers@0.1.2
+modules@0.12.2
+modules-runtime@0.10.2
+mongo@1.5.1
+mongo-dev-server@1.1.0
+mongo-id@1.0.7
+npm-mongo@3.0.11
+observe-sequence@1.0.16
+ordered-dict@1.1.0
+promise@0.11.1
+random@1.1.0
 reactive-var@1.0.11
-reload@1.1.11
-retry@1.0.9
-routepolicy@1.0.12
-shell-server@0.2.2
-spacebars@1.0.13
-spacebars-compiler@1.1.0
-standard-minifier-css@1.3.3
-standard-minifier-js@1.2.2
-templating@1.3.0
-templating-compiler@1.3.0
-templating-runtime@1.3.0
-templating-tools@1.1.0
-tracker@1.1.2
-ui@1.0.12
+reload@1.2.0
+retry@1.1.0
+routepolicy@1.0.13
+shell-server@0.3.1
+socket-stream-client@0.2.2
+spacebars@1.0.15
+spacebars-compiler@1.1.3
+standard-minifier-css@1.4.1
+standard-minifier-js@2.3.4
+templating@1.3.2
+templating-compiler@1.3.3
+templating-runtime@1.3.2
+templating-tools@1.1.2
+tracker@1.2.0
+ui@1.0.13
 underscore@1.0.10
-url@1.0.11
-webapp@1.3.13
+url@1.2.0
+webapp@1.6.2
 webapp-hashing@1.0.9