Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43

6 files changed, 95 insertions, 19 deletions

diff --git a/qa/qa/page/component/access_tokens.rb b/qa/qa/page/component/access_tokens.rb
new file mode 100644
index 00000000000..d8e3d12b38b
--- /dev/null
+++ b/qa/qa/page/component/access_tokens.rb
@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+module QA
+  module Page
+    module Component
+      module AccessTokens
+        extend QA::Page::PageConcern
+
+        def self.included(base)
+          super
+
+          base.view 'app/assets/javascripts/access_tokens/components/expires_at_field.vue' do
+            element :expiry_date_field
+          end
+
+          base.view 'app/views/shared/access_tokens/_form.html.haml' do
+            element :access_token_name_field
+            element :create_token_button
+          end
+
+          base.view 'app/views/shared/tokens/_scopes_form.html.haml' do
+            element :api_radio, 'qa-#{scope}-radio' # rubocop:disable QA/ElementWithPattern, Lint/InterpolationCheck
+          end
+
+          base.view 'app/views/shared/access_tokens/_created_container.html.haml' do
+            element :created_access_token
+          end
+
+          base.view 'app/views/shared/access_tokens/_table.html.haml' do
+            element :revoke_button
+          end
+        end
+
+        def fill_token_name(name)
+          fill_element(:access_token_name_field, name)
+        end
+
+        def check_api
+          check_element(:api_radio)
+        end
+
+        def click_create_token_button
+          click_element(:create_token_button)
+        end
+
+        def created_access_token
+          find_element(:created_access_token, wait: 30).value
+        end
+
+        def fill_expiry_date(date)
+          date = date.to_s if date.is_a?(Date)
+          Date.strptime(date, '%Y-%m-%d') rescue ArgumentError raise "Expiry date must be in YYYY-MM-DD format"
+
+          fill_element(:expiry_date_field, date)
+        end
+
+        def has_token_row_for_name?(token_name)
+          page.has_css?('tr', text: token_name, wait: 1.0)
+        end
+
+        def first_token_row_for_name(token_name)
+          page.find('tr', text: token_name, match: :first, wait: 1.0)
+        end
+
+        def revoke_first_token_with_name(token_name)
+          within first_token_row_for_name(token_name) do
+            accept_confirm do
+              click_element(:revoke_button)
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/page/component/commit_modal.rb b/qa/qa/page/component/commit_modal.rb
new file mode 100644
index 00000000000..7192e8bafb5
--- /dev/null
+++ b/qa/qa/page/component/commit_modal.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module QA
+  module Page
+    module Component
+      class CommitModal < Page::Base
+        view 'app/assets/javascripts/projects/commit/components/form_modal.vue' do
+          element :submit_commit_button, required: true
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/page/component/invite_members_modal.rb b/qa/qa/page/component/invite_members_modal.rb
index fbddb37f15e..9883ef22029 100644
--- a/qa/qa/page/component/invite_members_modal.rb
+++ b/qa/qa/page/component/invite_members_modal.rb
@@ -42,7 +42,7 @@ module QA
           within_element(:invite_members_modal_content) do
             fill_element :access_level_dropdown, with: access_level
 
-            fill_in 'Search for members to invite', with: username
+            fill_in 'Select members or type email addresses', with: username
 
             Support::WaitForRequests.wait_for_requests
 
diff --git a/qa/qa/page/component/issue_board/show.rb b/qa/qa/page/component/issue_board/show.rb
index d7dfb0757bc..dbf4dc30116 100644
--- a/qa/qa/page/component/issue_board/show.rb
+++ b/qa/qa/page/component/issue_board/show.rb
@@ -11,6 +11,7 @@ module QA
 
           view 'app/assets/javascripts/boards/components/board_form.vue' do
             element :board_name_field
+            element :save_changes_button
           end
 
           view 'app/assets/javascripts/boards/components/board_list.vue' do
@@ -23,10 +24,6 @@ module QA
             element :create_new_board_button
           end
 
-          view 'app/assets/javascripts/vue_shared/components/deprecated_modal.vue' do
-            element :save_changes_button
-          end
-
           view 'app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue' do
             element :labels_dropdown_content
           end
@@ -35,7 +32,7 @@ module QA
             element :labels_edit_button
           end
 
-          view 'app/views/shared/boards/_show.html.haml' do
+          view 'app/assets/javascripts/boards/components/board_content.vue' do
             element :boards_list
           end
 
diff --git a/qa/qa/page/component/snippet.rb b/qa/qa/page/component/snippet.rb
index b98c429df8c..73f41e0aa51 100644
--- a/qa/qa/page/component/snippet.rb
+++ b/qa/qa/page/component/snippet.rb
@@ -25,10 +25,6 @@ module QA
             element :file_title_content
           end
 
-          base.view 'app/assets/javascripts/vue_shared/components/blob_viewers/simple_viewer.vue' do
-            element :file_content
-          end
-
           base.view 'app/assets/javascripts/blob/components/blob_content.vue' do
             element :file_content
           end
diff --git a/qa/qa/page/component/wiki_page_form.rb b/qa/qa/page/component/wiki_page_form.rb
index e24b1b67af1..bb22b7da003 100644
--- a/qa/qa/page/component/wiki_page_form.rb
+++ b/qa/qa/page/component/wiki_page_form.rb
@@ -9,12 +9,11 @@ module QA
         def self.included(base)
           super
 
-          base.view 'app/views/shared/wikis/_form.html.haml' do
+          base.view 'app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue' do
             element :wiki_title_textbox
             element :wiki_content_textarea
             element :wiki_message_textbox
-            element :save_changes_button
-            element :create_page_button
+            element :wiki_submit_button
           end
 
           base.view 'app/assets/javascripts/pages/shared/wikis/components/delete_wiki_modal.vue' do
@@ -34,12 +33,8 @@ module QA
           fill_element(:wiki_message_textbox, message)
         end
 
-        def click_save_changes
-          click_element(:save_changes_button)
-        end
-
-        def click_create_page
-          click_element(:create_page_button)
+        def click_submit
+          click_element(:wiki_submit_button)
         end
 
         def delete_page