Deprecate JSTD in favor of Karma/Travis/Sauce.

Eric Wendelin · Eric Wendelin · commit 722b4e17b388 · 2014-10-10T16:04:13.000-06:00
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,5 @@
-lib-cov
 *.seed
 *.log
-*.csv
-*.dat
 *.out
 *.pid
 *.gz
@@ -13,5 +10,8 @@ results
 
 node_modules
 bower_components
+coverage
 
 .idea
+.coveralls.yml
+
diff --git a/.npmignore b/.npmignore
@@ -1 +1,2 @@
 bower_components/
+node_modules/
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,14 @@
+language: node_js
+node_js:
+- 0.10
+script: make test-ci
+install:
+- npm install
+- npm install bower -g
+- bower install
+addons:
+  sauce_connect: true
+env:
+  global:
+  - secure: hNvLoSVYWY+O2Oz5usb5+IFUMgWdM21xxZuCR4+qh1yJhlQYTaFANBDYJ5vhC74DbzLHRmy8ZUYa1G/4R4w8KXX9cCt6PFD2ETPpmZPJROHzoAoaYKahOAqdcMSVHn0BVKZCeAvPeLoBhvIfMJx4DOcRTTkKPzTJzg4ewzR/v3g=
+  - secure: hnc8EGbHzAlz6lAfVoGSf47pecv7G/LxbDHCIN2jn23SgU9SdScY9LT9K0X69smFsdBmOSCWDRRqPgX859sS/tz3lGHW6lCRn3mqclCNVhFNM6Vd+dB4hwAEvJQXhtMAaxM5Bqop+8C8OQ4NdoHgSYcdEvMT0CaWU1ZFrpjiBs4=
diff --git a/Makefile b/Makefile
@@ -1,16 +1,23 @@
-BROWSER_PATH="/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
+BROWSERS=Firefox,ChromeCanary,Opera,Safari,PhantomJS
 
-deploy:
-	npm publish
+test:
+	@$(MAKE) lint
+	@NODE_ENV=test ./node_modules/karma/bin/karma start --single-run --browsers $(BROWSERS)
+
+lint:
+	./node_modules/.bin/jshint ./spec/error-stack-parser-spec.js ./error-stack-parser.js
+
+test-ci:
+	$(MAKE) lint
+	@echo TRAVIS_JOB_ID $(TRAVIS_JOB_ID)
+	@NODE_ENV=test ./node_modules/karma/bin/karma start karma.conf.ci.js --single-run && \
+		cat ./coverage/Chrome*/lcov.info | ./node_modules/coveralls/bin/coveralls.js --verbose
 
 browser:
-	open spec/SpecRunner.html
+	open spec/spec-runner.html
 
 phantom:
-	/usr/bin/env DISPLAY=:1 phantomjs spec/lib/run-jasmine.js spec/SpecRunner.html
-
-jstd:
-	/usr/bin/env DISPLAY=:1 java -jar spec/JsTestDriver-1.3.5.jar --config spec/jsTestDriver.conf --browser ${BROWSER_PATH} --port 4224 --tests 'all' --testOutput './target'
+	/usr/bin/env DISPLAY=:1 phantomjs spec/lib/run-jasmine.js spec/spec-runner.html
 
 build: components
 	@component build --dev
@@ -19,6 +26,6 @@ components: component.json
 	@component install --dev
 
 clean:
-	rm -fr build components template.js
+	rm -fr build coverage components template.js
 
-.PHONY: clean
+.PHONY: clean test
diff --git a/bower.json b/bower.json
@@ -10,10 +10,6 @@
     "dependencies": {
         "stackframe": "~0.1.0"
     },
