Merge pull request #754 from cucumber/js-empty-string-fix

cucumber-expressions: fix captured empty strings being undefined

Author: aslakhellesoy

cucumber-expressions/go/cucumber_expression_test.go

@@ -100,6 +100,38 @@ func TestCucumberExpression(t *testing.T) {
 		)
 	})
 
+	t.Run("matches single quoted empty string as empty string", func(t *testing.T) {
+		require.Equal(
+			t,
+			MatchCucumberExpression(t, "three {string} mice", `three '' mice`),
+			[]interface{}{""},
+		)
+	})
+
+	t.Run("matches double quoted empty string as empty string", func(t *testing.T) {
+		require.Equal(
+			t,
+			MatchCucumberExpression(t, "three {string} mice", `three "" mice`),
+			[]interface{}{""},
+		)
+	})
+
+	t.Run("matches single quoted empty string as empty string along with other strings", func(t *testing.T) {
+		require.Equal(
+			t,
+			MatchCucumberExpression(t, "three {string} and {string} mice", `three '' and 'handsome' mice`),
+			[]interface{}{"", "handsome"},
+		)
+	})
+
+	t.Run("matches double quoted empty string as empty string along with other strings", func(t *testing.T) {
+		require.Equal(
+			t,
+			MatchCucumberExpression(t, "three {string} and {string} mice", `three "" and "handsome" mice`),
+			[]interface{}{"", "handsome"},
+		)
+	})
+
 	t.Run("matches escaped parenthesis", func(t *testing.T) {
 		require.Equal(
 			t,

cucumber-expressions/java/src/test/java/io/cucumber/cucumberexpressions/CucumberExpressionTest.java

@@ -82,6 +82,26 @@ public void matches_single_quoted_string_with_escaped_single_quote() {
         assertEquals(singletonList("bl'nd"), match("three {string} mice", "three 'bl\\'nd' mice"));
     }
 
+    @Test
+    public void matches_single_quoted_empty_string_as_empty_string() {
+        assertEquals(singletonList(""), match("three {string} mice", "three '' mice"));
+    }
+
+    @Test
+    public void matches_double_quoted_empty_string_as_empty_string() {
+        assertEquals(singletonList(""), match("three {string} mice", "three \"\" mice"));
+    }
+
+    @Test
+    public void matches_single_quoted_empty_string_as_empty_string_along_with_other_strings() {
+        assertEquals(asList("", "handsome"), match("three {string} and {string} mice", "three '' and 'handsome' mice"));
+    }
+
+    @Test
+    public void matches_double_quoted_empty_string_as_empty_string_along_with_other_strings() {
+        assertEquals(asList("", "handsome"), match("three {string} and {string} mice", "three \"\" and \"handsome\" mice"));
+    }
+
     @Test
     public void matches_escaped_parenthesis() {
         assertEquals(singletonList("blind"), match("three \\(exceptionally) {string} mice", "three (exceptionally) \"blind\" mice"));

cucumber-expressions/javascript/src/Group.ts

@@ -8,7 +8,7 @@ export default class Group {
 
   get values(): string[] {
     return (this.children.length === 0 ? [this] : this.children)
+      .filter(g => typeof g.start !== 'undefined')
       .map(g => g.value)
-      .filter(v => v !== null)
   }
 }

cucumber-expressions/javascript/src/ParameterTypeRegistry.ts

@@ -49,7 +49,7 @@ export default class ParameterTypeRegistry {
         'string',
         ParameterTypeRegistry.STRING_REGEXP,
         String,
-        s => s.replace(/\\"/g, '"').replace(/\\'/g, "'"),
+        s => (s || '').replace(/\\"/g, '"').replace(/\\'/g, "'"),
         true,
         false
       )

cucumber-expressions/javascript/test/CucumberExpressionTest.ts

@@ -95,6 +95,30 @@ describe('CucumberExpression', () => {
     )
   })
 
+  it('matches single quoted empty string as empty string', () => {
+    assert.deepStrictEqual(match('three {string} mice', "three '' mice"),
+      ['']
+    )
+  })
+
+  it('matches double quoted empty string as empty string ', () => {
+    assert.deepStrictEqual(match('three {string} mice', 'three "" mice'),
+      ['']
+    )
+  })
+
+  it('matches single quoted empty string as empty string, along with other strings', () => {
+    assert.deepStrictEqual(match('three {string} and {string} mice', "three '' and 'handsome' mice"),
+      ['', 'handsome']
+    )
+  })
+
+  it('matches double quoted empty string as empty string, along with other strings', () => {
+    assert.deepStrictEqual(match('three {string} and {string} mice', 'three "" and "handsome" mice'),
+      ['', 'handsome']
+    )
+  })
+
   it('matches escaped parenthesis', () => {
     assert.deepStrictEqual(
       match(

cucumber-expressions/ruby/spec/cucumber/cucumber_expressions/cucumber_expression_spec.rb

@@ -55,6 +55,22 @@ module CucumberExpressions
         expect(match('three {string} mice', "three 'bl\\'nd' mice")).to eq(["bl'nd"])
       end
 
+      it('matches single quoted empty string as empty string') do
+        expect(match('three {string} mice', "three '' mice")).to eq([''])
+      end
+
+      it('matches double quoted empty string as empty string') do
+        expect(match('three {string} mice', 'three "" mice')).to eq([''])
+      end
+
+      it('matches single quoted empty string as empty string, along with other strings') do
+        expect(match('three {string} and {string} mice', "three '' and 'handsome' mice")).to eq(['', 'handsome'])
+      end
+
+      it('matches double quoted empty string as empty string, along with other strings') do
+        expect(match('three {string} and {string} mice', 'three "" and "handsome" mice')).to eq(['', 'handsome'])
+      end
+
       it 'matches escaped parentheses' do
         expect(match('three \\(exceptionally) {string} mice', 'three (exceptionally) "blind" mice')).to eq(['blind'])
       end