Merge pull request #1249 from marmelab/fix-e2e-tests

[RFR] Fix E2E tests

Makefile

@@ -2,7 +2,7 @@
 
 install:
 	npm install
-	./node_modules/protractor/bin/webdriver-manager update
+	./node_modules/protractor/bin/webdriver-manager update  --versions.chrome=2.24
 
 run: examples/blog/build
 	@cp node_modules/fakerest/dist/FakeRest.min.js examples/blog/build/fakerest.js

package.json

@@ -9,9 +9,9 @@
     "url": "git://github.com/marmelab/ng-admin.git"
   },
   "files": [
-      "*.md",
-      "build/",
-      "lib/"
+    "*.md",
+    "build/",
+    "lib/"
   ],
   "dependencies": {
     "angular": "~1.4.8",
@@ -73,7 +73,7 @@
     "ngtemplate-loader": "^1.3.0",
     "node-sass": "^3.9.3",
     "phantomjs-prebuilt": "~2.1.4",
-    "protractor": "~3.1.1",
+    "protractor": "~4.0.11",
     "sass-loader": "^4.0.2",
     "sinon": "~1.14.1",
     "style-loader": "^0.13.1",

src/javascripts/test/protractor.conf.js

@@ -37,6 +37,7 @@ exports.config =  {
 
     specs: ['e2e/*.js'],
     baseUrl: 'http://' + (process.env.CI ? 'ngadmin' : 'localhost') + ':8001',
+    chromeDriver: '../../../node_modules/protractor/node_modules/webdriver-manager/selenium/chromedriver_2.24',
     maxSessions: 1,
     multiCapabilities: [
         {