diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-30 21:10:57 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-30 21:10:57 +0300 |
commit | b48bbc842d4baf2ba16bd8c4db9a924324b7f13a (patch) | |
tree | 240c25c78d10e517d31ebfac78551949a3f2fe1f /qa | |
parent | 93501e7509fb61b25f091d81381d3e86842a9cdd (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
5 files changed, 13 insertions, 12 deletions
diff --git a/qa/qa/page/project/settings/deploy_keys.rb b/qa/qa/page/project/settings/deploy_keys.rb index b94dbbea533..297d29550e3 100644 --- a/qa/qa/page/project/settings/deploy_keys.rb +++ b/qa/qa/page/project/settings/deploy_keys.rb @@ -13,7 +13,6 @@ module QA view 'app/views/shared/deploy_keys/_project_group_form.html.haml' do element :deploy_key_title_field element :deploy_key_field - element :deploy_key_expires_at_field element :add_deploy_key_button end diff --git a/qa/qa/page/project/tag/show.rb b/qa/qa/page/project/tag/show.rb index 1974448a7c5..b9703f46a50 100644 --- a/qa/qa/page/project/tag/show.rb +++ b/qa/qa/page/project/tag/show.rb @@ -8,7 +8,6 @@ module QA view 'app/views/projects/tags/show.html.haml' do element :tag_name_content element :tag_message_content - element :tag_release_notes_content end def has_tag_name?(text) @@ -18,10 +17,6 @@ module QA def has_tag_message?(text) has_element?(:tag_message_content, text: text) end - - def has_tag_release_notes?(text) - has_element?(:tag_release_notes_content, text: text) - end end end end diff --git a/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_project_spec.rb b/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_project_spec.rb index daf77b7b67c..9f452103fd5 100644 --- a/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_project_spec.rb +++ b/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_project_spec.rb @@ -7,7 +7,11 @@ module QA # this spec is used as a sanity test for gitlab migration because it can run outside of orchestrated setup # TODO: `:reliable` should be added back once https://gitlab.com/gitlab-org/gitlab/-/issues/403001 is resolved - context 'with import within same instance', orchestrated: false, import: false do + context 'with import within same instance', orchestrated: false, import: false, quarantine: { + type: :bug, + issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/403001', + except: { subdomain: /(staging.)?/, domain: 'gitlab' } + } do let!(:source_project_with_readme) { true } let!(:source_gitlab_address) { Runtime::Scenario.gitlab_address } let!(:source_admin_api_client) { admin_api_client } diff --git a/qa/qa/specs/features/api/1_manage/user_access_termination_spec.rb b/qa/qa/specs/features/api/1_manage/user_access_termination_spec.rb index 0a9337864ee..d3f80eaf235 100644 --- a/qa/qa/specs/features/api/1_manage/user_access_termination_spec.rb +++ b/qa/qa/specs/features/api/1_manage/user_access_termination_spec.rb @@ -3,7 +3,11 @@ module QA RSpec.describe 'Manage' do # TODO: `:reliable` should be added back once https://gitlab.com/gitlab-org/gitlab/-/issues/403001 is resolved - describe 'User', :requires_admin, product_group: :authentication_and_authorization do + describe 'User', :requires_admin, product_group: :authentication_and_authorization, quarantine: { + type: :bug, + issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/403001', + except: { subdomain: /(staging.)?/, domain: 'gitlab' } + } do before(:all) do admin_api_client = Runtime::API::Client.as_admin diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/protected_tags_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/protected_tags_spec.rb index f4ca7955a0f..479c5816938 100644 --- a/qa/qa/specs/features/browser_ui/3_create/repository/protected_tags_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/repository/protected_tags_spec.rb @@ -20,13 +20,12 @@ module QA let(:tag_name) { 'v0.0.1' } let(:tag_message) { 'Version 0.0.1' } - let(:tag_release_notes) { 'Release It!' } shared_examples 'successful tag creation' do |user, testcase| it "can be created by #{user}", testcase: testcase do Flow::Login.sign_in(as: send(user)) - create_tag_for_project(project, tag_name, tag_message, tag_release_notes) + create_tag_for_project(project, tag_name, tag_message) Page::Project::Tag::Show.perform do |show| expect(show).to have_tag_name(tag_name) @@ -40,7 +39,7 @@ module QA it "cannot be created by an unauthorized #{user}", testcase: testcase do Flow::Login.sign_in(as: send(user)) - create_tag_for_project(project, tag_name, tag_message, tag_release_notes) + create_tag_for_project(project, tag_name, tag_message) Page::Project::Tag::New.perform do |new_tag| expect(new_tag).to have_content('You are not allowed to create this tag as it is protected.') @@ -73,7 +72,7 @@ module QA it_behaves_like 'successful tag creation', :maintainer_user, 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347928' end - def create_tag_for_project(project, name, message, release_notes) + def create_tag_for_project(project, name, message) project.visit! Page::Project::Menu.perform(&:go_to_repository_tags) |