Merge pull request #75 from BogdanLivadariu/added-travis

Enhancements for travis

Author: atecarlos

.travis.yml

@@ -1,5 +1,16 @@
+sudo: false
+bundler_args: --retry 3
 language: node_js
 node_js:
-  - "0.12"
-install: npm install
-before_script: npm install -g grunt-cli && webdriver-manager update
+  - 0.12
+cache:
+  directories:
+    - node_modules/
+install:
+  - npm set progress=false
+  - travis_retry npm install
+before_script:
+  - npm install -g grunt-cli
+script:
+  - node_modules/grunt-protractor-runner/node_modules/.bin/webdriver-manager update
+  - npm test

Gruntfile.js

@@ -6,7 +6,7 @@ module.exports = function(grunt) {
             options: {
                 jshintrc: '.jshintrc',
             },
-            files: ['lib/**/*.js']    
+            files: ['lib/**/*.js']
         },
         jasmine_node: {
             options: {
@@ -18,7 +18,7 @@ module.exports = function(grunt) {
         connect: {
             example: {
                 options: {
-                    base: 'example'   
+                    base: 'example'
                 }
             },
             'client-test': {
@@ -29,7 +29,7 @@ module.exports = function(grunt) {
         },
         protractor: {
             options: {
-                configFile: 'example/protractor.conf',
+                configFile: 'example/protractor-conf.js',
                 //debug: true
             },
             example: {}

example/protractor-conf.js

@@ -0,0 +1,32 @@
+var config = {
+    baseUrl: 'http://localhost:8000/',
+    specs: [
+      'spec/*.spec.js'
+    ],
+    mocks: {
+      dir: 'mocks',
+      default: ['default']
+    },
+    onPrepare: function(){
+      require('../index').config = {
+        rootDirectory: __dirname
+      }
+    }
+};
+
+if (process.env.TRAVIS) {
+  //Run PhantomJS on Travis
+  config.capabilities = {
+    browserName: 'phantomjs',
+    'phantomjs.binary.path': require('phantomjs').path,
+    'phantomjs.ghostdriver.cli.args': ['--loglevel=DEBUG'],
+    shardTestFiles: true,
+    maxInstances: 2
+  };
+} else {
+  config.capabilities = {
+    browserName: 'chrome'
+  }
+  config.chromeDriver= '../node_modules/protractor/selenium/chromedriver';
+}
+exports.config = config;

example/protractor.conf

@@ -1,10 +1,10 @@
 module.exports = {
-	moduleConfig: {
-		rootDirectory: process.cwd(),
-		protractorConfig: 'protractor.conf'	
-	},
-	mocksConfig: {
-		dir: 'mocks',
-		defaults: []
-	}
+  moduleConfig: {
+    rootDirectory: process.cwd(),
+    protractorConfig: 'protractor-conf.js'
+  },
+  mocksConfig: {
+    dir: 'mocks',
+    defaults: []
+  }
 };

lib/defaultConfig.js

@@ -4,7 +4,8 @@
   "description": "Mock HTTP calls in your protractor specs.",
   "main": "index.js",
   "scripts": {
-    "example": "grunt example"
+    "example": "grunt example",
+    "test": "node_modules/.bin/grunt verify"
   },
   "author": "Carlos Atencio",
   "license": "BSD-2-Clause",
@@ -16,16 +17,14 @@
     "grunt-contrib-jshint": "~0.10.0",
     "grunt-jasmine-node": "~0.2.1",
     "grunt-protractor-runner": "^1.1.4",
-    "protractor": "~1.5.0"
+    "phantomjs": "2.1.3",
+    "protractor": "2.5.1"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/atecarlos/protractor-http-mock"
   },
   "dependencies": {
     "query-string": "^1.0.0"
-  },
-  "scripts": {
-    "test": "node_modules/.bin/grunt verify"
   }
 }