Merge pull request #1 from talis/travis-ci-build

90%: Move to Travis CI build

.nvmrc

@@ -0,0 +1 @@
+4.2

.travis.yml

@@ -0,0 +1,8 @@
+language: node_js
+node_js:
+  - stable
+before_script:
+  - npm install -g gulp
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+  - sleep 3

CONTRIBUTING.md

@@ -6,8 +6,9 @@
 files and running a development server. You'll need to run ```npm install``` in order to install the development
 dependencies and ```npm install -g gulp``` in order to install [gulp](http://gulpjs.com). The development server should
 be available at [http://localhost:8080/](http://localhost:8080/).
-3. Increment the version number in package.json, bower.json, and src/ng-context-menu.js
-5. Create pull requests on the **development** branch not master!
+4. Run ```gulp test``` to execute browser tests, this requires Firefox is installed and available in your PATH.
+5. Increment the version number in package.json, bower.json, and src/ng-context-menu.js
+6. Create pull requests on the **development** branch not master!
 
 Thank you for your contribution!
 

README.md

@@ -7,7 +7,7 @@ for their contributions.
 
 ---
 
-[![Code Climate](https://codeclimate.com/github/ianwalter/ng-context-menu.png)](https://codeclimate.com/github/ianwalter/ng-context-menu) [![Circle CI](https://circleci.com/gh/ianwalter/ng-context-menu.svg?style=svg)](https://circleci.com/gh/ianwalter/ng-context-menu)
+[![Code Climate](https://codeclimate.com/github/ianwalter/ng-context-menu.png)](https://codeclimate.com/github/ianwalter/ng-context-menu) [![Build Status](https://travis-ci.org/talis/ng-context-menu.svg)](https://travis-ci.org/talis/ng-context-menu)
 
 ---
 

gulpfile.js

@@ -79,7 +79,7 @@ gulp.task('protractor', function(done) {
       configFile: 'protractor.conf.js',
       args: [
         '--baseUrl', 'http://127.0.0.1:' + program.port,
-        '--browser', program.browsers ? program.browsers[0] : 'chrome'
+        '--browser', program.browsers ? program.browsers[0] : 'firefox'
       ]
     }))
     .on('end', function() {
@@ -114,6 +114,6 @@ function watch() {
   jsWatcher.on('change', changeNotification);
 }
 
-gulp.task('default', ['watch-mode', 'js', 'lint', 'test'], watch);
+gulp.task('default', ['watch-mode', 'js', 'lint', 'protractor-install'], watch);
 gulp.task('server', ['connect', 'default']);
-gulp.task('test', ['connect', 'protractor-install', 'protractor']);
+gulp.task('test', ['connect', 'protractor']);

package.json

@@ -5,7 +5,7 @@
   "main": "index.html",
   "devDependencies": {
     "commander": "^2.3.0",
-    "gulp": "~3.5.1",
+    "gulp": "~3.9.0",
     "gulp-concat": "~2.1.7",
     "gulp-connect": "^2.0.5",
     "gulp-jshint": "~1.3.4",
@@ -16,6 +16,7 @@
     "protractor": "^1.2.0"
   },
   "scripts": {
+    "pretest": "gulp protractor-install",
     "test": "gulp test"
   },
   "keywords": [

protractor.conf.js

@@ -1,7 +1,7 @@
-var outputDir = process.env.CIRCLE_TEST_REPORTS || 'test-result';
+var outputDir = 'test-result';
 var config = {
   capabilities: {
-    browserName: 'chrome'
+    browserName: 'firefox'
   },
   onPrepare: function() {
     require('jasmine-reporters');
@@ -12,8 +12,4 @@ var config = {
   specs: ['test/ui/**/*.spec.js']
 };
 
-if (process.env.CI) {
-  config.seleniumAddress = 'http://localhost:4444/wd/hub';
-}
-
 exports.config = config;