diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-23 12:08:01 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-23 12:08:01 +0300 |
commit | c71c2ba4c29ed3cc483e528a32f34816c98c39f4 (patch) | |
tree | 56a8a8355631b9d58544bb74816082529ce0044d /qa | |
parent | 5534414cd55a3e85d8f60e1a0883ed32f190df6b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
-rw-r--r-- | qa/qa/page/component/access_tokens.rb | 12 | ||||
-rw-r--r-- | qa/qa/tools/delete_test_snippets.rb | 7 |
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 |