Merge pull request #2 from d4goxn/master

Minor cleanup for Linux based dev environments
2014-10-24 16:51:29 +02:00
parent c82f8a09fd d926e77dca
commit 54bbfd3ce2
15 changed files with 4 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+node_modules
--- a/README.md
+++ b/README.md
@@ -21,9 +21,8 @@ flux-react extension to React JS. Read more about FLUX over at [Facebook Flux](h
 ### Run all tests with Karma
 * Run `npm test`

-Karma will launch Chrome and run the tests once. If you need to run tests on a server with
-PhantomJS, either change `karma.conf.js` to use PhantomJS or manually start it with:
-`./node_modules/karma/bin/karma start --single-run --browsers PhantomJS`
+Karma will launch PhantomJS and run the tests once. If you need to run tests in a GUI browser, either change `karma.conf.js` to use Chrome or Firefox, or manually start it with:
+`./node_modules/karma/bin/karma start --single-run --browsers Chrome`

 ### Minify the code, ready for production
 * Run `gulp deploy`
--- a/app/.DS_Store
+++ b/app/.DS_Store
--- a/app/App.js
+++ b/app/App.js
--- a/app/main.js
+++ b/app/main.js
--- a/dev/main.js
+++ b/dev/main.js
--- a/dev/test.js
+++ b/dev/test.js
--- a/gulpfile.js
+++ b/gulpfile.js
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -63,7 +63,7 @@ module.exports = function(config) {
        // start these browsers
        // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
        //browsers: ['Chrome', 'Firefox', 'PhantomJS'],
-        browsers: ['Chrome'],
+        browsers: ['PhantomJS'],


        // Continuous Integration mode
--- a/package.json
+++ b/package.json
--- a/test.html
+++ b/test.html
--- a/tests/App-test.js
+++ b/tests/App-test.js
--- a/utils/browserify.js
+++ b/utils/browserify.js
--- a/utils/es5-shim.js
+++ b/utils/es5-shim.js
--- a/utils/handleError.js
+++ b/utils/handleError.js