Skip to content
Permalink
Browse files

Protractor update

  • Loading branch information
raffaelemasotti committed Sep 29, 2015
1 parent 175a8bb commit 67709e5fec5e490c574349a687cf63aa5411a2d8
Showing with 63 additions and 64 deletions.
  1. +0 −1 bower.json
  2. +62 −62 package.json
  3. +1 −1 test/protractor.conf.js
@@ -1,7 +1,6 @@
{
"dependencies": {
"angular": "~1.4.6",
"angular-cookies": "~1.4.6",
"angular-resource": "~1.4.6",
"angular-route": "~1.4.6",
"angular-mocks": "~1.4.6",
@@ -1,63 +1,63 @@
{
"dependencies": {
"bower": "~1.3.6",
"grunt": "~0.4.1",
"grunt-bower-task": "~0.3.4",
"grunt-cli": "~0.1.11",
"grunt-contrib-clean": "~0.5.0",
"grunt-contrib-less": "~0.9.0",
"grunt-contrib-concat": "~0.3.0",
"grunt-contrib-copy": "~0.4.1",
"grunt-contrib-cssmin": "~0.6.0",
"grunt-contrib-htmlmin": "~0.1.3",
"grunt-contrib-imagemin": "~0.2.0",
"grunt-contrib-watch": "~0.5.3",
"connect-livereload": "~0.3.0",
"grunt-contrib-connect": "~0.3.0",
"grunt-open": "~0.2.0",
"grunt-ng-annotate": "~1.0.1",
"grunt-rev": "~0.1.0",
"grunt-usemin": "~2.0.0",
"load-grunt-tasks": "~0.2.0",
"grunt-contrib-jshint": "~0.10.0",
"jshint-stylish": "0.1.4",
"grunt-contrib-uglify": "~0.2.2",
"protractor": "1.0.0-rc1",
"grunt-protractor-runner": "~1.0.0",
"grunt-shell": "~0.4.0",
"grunt-karma": "~0.6.2",
"karma-script-launcher": "~0.1.0",
"karma-firefox-launcher": "~0.1.0",
"karma-chrome-launcher": "~0.1.0",
"karma-ng-html2js-preprocessor": "~0.1.0",
"grunt-html2js": "~0.2.4",
"karma-jasmine": "~0.1.3",
"karma-phantomjs-launcher": "~0.1.0",
"karma-coverage": "~0.1.0",
"karma": "~0.10",
"karma-spec-reporter": "~0.0.8",
"dgeni": "~0.2.2",
"dgeni-packages": "~0.7.0",
"canonical-path": "0.0.2",
"lodash": "~2.1.0",
"winston": "~0.7.2",
"marked": "~0.3.0",
"grunt-html-build": "~0.3.1",
"grunt-newer": "^1.1.1",
"grunt-replace": "^0.8.0"
},
"devDependencies": {
"tmp": "0.0.23"
},
"engines": {
"node": ">=0.9.0"
},
"name": "pundit2",
"private": true,
"scripts": {
"build": "grunt build",
"postinstall": "grunt install",
"test": "grunt test"
},
"version": "0.0.1"
}
"dependencies": {
"bower": "~1.3.6",
"canonical-path": "0.0.2",
"connect-livereload": "~0.3.0",
"dgeni": "~0.2.2",
"dgeni-packages": "~0.7.0",
"grunt": "~0.4.1",
"grunt-bower-task": "~0.3.4",
"grunt-cli": "~0.1.11",
"grunt-contrib-clean": "~0.5.0",
"grunt-contrib-concat": "~0.3.0",
"grunt-contrib-connect": "~0.3.0",
"grunt-contrib-copy": "~0.4.1",
"grunt-contrib-cssmin": "~0.6.0",
"grunt-contrib-htmlmin": "~0.1.3",
"grunt-contrib-imagemin": "~0.2.0",
"grunt-contrib-jshint": "~0.10.0",
"grunt-contrib-less": "~0.9.0",
"grunt-contrib-uglify": "~0.2.2",
"grunt-contrib-watch": "~0.5.3",
"grunt-html-build": "~0.3.1",
"grunt-html2js": "~0.2.4",
"grunt-karma": "~0.6.2",
"grunt-newer": "^1.1.1",
"grunt-ng-annotate": "~1.0.1",
"grunt-open": "~0.2.0",
"grunt-protractor-runner": "^2.1.0",
"grunt-replace": "^0.8.0",
"grunt-rev": "~0.1.0",
"grunt-shell": "~0.4.0",
"grunt-usemin": "~2.0.0",
"jshint-stylish": "0.1.4",
"karma": "~0.10",
"karma-chrome-launcher": "~0.1.0",
"karma-coverage": "~0.1.0",
"karma-firefox-launcher": "~0.1.0",
"karma-jasmine": "~0.1.3",
"karma-ng-html2js-preprocessor": "~0.1.0",
"karma-phantomjs-launcher": "~0.1.0",
"karma-script-launcher": "~0.1.0",
"karma-spec-reporter": "~0.0.8",
"load-grunt-tasks": "~0.2.0",
"lodash": "~2.1.0",
"marked": "~0.3.0",
"protractor": "^2.1.0",
"winston": "~0.7.2"
},
"devDependencies": {
"tmp": "0.0.23"
},
"engines": {
"node": ">=0.9.0"
},
"name": "pundit2",
"private": true,
"scripts": {
"build": "grunt build",
"postinstall": "grunt install",
"test": "grunt test"
},
"version": "0.0.1"
}
@@ -1,7 +1,7 @@
exports.config = {

// To launch the tests on your dev machine:
seleniumServerJar: '../node_modules/protractor/selenium/selenium-server-standalone-2.42.2.jar',
seleniumServerJar: '../node_modules/protractor/selenium/selenium-server-standalone-2.47.1.jar',
seleniumPort: null,
chromeDriver: '../node_modules/protractor/selenium/chromedriver',
seleniumArgs: [],

0 comments on commit 67709e5

Please sign in to comment.
You can’t perform that action at this time.