Skip to content

Commit

Permalink
fix(code-health): fix to run unit tests in chrome 55 and travis CI (#191
Browse files Browse the repository at this point in the history
)

* fix to run unit tests in chrome 55

* use firefox in travis

* adding dist: trustry to see if it works in travis
  • Loading branch information
emoralesb05 authored Dec 14, 2016
1 parent fe01822 commit de393fd
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
sudo: required
dist: trusty
language: node_js
node_js:
- '5.4'
Expand Down
7 changes: 5 additions & 2 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,19 @@ module.exports = function (config) {
config: './angular-cli.json',
environment: 'dev'
},
mime: {
'text/x-typescript': ['ts','tsx']
},
reporters: ['progress', 'karma-remap-istanbul'],
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['Firefox'],
browsers: ['Chrome'],
singleRun: false
};
if (process.env.TRAVIS) {
//configuration.browsers = ['Chrome_travis_ci'];
configuration.browsers = ['Chrome_travis_ci'];
}
config.set(configuration);
};

0 comments on commit de393fd

Please sign in to comment.