diff options
Diffstat (limited to 'spec/features/projects/settings')
30 files changed, 78 insertions, 143 deletions
diff --git a/spec/features/projects/settings/access_tokens_spec.rb b/spec/features/projects/settings/access_tokens_spec.rb index 88f9a50b093..12e14f5193f 100644 --- a/spec/features/projects/settings/access_tokens_spec.rb +++ b/spec/features/projects/settings/access_tokens_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Project > Settings > Access Tokens', :js do +RSpec.describe 'Project > Settings > Access Tokens', :js, feature_category: :credential_management do include Spec::Support::Helpers::ModalHelpers let_it_be(:user) { create(:user) } diff --git a/spec/features/projects/settings/branch_names_settings_spec.rb b/spec/features/projects/settings/branch_names_settings_spec.rb index fdd883bc2b6..5d82dff1efd 100644 --- a/spec/features/projects/settings/branch_names_settings_spec.rb +++ b/spec/features/projects/settings/branch_names_settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Project settings > repositories > Branch names', :js do +RSpec.describe 'Project settings > repositories > Branch names', :js, feature_category: :projects do let_it_be(:project) { create(:project, :public) } let(:user) { create(:user) } diff --git a/spec/features/projects/settings/branch_rules_settings_spec.rb b/spec/features/projects/settings/branch_rules_settings_spec.rb index 5cc35f108b5..71d9c559b77 100644 --- a/spec/features/projects/settings/branch_rules_settings_spec.rb +++ b/spec/features/projects/settings/branch_rules_settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > Repository > Branch rules settings' do +RSpec.describe 'Projects > Settings > Repository > Branch rules settings', feature_category: :projects do let(:project) { create(:project_empty_repo) } let(:user) { create(:user) } let(:role) { :developer } diff --git a/spec/features/projects/settings/external_authorization_service_settings_spec.rb b/spec/features/projects/settings/external_authorization_service_settings_spec.rb index c236c85b773..a99fd5f9788 100644 --- a/spec/features/projects/settings/external_authorization_service_settings_spec.rb +++ b/spec/features/projects/settings/external_authorization_service_settings_spec.rb @@ -2,7 +2,8 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > External Authorization Classification Label setting' do +RSpec.describe 'Projects > Settings > External Authorization Classification Label setting', +feature_category: :projects do let(:user) { create(:user) } let(:project) { create(:project_empty_repo) } diff --git a/spec/features/projects/settings/forked_project_settings_spec.rb b/spec/features/projects/settings/forked_project_settings_spec.rb index 04fb6953b51..28d5c080db9 100644 --- a/spec/features/projects/settings/forked_project_settings_spec.rb +++ b/spec/features/projects/settings/forked_project_settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > For a forked project', :js do +RSpec.describe 'Projects > Settings > For a forked project', :js, feature_category: :projects do include ProjectForksHelper let(:user) { create(:user) } let(:original_project) { create(:project) } diff --git a/spec/features/projects/settings/lfs_settings_spec.rb b/spec/features/projects/settings/lfs_settings_spec.rb index 6e1be3c7e51..1695b49830d 100644 --- a/spec/features/projects/settings/lfs_settings_spec.rb +++ b/spec/features/projects/settings/lfs_settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > LFS settings' do +RSpec.describe 'Projects > Settings > LFS settings', feature_category: :projects do let(:project) { create(:project) } let(:user) { create(:user) } let(:role) { :maintainer } diff --git a/spec/features/projects/settings/merge_requests_settings_spec.rb b/spec/features/projects/settings/merge_requests_settings_spec.rb index ba84d8b6d1a..ca90817b0a4 100644 --- a/spec/features/projects/settings/merge_requests_settings_spec.rb +++ b/spec/features/projects/settings/merge_requests_settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > Merge requests' do +RSpec.describe 'Projects > Settings > Merge requests', feature_category: :projects do include ProjectForksHelper let(:user) { create(:user) } diff --git a/spec/features/projects/settings/monitor_settings_spec.rb b/spec/features/projects/settings/monitor_settings_spec.rb index 871391fbe9c..2cdcf86757e 100644 --- a/spec/features/projects/settings/monitor_settings_spec.rb +++ b/spec/features/projects/settings/monitor_settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > For a forked project', :js do +RSpec.describe 'Projects > Settings > For a forked project', :js, feature_category: :projects do let_it_be(:project) { create(:project, :repository, create_templates: :issue) } let(:user) { project.first_owner } diff --git a/spec/features/projects/settings/packages_settings_spec.rb b/spec/features/projects/settings/packages_settings_spec.rb index 1c2b0faa215..4ef17830f81 100644 --- a/spec/features/projects/settings/packages_settings_spec.rb +++ b/spec/features/projects/settings/packages_settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > Packages', :js do +RSpec.describe 'Projects > Settings > Packages', :js, feature_category: :projects do let_it_be(:project) { create(:project) } let(:user) { project.first_owner } @@ -33,6 +33,10 @@ RSpec.describe 'Projects > Settings > Packages', :js do it 'displays the packages access level setting' do expect(page).to have_selector('[data-testid="package-registry-access-level"] > label', text: 'Package registry') + expect(page).to have_selector('input[name="package_registry_enabled"]', visible: false) + expect(page).to have_selector('input[name="package_registry_enabled"] + button', visible: true) + expect(page).to have_selector('input[name="package_registry_api_for_everyone_enabled"]', visible: false) + expect(page).to have_selector('input[name="package_registry_api_for_everyone_enabled"] + button', visible: true) expect(page).to have_selector( 'input[name="project[project_feature_attributes][package_registry_access_level]"]', visible: false diff --git a/spec/features/projects/settings/pipelines_settings_spec.rb b/spec/features/projects/settings/pipelines_settings_spec.rb index a64f81430d1..37973c9b8d6 100644 --- a/spec/features/projects/settings/pipelines_settings_spec.rb +++ b/spec/features/projects/settings/pipelines_settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe "Projects > Settings > Pipelines settings" do +RSpec.describe "Projects > Settings > Pipelines settings", feature_category: :projects do let(:project) { create(:project) } let(:user) { create(:user) } let(:role) { :developer } @@ -165,7 +165,7 @@ RSpec.describe "Projects > Settings > Pipelines settings" do let(:page_token) { find('#registration_token').text } before do - click_button 'Reset registration token' + click_link 'Reset registration token' end it 'changes registration token' do diff --git a/spec/features/projects/settings/project_badges_spec.rb b/spec/features/projects/settings/project_badges_spec.rb index 2c26168e3c0..f4c2265c2c2 100644 --- a/spec/features/projects/settings/project_badges_spec.rb +++ b/spec/features/projects/settings/project_badges_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Project Badges' do +RSpec.describe 'Project Badges', feature_category: :projects do include WaitForRequests let(:user) { create(:user) } diff --git a/spec/features/projects/settings/project_settings_spec.rb b/spec/features/projects/settings/project_settings_spec.rb index a0d44b579a8..46a41cfc6f1 100644 --- a/spec/features/projects/settings/project_settings_spec.rb +++ b/spec/features/projects/settings/project_settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects settings' do +RSpec.describe 'Projects settings', feature_category: :projects do let_it_be(:project) { create(:project) } let(:user) { project.first_owner } diff --git a/spec/features/projects/settings/registry_settings_cleanup_tags_spec.rb b/spec/features/projects/settings/registry_settings_cleanup_tags_spec.rb index 477c4c2e1ba..d4c1fe4d43e 100644 --- a/spec/features/projects/settings/registry_settings_cleanup_tags_spec.rb +++ b/spec/features/projects/settings/registry_settings_cleanup_tags_spec.rb @@ -2,7 +2,8 @@ require 'spec_helper' -RSpec.describe 'Project > Settings > Packages and registries > Container registry tag expiration policy' do +RSpec.describe 'Project > Settings > Packages and registries > Container registry tag expiration policy', +feature_category: :projects do let_it_be(:user) { create(:user) } let_it_be(:project, reload: true) { create(:project, namespace: user.namespace) } diff --git a/spec/features/projects/settings/registry_settings_spec.rb b/spec/features/projects/settings/registry_settings_spec.rb index d64570cd5cc..072b5f7f3b0 100644 --- a/spec/features/projects/settings/registry_settings_spec.rb +++ b/spec/features/projects/settings/registry_settings_spec.rb @@ -2,7 +2,8 @@ require 'spec_helper' -RSpec.describe 'Project > Settings > Packages and registries > Container registry tag expiration policy' do +RSpec.describe 'Project > Settings > Packages and registries > Container registry tag expiration policy', +feature_category: :projects do let_it_be(:user) { create(:user) } let_it_be(:project, reload: true) { create(:project, namespace: user.namespace) } diff --git a/spec/features/projects/settings/repository_settings_spec.rb b/spec/features/projects/settings/repository_settings_spec.rb index d73ff0284cd..6f0a3094849 100644 --- a/spec/features/projects/settings/repository_settings_spec.rb +++ b/spec/features/projects/settings/repository_settings_spec.rb @@ -2,12 +2,13 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > Repository settings' do +RSpec.describe 'Projects > Settings > Repository settings', feature_category: :projects do let(:project) { create(:project_empty_repo) } let(:user) { create(:user) } let(:role) { :developer } before do + stub_feature_flags(branch_rules: false) project.add_role(user, role) sign_in(user) end @@ -39,19 +40,18 @@ RSpec.describe 'Projects > Settings > Repository settings' do end context 'Branch rules', :js do - it 'renders branch rules settings' do - visit project_settings_repository_path(project) - expect(page).to have_content('Branch rules') - end - context 'branch_rules feature flag disabled', :js do it 'does not render branch rules settings' do - stub_feature_flags(branch_rules: false) visit project_settings_repository_path(project) - expect(page).not_to have_content('Branch rules') end end + + it 'renders branch rules settings' do + stub_feature_flags(branch_rules: true) + visit project_settings_repository_path(project) + expect(page).to have_content('Branch rules') + end end context 'Deploy Keys', :js do @@ -164,13 +164,7 @@ RSpec.describe 'Projects > Settings > Repository settings' do end project.reload - - # TODO: The following line is skipped because a toast with - # "An error occurred while loading branch rules. Please try again." - # shows up right after which hides the below message. It is causing flakiness. - # https://gitlab.com/gitlab-org/gitlab/-/issues/383717#note_1185091998 - - # expect(page).to have_content('Mirroring settings were successfully updated') + expect(page).to have_content('Mirroring settings were successfully updated') expect(project.remote_mirrors.first.only_protected_branches).to eq(false) end @@ -190,13 +184,7 @@ RSpec.describe 'Projects > Settings > Repository settings' do end project.reload - - # TODO: The following line is skipped because a toast with - # "An error occurred while loading branch rules. Please try again." - # shows up right after which hides the below message. It is causing flakiness. - # https://gitlab.com/gitlab-org/gitlab/-/issues/383717#note_1185091998 - - # expect(page).to have_content('Mirroring settings were successfully updated') + expect(page).to have_content('Mirroring settings were successfully updated') expect(project.remote_mirrors.first.only_protected_branches).to eq(true) end @@ -213,7 +201,12 @@ RSpec.describe 'Projects > Settings > Repository settings' do click_button 'Mirror repository' end - expect(page).to have_content('Mirroring settings were successfully updated') + # TODO: The following line is skipped because a toast with + # "An error occurred while loading branch rules. Please try again." + # shows up right after which hides the below message. It is causing flakiness. + # https://gitlab.com/gitlab-org/gitlab/-/issues/383717#note_1185091998 + + # expect(page).to have_content('Mirroring settings were successfully updated') expect(project.reload.remote_mirrors.first.keep_divergent_refs).to eq(true) end @@ -229,7 +222,12 @@ RSpec.describe 'Projects > Settings > Repository settings' do click_button 'Mirror repository' end - expect(page).to have_content('Mirroring settings were successfully updated') + # TODO: The following line is skipped because a toast with + # "An error occurred while loading branch rules. Please try again." + # shows up right after which hides the below message. It is causing flakiness. + # https://gitlab.com/gitlab-org/gitlab/-/issues/383717#note_1185091998 + + # expect(page).to have_content('Mirroring settings were successfully updated') expect(page).to have_selector('[title="Copy SSH public key"]') end @@ -272,7 +270,6 @@ RSpec.describe 'Projects > Settings > Repository settings' do click_button 'Start cleanup' end end - expect(page).to have_content('Repository cleanup has started') expect(RepositoryCleanupWorker.jobs.count).to eq(1) end diff --git a/spec/features/projects/settings/secure_files_spec.rb b/spec/features/projects/settings/secure_files_spec.rb index ee38acf1953..9afe1f4de54 100644 --- a/spec/features/projects/settings/secure_files_spec.rb +++ b/spec/features/projects/settings/secure_files_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Secure Files', :js do +RSpec.describe 'Secure Files', :js, feature_category: :projects do let(:project) { create(:project) } let(:user) { create(:user) } @@ -12,31 +12,10 @@ RSpec.describe 'Secure Files', :js do sign_in(user) end - context 'when the :ci_secure_files feature flag is enabled' do - before do - stub_feature_flags(ci_secure_files: true) - - visit project_settings_ci_cd_path(project) - end - - context 'authenticated user with admin permissions' do - it 'shows the secure files settings' do - expect(page).to have_content('Secure Files') - end - end - end - - context 'when the :ci_secure_files feature flag is disabled' do - before do - stub_feature_flags(ci_secure_files: false) - + context 'authenticated user with admin permissions' do + it 'shows the secure files settings' do visit project_settings_ci_cd_path(project) - end - - context 'authenticated user with admin permissions' do - it 'does not shows the secure files settings' do - expect(page).not_to have_content('Secure Files') - end + expect(page).to have_content('Secure Files') end end diff --git a/spec/features/projects/settings/service_desk_setting_spec.rb b/spec/features/projects/settings/service_desk_setting_spec.rb index 86c5c3d2d8c..859c738731b 100644 --- a/spec/features/projects/settings/service_desk_setting_spec.rb +++ b/spec/features/projects/settings/service_desk_setting_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Service Desk Setting', :js, :clean_gitlab_redis_cache do +RSpec.describe 'Service Desk Setting', :js, :clean_gitlab_redis_cache, feature_category: :projects do let(:project) { create(:project_empty_repo, :private, service_desk_enabled: false) } let(:presenter) { project.present(current_user: user) } let(:user) { create(:user) } diff --git a/spec/features/projects/settings/user_archives_project_spec.rb b/spec/features/projects/settings/user_archives_project_spec.rb index 03ea9e7c580..a6aac02d272 100644 --- a/spec/features/projects/settings/user_archives_project_spec.rb +++ b/spec/features/projects/settings/user_archives_project_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > User archives a project' do +RSpec.describe 'Projects > Settings > User archives a project', feature_category: :projects do let(:user) { create(:user) } before do diff --git a/spec/features/projects/settings/user_changes_avatar_spec.rb b/spec/features/projects/settings/user_changes_avatar_spec.rb index 92d5b4c1fcd..87043aec9b6 100644 --- a/spec/features/projects/settings/user_changes_avatar_spec.rb +++ b/spec/features/projects/settings/user_changes_avatar_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > User changes avatar' do +RSpec.describe 'Projects > Settings > User changes avatar', feature_category: :projects do let(:project) { create(:project, :repository) } let(:user) { project.creator } diff --git a/spec/features/projects/settings/user_changes_default_branch_spec.rb b/spec/features/projects/settings/user_changes_default_branch_spec.rb index bf064839bd7..39704fdbbb2 100644 --- a/spec/features/projects/settings/user_changes_default_branch_spec.rb +++ b/spec/features/projects/settings/user_changes_default_branch_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > User changes default branch' do +RSpec.describe 'Projects > Settings > User changes default branch', feature_category: :projects do let(:user) { create(:user) } before do diff --git a/spec/features/projects/settings/user_interacts_with_deploy_keys_spec.rb b/spec/features/projects/settings/user_interacts_with_deploy_keys_spec.rb index 0fc12f93850..3a58de9aa7d 100644 --- a/spec/features/projects/settings/user_interacts_with_deploy_keys_spec.rb +++ b/spec/features/projects/settings/user_interacts_with_deploy_keys_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -RSpec.describe "User interacts with deploy keys", :js do +RSpec.describe "User interacts with deploy keys", :js, feature_category: :projects do let(:project) { create(:project, :repository) } let(:user) { project.first_owner } diff --git a/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb b/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb index c76b4d0af88..cfefdd54c23 100644 --- a/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb +++ b/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -RSpec.describe 'Projects > Settings > User manages merge request settings' do +RSpec.describe 'Projects > Settings > User manages merge request settings', feature_category: :projects do include ProjectForksHelper let(:user) { create(:user) } diff --git a/spec/features/projects/settings/user_manages_project_members_spec.rb b/spec/features/projects/settings/user_manages_project_members_spec.rb index 1d258582b3a..ee832da48d9 100644 --- a/spec/features/projects/settings/user_manages_project_members_spec.rb +++ b/spec/features/projects/settings/user_manages_project_members_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > User manages project members' do +RSpec.describe 'Projects > Settings > User manages project members', feature_category: :projects do include Spec::Support::Helpers::Features::MembersHelpers include Spec::Support::Helpers::ModalHelpers @@ -51,8 +51,6 @@ RSpec.describe 'Projects > Settings > User manages project members' do click_button 'Import project members' wait_for_requests - page.refresh - expect(find_member_row(user_mike)).to have_content('Reporter') end diff --git a/spec/features/projects/settings/user_renames_a_project_spec.rb b/spec/features/projects/settings/user_renames_a_project_spec.rb index 2e2d7119e2e..2da6e760fbf 100644 --- a/spec/features/projects/settings/user_renames_a_project_spec.rb +++ b/spec/features/projects/settings/user_renames_a_project_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > User renames a project' do +RSpec.describe 'Projects > Settings > User renames a project', feature_category: :projects do let(:user) { create(:user) } let(:project) { create(:project, namespace: user.namespace, path: 'gitlab', name: 'sample') } diff --git a/spec/features/projects/settings/user_searches_in_settings_spec.rb b/spec/features/projects/settings/user_searches_in_settings_spec.rb index 7ed96d01189..8a11507d064 100644 --- a/spec/features/projects/settings/user_searches_in_settings_spec.rb +++ b/spec/features/projects/settings/user_searches_in_settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'User searches project settings', :js do +RSpec.describe 'User searches project settings', :js, feature_category: :projects do let_it_be(:user) { create(:user) } let_it_be(:project) { create(:project, :repository, namespace: user.namespace, pages_https_only: false) } diff --git a/spec/features/projects/settings/user_sees_revoke_deploy_token_modal_spec.rb b/spec/features/projects/settings/user_sees_revoke_deploy_token_modal_spec.rb index 47383be1ba1..65aed4fd06f 100644 --- a/spec/features/projects/settings/user_sees_revoke_deploy_token_modal_spec.rb +++ b/spec/features/projects/settings/user_sees_revoke_deploy_token_modal_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Repository Settings > User sees revoke deploy token modal', :js do +RSpec.describe 'Repository Settings > User sees revoke deploy token modal', :js, feature_category: :projects do let(:project) { create(:project, :public, :repository) } let(:user) { project.creator } let(:role) { :developer } diff --git a/spec/features/projects/settings/user_tags_project_spec.rb b/spec/features/projects/settings/user_tags_project_spec.rb index e9a2aa29352..43e8e5a2d38 100644 --- a/spec/features/projects/settings/user_tags_project_spec.rb +++ b/spec/features/projects/settings/user_tags_project_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > User tags a project', :js do +RSpec.describe 'Projects > Settings > User tags a project', :js, feature_category: :projects do let(:user) { create(:user) } let(:project) { create(:project, namespace: user.namespace) } let!(:topic) { create(:topic, name: 'topic1') } diff --git a/spec/features/projects/settings/user_transfers_a_project_spec.rb b/spec/features/projects/settings/user_transfers_a_project_spec.rb index 23e10a36cee..53b4ee881f9 100644 --- a/spec/features/projects/settings/user_transfers_a_project_spec.rb +++ b/spec/features/projects/settings/user_transfers_a_project_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > User transfers a project', :js do +RSpec.describe 'Projects > Settings > User transfers a project', :js, feature_category: :projects do let(:user) { create(:user) } let(:project) { create(:project, :repository, namespace: user.namespace) } let(:group) { create(:group) } diff --git a/spec/features/projects/settings/visibility_settings_spec.rb b/spec/features/projects/settings/visibility_settings_spec.rb index 5cb12544066..5246eda976b 100644 --- a/spec/features/projects/settings/visibility_settings_spec.rb +++ b/spec/features/projects/settings/visibility_settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > Visibility settings', :js do +RSpec.describe 'Projects > Settings > Visibility settings', :js, feature_category: :projects do let(:user) { create(:user) } let(:project) { create(:project, namespace: user.namespace, visibility_level: 20) } @@ -28,26 +28,6 @@ RSpec.describe 'Projects > Settings > Visibility settings', :js do expect(visibility_select_container).to have_content 'Only accessible by project members. Membership must be explicitly granted to each user.' end - context 'builds select' do - it 'hides builds select section' do - find('.project-feature-controls[data-for="project[project_feature_attributes][builds_access_level]"] .gl-toggle').click - - visit project_settings_merge_requests_path(project) - - expect(page).to have_selector('.builds-feature', visible: false) - end - - context 'given project with builds_disabled access level' do - let(:project) { create(:project, :builds_disabled, namespace: user.namespace) } - - it 'hides builds select section' do - visit project_settings_merge_requests_path(project) - - expect(page).to have_selector('.builds-feature', visible: false) - end - end - end - context 'disable email notifications' do it 'is visible' do expect(page).to have_selector('.js-emails-disabled', visible: true) diff --git a/spec/features/projects/settings/webhooks_settings_spec.rb b/spec/features/projects/settings/webhooks_settings_spec.rb index adbf2f6ee5c..8d22d84b9c9 100644 --- a/spec/features/projects/settings/webhooks_settings_spec.rb +++ b/spec/features/projects/settings/webhooks_settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > Webhook Settings' do +RSpec.describe 'Projects > Settings > Webhook Settings', feature_category: :projects do let(:project) { create(:project) } let(:user) { create(:user) } let(:webhooks_path) { project_hooks_path(project) } @@ -41,54 +41,28 @@ RSpec.describe 'Projects > Settings > Webhook Settings' do expect(page).to have_content('Tag push events') expect(page).to have_content('Issues events') expect(page).to have_content('Confidential issues events') - expect(page).to have_content('Note events') - expect(page).to have_content('Merge requests events') + expect(page).to have_content('Comment') + expect(page).to have_content('Merge request events') expect(page).to have_content('Pipeline events') expect(page).to have_content('Wiki page events') expect(page).to have_content('Releases events') end - context 'when feature flag "enhanced_webhook_support_regex" is disabled' do - before do - stub_feature_flags(enhanced_webhook_support_regex: false) - end - - it 'create webhook', :js do - visit webhooks_path - - fill_in 'URL', with: url - check 'Tag push events' - fill_in 'hook_push_events_branch_filter', with: 'master' - check 'Enable SSL verification' - check 'Job events' - - click_button 'Add webhook' - - expect(page).to have_content(url) - expect(page).to have_content('SSL Verification: enabled') - expect(page).to have_content('Tag push events') - expect(page).to have_content('Job events') - expect(page).to have_content('Push events') - end - end - - context 'when feature flag "enhanced_webhook_support_regex" is enabled' do - it 'create webhook', :js do - visit webhooks_path + it 'create webhook', :js do + visit webhooks_path - fill_in 'URL', with: url - check 'Tag push events' - check 'Enable SSL verification' - check 'Job events' + fill_in 'URL', with: url + check 'Tag push events' + check 'Enable SSL verification' + check 'Job events' - click_button 'Add webhook' + click_button 'Add webhook' - expect(page).to have_content(url) - expect(page).to have_content('SSL Verification: enabled') - expect(page).to have_content('Tag push events') - expect(page).to have_content('Job events') - expect(page).to have_content('Push events') - end + expect(page).to have_content(url) + expect(page).to have_content('SSL Verification: enabled') + expect(page).to have_content('Tag push events') + expect(page).to have_content('Job events') + expect(page).to have_content('Push events') end it 'edit existing webhook', :js do @@ -100,8 +74,8 @@ RSpec.describe 'Projects > Settings > Webhook Settings' do check 'Enable SSL verification' click_button 'Save changes' - expect(page).to have_content 'SSL Verification: enabled' - expect(page).to have_content(url) + expect(page).to have_content('Enable SSL verification') + expect(page).to have_current_path(edit_project_hook_path(project, hook), ignore_query: true) end it 'test existing webhook', :js do |