Merge branch 'master' of https://github.com/cucumber/cucumber-js into…

… v1.2.2-chimp

CHANGELOG.md

@@ -1,4 +1,10 @@
-### [master (unreleased)](https://github.com/cucumber/cucumber-js/compare/v1.2.1...master)
+### [master (unreleased)](https://github.com/cucumber/cucumber-js/compare/v1.2.2...master)
+
+### [1.2.2](https://github.com/cucumber/cucumber-js/compare/v1.2.1...v1.2.2) (2016-08-05)
+
+#### Bug Fixes
+
+* Fix error when stack trace has no frames (#610) (Jan Molak)
 
 ### [1.2.1](https://github.com/cucumber/cucumber-js/compare/v1.2.0...v1.2.1) (2016-07-01)
 

lib/cucumber/runtime/stack_trace_filter.js

@@ -12,7 +12,7 @@ function isFrameInCucumber(frame) {
 
 function filter() {
   currentFilter = chain.filter.attach(function (error, frames) {
-    if (isFrameInCucumber(frames[0])) {
+    if (frames.length > 0 && isFrameInCucumber(frames[0])) {
       return frames;
     }
     return frames.filter(_.negate(isFrameInCucumber));

package.json

@@ -8,7 +8,7 @@
     "gherkin",
     "tests"
   ],
-  "version": "1.2.1",
+  "version": "1.2.2",
   "homepage": "http://github.com/cucumber/cucumber-js",
   "author": "Julien Biezemans <[email protected]> (http://jbpros.net)",
   "contributors": [
@@ -86,7 +86,8 @@
     "John McLaughlin <[email protected]>",
     "Josh Goldberg <[email protected]>",
     "Artur Pomadowski <[email protected]>",
-    "Benjamín Eidelman <[email protected]>"
+    "Benjamín Eidelman <[email protected]>",
+    "Jan Molak <[email protected]>"
   ],
   "repository": {
     "type": "git",

release/cucumber.js

@@ -2599,7 +2599,7 @@ function isFrameInCucumber(frame) {
 
 function filter() {
   currentFilter = chain.filter.attach(function (error, frames) {
-    if (isFrameInCucumber(frames[0])) {
+    if (frames.length > 0 && isFrameInCucumber(frames[0])) {
       return frames;
     }
     return frames.filter(_.negate(isFrameInCucumber));
@@ -3818,6 +3818,9 @@ var objectKeys = Object.keys || function (obj) {
 },{"util/":178}],68:[function(require,module,exports){
 module.exports = balanced;
 function balanced(a, b, str) {
+  if (a instanceof RegExp) a = maybeMatch(a, str);
+  if (b instanceof RegExp) b = maybeMatch(b, str);
+
   var r = range(a, b, str);
 
   return r && {
@@ -3829,6 +3832,11 @@ function balanced(a, b, str) {
   };
 }
 
+function maybeMatch(reg, str) {
+  var m = str.match(reg);
+  return m ? m[0] : null;
+}
+
 balanced.range = range;
 function range(a, b, str) {
   var begs, beg, left, right, result;
@@ -3840,7 +3848,7 @@ function range(a, b, str) {
     begs = [];
     left = str.length;
 
-    while (i < str.length && i >= 0 && ! result) {
+    while (i >= 0 && !result) {
       if (i == ai) {
         begs.push(i);
         ai = str.indexOf(a, i + 1);
@@ -37771,7 +37779,7 @@ module.exports={
     "gherkin",
     "tests"
   ],
-  "version": "1.2.1",
+  "version": "1.2.2",
   "homepage": "http://github.com/cucumber/cucumber-js",
   "author": "Julien Biezemans <[email protected]> (http://jbpros.net)",
   "contributors": [
@@ -37849,7 +37857,8 @@ module.exports={
     "John McLaughlin <[email protected]>",
     "Josh Goldberg <[email protected]>",
     "Artur Pomadowski <[email protected]>",
-    "Benjamín Eidelman <[email protected]>"
+    "Benjamín Eidelman <[email protected]>",
+    "Jan Molak <[email protected]>"
   ],
   "repository": {
     "type": "git",