Skip to content
Permalink
Browse files

Updated some files and dependencies.

  • Loading branch information...
ppanopticon committed Oct 4, 2017
1 parent c623c52 commit 02739be5c3bf3887450c1bda2d76a6fd431e5acc
Showing with 38 additions and 48 deletions.
  1. +0 −1 .travis.yml
  2. +31 −41 karma.conf.js
  3. +7 −6 package.json
@@ -16,7 +16,6 @@ before_script:
- sudo apt-get update -q
- sudo apt-get install -q google-chrome-stable
script:
- ng test --single-run
- ng build
before_deploy:
- npm install -g @angular/cli
@@ -1,44 +1,34 @@
// Karma configuration file, see link for more information
// https://karma-runner.github.io/0.13/config/configuration-file.html
// https://karma-runner.github.io/1.0/config/configuration-file.html

module.exports = function (config) {
config.set({
basePath: '',
frameworks: ['jasmine', '@angular/cli'],
plugins: [
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
require('@angular/cli/plugins/karma')
],
client:{
clearContext: false // leave Jasmine Spec Runner output visible in browser
},
files: [
{ pattern: './src/test.ts', watched: false }
],
preprocessors: {
'./src/test.ts': ['@angular/cli']
},
mime: {
'text/x-typescript': ['ts','tsx']
},
coverageIstanbulReporter: {
reports: [ 'html', 'lcovonly' ],
fixWebpackSourcePaths: true
},
angularCli: {
environment: 'dev'
},
reporters: config.angularCli && config.angularCli.codeCoverage
? ['progress', 'coverage-istanbul']
: ['progress', 'kjhtml'],
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['Chrome'],
singleRun: false
});
};
config.set({
basePath: '',
frameworks: ['jasmine', '@angular/cli'],
plugins: [
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
require('@angular/cli/plugins/karma')
],
client:{
clearContext: false // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
reports: [ 'html', 'lcovonly' ],
fixWebpackSourcePaths: true
},
angularCli: {
environment: 'dev'
},
reporters: ['progress', 'kjhtml'],
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['Chrome'],
mime: { 'text/x-typescript': ['ts','tsx'] },
singleRun: false
});
};
@@ -48,17 +48,18 @@
"@angular/cli": "^1.4.4",
"@angular/compiler-cli": "^4.3.6",
"@types/jasmine": "^2.6.0",
"@types/jasminewd2": "~2.0.2",
"codelyzer": "~3.1.1",
"jasmine-core": "~2.6.4",
"jasmine-spec-reporter": "~4.1.1",
"jasmine-core": "~2.6.2",
"jasmine-spec-reporter": "~4.1.0",
"karma": "~1.7.0",
"karma-chrome-launcher": "~2.2.0",
"karma-chrome-launcher": "~2.1.1",
"karma-cli": "~1.0.1",
"karma-coverage-istanbul-reporter": "^1.3.0",
"karma-coverage-istanbul-reporter": "^1.2.1",
"karma-jasmine": "~1.1.0",
"karma-jasmine-html-reporter": "^0.2.2",
"protractor": "~5.1.0",
"ts-node": "~3.1.0",
"protractor": "~5.1.2",
"ts-node": "~3.2.0",
"tslint": "~5.4.2"
}
}

0 comments on commit 02739be

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