Add latest changes from gitlab-org/gitlab@13-3-stable-ee

3 files changed, 9 insertions, 14 deletions

diff --git a/qa/qa/page/component/confirm_modal.rb b/qa/qa/page/component/confirm_modal.rb
index 039640d207a..25eea8e0d93 100644
--- a/qa/qa/page/component/confirm_modal.rb
+++ b/qa/qa/page/component/confirm_modal.rb
@@ -20,7 +20,14 @@ module QA
           fill_element :confirm_input, text
         end
 
-        def click_confirm_button
+        def wait_for_confirm_button_enabled
+          wait_until(reload: false) do
+            !find_element(:confirm_button).disabled?
+          end
+        end
+
+        def confirm_transfer
+          wait_for_confirm_button_enabled
           click_element :confirm_button
         end
       end
diff --git a/qa/qa/page/component/new_snippet.rb b/qa/qa/page/component/new_snippet.rb
index 18f2e237097..3e5ae29177a 100644
--- a/qa/qa/page/component/new_snippet.rb
+++ b/qa/qa/page/component/new_snippet.rb
@@ -55,12 +55,10 @@ module QA
         end
 
         def fill_file_name(name)
-          finished_loading?
           fill_element :file_name_field, name
         end
 
         def fill_file_content(content)
-          finished_loading?
           text_area.set content
         end
 
diff --git a/qa/qa/page/component/snippet.rb b/qa/qa/page/component/snippet.rb
index 4ff19c01f1f..b84166ccefd 100644
--- a/qa/qa/page/component/snippet.rb
+++ b/qa/qa/page/component/snippet.rb
@@ -38,7 +38,7 @@ module QA
             element :delete_snippet_button
           end
 
-          base.view 'app/assets/javascripts/snippets/components/snippet_blob_view.vue' do
+          base.view 'app/assets/javascripts/snippets/components/show.vue' do
             element :clone_button
           end
 
@@ -100,19 +100,16 @@ module QA
         end
 
         def has_file_content?(file_content)
-          finished_loading?
           within_element(:file_content) do
             has_text?(file_content)
           end
         end
 
         def click_edit_button
-          finished_loading?
           click_element(:snippet_action_button, action: 'Edit')
         end
 
         def click_delete_button
-          finished_loading?
           click_element(:snippet_action_button, action: 'Delete')
           click_element(:delete_snippet_button)
           # wait for the page to reload after deletion
@@ -123,32 +120,27 @@ module QA
         end
 
         def get_repository_uri_http
-          finished_loading?
           click_element(:clone_button)
           Git::Location.new(find_element(:copy_http_url_button)['data-clipboard-text']).uri.to_s
         end
 
         def get_repository_uri_ssh
-          finished_loading?
           click_element(:clone_button)
           Git::Location.new(find_element(:copy_ssh_url_button)['data-clipboard-text']).uri.to_s
         end
 
         def add_comment(comment)
-          finished_loading?
           fill_element(:note_field, comment)
           click_element(:comment_button)
         end
 
         def has_comment_author?(author_username)
-          finished_loading?
           within_element(:note_author_content) do
             has_text?('@' + author_username)
           end
         end
 
         def has_comment_content?(comment_content)
-          finished_loading?
           within_element(:note_content) do
             has_text?(comment_content)
           end
@@ -161,14 +153,12 @@ module QA
         end
 
         def edit_comment(comment)
-          finished_loading?
           click_element(:edit_comment_button)
           fill_element(:edit_note_field, comment)
           click_element(:save_comment_button)
         end
 
         def delete_comment(comment)
-          finished_loading?
           click_element(:more_actions_dropdown)
           accept_alert do
             click_element(:delete_comment_button)