Skip to content

Commit

Permalink
Enabled verbose logging in Karma. Temporarily removed Safari on OSX, …
Browse files Browse the repository at this point in the history
  • Loading branch information
JamesMessinger committed Dec 29, 2015
1 parent eb148e2 commit ce42b1f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
4 changes: 2 additions & 2 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

var baseConfig = {
frameworks: ['mocha'],
reporters: ['mocha'],
reporters: ['verbose'],
files: [
// Third-Party Libraries
'www/bower_components/chai/chai.js',
Expand Down Expand Up @@ -89,7 +89,7 @@ function configureLocalBrowsers(config) {
isLinux = !(isMac || isWindows);

if (isMac) {
config.browsers = ['PhantomJS', 'Firefox', 'Chrome', 'Safari'];
config.browsers = ['PhantomJS', 'Firefox', 'Chrome']; // 'Safari']; TEMPORARILY removing Safari, due to this bug: https://github.com/karma-runner/karma/issues/1768
}
else if (isLinux) {
config.browsers = ['PhantomJS', 'Firefox'];
Expand Down
8 changes: 0 additions & 8 deletions tests/fixtures/mocha.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,6 @@
mocha.asyncOnly();
mocha.checkLeaks();
mocha.globals(['$0', '$1', '$2', '$3', '$4', '$5', 'ga', 'gaplugins', 'gaGlobal']);

// Output each test's name, for debugging purposes
beforeEach(function() {
console.log('START ' + this.currentTest.parent.title + ' - ' + this.currentTest.title);
});
afterEach(function() {
console.log('DONE ' + this.currentTest.parent.title + ' - ' + this.currentTest.title);
});
}

beforeEach(function() {
Expand Down

0 comments on commit ce42b1f

Please sign in to comment.