Merge pull request #79 from demee/using_protractor_form_grunt

Using progrator from grunt package

Author: atecarlos

.gitignore

@@ -4,4 +4,5 @@ node_modules/
 .DS_Store
 .grunt
 _SpecRunner.html
-tests/bundle/
+tests/bundle/
+.idea/

.travis.yml

@@ -12,5 +12,5 @@ install:
 before_script:
   - npm install -g grunt-cli
 script:
-  - node_modules/grunt-protractor-runner/node_modules/.bin/webdriver-manager update
+  - npm run webdriver-update
   - npm test

README.md

@@ -210,5 +210,5 @@ Included in the code base is an extensive list examples on how to use all the fe
 To run these tests locally, please follow these steps from the root directory:
 
 1. `npm install`
-2. `node_modules/.bin/webdriver-manager update`
+2. `npm webdriver-update`
 3. `npm run example`

example/protractor-conf.js

@@ -15,18 +15,17 @@ var config = {
 };
 
 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
-  };
+    //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';
+    config.capabilities = {
+      browserName: 'chrome'
+    };
 }
 exports.config = config;

package.json

@@ -5,7 +5,8 @@
   "main": "index.js",
   "scripts": {
     "example": "grunt example",
-    "test": "node_modules/.bin/grunt verify"
+    "test": "node_modules/.bin/grunt verify",
+    "webdriver-update": "node_modules/grunt-protractor-runner/node_modules/protractor/bin/webdriver-manager update"
   },
   "author": "Carlos Atencio",
   "license": "BSD-2-Clause",
@@ -17,8 +18,7 @@
     "grunt-contrib-jshint": "~0.10.0",
     "grunt-jasmine-node": "~0.2.1",
     "grunt-protractor-runner": "^1.1.4",
-    "phantomjs": "2.1.3",
-    "protractor": "2.5.1"
+    "phantomjs": "2.1.3"
   },
   "repository": {
     "type": "git",