Skip to content

Commit

Permalink
Merge pull request #450 from Behat/bugfix/issue-448-in-3.0
Browse files Browse the repository at this point in the history 
Bugfix for #448 in 3.0
  • Loading branch information
@everzet
everzet committed Feb 11, 2014
2 parents df94075 + dcdba8c commit fe3cffc
Show file tree
Hide file tree
Showing 4 changed files with 277 additions and 9 deletions.
4 changes: 2 additions & 2 deletions features/append_snippets.feature
View file
Expand Up @@ -615,9 +615,9 @@ Feature: Append snippets option
}
/**
* @Given do something undefined with \1
* @Given do something undefined with \:arg1
*/
public function doSomethingUndefinedWith2()
public function doSomethingUndefinedWith2($arg1)
{
throw new PendingException();
}
Expand Down
268 changes: 268 additions & 0 deletions features/snippets.feature
View file
@@ -0,0 +1,268 @@
Feature: Snippets
In order to not manually write definitions every time
As a feature tester
I need tool to generate snippets for me

Background:
Given a file named "features/coffee.feature" with:
"""
Feature: Snippets
Background:
Given I have magically created 10$
Scenario: Single quotes
When I have chose 'coffee with turkey' in coffee machine
Then I should have 'turkey with coffee sauce'
And I should get a 'super/string':
'''
Test #1
'''
And I should get a simple string:
'''
Test #2
'''
Scenario: Double quotes
When I have chose "pizza tea" in coffee machine
And do something undefined with \1
Then I should have "pizza tea"
And I should get a "super/string":
'''
Test #1
'''
And I should get a simple string:
'''
Test #2
'''
"""

Scenario: Regex snippets
Given a file named "features/bootstrap/FeatureContext.php" with:
"""
<?php
use Behat\Behat\Context\CustomSnippetAcceptingContext,
Behat\Behat\Tester\Exception\PendingException;
use Behat\Gherkin\Node\PyStringNode,
Behat\Gherkin\Node\TableNode;
class FeatureContext implements CustomSnippetAcceptingContext {
public static function getAcceptedSnippetType() { return 'regex'; }
}
"""
When I run "behat --no-colors -f progress features/coffee.feature"
Then it should pass with:
"""
UUUUUUUUUUU
2 scenarios (2 undefined)
11 steps (11 undefined)
--- FeatureContext has missing steps. Define them with these snippets:
/**
* @Given /^I have magically created (\d+)\$$/
*/
public function iHaveMagicallyCreated($arg1)
{
throw new PendingException();
}
/**
* @When /^I have chose '([^']*)' in coffee machine$/
*/
public function iHaveChoseCoffeeWithTurkeyInCoffeeMachine($arg1)
{
throw new PendingException();
}
/**
* @Then /^I should have '([^']*)'$/
*/
public function iShouldHaveTurkeyWithCoffeeSauce($arg1)
{
throw new PendingException();
}
/**
* @Given /^I should get a '([^']*)':$/
*/
public function iShouldGetASuperString($arg1, PyStringNode $string)
{
throw new PendingException();
}
/**
* @Given /^I should get a simple string:$/
*/
public function iShouldGetASimpleString(PyStringNode $string)
{
throw new PendingException();
}
/**
* @When /^I have chose "([^"]*)" in coffee machine$/
*/
public function iHaveChoseInCoffeeMachine($arg1)
{
throw new PendingException();
}
/**
* @Given /^do something undefined with \\(\d+)$/
*/
public function doSomethingUndefinedWith($arg1)
{
throw new PendingException();
}
/**
* @Then /^I should have "([^"]*)"$/
*/
public function iShouldHave($arg1)
{
throw new PendingException();
}
/**
* @Given /^I should get a "([^"]*)":$/
*/
public function iShouldGetA($arg1, PyStringNode $string)
{
throw new PendingException();
}
"""

Scenario: Regex snippets are working
Given a file named "features/bootstrap/FeatureContext.php" with:
"""
<?php
use Behat\Behat\Context\CustomSnippetAcceptingContext,
Behat\Behat\Tester\Exception\PendingException;
use Behat\Gherkin\Node\PyStringNode,
Behat\Gherkin\Node\TableNode;
class FeatureContext implements CustomSnippetAcceptingContext {
public static function getAcceptedSnippetType() { return 'regex'; }
}
"""
When I run "behat --no-colors -f progress --append-snippets features/coffee.feature"
And I run "behat --no-colors -f progress features/coffee.feature"
Then it should pass with:
"""
P----P-----
--- Pending steps:
Given I have magically created 10$ # FeatureContext::iHaveMagicallyCreated()
TODO: write pending definition
Given I have magically created 10$ # FeatureContext::iHaveMagicallyCreated()
TODO: write pending definition
2 scenarios (2 pending)
11 steps (2 pending, 9 skipped)
"""

