Skip to content

Commit

Permalink
re-enable all tests
Browse files Browse the repository at this point in the history
  • Loading branch information
rkrauskopf committed Jan 8, 2019
1 parent c023dc1 commit 48d40fc
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 19 deletions.
28 changes: 14 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ node_js:

os:
- linux
# - osx
# - windows
- osx
- windows

before_script:
- npm run lint
Expand All @@ -33,19 +33,19 @@ after_success:

jobs:
include:
# - name: Browser tests (Linux)
# os: linux
# script: npm run coverage:browser
# addons:
# firefox: latest
# chrome: stable
- name: Browser tests (Linux)
os: linux
script: npm run coverage:browser
addons:
firefox: latest
chrome: stable

# - name: Browser tests (Mac)
# os: osx
# script: npm run coverage:browser
# addons:
# firefox: latest
# chrome: stable
- name: Browser tests (Mac)
os: osx
script: npm run coverage:browser
addons:
firefox: latest
chrome: stable

- name: Browser tests (Windows via SauceLabs)
os: linux
Expand Down
7 changes: 2 additions & 5 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ function configureSauceLabs (config) {
config.browserDisconnectTolerance = 5,
config.browserDisconnectTimeout = 60000;
config.browserNoActivityTimeout = 60000;
config.logLevel = "debug";
// config.logLevel = "debug";

// The following tests tend to fail on SauceLabs,
// probably due to zero-byte files and special characters in the paths.
Expand All @@ -143,9 +143,6 @@ function configureSauceLabs (config) {
"test/specs/circular*/**/*.spec.js",
"test/specs/empty/**/*.spec.js",
"test/specs/invalid/**/*.spec.js",
"test/specs/parsers/**/*.spec.js",
// "test/specs/substrings/**/*.spec.js",
// "test/specs/yaml.spec.js",
// "test/specs/root/**/*.spec.js"
"test/specs/parsers/**/*.spec.js"
];
}

0 comments on commit 48d40fc

Please sign in to comment.