Permalink
Browse files

[chore] Upgrade seed dependencies

- Modified app code for changes in Clarity v0.10.x
- Modified code for changes to Jasmine
- modified configurations for changes to multiple deps

`ng start`, `ng test`, and `ng e2e` all run as expected.

Signed-off-by: Matt Hippely <mhippely@vmware.com>
  • Loading branch information...
hippee-lee committed Aug 18, 2017
1 parent 8a117b3 commit f9644acb1da055396ef7eb3caa667b51bdabb7a4
Showing with 1,783 additions and 1,403 deletions.
  1. +9 −0 .travis.yml
  2. +2 −1 e2e/tsconfig.json
  3. +6 −2 karma.conf.js
  4. +25 −24 package.json
  5. +23 −27 protractor.config.js
  6. +1,718 −1,349 yarn.lock
View
@@ -2,9 +2,18 @@ language: node_js
node_js:
- "7.1"
sudo: required
dist: trusty
group: edge
addons:
apt:
sources:
- ubuntu-toolchain-r-test
- google-chrome
packages:
- g++-4.8
- google-chrome-stable
before_install:
- export CHROME_BIN=/usr/bin/google-chrome
View
@@ -15,7 +15,8 @@
"node_modules/@types"
],
"types": [
"jasmine"
"jasmine",
"jasminewd2"
]
},
"exclude": [
View
@@ -7,7 +7,7 @@ module.exports = function (config) {
frameworks: ['jasmine', '@angular/cli'],
plugins: [
require('karma-jasmine'),
require('karma-phantomjs-launcher'),
require('karma-chrome-launcher'),
require('karma-mocha-reporter'),
require('karma-remap-istanbul'),
require('@angular/cli/plugins/karma')
@@ -27,6 +27,10 @@ module.exports = function (config) {
lcovonly: './coverage/coverage.lcov'
}
},
coverageIstanbulReporter: {
reports: [ 'html', 'lcovonly', 'text-summary' ],
fixWebpackSourcePaths: true
},
angularCli: {
config: './angular-cli.json',
environment: 'dev'
@@ -38,7 +42,7 @@ module.exports = function (config) {
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['PhantomJS'],
browsers: ['ChromeHeadless'],
singleRun: true
});
};
View
@@ -21,39 +21,40 @@
"@angular/platform-browser": "^4.3.0",
"@angular/platform-browser-dynamic": "^4.3.0",
"@angular/router": "^4.3.0",
"@webcomponents/custom-elements": "1.0.0-alpha.3",
"clarity-angular": "^0.10.0",
"clarity-icons": "^0.10.0",
"clarity-ui": "^0.10.0",
"@webcomponents/custom-elements": "1.0.0",
"clarity-angular": "~0.10.1",
"clarity-icons": "~0.10.1",
"clarity-ui": "~0.10.1",
"core-js": "^2.4.1",
"mutationobserver-shim": "^0.3.2",
"rxjs": "^5.0.1",
"rxjs": "^5.4.3",
"ts-helpers": "^1.1.1",
"web-animations-js": "^2.2.1",
"zone.js": "^0.8.4"
"web-animations-js": "^2.3.1",
"zone.js": "^0.8.16"
},
"devDependencies": {
"@angular/cli": "^1.0.0",
"@angular/cli": "^1.2.1",
"@angular/compiler-cli": "^4.3.0",
"@types/core-js": "^0.9.34",
"@types/jasmine": "~2.2.30",
"@types/node": "^6.0.42",
"@types/core-js": "~0.9.42",
"@types/jasmine": "^2.5.53",
"@types/jasminewd2": "^2.0.2",
"@types/node": "^8.0.24",
"bootstrap": "4.0.0-alpha.5",
"codelyzer": "~2.0.0-beta.4",
"enhanced-resolve": "^3.0.0",
"jasmine-core": "2.4.1",
"jasmine-spec-reporter": "2.5.0",
"karma": "1.2.0",
"codelyzer": "~3.1.2",
"enhanced-resolve": "~3.4.1",
"jasmine-core": "~2.6.2",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~1.7.0",
"karma-chrome-launcher": "^2.2.0",
"karma-cli": "^1.0.1",
"karma-jasmine": "^1.0.2",
"karma-mocha-reporter": "^2.2.1",
"karma-phantomjs-launcher": "^1.0.0",
"karma-remap-istanbul": "^0.2.1",
"protractor": "4.0.9",
"ts-node": "1.2.1",
"tslint": "^4.1.1",
"typescript": "~2.2.0",
"karma-mocha-reporter": "~2.2.1",
"karma-remap-istanbul": "~0.6.0",
"protractor": "~5.1.2",
"ts-node": "^3.0.4",
"tslint": "^5.3.2",
"typescript": "~2.3.3",
"typings": "^1.4.0",
"webdriver-manager": "10.2.5"
"webdriver-manager": "^12.0.6"
}
}
View
@@ -1,32 +1,28 @@
// Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/docs/referenceConf.js
// https://github.com/angular/protractor/blob/master/lib/config.ts
/*global jasmine */
var SpecReporter = require('jasmine-spec-reporter');
const { SpecReporter } = require('jasmine-spec-reporter');
exports.config = {
allScriptsTimeout: 11000,
specs: [
'./e2e/**/*.e2e-spec.ts'
],
capabilities: {
'browserName': 'chrome'
},
directConnect: true,
baseUrl: 'http://localhost:4200/',
framework: 'jasmine',
jasmineNodeOpts: {
showColors: true,
defaultTimeoutInterval: 30000,
print: function() {}
},
useAllAngular2AppRoots: true,
beforeLaunch: function() {
require('ts-node').register({
project: 'e2e'
});
},
onPrepare: function() {
jasmine.getEnv().addReporter(new SpecReporter());
}
allScriptsTimeout: 11000,
specs: [
'./e2e/**/*.e2e-spec.ts'
],
capabilities: {
'browserName': 'chrome'
},
directConnect: true,
baseUrl: 'http://localhost:4200/',
framework: 'jasmine',
jasmineNodeOpts: {
showColors: true,
defaultTimeoutInterval: 30000,
print: function() {}
},
onPrepare() {
require('ts-node').register({
project: 'e2e/tsconfig.json'
});
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
}
};
Oops, something went wrong.

0 comments on commit f9644ac

Please sign in to comment.