Scenario: Turnip snippets
Given a file named "features/bootstrap/FeatureContext.php" with:
"""
<?php
use Behat\Behat\Context\SnippetAcceptingContext,
Behat\Behat\Tester\Exception\PendingException;
use Behat\Gherkin\Node\PyStringNode,
Behat\Gherkin\Node\TableNode;
class FeatureContext implements SnippetAcceptingContext { }
"""
When I run "behat --no-colors -f progress features/coffee.feature"
Then it should pass with:
"""
UUUUUUUUUUU
2 scenarios (2 undefined)
11 steps (11 undefined)
--- FeatureContext has missing steps. Define them with these snippets:
/**
* @Given I have magically created :arg1$
*/
public function iHaveMagicallyCreated($arg1)
{
throw new PendingException();
}
/**
* @When I have chose :arg1 in coffee machine
*/
public function iHaveChoseInCoffeeMachine($arg1)
{
throw new PendingException();
}
/**
* @Then I should have :arg1
*/
public function iShouldHave($arg1)
{
throw new PendingException();
}
/**
* @Given I should get a :arg1:
*/
public function iShouldGetA($arg1, PyStringNode $string)
{
throw new PendingException();
}
/**
* @Given I should get a simple string:
*/
public function iShouldGetASimpleString(PyStringNode $string)
{
throw new PendingException();
}
/**
* @Given do something undefined with \:arg1
*/
public function doSomethingUndefinedWith($arg1)
{
throw new PendingException();
}
"""

Scenario: Turnip snippets are working
Given a file named "features/bootstrap/FeatureContext.php" with:
"""
<?php
use Behat\Behat\Context\SnippetAcceptingContext,
Behat\Behat\Tester\Exception\PendingException;
use Behat\Gherkin\Node\PyStringNode,
Behat\Gherkin\Node\TableNode;
class FeatureContext implements SnippetAcceptingContext { }
"""
When I run "behat --no-colors -f progress --append-snippets features/coffee.feature"
And I run "behat --no-colors -f progress features/coffee.feature"
Then it should pass with:
"""
P----P-----
--- Pending steps:
Given I have magically created 10$ # FeatureContext::iHaveMagicallyCreated()
TODO: write pending definition
Given I have magically created 10$ # FeatureContext::iHaveMagicallyCreated()
TODO: write pending definition
2 scenarios (2 pending)
11 steps (2 pending, 9 skipped)
"""
6 changes: 3 additions & 3 deletions src/Behat/Behat/Definition/Pattern/Policy/RegexPatternPolicy.php
View file
Expand Up @@ -24,9 +24,9 @@ class RegexPatternPolicy implements PatternPolicy
* @var string[string]
*/
private static $replacePatterns = array(
"/(?<= |^)\\\'(?:((?!\\').)*)\\\'(?= |$)/" => "\\'([^\']*)\\'", // Single quoted strings
'/(?<= |^)\"(?:[^\"]*)\"(?= |$)/' => "\"([^\"]*)\"", // Double quoted strings
'/(\d+)/' => "(\\d+)", // Numbers
"/(?<=\W|^)\\\'(?:((?!\\').)*)\\\'(?=\W|$)/" => "'([^']*)'", // Single quoted strings
'/(?<=\W|^)\"(?:[^\"]*)\"(?=\W|$)/' => "\"([^\"]*)\"", // Double quoted strings
'/(?<=\W|^)(\d+)(?=\W|$)/' => "(\\d+)", // Numbers
);

/**
Expand Down
8 changes: 4 additions & 4 deletions src/Behat/Behat/Definition/Pattern/Policy/TurnipPatternPolicy.php
View file
Expand Up @@ -28,9 +28,9 @@ class TurnipPatternPolicy implements PatternPolicy
* @var string[]
*/
private static $placeholderPatterns = array(
"/(?<=\s|^)\"[^\"]+\"(?=\s|$)/",
"/(?<=\s|^)'[^']+'(?=\s|$)/",
"/(?<=\s|^)\d+/"
"/(?<=\W|^)\"[^\"]+\"(?=\W|$)/",
"/(?<=\W|^)'[^']+'(?=\W|$)/",
"/(?<=\W|^)\d+(?=\W|$)/"
);

/**
Expand Down Expand Up @@ -82,7 +82,7 @@ public function transformPatternToRegex($pattern)
self::PLACEHOLDER_REGEXP,
function ($match) {
return sprintf(
"[\"']?(?P<%s>(?<=\")[^\"]+(?=\")|(?<=')[^']+(?=')|(?<=\s)\w+(?=\s|$))['\"]?",
"[\"']?(?P<%s>(?<=\")[^\"]+(?=\")|(?<=')[^']+(?=')|(?<=\W)\w+(?=\W|$))['\"]?",
$match[1]
);
},
Expand Down

0 comments on commit fe3cffc

Please sign in to comment.