Add latest changes from gitlab-org/gitlab@master

3 files changed, 10 insertions, 13 deletions

diff --git a/qa/qa/page/project/settings/main.rb b/qa/qa/page/project/settings/main.rb
index 4db66543a25..48af635bb79 100644
--- a/qa/qa/page/project/settings/main.rb
+++ b/qa/qa/page/project/settings/main.rb
@@ -11,8 +11,9 @@ module QA
           include Component::Breadcrumbs
 
           view 'app/views/projects/edit.html.haml' do
-            element :advanced_settings
-            element :merge_request_settings
+            element :advanced_settings_content
+            element :merge_request_settings_content
+            element :visibility_features_permissions_content
           end
 
           view 'app/views/projects/settings/_general.html.haml' do
@@ -20,10 +21,6 @@ module QA
             element :save_naming_topics_avatar_button
           end
 
-          view 'app/views/projects/edit.html.haml' do
-            element :visibility_features_permissions_content
-          end
-
           def rename_project_to(name)
             fill_project_name(name)
             click_save_changes
@@ -38,13 +35,13 @@ module QA
           end
 
           def expand_advanced_settings(&block)
-            expand_content(:advanced_settings) do
+            expand_content(:advanced_settings_content) do
               Advanced.perform(&block)
             end
           end
 
           def expand_merge_requests_settings(&block)
-            expand_content(:merge_request_settings) do
+            expand_content(:merge_request_settings_content) do
               MergeRequest.perform(&block)
             end
           end
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
 
diff --git a/qa/qa/resource/merge_request.rb b/qa/qa/resource/merge_request.rb
index fd5f454f134..869be06c542 100644
--- a/qa/qa/resource/merge_request.rb
+++ b/qa/qa/resource/merge_request.rb
@@ -75,7 +75,7 @@ module QA
         Page::MergeRequest::New.perform do |new_page|
           new_page.fill_title(@title)
           new_page.choose_template(@template) if @template
-          new_page.fill_description(@description) unless @template
+          new_page.fill_description(@description) if @description && !@template
           new_page.choose_milestone(@milestone) if @milestone
           new_page.assign_to_me if @assignee == 'me'
           labels.each do |label|