Fix Github conflict manually

This commit is contained in:
Jarek Jakubowski
2019-01-18 14:28:30 +01:00
committed by GitHub
parent 4a306c52a8
commit a2a7d8bea8

View File

@@ -3,13 +3,8 @@ Feature: Edit record
Scenario: As an Admin I want to change title of a record
Given I am logged in as "admin"
<<<<<<< Updated upstream
When I visit the "pages_overview" page
And I click the "edit_button" element
=======
When I visit the "edit_record" page with parameters:
| id | 2 |
>>>>>>> Stashed changes
Then I wait for "title_field" element to appear
When I fill the "title_field" field with "Changed title"
@@ -17,4 +12,4 @@ Feature: Edit record
When I visit the "single_record" page with parameters:
| id | 2 |
Then there is element "title" with text "Changed title"
Then there is element "title" with text "Changed title"