Skip to content

Commit

Permalink
Merge pull request #1498 from stealjs/xenial-travis
Browse files Browse the repository at this point in the history
Migrate to use Xenial in Travis
  • Loading branch information
cherifGsoul authored Aug 14, 2019
2 parents 226625c + 566e75f commit f9b7e99
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@ language: node_js
matrix:
include:
- node_js: 8
script: npm run test-node:ci
script: 'npm run test-node:ci'
- node_js: node
addons:
sauce_connect: true
before_script:
- npm run http-server &
- sleep 2
script: npm run ui
dist: xenial
services:
- xvfb
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
"saucelabs": "^1.3.0",
"steal-conditional": "^0.3.2",
"steal-qunit": "^1.0.0",
"test-saucelabs": "0.0.1",
"testee": "^0.5.1",
"test-saucelabs": "^0.0.6",
"testee": "^0.9.0",
"traceur": "0.0.111",
"traceur-runtime": "jmcriffey/bower-traceur-runtime#0.0.91",
"wd": "^1.1.3",
Expand Down
4 changes: 3 additions & 1 deletion test/init_error/dev.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
<script>
steal.done().then(null, function(err){
if(window.assert) {
var worked = /two\.js/.test(err.stack) || /Function code/.test(err.stack);
// IE and Safari don’t give good stack traces for this.
var browserDoesntSupportGoodStackTraces = /Function code/.test(err.stack) || /anonymous/.test(err.stack);
var worked = /two\.js/.test(err.stack) || browserDoesntSupportGoodStackTraces;
window.assert.ok(worked, "got the source in the stack trace");
window.done();
} else {
Expand Down
5 changes: 3 additions & 2 deletions test/syntax_errs/build.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@
return steal.import("~/importer");
})
.then(null, function(err){
var isEdge = /Anonymous function/.test(err.stack);
// IE and Safari don’t give good stack traces for this.
var browserDoesntSupportGoodStackTraces = /Function code/.test(err.stack) || /anonymous/.test(err.stack);
if(window.assert) {
if(isEdge) {
if(browserDoesntSupportGoodStackTraces) {
window.assert.ok(true);
} else {
window.assert.ok(/breaking\.js/.test(err.stack), "Breaking file in the stack trace");
Expand Down

0 comments on commit f9b7e99

Please sign in to comment.