Skip to content

Commit

Permalink
removed Dockerfile
Browse files Browse the repository at this point in the history
removed Procfile
updated protractor and added chromedriver
protractor tests running now
  • Loading branch information
DBosley committed Oct 16, 2016
1 parent 1ae6a7c commit e3ef20f
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 31 deletions.
3 changes: 0 additions & 3 deletions Dockerfile

This file was deleted.

1 change: 0 additions & 1 deletion Procfile

This file was deleted.

42 changes: 21 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,25 @@
"name": "keystone-angular2-webpack-starter",
"version": "0.0.1",
"private": true,
"scripts": {
"clean": "rimraf node_modules doc dist && npm cache clean",
"clean-install": "npm run clean && npm install",
"clean-start": "npm run clean-install && npm start",
"build": "rimraf dist && webpack --progress --profile --bail",
"webdriver-update": "webdriver-manager update",
"webdriver-start": "webdriver-manager start",
"lint": "tslint --force \"src/**/*.ts\"",
"e2e": "protractor protractor.conf.js",
"e2e-live": "protractor --elementExplorer",
"pretest": "npm run lint",
"test": "karma start",
"posttest": "remap-istanbul -i coverage/json/coverage-final.json -o coverage/html -t html",
"test-watch": "karma start --no-single-run --auto-watch",
"ci": "npm run e2e && npm run test",
"docs": "typedoc --options typedoc.json src/app/app.component.ts",
"start": "node keystone",
"postinstall": "npm run webdriver-update"
},
"dependencies": {
"@angular/common": "~2.0.0",
"@angular/compiler": "~2.0.0",
Expand Down Expand Up @@ -32,6 +51,7 @@
"angular2-template-loader": "^0.4.0",
"autoprefixer": "^6.3.2",
"awesome-typescript-loader": "^2.2.4",
"chromedriver": "^2.24.1",
"codelyzer": "0.0.26",
"copy-webpack-plugin": "^3.0.0",
"css-loader": "^0.25.0",
Expand All @@ -56,7 +76,7 @@
"null-loader": "0.1.1",
"phantomjs-prebuilt": "^2.1.4",
"postcss-loader": "^0.13.0",
"protractor": "^3.1.1",
"protractor": "^3.3.0",
"raw-loader": "0.5.1",
"remap-istanbul": "^0.6.4",
"rimraf": "^2.5.1",
Expand All @@ -73,25 +93,5 @@
"webpack-dashboard": "^0.1.8",
"webpack-dev-middleware": "^1.8.4",
"webpack-hot-middleware": "^2.13.0"
},
"scripts": {
"clean": "rimraf node_modules doc dist && npm cache clean",
"clean-install": "npm run clean && npm install",
"clean-start": "npm run clean-install && npm start",
"watch": "webpack --watch --progress --profile",
"build": "rimraf dist && webpack --progress --profile --bail",
"webdriver-update": "webdriver-manager update",
"webdriver-start": "webdriver-manager start",
"lint": "tslint --force \"ng2/**/*.ts\"",
"e2e": "protractor",
"e2e-live": "protractor --elementExplorer",
"pretest": "npm run lint",
"test": "karma start",
"posttest": "remap-istanbul -i coverage/json/coverage-final.json -o coverage/html -t html",
"test-watch": "karma start --no-single-run --auto-watch",
"ci": "npm run e2e && npm run test",
"docs": "typedoc --options typedoc.json ng2/app/app.component.ts",
"start": "node keystone",
"postinstall": "npm run webdriver-update"
}
}
18 changes: 12 additions & 6 deletions protractor.conf.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
exports.config = {
baseUrl: 'http://localhost:8080/',

baseUrl: 'http://localhost:3000/',
chromeDriver: './node_modules/chromedriver/lib/chromedriver/chromedriver.exe',
seleniumAddress: 'http://localhost:4444/wd/hub',
specs: [
'ng2/**/*.e2e-spec.js'
'src/**/*.e2e-spec.js'
],
exclude: [],

Expand All @@ -19,9 +20,14 @@ exports.config = {
},
directConnect: true,

capabilities: {
'browserName': 'chrome'
},
multiCapabilities: [{
'browserName': 'chrome',
'chromeOptions': {
binary: 'C:/Program Files (x86)/Google/Chrome/Application/chrome.exe',
args: [],
extensions: [],
}
}],

onPrepare: function () {
var SpecReporter = require('jasmine-spec-reporter');
Expand Down

0 comments on commit e3ef20f

Please sign in to comment.