From a2a7d8bea87f163ed083393bbc87bd403ea68091 Mon Sep 17 00:00:00 2001 From: Jarek Jakubowski Date: Fri, 18 Jan 2019 14:28:30 +0100 Subject: [PATCH] Fix Github conflict manually --- tests/e2e/features/edit_record.feature | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/e2e/features/edit_record.feature b/tests/e2e/features/edit_record.feature index f0f076be..6a796613 100644 --- a/tests/e2e/features/edit_record.feature +++ b/tests/e2e/features/edit_record.feature @@ -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" \ No newline at end of file + Then there is element "title" with text "Changed title"