fix merge errors and some tests

This commit is contained in:
Reinier Balt 2010-11-09 15:13:22 +01:00
parent 0f525436ff
commit f2d977e12a
7 changed files with 17 additions and 34 deletions

View file

@ -70,3 +70,9 @@ Feature: Manage the list of contexts
| state | name |
| active | @phone |
| hidden | @hidden|
@selenium @wip
Scenario: Cannot add a context with comma in the name
When I go to the contexts page
And I add a new active context "foo, bar"
Then I should see "Name cannot contain the comma"