Add latest changes from gitlab-org/gitlab@master

2 files changed, 18 insertions, 1 deletions

diff --git a/qa/qa/page/component/access_tokens.rb b/qa/qa/page/component/access_tokens.rb
index 6a9249621e1..ec8bbe8ff97 100644
--- a/qa/qa/page/component/access_tokens.rb
+++ b/qa/qa/page/component/access_tokens.rb
@@ -22,10 +22,22 @@ module QA
             element :api_label, '#{scope}_label' # rubocop:disable QA/ElementWithPattern, Lint/InterpolationCheck
           end
 
+          base.view 'app/assets/javascripts/access_tokens/components/new_access_token_app.vue' do
+            element :created_access_token
+          end
+
+          # This element will be removed once `access_token_ajax` feature flag is removed
+          # and this work is completed: https://gitlab.com/gitlab-org/gitlab/-/issues/357848
           base.view 'app/views/shared/access_tokens/_created_container.html.haml' do
             element :created_access_token
           end
 
+          base.view 'app/assets/javascripts/access_tokens/components/access_token_table_app.vue' do
+            element :revoke_button
+          end
+
+          # This element will be removed once `access_token_ajax` feature flag is removed
+          # and this work is completed: https://gitlab.com/gitlab-org/gitlab/-/issues/357848
           base.view 'app/views/shared/access_tokens/_table.html.haml' do
             element :revoke_button
           end
diff --git a/qa/qa/tools/delete_test_snippets.rb b/qa/qa/tools/delete_test_snippets.rb
index 5da962b14f3..e590077f81c 100644
--- a/qa/qa/tools/delete_test_snippets.rb
+++ b/qa/qa/tools/delete_test_snippets.rb
@@ -12,7 +12,7 @@ module QA
     class DeleteTestSnippets
       include Support::API
 
-      ITEMS_PER_PAGE = '100'
+      ITEMS_PER_PAGE = '1'
 
       def initialize(delete_before: (Date.today - 1).to_s, dry_run: false)
         raise ArgumentError, "Please provide GITLAB_ADDRESS" unless ENV['GITLAB_ADDRESS']
@@ -69,6 +69,11 @@ module QA
             to_delete
           end
           snippet_ids.concat(snippets.map { |snippet| snippet['id'] })
+
+          if (page_no + 1) == 1000
+            puts "Stopping at page 1000 to avoid timeout, total number of pages: #{pages}"
+            break
+          end
         end
 
         snippet_ids.uniq