From c540aa15c4d61926c9c24b06e91be513e752239b Mon Sep 17 00:00:00 2001 From: Dan Ross Date: Fri, 24 Oct 2014 17:15:47 +0300 Subject: [PATCH 1/3] Git: ignore node_modules --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3c3629e --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +node_modules From 7451109d2a8c8ebe252d45702f001fb79b7268f0 Mon Sep 17 00:00:00 2001 From: Dan Ross Date: Fri, 24 Oct 2014 17:16:21 +0300 Subject: [PATCH 2/3] Removed execute permissions from regular files. --- README.md | 0 app/.DS_Store | Bin app/App.js | 0 app/main.js | 0 dev/main.js | 0 dev/test.js | 0 gulpfile.js | 0 karma.conf.js | 0 package.json | 0 test.html | 0 tests/App-test.js | 0 utils/browserify.js | 0 utils/es5-shim.js | 0 utils/handleError.js | 0 14 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 README.md mode change 100755 => 100644 app/.DS_Store mode change 100755 => 100644 app/App.js mode change 100755 => 100644 app/main.js mode change 100755 => 100644 dev/main.js mode change 100755 => 100644 dev/test.js mode change 100755 => 100644 gulpfile.js mode change 100755 => 100644 karma.conf.js mode change 100755 => 100644 package.json mode change 100755 => 100644 test.html mode change 100755 => 100644 tests/App-test.js mode change 100755 => 100644 utils/browserify.js mode change 100755 => 100644 utils/es5-shim.js mode change 100755 => 100644 utils/handleError.js diff --git a/README.md b/README.md old mode 100755 new mode 100644 diff --git a/app/.DS_Store b/app/.DS_Store old mode 100755 new mode 100644 diff --git a/app/App.js b/app/App.js old mode 100755 new mode 100644 diff --git a/app/main.js b/app/main.js old mode 100755 new mode 100644 diff --git a/dev/main.js b/dev/main.js old mode 100755 new mode 100644 diff --git a/dev/test.js b/dev/test.js old mode 100755 new mode 100644 diff --git a/gulpfile.js b/gulpfile.js old mode 100755 new mode 100644 diff --git a/karma.conf.js b/karma.conf.js old mode 100755 new mode 100644 diff --git a/package.json b/package.json old mode 100755 new mode 100644 diff --git a/test.html b/test.html old mode 100755 new mode 100644 diff --git a/tests/App-test.js b/tests/App-test.js old mode 100755 new mode 100644 diff --git a/utils/browserify.js b/utils/browserify.js old mode 100755 new mode 100644 diff --git a/utils/es5-shim.js b/utils/es5-shim.js old mode 100755 new mode 100644 diff --git a/utils/handleError.js b/utils/handleError.js old mode 100755 new mode 100644 From d926e77dcac1b062c3e98aef714998eaa951d638 Mon Sep 17 00:00:00 2001 From: Dan Ross Date: Fri, 24 Oct 2014 17:25:31 +0300 Subject: [PATCH 3/3] Karma: use PhantomJS instead of Chrome Chrome cannot be specified as a dependency and installed automatically, but PhantomJS can. Most Linux distros use Chromium instead of Chrome, which Karma does not recognize. --- README.md | 5 ++--- karma.conf.js | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1527b6d..aab326a 100644 --- 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` diff --git a/karma.conf.js b/karma.conf.js index 89e7945..f65e7e9 100644 --- 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