From df957153a8119306e4b4ced7f3b2245dcfdc8e3c Mon Sep 17 00:00:00 2001 From: gedi Date: Tue, 9 Jun 2015 19:01:35 +0300 Subject: [PATCH] disable multiline feature for step definitions --- gherkin/parse.go | 5 ----- gherkin/parse_steps_test.go | 12 +++++------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/gherkin/parse.go b/gherkin/parse.go index 3ccbf1d..5d3e969 100644 --- a/gherkin/parse.go +++ b/gherkin/parse.go @@ -189,11 +189,6 @@ func (p *parser) parseSteps() (steps []*Step, err error) { step.Type = Given } } - // step text maybe multilined - // @TODO: think about use case when there is a different token matched instead of TEXT - for ; p.peek().OfType(lexer.TEXT); tok = p.next() { - step.Text += " " + tok.Value - } if step.Text[len(step.Text)-1] == ':' { next := p.peek() diff --git a/gherkin/parse_steps_test.go b/gherkin/parse_steps_test.go index f6fb4e8..babe219 100644 --- a/gherkin/parse_steps_test.go +++ b/gherkin/parse_steps_test.go @@ -38,9 +38,8 @@ var testStepSamples = map[string]string{ When I do something Then something should happen`, - "step_group_multiline": `Given an admin user "John Doe" - And user "John Doe" belongs - to user group "editors" + "step_group_another": `Given an admin user "John Doe" + And user "John Doe" belongs to user group "editors" When I do something Then I expect the result`, } @@ -274,9 +273,9 @@ func Test_parse_step_group(t *testing.T) { }, t) } -func Test_parse_step_group_multiline(t *testing.T) { +func Test_parse_another_step_group(t *testing.T) { p := &parser{ - lx: lexer.New(strings.NewReader(testStepSamples["step_group_multiline"])), + lx: lexer.New(strings.NewReader(testStepSamples["step_group_another"])), path: "some.feature", ast: newAST(), } @@ -291,7 +290,7 @@ func Test_parse_step_group_multiline(t *testing.T) { steps[0].assertType(Given, t) steps[0].assertText(`an admin user "John Doe"`, t) steps[1].assertType(Given, t) - steps[1].assertText(`user "John Doe" belongs user "John Doe" belongs`, t) + steps[1].assertText(`user "John Doe" belongs to user group "editors"`, t) steps[2].assertType(When, t) steps[2].assertText("I do something", t) steps[3].assertType(Then, t) @@ -301,7 +300,6 @@ func Test_parse_step_group_multiline(t *testing.T) { p.ast.assertMatchesTypes([]lexer.TokenType{ lexer.GIVEN, lexer.AND, - lexer.TEXT, lexer.WHEN, lexer.THEN, lexer.EOF,