Skip to content

Commit d5f4061

Browse files
committed
Improve CI for PRs. Upgrade dependencies.
1 parent 3ab3025 commit d5f4061

File tree

5 files changed

+36
-23
lines changed

5 files changed

+36
-23
lines changed

.travis.yml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
11
language: node_js
2-
node_js:
3-
- '0.12'
4-
script: gulp ci
5-
install:
6-
- npm install
72
sudo: false
3+
node_js: stable
84
addons:
95
sauce_connect: true
10-
env:
11-
global:
12-
- secure: cBNumaXdO6q+sXCyrD0c/z++mGs7PdQBSTIbdPGF4U/4FtaLNp/I/GNrKNsfejWNlqlqaxPS/SjUdlDSdpHOVC6tSKYI6YWBMY/0ov4OPZWgMoX7WvB287MDi+627amz6REt1Cp4oaxep9xolMEO9l+FQYE5Dyu1PuJsgA/niWA=
13-
- secure: HEualrdtngTaAR85L8ZANYyFgOgmLINwEXXk9h5cOrnWPcxNkrIiSmWJ9xxrZNosIQXa8vMEyE7MoRFFRd6bEX5UuIWEM36zoGDtAJpTXybAtHB4c2NKAKC3PlpCyl1lIdHzJQdYORs5KZRSBkA0eT0g8r5fkG/nh0y7/rhv95I=
6+
firefox: latest
7+
apt:
8+
sources:
9+
- google-chrome
10+
packages:
11+
- google-chrome-stable
12+
before_install:
13+
- export CHROME_BIN=chromium-browser
14+
- export DISPLAY=:99.0
15+
- sh -e /etc/init.d/xvfb start
16+
before_script:
17+
- npm install
18+
script:
19+
- if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then gulp ci; else gulp pr; fi

gulpfile.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,14 @@ gulp.task('test', function (done) {
3535
server.start();
3636
});
3737

38+
gulp.task('test-pr', ['dist'], function (done) {
39+
new karma.Server({
40+
configFile: __dirname + '/karma.conf.js',
41+
browsers: ['Firefox', 'Chrome_Travis'],
42+
singleRun: true
43+
}, done).start();
44+
});
45+
3846
gulp.task('test-ci', ['dist'], function (done) {
3947
var server = new karma.Server({
4048
configFile: __dirname + '/karma.conf.ci.js',

karma.conf.ci.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ module.exports = function (config) {
5050
base: 'SauceLabs',
5151
browserName: 'firefox',
5252
platform: 'Windows 8.1',
53-
version: '42.0'
53+
version: '43.0'
5454
},
5555
slFirefoxDev: {
5656
base: 'SauceLabs',

karma.conf.js

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,17 @@ module.exports = function (config) {
1212
'spec/spec-helper.js',
1313
'spec/*-spec.js'
1414
],
15-
reporters: ['progress', 'coverage'],
16-
preprocessors: {
17-
'*.js': 'coverage'
18-
},
19-
coverageReporter: {
20-
type: 'lcov',
21-
dir: 'coverage'
22-
},
15+
reporters: ['spec'],
2316
port: 9876,
2417
colors: true,
2518
logLevel: config.LOG_INFO,
2619
autoWatch: true,
27-
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
20+
customLaunchers: {
21+
Chrome_Travis: {
22+
base: 'Chrome',
23+
flags: ['--no-sandbox']
24+
}
25+
},
2826
//browsers: ['ChromeCanary', 'Firefox'],
2927
browsers: ['PhantomJS2'],
3028
singleRun: false

package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@
77
"Oliver Salzburg (https://github.com/oliversalzburg)"
88
],
99
"version": "1.0.1",
10-
"license": "SEE LICENSE IN LICENSE",
10+
"license": "Unlicense",
1111
"keywords": [
1212
"stacktrace",
1313
"error",
1414
"debugger",
1515
"client",
1616
"browser"
1717
],
18-
"homepage": "http://www.stacktracejs.com",
18+
"homepage": "https://www.stacktracejs.com",
1919
"repository": {
2020
"type": "git",
2121
"url": "git://github.com/stacktracejs/stacktrace.js.git"
2222
},
2323
"dependencies": {
2424
"error-stack-parser": "~1.2",
25-
"stack-generator": "~1",
25+
"stack-generator": "~1.0",
2626
"stacktrace-gps": "~2"
2727
},
2828
"devDependencies": {
@@ -39,7 +39,7 @@
3939
"jasmine-ajax": "^3.2.0",
4040
"jasmine-core": "^2.3.4",
4141
"json3": "^3.3.2",
42-
"karma": "^0.13.9",
42+
"karma": "^0.13.15",
4343
"karma-chrome-launcher": "^0.2.1",
4444
"karma-coverage": "^0.5.2",
4545
"karma-firefox-launcher": "^0.1.7",
@@ -50,6 +50,7 @@
5050
"karma-phantomjs2-launcher": "^0.3.2",
5151
"karma-safari-launcher": "^0.1.1",
5252
"karma-sauce-launcher": "^0.2.14",
53+
"karma-spec-reporter": "0.0.23",
5354
"run-sequence": "^1.1.2"
5455
},
5556
"bugs": {

0 commit comments

Comments
 (0)