-    "devDependencies": {
-        "jasmine": "~1.3.1",
-        "jasmine-jstd-adapter": "~1.1.2"
-    },
     "moduleType": [
         "amd",
         "globals",
@@ -25,7 +21,8 @@
         "backtrace",
         "cross-browser",
         "framework-agnostic",
-        "error"
+        "error",
+        "debugger"
     ],
     "license": "Public Domain",
     "ignore": [
diff --git a/error-stack-parser.js b/error-stack-parser.js
@@ -41,11 +41,11 @@
             var locationParts = urlLike.split(':');
             var lastNumber = locationParts.pop();
             var possibleNumber = locationParts[locationParts.length - 1];
-            if (possibleNumber != Number(possibleNumber)) {
-                return [locationParts.join(':'), lastNumber, undefined];
-            } else {
+            if (!isNaN(parseFloat(possibleNumber)) && isFinite(possibleNumber)) {
                 var lineNumber = locationParts.pop();
                 return [locationParts.join(':'), lineNumber, lastNumber];
+            } else {
+                return [locationParts.join(':'), lastNumber, undefined];
             }
         };
 
@@ -98,14 +98,14 @@
         };
 
         this.parseOpera10a = function parseOpera10a(e) {
-            var ANON = '{anonymous}', lineRE = /Line (\d+).*script (?:in )?(\S+)(?:: In function (\S+))?$/i;
-            var lines = e.stacktrace.split('\n'), result = [];
+            var lineRE = /Line (\d+).*script (?:in )?(\S+)(?:: In function (\S+))?$/i;
+            var lines = e.stacktrace.split('\n');
+            var result = [];
 
             for (var i = 0, len = lines.length; i < len; i += 2) {
                 var match = lineRE.exec(lines[i]);
                 if (match) {
-                    var fnName = match[3] || ANON;
-                    result.push(fnName + '()@' + match[2] + ':' + match[1] + ' -- ' + lines[i + 1].replace(/^\s+/, ''));
+                    result.push(new StackFrame(match[3], undefined, match[2], match[1]));
                 }
             }
 
diff --git a/karma.conf.ci.js b/karma.conf.ci.js
@@ -0,0 +1,70 @@
+module.exports = function (config) {
+    if (!process.env.SAUCE_USERNAME || !process.env.SAUCE_ACCESS_KEY) {
+        console.log('Make sure the SAUCE_USERNAME and SAUCE_ACCESS_KEY environment variables are set.');
+        process.exit(1);
+    }
+
+    // Check out https://saucelabs.com/platforms for all browser/platform combos
+    var customLaunchers = {
+        sl_chrome: {
+            base: 'SauceLabs',
+            browserName: 'chrome'
+        },
+        sl_firefox: {
+            base: 'SauceLabs',
+            browserName: 'firefox'
+        },
+        sl_ie_11: {
+            base: 'SauceLabs',
+            browserName: 'internet explorer',
+            platform: 'Windows 8.1',
+            version: '11'
+        },
+        sl_ie_9: {
+            base: 'SauceLabs',
+            browserName: 'internet explorer',
+            platform: 'Windows 7',
+            version: '9'
+        }
+    };
+
+    config.set({
+        basePath: '',
+        frameworks: ['jasmine'],
+        files: [
+            'bower_components/stackframe/stackframe.js',
+            'error-stack-parser.js',
+            'spec/captured-errors.js',
+            'spec/spec-helper.js',
+            'spec/*-spec.js'
+        ],
+        exclude: [],
+        port: 9876,
+        colors: true,
+        logLevel: config.LOG_INFO,
+        autoWatch: true,
+        browserDisconnectTimeout : 10000,
+        browserDisconnectTolerance : 1,
+        browserNoActivityTimeout : 240000,
+        captureTimeout : 240000,
+        sauceLabs: {
+            testName: 'error-stack-parser unit tests',
+            recordScreenshots: false,
+            connectOptions: {
+                port: 5757,
+                logfile: 'sauce_connect.log'
+            }
+        },
+        customLaunchers: customLaunchers,
+        browsers: Object.keys(customLaunchers),
+        reporters: ['progress', 'saucelabs', 'coverage'],
+        preprocessors: {
+            'error-stack-parser.js': 'coverage'
+        },
+        coverageReporter: {
+            type: 'lcov',
+            dir: 'coverage'
+        },
+        singleRun: true
+    });
+};
diff --git a/karma.conf.js b/karma.conf.js
@@ -0,0 +1,28 @@
+module.exports = function (config) {
+    config.set({
+        basePath: '',
+        frameworks: ['jasmine'],
+        files: [
+            'bower_components/stackframe/stackframe.js',
+            'error-stack-parser.js',
+            'spec/captured-errors.js',
+            'spec/spec-helper.js',
+            'spec/*-spec.js'
+        ],
+        reporters: ['progress', 'coverage'],
+        preprocessors: {
+            'error-stack-parser.js': 'coverage'
+        },
+        coverageReporter: {
+            type: 'lcov',
+            dir: 'coverage'
+        },
+        port: 9876,
+        colors: true,
+        logLevel: config.LOG_INFO,
+        autoWatch: true,
+        // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+        browsers: ['Firefox', 'ChromeCanary', 'Opera', 'Safari', 'PhantomJS'],
+        singleRun: false
+    });
+};
diff --git a/package.json b/package.json
@@ -1,26 +1,38 @@
 {
-  "name": "error-stack-parser",
-  "description": "Extract meaning from JS Errors",
-  "author": "Eric Wendelin <me@eriwen.com> (http://eriwen.com)",
-  "version": "0.1.1",
-  "keywords": ["stacktrace", "error"],
-  "homepage": "http://www.stacktracejs.com",
-  "dependencies": {
-    "stackframe": "~0.1.0"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/stacktracejs/error-stack-parser.git"
-  },
-  "bugs": {
-    "url": "https://github.com/stacktracejs/error-stack-parser/issues"
-  },
-  "licenses": [{
-    "type": "Public Domain",
-    "url": "https://github.com/stacktracejs/error-stack-parser/blob/master/LICENSE"
-  }],
-  "main": "./error-stack-parser.js",
-  "scripts": {
-    "test": "make jstd"
-  }
+    "name": "error-stack-parser",
+    "description": "Extract meaning from JS Errors",
+    "author": "Eric Wendelin <me@eriwen.com> (http://eriwen.com)",
+    "version": "0.1.1",
+    "keywords": ["stacktrace", "error"],
+    "homepage": "http://www.stacktracejs.com",
+    "dependencies": {
+        "stackframe": "~0.1.0"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git://github.com/stacktracejs/error-stack-parser.git"
+    },
+    "devDependencies": {
+        "colors": "~1.0.3",
+        "coveralls": "^2.11.2",
+        "jshint": "^2.5.6",
+        "karma": "~0.12",
+        "karma-chrome-launcher": "^0.1.5",
+        "karma-coverage": "^0.2.6",
+        "karma-firefox-launcher": "^0.1.3",
+        "karma-ie-launcher": "^0.1.5",
+        "karma-jasmine": "^0.1.5",
+        "karma-opera-launcher": "^0.1.0",
+        "karma-phantomjs-launcher": "^0.1.4",
+        "karma-safari-launcher": "^0.1.1",
+        "karma-sauce-launcher": "^0.2.10"
+    },
+    "bugs": {
+        "url": "https://github.com/stacktracejs/error-stack-parser/issues"
+    },
+    "licenses": [{
+        "type": "Public Domain",
+        "url": "https://github.com/stacktracejs/error-stack-parser/blob/master/LICENSE"
+    }],
+    "main": "./error-stack-parser.js"
 }
diff --git a/spec/JsTestDriver-1.3.5.jar b/spec/JsTestDriver-1.3.5.jar
diff --git a/spec/error-stack-parser-spec.js b/spec/error-stack-parser-spec.js
@@ -63,6 +63,19 @@ describe('ErrorStackParser', function () {
             expect(stackFrames[2]).toMatchStackFrame([undefined, undefined, 'http://path/to/file.js', 18]);
         });
 
+        it('should parse Opera 10 Error messages', function () {
+            var stackFrames = unit.parse(CapturedExceptions.OPERA_10);
+            expect(stackFrames).toBeTruthy();
+            expect(stackFrames.length).toBe(7);
+            expect(stackFrames[0]).toMatchStackFrame([undefined, undefined, 'http://path/to/file.js', 42]);
+            expect(stackFrames[1]).toMatchStackFrame([undefined, undefined, 'http://path/to/file.js', 27]);
+            expect(stackFrames[2]).toMatchStackFrame(['printStackTrace', undefined, 'http://path/to/file.js', 18]);
+            expect(stackFrames[3]).toMatchStackFrame(['bar', undefined, 'http://path/to/file.js', 4]);
+            expect(stackFrames[4]).toMatchStackFrame(['bar', undefined, 'http://path/to/file.js', 7]);
+            expect(stackFrames[5]).toMatchStackFrame(['foo', undefined, 'http://path/to/file.js', 11]);
+            expect(stackFrames[6]).toMatchStackFrame([undefined, undefined, 'http://path/to/file.js', 15]);
+        });
+
         it('should parse Opera 11 Error messages', function () {
             var stackFrames = unit.parse(CapturedExceptions.OPERA_11);
             expect(stackFrames).toBeTruthy();
diff --git a/spec/jsTestDriver.conf b/spec/jsTestDriver.conf
diff --git a/spec/lib/plugins/coverage-1.3.5.jar b/spec/lib/plugins/coverage-1.3.5.jar
diff --git a/spec/lib/run-jasmine.js b/spec/lib/run-jasmine.js
diff --git a/spec/spec-runner.html b/spec/spec-runner.html
