summaryrefslogtreecommitdiff
path: root/qa/qa/page/project/settings/merge_request.rb
diff options
context:
space:
mode:
Diffstat (limited to 'qa/qa/page/project/settings/merge_request.rb')
-rw-r--r--qa/qa/page/project/settings/merge_request.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/qa/qa/page/project/settings/merge_request.rb b/qa/qa/page/project/settings/merge_request.rb
index ec8d73df1b3..34754124931 100644
--- a/qa/qa/page/project/settings/merge_request.rb
+++ b/qa/qa/page/project/settings/merge_request.rb
@@ -8,11 +8,11 @@ module QA
include QA::Page::Settings::Common
view 'app/views/projects/edit.html.haml' do
- element :save_merge_request_changes
+ element :save_merge_request_changes_button
end
view 'app/views/projects/_merge_request_merge_method_settings.html.haml' do
- element :radio_button_merge_ff
+ element :merge_ff_radio_button
end
view 'app/views/projects/_merge_request_merge_checks_settings.html.haml' do
@@ -20,11 +20,11 @@ module QA
end
def click_save_changes
- click_element :save_merge_request_changes
+ click_element :save_merge_request_changes_button
end
def enable_ff_only
- click_element :radio_button_merge_ff
+ click_element :merge_ff_radio_button
click_save_changes
end