diff options
Diffstat (limited to 'spec/features/projects')
43 files changed, 471 insertions, 342 deletions
diff --git a/spec/features/projects/active_tabs_spec.rb b/spec/features/projects/active_tabs_spec.rb index 96a321037a9..b333f64aa87 100644 --- a/spec/features/projects/active_tabs_spec.rb +++ b/spec/features/projects/active_tabs_spec.rb @@ -18,12 +18,11 @@ RSpec.describe 'Project active tab' do end context 'on project Home' do - context 'when feature flag :sidebar_refactor is enabled' do - before do - visit project_path(project) - end + it 'activates Project scope menu' do + visit project_path(project) - it_behaves_like 'page has active tab', 'Project' + expect(page).to have_selector('.sidebar-top-level-items > li.active', count: 1) + expect(find('.sidebar-top-level-items > li.active')).to have_content(project.name) end context 'when feature flag :sidebar_refactor is disabled' do @@ -36,11 +35,23 @@ RSpec.describe 'Project active tab' do it_behaves_like 'page has active tab', 'Project' it_behaves_like 'page has active sub tab', 'Details' end + end - context 'on project Home/Activity' do + context 'on Project information' do + context 'default link' do before do visit project_path(project) - click_tab('Activity') + + click_link('Project information', match: :first) + end + + it_behaves_like 'page has active tab', 'Project' + it_behaves_like 'page has active sub tab', 'Activity' + end + + context 'on Project information/Activity' do + before do + visit activity_project_path(project) end it_behaves_like 'page has active tab', 'Project' diff --git a/spec/features/projects/badges/pipeline_badge_spec.rb b/spec/features/projects/badges/pipeline_badge_spec.rb index bfc924b5d9b..9d8f9872a1a 100644 --- a/spec/features/projects/badges/pipeline_badge_spec.rb +++ b/spec/features/projects/badges/pipeline_badge_spec.rb @@ -68,7 +68,7 @@ RSpec.describe 'Pipeline Badge' do visit pipeline_project_badges_path(project, ref: ref, format: :svg) expect(page.status_code).to eq(200) - expect(page.response_headers['Cache-Control']).to include 'no-cache' + expect(page.response_headers['Cache-Control']).to eq('no-store') end end diff --git a/spec/features/projects/blobs/blob_show_spec.rb b/spec/features/projects/blobs/blob_show_spec.rb index 3598aa2f423..595304789a6 100644 --- a/spec/features/projects/blobs/blob_show_spec.rb +++ b/spec/features/projects/blobs/blob_show_spec.rb @@ -172,7 +172,7 @@ RSpec.describe 'File blob', :js do end end - context 'sucessfully change ref of similar name' do + context 'successfully change ref of similar name' do before do project.repository.create_branch('dev') project.repository.create_branch('development') @@ -182,14 +182,32 @@ RSpec.describe 'File blob', :js do visit_blob('files/js/application.js', ref: 'development') switch_ref_to('dev') - expect(page.find('.file-title-name').text).to eq('application.js') + aggregate_failures do + expect(page.find('.file-title-name').text).to eq('application.js') + expect(page).not_to have_css('flash-container') + end end it 'switch ref from shorter to longer ref name' do visit_blob('files/js/application.js', ref: 'dev') switch_ref_to('development') + aggregate_failures do + expect(page.find('.file-title-name').text).to eq('application.js') + expect(page).not_to have_css('flash-container') + end + end + end + + it 'successfully changes ref when the ref name matches the project name' do + project.repository.create_branch(project.name) + + visit_blob('files/js/application.js', ref: project.name) + switch_ref_to('master') + + aggregate_failures do expect(page.find('.file-title-name').text).to eq('application.js') + expect(page).not_to have_css('flash-container') end end end diff --git a/spec/features/projects/branches/user_deletes_branch_spec.rb b/spec/features/projects/branches/user_deletes_branch_spec.rb index 53994ec018e..3b8f49accc5 100644 --- a/spec/features/projects/branches/user_deletes_branch_spec.rb +++ b/spec/features/projects/branches/user_deletes_branch_spec.rb @@ -12,7 +12,7 @@ RSpec.describe "User deletes branch", :js do sign_in(user) end - it "deletes branch" do + it "deletes branch", :js do visit(project_branches_path(project)) branch_search = find('input[data-testid="branch-search"]') @@ -21,11 +21,38 @@ RSpec.describe "User deletes branch", :js do branch_search.native.send_keys(:enter) page.within(".js-branch-improve\\/awesome") do - accept_alert { find(".btn-danger").click } + find('.js-delete-branch-button').click + end + + page.within '.modal-footer' do + click_button 'Yes, delete branch' end wait_for_requests - expect(page).to have_css(".js-branch-improve\\/awesome", visible: :hidden) + expect(page).to have_content('Branch was deleted') + end + + context 'when the feature flag :delete_branch_confirmation_modals is disabled' do + before do + stub_feature_flags(delete_branch_confirmation_modals: false) + end + + it "deletes branch" do + visit(project_branches_path(project)) + + branch_search = find('input[data-testid="branch-search"]') + + branch_search.set('improve/awesome') + branch_search.native.send_keys(:enter) + + page.within(".js-branch-improve\\/awesome") do + accept_alert { click_link(title: 'Delete branch') } + end + + wait_for_requests + + expect(page).to have_css(".js-branch-improve\\/awesome", visible: :hidden) + end end end diff --git a/spec/features/projects/branches/user_views_branches_spec.rb b/spec/features/projects/branches/user_views_branches_spec.rb index 19d96579785..d0c0a0860d9 100644 --- a/spec/features/projects/branches/user_views_branches_spec.rb +++ b/spec/features/projects/branches/user_views_branches_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -RSpec.describe "User views branches" do +RSpec.describe "User views branches", :js do let_it_be(:project) { create(:project, :repository) } let_it_be(:user) { project.owner } @@ -10,9 +10,12 @@ RSpec.describe "User views branches" do sign_in(user) end - context "all branches" do + context "all branches", :js do before do visit(project_branches_path(project)) + branch_search = find('input[data-testid="branch-search"]') + branch_search.set('master') + branch_search.native.send_keys(:enter) end it "shows branches" do @@ -20,6 +23,10 @@ RSpec.describe "User views branches" do expect(page.all(".graph-side")).to all( have_content(/\d+/) ) end + + it "displays a disabled button with a tooltip for the default branch that cannot be deleted", :js do + expect(page).to have_button('The default branch cannot be deleted', disabled: true) + end end context "protected branches" do diff --git a/spec/features/projects/branches_spec.rb b/spec/features/projects/branches_spec.rb index f805416b03d..0a79719f14a 100644 --- a/spec/features/projects/branches_spec.rb +++ b/spec/features/projects/branches_spec.rb @@ -88,10 +88,7 @@ RSpec.describe 'Branches' do it 'shows filtered branches', :js do visit project_branches_path(project) - branch_search = find('input[data-testid="branch-search"]') - - branch_search.set('fix') - branch_search.native.send_keys(:enter) + search_for_branch('fix') expect(page).to have_content('fix') expect(find('.all-branches')).to have_selector('li', count: 1) @@ -99,13 +96,14 @@ RSpec.describe 'Branches' do end describe 'Delete unprotected branch on Overview' do - it 'removes branch after confirmation', :js, quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/239019' do + it 'removes branch after confirmation', :js do visit project_branches_filtered_path(project, state: 'all') expect(all('.all-branches').last).to have_selector('li', count: 20) - accept_confirm { first('.js-branch-item .btn-danger').click } - expect(all('.all-branches').last).to have_selector('li', count: 19) + delete_branch_and_confirm + + expect(page).to have_content('Branch was deleted') end end @@ -151,10 +149,7 @@ RSpec.describe 'Branches' do it 'shows filtered branches', :js do visit project_branches_filtered_path(project, state: 'all') - branch_search = find('input[data-testid="branch-search"]') - - branch_search.set('fix') - branch_search.native.send_keys(:enter) + search_for_branch('fix') expect(page).to have_content('fix') expect(find('.all-branches')).to have_selector('li', count: 1) @@ -165,17 +160,39 @@ RSpec.describe 'Branches' do it 'removes branch after confirmation', :js do visit project_branches_filtered_path(project, state: 'all') - branch_search = find('input[data-testid="branch-search"]') + search_for_branch('fix') - branch_search.set('fix') - branch_search.native.send_keys(:enter) + expect(all('.all-branches').last).to have_selector('li', count: 1) - expect(page).to have_content('fix') - expect(find('.all-branches')).to have_selector('li', count: 1) - accept_confirm { find('.js-branch-fix .btn-danger').click } + delete_branch_and_confirm + + expect(page).to have_content('Branch was deleted') + + page.refresh + + search_for_branch('fix') expect(page).not_to have_content('fix') - expect(find('.all-branches')).to have_selector('li', count: 0) + expect(all('.all-branches').last).to have_selector('li', count: 0) + end + + context 'when the delete_branch_confirmation_modals feature flag is disabled' do + it 'removes branch after confirmation', :js do + stub_feature_flags(delete_branch_confirmation_modals: false) + + visit project_branches_filtered_path(project, state: 'all') + + search_for_branch('fix') + + expect(page).to have_content('fix') + expect(find('.all-branches')).to have_selector('li', count: 1) + accept_confirm do + within('.js-branch-item', match: :first) { click_link(title: 'Delete branch') } + end + + expect(page).not_to have_content('fix') + expect(find('.all-branches')).to have_selector('li', count: 0) + end end end @@ -323,4 +340,18 @@ RSpec.describe 'Branches' do def create_file(message: 'message', branch_name:) repository.create_file(user, generate(:branch), 'content', message: message, branch_name: branch_name) end + + def search_for_branch(name) + branch_search = find('input[data-testid="branch-search"]') + branch_search.set(name) + branch_search.native.send_keys(:enter) + end + + def delete_branch_and_confirm + find('.js-delete-branch-button', match: :first).click + + within '.modal-footer' do + click_button 'Yes, delete branch' + end + end end diff --git a/spec/features/projects/clusters/applications_spec.rb b/spec/features/projects/clusters/applications_spec.rb deleted file mode 100644 index 74b477dd85d..00000000000 --- a/spec/features/projects/clusters/applications_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' -require_relative '../../../../spec/features/clusters/installing_applications_shared_examples' - -RSpec.describe 'Project-level Cluster Applications', :js do - include GoogleApi::CloudPlatformHelpers - - let(:project) { create(:project) } - let(:user) { create(:user) } - - before do - project.add_maintainer(user) - sign_in(user) - end - - describe 'Installing applications' do - include_examples "installing applications on a cluster" do - let(:cluster_path) { project_cluster_path(project, cluster) } - let(:cluster_factory_args) { [projects: [project]] } - end - end -end diff --git a/spec/features/projects/confluence/user_views_confluence_page_spec.rb b/spec/features/projects/confluence/user_views_confluence_page_spec.rb index 7ec724ed55d..ece2f82f5c6 100644 --- a/spec/features/projects/confluence/user_views_confluence_page_spec.rb +++ b/spec/features/projects/confluence/user_views_confluence_page_spec.rb @@ -12,7 +12,7 @@ RSpec.describe 'User views the Confluence page' do end it 'shows the page when the Confluence integration is enabled' do - service = create(:confluence_service, project: project) + service = create(:confluence_integration, project: project) visit project_wikis_confluence_path(project) diff --git a/spec/features/projects/environments/environment_spec.rb b/spec/features/projects/environments/environment_spec.rb index 1d7be7fa7a3..fea054de64e 100644 --- a/spec/features/projects/environments/environment_spec.rb +++ b/spec/features/projects/environments/environment_spec.rb @@ -329,11 +329,11 @@ RSpec.describe 'Environment' do expect(page).to have_button('Stop') end - it 'user deletes the branch with running environment' do + it 'user deletes the branch with running environment', :js do visit project_branches_filtered_path(project, state: 'all', search: 'feature') remove_branch_with_hooks(project, user, 'feature') do - page.within('.js-branch-feature') { find('a.btn-danger').click } + page.within('.js-branch-feature') { find('.js-delete-branch-button').click } end visit_environment(environment) @@ -341,6 +341,24 @@ RSpec.describe 'Environment' do expect(page).not_to have_button('Stop') end + context 'when the feature flag :delete_branch_confirmation_modals is disabled' do + before do + stub_feature_flags(delete_branch_confirmation_modals: false) + end + + it 'user deletes the branch with running environment' do + visit project_branches_filtered_path(project, state: 'all', search: 'feature') + + remove_branch_with_hooks(project, user, 'feature') do + within('.js-branch-feature') { click_link(title: 'Delete branch') } + end + + visit_environment(environment) + + expect(page).not_to have_button('Stop') + end + end + ## # This is a workaround for problem described in #24543 # diff --git a/spec/features/projects/environments/environments_spec.rb b/spec/features/projects/environments/environments_spec.rb index de7ff1c473d..0dd4bd55d46 100644 --- a/spec/features/projects/environments/environments_spec.rb +++ b/spec/features/projects/environments/environments_spec.rb @@ -81,7 +81,7 @@ RSpec.describe 'Environments page', :js do context 'when cluster is not reachable' do let!(:cluster) { create(:cluster, :provided_by_gcp, projects: [project]) } - let!(:application_prometheus) { create(:clusters_applications_prometheus, :installed, cluster: cluster) } + let!(:integration_prometheus) { create(:clusters_integrations_prometheus, cluster: cluster) } before do allow_next_instance_of(Kubeclient::Client) do |instance| diff --git a/spec/features/projects/environments_pod_logs_spec.rb b/spec/features/projects/environments_pod_logs_spec.rb index eaef3e6ca28..5019e45593c 100644 --- a/spec/features/projects/environments_pod_logs_spec.rb +++ b/spec/features/projects/environments_pod_logs_spec.rb @@ -40,7 +40,7 @@ RSpec.describe 'Environment > Pod Logs', :js, :kubeclient do dropdown_items = find(".dropdown-menu").all(".dropdown-item") expect(dropdown_items.first).to have_content(environment.name) - expect(dropdown_items.size).to eq(3) + expect(dropdown_items.size).to eq(2) end end diff --git a/spec/features/projects/feature_flag_user_lists/user_deletes_feature_flag_user_list_spec.rb b/spec/features/projects/feature_flag_user_lists/user_deletes_feature_flag_user_list_spec.rb index 2a81c706525..37d6f299883 100644 --- a/spec/features/projects/feature_flag_user_lists/user_deletes_feature_flag_user_list_spec.rb +++ b/spec/features/projects/feature_flag_user_lists/user_deletes_feature_flag_user_list_spec.rb @@ -17,12 +17,13 @@ RSpec.describe 'User deletes feature flag user list', :js do end it 'deletes the list' do - visit(project_feature_flags_path(project, scope: 'userLists')) + visit(project_feature_flags_user_lists_path(project, scope: 'userLists')) delete_user_list_button.click delete_user_list_modal_confirmation_button.click - expect(page).to have_text('Lists 0') + expect(page).to have_text('Lists') + expect(page).not_to have_selector('[data-testid="ffUserListName"]') end end @@ -34,7 +35,7 @@ RSpec.describe 'User deletes feature flag user list', :js do end it 'does not delete the list' do - visit(project_feature_flags_path(project, scope: 'userLists')) + visit(project_feature_flags_user_lists_path(project, scope: 'userLists')) delete_user_list_button.click delete_user_list_modal_confirmation_button.click diff --git a/spec/features/projects/feature_flags/user_sees_feature_flag_list_spec.rb b/spec/features/projects/feature_flags/user_sees_feature_flag_list_spec.rb index 50fc7bb0753..d922bc1f4a0 100644 --- a/spec/features/projects/feature_flags/user_sees_feature_flag_list_spec.rb +++ b/spec/features/projects/feature_flags/user_sees_feature_flag_list_spec.rb @@ -18,65 +18,21 @@ RSpec.describe 'User sees feature flag list', :js do context 'with legacy feature flags' do before do - create_flag(project, 'ci_live_trace', false).tap do |feature_flag| + create_flag(project, 'ci_live_trace', false, version: :legacy_flag).tap do |feature_flag| create_scope(feature_flag, 'review/*', true) end - create_flag(project, 'drop_legacy_artifacts', false) - create_flag(project, 'mr_train', true).tap do |feature_flag| + create_flag(project, 'drop_legacy_artifacts', false, version: :legacy_flag) + create_flag(project, 'mr_train', true, version: :legacy_flag).tap do |feature_flag| create_scope(feature_flag, 'production', false) end end - it 'user sees the first flag' do - visit(project_feature_flags_path(project)) - - within_feature_flag_row(1) do - expect(page.find('.js-feature-flag-id')).to have_content('^1') - expect(page.find('.feature-flag-name')).to have_content('ci_live_trace') - expect_status_toggle_button_not_to_be_checked - - within_feature_flag_scopes do - expect(page.find('[data-qa-selector="feature-flag-scope-muted-badge"]:nth-child(1)')).to have_content('*') - expect(page.find('[data-qa-selector="feature-flag-scope-info-badge"]:nth-child(2)')).to have_content('review/*') - end - end - end - - it 'user sees the second flag' do - visit(project_feature_flags_path(project)) - - within_feature_flag_row(2) do - expect(page.find('.js-feature-flag-id')).to have_content('^2') - expect(page.find('.feature-flag-name')).to have_content('drop_legacy_artifacts') - expect_status_toggle_button_not_to_be_checked - - within_feature_flag_scopes do - expect(page.find('[data-qa-selector="feature-flag-scope-muted-badge"]:nth-child(1)')).to have_content('*') - end - end - end - - it 'user sees the third flag' do - visit(project_feature_flags_path(project)) - - within_feature_flag_row(3) do - expect(page.find('.js-feature-flag-id')).to have_content('^3') - expect(page.find('.feature-flag-name')).to have_content('mr_train') - expect_status_toggle_button_to_be_checked - - within_feature_flag_scopes do - expect(page.find('[data-qa-selector="feature-flag-scope-info-badge"]:nth-child(1)')).to have_content('*') - expect(page.find('[data-qa-selector="feature-flag-scope-muted-badge"]:nth-child(2)')).to have_content('production') - end - end - end - - it 'user sees the status toggle disabled' do + it 'shows empty page' do visit(project_feature_flags_path(project)) - within_feature_flag_row(1) do - expect_status_toggle_button_to_be_disabled - end + expect(page).to have_text 'Get started with feature flags' + expect(page).to have_selector('.btn-confirm', text: 'New feature flag') + expect(page).to have_selector('[data-qa-selector="configure_feature_flags_button"]', text: 'Configure') end end diff --git a/spec/features/projects/feature_flags/user_updates_feature_flag_spec.rb b/spec/features/projects/feature_flags/user_updates_feature_flag_spec.rb index a435e565ff1..9c03a26abc8 100644 --- a/spec/features/projects/feature_flags/user_updates_feature_flag_spec.rb +++ b/spec/features/projects/feature_flags/user_updates_feature_flag_spec.rb @@ -73,16 +73,16 @@ RSpec.describe 'User updates feature flag', :js do context 'with a legacy feature flag' do let!(:feature_flag) do create_flag(project, 'ci_live_trace', true, - description: 'For live trace feature') + description: 'For live trace feature', + version: :legacy_flag) end let!(:scope) { create_scope(feature_flag, 'review/*', true) } - it 'the user cannot edit the flag' do + it 'shows not found error' do visit(edit_project_feature_flag_path(project, feature_flag)) - expect(page).to have_text 'This feature flag is read-only, and it will be removed in 14.0.' - expect(page).to have_css('button.js-ff-submit.disabled') + expect(page).to have_text 'Page Not Found' end end end diff --git a/spec/features/projects/features_visibility_spec.rb b/spec/features/projects/features_visibility_spec.rb index 363fe8c35fe..2e5a5cef0fd 100644 --- a/spec/features/projects/features_visibility_spec.rb +++ b/spec/features/projects/features_visibility_spec.rb @@ -43,7 +43,7 @@ RSpec.describe 'Edit Project Settings' do context 'When external issue tracker is enabled and issues enabled on project settings' do it 'does not hide issues tab and hides labels tab' do allow_next_instance_of(Project) do |instance| - allow(instance).to receive(:external_issue_tracker).and_return(JiraService.new) + allow(instance).to receive(:external_issue_tracker).and_return(Integrations::Jira.new) end visit project_path(project) @@ -58,7 +58,7 @@ RSpec.describe 'Edit Project Settings' do project.issues_enabled = false project.save! allow_next_instance_of(Project) do |instance| - allow(instance).to receive(:external_issue_tracker).and_return(JiraService.new) + allow(instance).to receive(:external_issue_tracker).and_return(Integrations::Jira.new) end end diff --git a/spec/features/projects/import_export/import_file_spec.rb b/spec/features/projects/import_export/import_file_spec.rb index af228764c17..25836514981 100644 --- a/spec/features/projects/import_export/import_file_spec.rb +++ b/spec/features/projects/import_export/import_file_spec.rb @@ -30,14 +30,14 @@ RSpec.describe 'Import/Export - project import integration test', :js do it 'user imports an exported project successfully', :sidekiq_might_not_need_inline do visit new_project_path - click_import_project_tab + click_import_project click_link 'GitLab export' fill_in :name, with: 'Test Project Name', visible: true fill_in :path, with: 'test-project-path', visible: true attach_file('file', file) - expect { click_on 'Import project' }.to change { Project.count }.by(1) + expect { click_button 'Import project' }.to change { Project.count }.by(1) project = Project.last expect(project).not_to be_nil @@ -49,11 +49,11 @@ RSpec.describe 'Import/Export - project import integration test', :js do visit new_project_path - click_import_project_tab + click_import_project click_link 'GitLab export' fill_in :name, with: project.name, visible: true attach_file('file', file) - click_on 'Import project' + click_button 'Import project' page.within('.flash-container') do expect(page).to have_content('Project could not be imported') @@ -61,7 +61,7 @@ RSpec.describe 'Import/Export - project import integration test', :js do end end - def click_import_project_tab + def click_import_project find('[data-qa-selector="import_project_link"]').click end end diff --git a/spec/features/projects/infrastructure_registry_spec.rb b/spec/features/projects/infrastructure_registry_spec.rb new file mode 100644 index 00000000000..9cab4ebeb3a --- /dev/null +++ b/spec/features/projects/infrastructure_registry_spec.rb @@ -0,0 +1,61 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe 'Infrastructure Registry' do + let_it_be(:user) { create(:user) } + let_it_be(:project) { create(:project) } + + before do + sign_in(user) + project.add_maintainer(user) + end + + context 'when feature is not available' do + before do + stub_feature_flags(infrastructure_registry_page: false) + end + + it 'gives 404' do + visit_project_infrastructure_registry + + expect(status_code).to eq(404) + end + end + + context 'when feature is available', :js do + before do + visit_project_infrastructure_registry + end + + context 'when there are packages' do + let_it_be(:terraform_module) { create(:terraform_module_package, project: project, created_at: 1.day.ago, version: '1.0.0') } + let_it_be(:terraform_module2) { create(:terraform_module_package, project: project, created_at: 2.days.ago, version: '2.0.0') } + let_it_be(:packages) { [terraform_module, terraform_module2] } + + it_behaves_like 'packages list' + + context 'deleting a package' do + let_it_be(:project) { create(:project) } + let_it_be(:terraform_module) { create(:terraform_module_package, project: project) } + + it 'allows you to delete a module', :aggregate_failures do + # this is still using the package copy in the UI too + click_button('Remove package') + click_button('Delete package') + + expect(page).to have_content 'Package deleted successfully' + expect(page).not_to have_content(terraform_module.name) + end + end + end + + it 'displays the empty message' do + expect(page).to have_content('You have no Terraform modules in your project') + end + end + + def visit_project_infrastructure_registry + visit project_infrastructure_registry_index_path(project) + end +end diff --git a/spec/features/projects/services/user_activates_flowdock_spec.rb b/spec/features/projects/integrations/user_activates_flowdock_spec.rb index 4a4d7bbecfd..4a4d7bbecfd 100644 --- a/spec/features/projects/services/user_activates_flowdock_spec.rb +++ b/spec/features/projects/integrations/user_activates_flowdock_spec.rb diff --git a/spec/features/projects/services/user_activates_jira_spec.rb b/spec/features/projects/integrations/user_activates_jira_spec.rb index 10f84aae93f..10f84aae93f 100644 --- a/spec/features/projects/services/user_activates_jira_spec.rb +++ b/spec/features/projects/integrations/user_activates_jira_spec.rb diff --git a/spec/features/projects/services/user_activates_pivotaltracker_spec.rb b/spec/features/projects/integrations/user_activates_pivotaltracker_spec.rb index 83f66d4fa7b..83f66d4fa7b 100644 --- a/spec/features/projects/services/user_activates_pivotaltracker_spec.rb +++ b/spec/features/projects/integrations/user_activates_pivotaltracker_spec.rb diff --git a/spec/features/projects/members/invite_group_spec.rb b/spec/features/projects/members/invite_group_spec.rb index 4caf3e947c7..6ce6834b5d5 100644 --- a/spec/features/projects/members/invite_group_spec.rb +++ b/spec/features/projects/members/invite_group_spec.rb @@ -32,6 +32,14 @@ RSpec.describe 'Project > Members > Invite group', :js do expect(page).to have_selector(expected_invite_group_selector) end + + it 'does not display either the form or the button when visiting the page not signed in' do + project = create(:project, namespace: create(:group)) + + visit project_project_members_path(project) + + expect(page).not_to have_selector(expected_invite_group_selector) + end end describe 'Share with group lock' do diff --git a/spec/features/projects/members/list_spec.rb b/spec/features/projects/members/list_spec.rb index f1fc579bb8a..25598146604 100644 --- a/spec/features/projects/members/list_spec.rb +++ b/spec/features/projects/members/list_spec.rb @@ -6,17 +6,17 @@ RSpec.describe 'Project members list', :js do include Spec::Support::Helpers::Features::MembersHelpers include Spec::Support::Helpers::Features::InviteMembersModalHelper - let(:user1) { create(:user, name: 'John Doe') } - let(:user2) { create(:user, name: 'Mary Jane') } - let(:group) { create(:group) } - let(:project) { create(:project, :internal, namespace: group) } + let_it_be(:user1) { create(:user, name: 'John Doe') } + let_it_be(:user2) { create(:user, name: 'Mary Jane') } + let_it_be(:group) { create(:group) } + let_it_be(:project) { create(:project, :internal, namespace: group) } before do sign_in(user1) group.add_owner(user1) end - it 'show members from project and group' do + it 'show members from project and group', :aggregate_failures do project.add_developer(user2) visit_members_page @@ -25,7 +25,7 @@ RSpec.describe 'Project members list', :js do expect(second_row).to have_content(user2.name) end - it 'show user once if member of both group and project' do + it 'show user once if member of both group and project', :aggregate_failures do project.add_developer(user1) visit_members_page @@ -47,7 +47,7 @@ RSpec.describe 'Project members list', :js do end end - it 'add user to project' do + it 'add user to project', :snowplow, :aggregate_failures do visit_members_page invite_member(user2.name, role: 'Reporter') @@ -55,9 +55,17 @@ RSpec.describe 'Project members list', :js do page.within find_member_row(user2) do expect(page).to have_button('Reporter') end + + expect_snowplow_event( + category: 'Members::CreateService', + action: 'create_member', + label: 'project-members-page', + property: 'existing_user', + user: user1 + ) end - it 'uses ProjectMember access_level_roles for the invite members modal access option' do + it 'uses ProjectMember access_level_roles for the invite members modal access option', :aggregate_failures do visit_members_page click_on 'Invite members' @@ -95,7 +103,7 @@ RSpec.describe 'Project members list', :js do expect(members_table).not_to have_content(other_user.name) end - it 'invite user to project' do + it 'invite user to project', :snowplow, :aggregate_failures do visit_members_page invite_member('test@example.com', role: 'Reporter') @@ -105,6 +113,28 @@ RSpec.describe 'Project members list', :js do page.within find_invited_member_row('test@example.com') do expect(page).to have_button('Reporter') end + + expect_snowplow_event( + category: 'Members::InviteService', + action: 'create_member', + label: 'project-members-page', + property: 'net_new_user', + user: user1 + ) + end + + context 'as a signed out visitor viewing a public project' do + let_it_be(:project) { create(:project, :public) } + + before do + sign_out(user1) + end + + it 'does not show the Invite members button when not signed in' do + visit_members_page + + expect(page).not_to have_button('Invite members') + end end context 'project bots' do @@ -114,7 +144,7 @@ RSpec.describe 'Project members list', :js do project.add_maintainer(project_bot) end - it 'does not show form used to change roles and "Expiration date" or the remove user button' do + it 'does not show form used to change roles and "Expiration date" or the remove user button', :aggregate_failures do visit_members_page page.within find_member_row(project_bot) do diff --git a/spec/features/projects/members/tabs_spec.rb b/spec/features/projects/members/tabs_spec.rb index 471be26e126..5611e7ee810 100644 --- a/spec/features/projects/members/tabs_spec.rb +++ b/spec/features/projects/members/tabs_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Members > Tabs' do +RSpec.describe 'Projects > Members > Tabs', :js do include Spec::Support::Helpers::Features::MembersHelpers using RSpec::Parameterized::TableSyntax @@ -44,7 +44,7 @@ RSpec.describe 'Projects > Members > Tabs' do end end - context 'when searching "Groups"', :js do + context 'when searching "Groups"' do before do click_link 'Groups' diff --git a/spec/features/projects/members/user_requests_access_spec.rb b/spec/features/projects/members/user_requests_access_spec.rb index 7073741a92d..94543290050 100644 --- a/spec/features/projects/members/user_requests_access_spec.rb +++ b/spec/features/projects/members/user_requests_access_spec.rb @@ -3,8 +3,9 @@ require 'spec_helper' RSpec.describe 'Projects > Members > User requests access', :js do - let(:user) { create(:user) } - let(:project) { create(:project, :public, :repository) } + let_it_be(:user) { create(:user) } + let_it_be(:project) { create(:project, :public, :repository) } + let(:maintainer) { project.owner } before do @@ -47,6 +48,8 @@ RSpec.describe 'Projects > Members > User requests access', :js do expect(project.requesters.exists?(user_id: user)).to be_truthy + click_link 'Project information' + page.within('.nav-sidebar') do click_link('Members') end diff --git a/spec/features/projects/navbar_spec.rb b/spec/features/projects/navbar_spec.rb index ee5bf99fd75..bce11e6bc8a 100644 --- a/spec/features/projects/navbar_spec.rb +++ b/spec/features/projects/navbar_spec.rb @@ -17,6 +17,10 @@ RSpec.describe 'Project navbar' do end context 'when sidebar refactor feature flag is disabled' do + let(:project_context_nav_item) do + nil + end + before do stub_feature_flags(sidebar_refactor: false) insert_package_nav(_('Operations')) diff --git a/spec/features/projects/new_project_spec.rb b/spec/features/projects/new_project_spec.rb index a1523f9eb08..c57432ae94e 100644 --- a/spec/features/projects/new_project_spec.rb +++ b/spec/features/projects/new_project_spec.rb @@ -4,6 +4,7 @@ require 'spec_helper' RSpec.describe 'New project', :js do include Select2Helper + include Spec::Support::Helpers::Features::TopNavSpecHelpers shared_examples 'combined_menu: feature flag examples' do context 'as a user' do @@ -45,34 +46,39 @@ RSpec.describe 'New project', :js do end it 'when in control it renders "project" in the new projects dropdown' do - pending_on_combined_menu_flag - stub_experiments(new_repo: :control) visit new_project_path - find('#nav-projects-dropdown').click - - page.within('#nav-projects-dropdown') do - expect(page).to have_selector('a', text: 'Create blank project') - expect(page).to have_selector('a', text: 'Import project') - expect(page).to have_no_selector('a', text: 'Create blank project/repository') - expect(page).to have_no_selector('a', text: 'Import project/repository') + open_top_nav_projects + + within_top_nav do + if Feature.enabled?(:combined_menu, default_enabled: :yaml) + expect(page).to have_selector('a', text: 'Create new project') + expect(page).to have_no_selector('a', text: 'Create blank project/repository') + else + expect(page).to have_selector('a', text: 'Create blank project') + expect(page).to have_selector('a', text: 'Import project') + expect(page).to have_no_selector('a', text: 'Create blank project/repository') + expect(page).to have_no_selector('a', text: 'Import project/repository') + end end end it 'when in candidate it renders "project/repository" in the new projects dropdown' do - pending_on_combined_menu_flag - stub_experiments(new_repo: :candidate) visit new_project_path - find('#nav-projects-dropdown').click + open_top_nav_projects - page.within('#nav-projects-dropdown') do - expect(page).to have_selector('a', text: 'Create blank project/repository') - expect(page).to have_selector('a', text: 'Import project/repository') + within_top_nav do + if Feature.enabled?(:combined_menu, default_enabled: :yaml) + expect(page).to have_selector('a', text: 'Create new project') + else + expect(page).to have_selector('a', text: 'Create blank project/repository') + expect(page).to have_selector('a', text: 'Import project/repository') + end end end end @@ -356,16 +362,6 @@ RSpec.describe 'New project', :js do expect(git_import_instructions).to have_content 'Git repository URL' end - it 'reports error if repo URL does not end with .git' do - fill_in 'project_import_url', with: 'http://foo/bar' - fill_in 'project_name', with: 'import-project-without-git-suffix' - fill_in 'project_path', with: 'import-project-without-git-suffix' - - click_button 'Create project' - - expect(page).to have_text('Please provide a valid URL ending with .git') - end - it 'keeps "Import project" tab open after form validation error' do collision_project = create(:project, name: 'test-name-collision', namespace: user.namespace) @@ -422,7 +418,7 @@ RSpec.describe 'New project', :js do end end - context 'with combined_menu: feature flag on' do + context 'with combined_menu feature flag on' do let(:needs_rewrite_for_combined_menu_flag_on) { true } before do @@ -441,8 +437,4 @@ RSpec.describe 'New project', :js do it_behaves_like 'combined_menu: feature flag examples' end - - def pending_on_combined_menu_flag - pending 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56587' if needs_rewrite_for_combined_menu_flag_on - end end diff --git a/spec/features/projects/pages/user_edits_settings_spec.rb b/spec/features/projects/pages/user_edits_settings_spec.rb index 412ba17cf20..71d4cce2784 100644 --- a/spec/features/projects/pages/user_edits_settings_spec.rb +++ b/spec/features/projects/pages/user_edits_settings_spec.rb @@ -39,12 +39,6 @@ RSpec.describe 'Pages edits pages settings', :js do end end - it 'renders first deployment warning' do - visit project_pages_path(project) - - expect(page).to have_content('It may take up to 30 minutes before the site is available after the first deployment.') - end - shared_examples 'does not render access control warning' do it 'does not render access control warning' do visit project_pages_path(project) diff --git a/spec/features/projects/releases/user_views_releases_spec.rb b/spec/features/projects/releases/user_views_releases_spec.rb index d8a55fc7f3b..fcb1b6a0015 100644 --- a/spec/features/projects/releases/user_views_releases_spec.rb +++ b/spec/features/projects/releases/user_views_releases_spec.rb @@ -19,129 +19,147 @@ RSpec.describe 'User views releases', :js do project.add_guest(guest) end - context('when the user is a maintainer') do - before do - sign_in(maintainer) - - visit project_releases_path(project) - end + shared_examples 'releases index page' do + context('when the user is a maintainer') do + before do + sign_in(maintainer) - it 'sees the release' do - page.within("##{release_v1.tag}") do - expect(page).to have_content(release_v1.name) - expect(page).to have_content(release_v1.tag) - expect(page).not_to have_content('Upcoming Release') + visit project_releases_path(project) end - end - - context 'when there is a link as an asset' do - let!(:release_link) { create(:release_link, release: release_v1, url: url ) } - let(:url) { "#{project.web_url}/-/jobs/1/artifacts/download" } - let(:direct_asset_link) { Gitlab::Routing.url_helpers.project_release_url(project, release_v1) << "/downloads#{release_link.filepath}" } - it 'sees the link' do - page.within("##{release_v1.tag} .js-assets-list") do - expect(page).to have_link release_link.name, href: direct_asset_link - expect(page).not_to have_css('[data-testid="external-link-indicator"]') + it 'sees the release' do + page.within("##{release_v1.tag}") do + expect(page).to have_content(release_v1.name) + expect(page).to have_content(release_v1.tag) + expect(page).not_to have_content('Upcoming Release') end end - context 'when there is a link redirect' do - let!(:release_link) { create(:release_link, release: release_v1, name: 'linux-amd64 binaries', filepath: '/binaries/linux-amd64', url: url) } + context 'when there is a link as an asset' do + let!(:release_link) { create(:release_link, release: release_v1, url: url ) } let(:url) { "#{project.web_url}/-/jobs/1/artifacts/download" } + let(:direct_asset_link) { Gitlab::Routing.url_helpers.project_release_url(project, release_v1) << "/downloads#{release_link.filepath}" } - it 'sees the link', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/329301' do + it 'sees the link' do page.within("##{release_v1.tag} .js-assets-list") do expect(page).to have_link release_link.name, href: direct_asset_link expect(page).not_to have_css('[data-testid="external-link-indicator"]') end end - end - context 'when url points to external resource' do - let(:url) { 'http://google.com/download' } + context 'when there is a link redirect' do + let!(:release_link) { create(:release_link, release: release_v1, name: 'linux-amd64 binaries', filepath: '/binaries/linux-amd64', url: url) } + let(:url) { "#{project.web_url}/-/jobs/1/artifacts/download" } - it 'sees that the link is external resource', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/329302' do - page.within("##{release_v1.tag} .js-assets-list") do - expect(page).to have_css('[data-testid="external-link-indicator"]') + it 'sees the link', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/329301' do + page.within("##{release_v1.tag} .js-assets-list") do + expect(page).to have_link release_link.name, href: direct_asset_link + expect(page).not_to have_css('[data-testid="external-link-indicator"]') + end + end + end + + context 'when url points to external resource' do + let(:url) { 'http://google.com/download' } + + it 'sees that the link is external resource', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/329302' do + page.within("##{release_v1.tag} .js-assets-list") do + expect(page).to have_css('[data-testid="external-link-indicator"]') + end end end end - end - context 'with an upcoming release' do - it 'sees the upcoming tag' do - page.within("##{release_v3.tag}") do - expect(page).to have_content('Upcoming Release') + context 'with an upcoming release' do + it 'sees the upcoming tag' do + page.within("##{release_v3.tag}") do + expect(page).to have_content('Upcoming Release') + end end end - end - context 'with a tag containing a slash' do - it 'sees the release' do - page.within("##{release_v2.tag.parameterize}") do - expect(page).to have_content(release_v2.name) - expect(page).to have_content(release_v2.tag) + context 'with a tag containing a slash' do + it 'sees the release' do + page.within("##{release_v2.tag.parameterize}") do + expect(page).to have_content(release_v2.name) + expect(page).to have_content(release_v2.tag) + end end end - end - context 'sorting' do - def sort_page(by:, direction:) - within '[data-testid="releases-sort"]' do - find('.dropdown-toggle').click + context 'sorting' do + def sort_page(by:, direction:) + within '[data-testid="releases-sort"]' do + find('.dropdown-toggle').click - click_button(by, class: 'dropdown-item') + click_button(by, class: 'dropdown-item') - find('.sorting-direction-button').click if direction == :ascending + find('.sorting-direction-button').click if direction == :ascending + end end - end - shared_examples 'releases sort order' do - it "sorts the releases #{description}" do - card_titles = page.all('.release-block .card-title', minimum: expected_releases.count) + shared_examples 'releases sort order' do + it "sorts the releases #{description}" do + card_titles = page.all('.release-block .card-title', minimum: expected_releases.count) - card_titles.each_with_index do |title, index| - expect(title).to have_content(expected_releases[index].name) + card_titles.each_with_index do |title, index| + expect(title).to have_content(expected_releases[index].name) + end end end - end - context "when the page is sorted by the default sort order" do - let(:expected_releases) { [release_v3, release_v2, release_v1] } + context "when the page is sorted by the default sort order" do + let(:expected_releases) { [release_v3, release_v2, release_v1] } - it_behaves_like 'releases sort order' - end + it_behaves_like 'releases sort order' + end - context "when the page is sorted by created_at ascending " do - let(:expected_releases) { [release_v2, release_v1, release_v3] } + context "when the page is sorted by created_at ascending " do + let(:expected_releases) { [release_v2, release_v1, release_v3] } - before do - sort_page by: 'Created date', direction: :ascending + before do + sort_page by: 'Created date', direction: :ascending + end + + it_behaves_like 'releases sort order' end + end + end + + context('when the user is a guest') do + before do + sign_in(guest) + end + + it 'renders release info except for Git-related data' do + visit project_releases_path(project) + + within('.release-block', match: :first) do + expect(page).to have_content(release_v3.description) - it_behaves_like 'releases sort order' + # The following properties (sometimes) include Git info, + # so they are not rendered for Guest users + expect(page).not_to have_content(release_v3.name) + expect(page).not_to have_content(release_v3.tag) + expect(page).not_to have_content(release_v3.commit.short_id) + end end end end - context('when the user is a guest') do + context 'when the releases_index_apollo_client feature flag is enabled' do before do - sign_in(guest) + stub_feature_flags(releases_index_apollo_client: true) end - it 'renders release info except for Git-related data' do - visit project_releases_path(project) - - within('.release-block', match: :first) do - expect(page).to have_content(release_v3.description) + it_behaves_like 'releases index page' + end - # The following properties (sometimes) include Git info, - # so they are not rendered for Guest users - expect(page).not_to have_content(release_v3.name) - expect(page).not_to have_content(release_v3.tag) - expect(page).not_to have_content(release_v3.commit.short_id) - end + context 'when the releases_index_apollo_client feature flag is disabled' do + before do + stub_feature_flags(releases_index_apollo_client: false) end + + it_behaves_like 'releases index page' end end diff --git a/spec/features/projects/serverless/functions_spec.rb b/spec/features/projects/serverless/functions_spec.rb index a0b06d7e2a1..db8c2a24f2f 100644 --- a/spec/features/projects/serverless/functions_spec.rb +++ b/spec/features/projects/serverless/functions_spec.rb @@ -25,7 +25,6 @@ RSpec.describe 'Functions', :js do end it 'sees an empty state require Knative installation' do - expect(page).to have_link('Install Knative') expect(page).to have_selector('.empty-state') end end diff --git a/spec/features/projects/services/disable_triggers_spec.rb b/spec/features/projects/services/disable_triggers_spec.rb index d9e200cf563..c6413685f38 100644 --- a/spec/features/projects/services/disable_triggers_spec.rb +++ b/spec/features/projects/services/disable_triggers_spec.rb @@ -15,7 +15,7 @@ RSpec.describe 'Disable individual triggers', :js do let(:service_name) { 'Jenkins' } it 'shows trigger checkboxes' do - event_count = JenkinsService.supported_events.count + event_count = Integrations::Jenkins.supported_events.count expect(page).to have_content "Trigger" expect(page).to have_css(checkbox_selector, visible: :all, count: event_count) diff --git a/spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb b/spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb index 54a501e89a2..b2ca0424b6d 100644 --- a/spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb +++ b/spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb @@ -14,35 +14,10 @@ RSpec.describe 'Set up Mattermost slash commands', :js do context 'mattermost service is enabled' do let(:mattermost_enabled) { true } - it 'shows a help message' do - expect(page).to have_content("Use this service to perform common") - end - - it 'shows a token placeholder' do - token_placeholder = find_field('service_token')['placeholder'] - - expect(token_placeholder).to eq('XXxxXXxxXXxxXXxxXXxxXXxx') - end - - it 'redirects to the integrations page after saving but not activating' do - token = ('a'..'z').to_a.join - - fill_in 'service_token', with: token - click_active_checkbox - click_save_integration - - expect(current_path).to eq(edit_project_service_path(project, :mattermost_slash_commands)) - expect(page).to have_content('Mattermost slash commands settings saved, but not active.') - end - - it 'redirects to the integrations page after activating' do - token = ('a'..'z').to_a.join - - fill_in 'service_token', with: token - click_save_integration + describe 'activation' do + let(:edit_path) { edit_project_service_path(project, :mattermost_slash_commands) } - expect(current_path).to eq(edit_project_service_path(project, :mattermost_slash_commands)) - expect(page).to have_content('Mattermost slash commands settings saved and active.') + include_examples 'user activates the Mattermost Slash Command integration' end it 'shows the add to mattermost button' do @@ -109,7 +84,7 @@ RSpec.describe 'Set up Mattermost slash commands', :js do end it 'shows an error alert with the error message if there is an error requesting teams' do - allow_any_instance_of(MattermostSlashCommandsService).to receive(:list_teams) { [[], 'test mattermost error message'] } + allow_any_instance_of(Integrations::MattermostSlashCommands).to receive(:list_teams) { [[], 'test mattermost error message'] } click_link 'Add to Mattermost' @@ -138,7 +113,7 @@ RSpec.describe 'Set up Mattermost slash commands', :js do def stub_teams(count: 0) teams = create_teams(count) - allow_any_instance_of(MattermostSlashCommandsService).to receive(:list_teams) { [teams, nil] } + allow_any_instance_of(Integrations::MattermostSlashCommands).to receive(:list_teams) { [teams, nil] } teams end diff --git a/spec/features/projects/services/user_activates_slack_notifications_spec.rb b/spec/features/projects/services/user_activates_slack_notifications_spec.rb index 0cba1ee1c4c..dec83ff1489 100644 --- a/spec/features/projects/services/user_activates_slack_notifications_spec.rb +++ b/spec/features/projects/services/user_activates_slack_notifications_spec.rb @@ -20,7 +20,7 @@ RSpec.describe 'User activates Slack notifications', :js do end context 'when service is already configured' do - let(:service) { SlackService.new } + let(:service) { Integrations::Slack.new } let(:project) { create(:project, slack_service: service) } before do diff --git a/spec/features/projects/settings/monitor_settings_spec.rb b/spec/features/projects/settings/monitor_settings_spec.rb index 64138e0aeca..971a747e64f 100644 --- a/spec/features/projects/settings/monitor_settings_spec.rb +++ b/spec/features/projects/settings/monitor_settings_spec.rb @@ -41,7 +41,7 @@ RSpec.describe 'Projects > Settings > For a forked project', :js do visit project_settings_operations_path(project) wait_for_requests - click_expand_incident_management_button + click_settings_tab end it 'renders form for incident management' do @@ -60,22 +60,24 @@ RSpec.describe 'Projects > Settings > For a forked project', :js do click_on('bug') save_form - click_expand_incident_management_button + click_settings_tab expect(find_field(create_issue)).to be_checked expect(page).to have_selector(:id, 'alert-integration-settings-issue-template', text: 'bug') + + click_settings_tab expect(find_field(send_email)).not_to be_checked end - def click_expand_incident_management_button - within '.qa-incident-management-settings' do - click_button('Expand') + def click_settings_tab + within '[data-testid="alert-integration-settings"]' do + click_link 'Alert settings' end end def save_form - page.within ".qa-incident-management-settings" do - click_on 'Save changes' + page.within '[data-testid="alert-integration-settings"]' do + click_button 'Save changes' end end end diff --git a/spec/features/projects/settings/registry_settings_spec.rb b/spec/features/projects/settings/registry_settings_spec.rb index 6a2769d11fd..1cc54b71d4a 100644 --- a/spec/features/projects/settings/registry_settings_spec.rb +++ b/spec/features/projects/settings/registry_settings_spec.rb @@ -24,14 +24,14 @@ RSpec.describe 'Project > Settings > CI/CD > Container registry tag expiration p it 'shows available section' do subject - settings_block = find('#js-registry-policies') + settings_block = find('[data-testid="registry-settings-app"]') expect(settings_block).to have_text 'Clean up image tags' end it 'saves cleanup policy submit the form' do subject - within '#js-registry-policies' do + within '[data-testid="registry-settings-app"]' do select('Every day', from: 'Run cleanup') select('50 tags per image name', from: 'Keep the most recent:') fill_in('Keep tags matching:', with: 'stable') @@ -49,7 +49,7 @@ RSpec.describe 'Project > Settings > CI/CD > Container registry tag expiration p it 'does not save cleanup policy submit form with invalid regex' do subject - within '#js-registry-policies' do + within '[data-testid="registry-settings-app"]' do fill_in('Remove tags matching:', with: '*-production') submit_button = find('[data-testid="save-button"') @@ -80,7 +80,7 @@ RSpec.describe 'Project > Settings > CI/CD > Container registry tag expiration p it 'displays the expected result' do subject - within '#js-registry-policies' do + within '[data-testid="registry-settings-app"]' do case result when :available_section expect(find('[data-testid="enable-toggle"]')).to have_content('Disabled - Tags will not be automatically deleted.') @@ -98,7 +98,7 @@ RSpec.describe 'Project > Settings > CI/CD > Container registry tag expiration p it 'does not exists' do subject - expect(page).not_to have_selector('#js-registry-policies') + expect(page).not_to have_selector('[data-testid="registry-settings-app"]') end end @@ -108,7 +108,7 @@ RSpec.describe 'Project > Settings > CI/CD > Container registry tag expiration p it 'does not exists' do subject - expect(page).not_to have_selector('#js-registry-policies') + expect(page).not_to have_selector('[data-testid="registry-settings-app"]') end 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 50451075db5..91355d8f625 100644 --- a/spec/features/projects/settings/service_desk_setting_spec.rb +++ b/spec/features/projects/settings/service_desk_setting_spec.rb @@ -89,25 +89,10 @@ RSpec.describe 'Service Desk Setting', :js, :clean_gitlab_redis_cache do before do stub_licensed_features(custom_file_templates_for_namespace: false, custom_file_templates: false) group.update_columns(file_template_project_id: group_template_repo.id) + visit edit_project_path(project) end - context 'when inherited_issuable_templates enabled' do - before do - stub_feature_flags(inherited_issuable_templates: true) - visit edit_project_path(project) - end - - it_behaves_like 'issue description templates from current project only' - end - - context 'when inherited_issuable_templates disabled' do - before do - stub_feature_flags(inherited_issuable_templates: false) - visit edit_project_path(project) - end - - it_behaves_like 'issue description templates from current project only' - end + it_behaves_like 'issue description templates from current project only' end end end 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 bf90e86c263..862bae45fc6 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 @@ -116,7 +116,8 @@ RSpec.describe 'Projects > Settings > User manages merge request settings' do click_on('Save changes') end - find('.flash-notice') + wait_for_all_requests + checkbox = find_field('project_printing_merge_request_link_enabled') expect(checkbox).not_to be_checked @@ -139,7 +140,8 @@ RSpec.describe 'Projects > Settings > User manages merge request settings' do click_on('Save changes') end - find('.flash-notice') + wait_for_all_requests + checkbox = find_field('project_remove_source_branch_after_merge') expect(checkbox).not_to be_checked 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 9b09958bae5..a60743f0e47 100644 --- a/spec/features/projects/settings/user_searches_in_settings_spec.rb +++ b/spec/features/projects/settings/user_searches_in_settings_spec.rb @@ -63,7 +63,7 @@ RSpec.describe 'User searches project settings', :js do visit project_settings_operations_path(project) end - it_behaves_like 'can search settings', 'Alert integrations', 'Error tracking' + it_behaves_like 'can search settings', 'Alerts', 'Error tracking' end context 'in Pages page' do diff --git a/spec/features/projects/show/schema_markup_spec.rb b/spec/features/projects/show/schema_markup_spec.rb index 1777b72cbf5..28803db924a 100644 --- a/spec/features/projects/show/schema_markup_spec.rb +++ b/spec/features/projects/show/schema_markup_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' RSpec.describe 'Projects > Show > Schema Markup' do - let_it_be(:project) { create(:project, :repository, :public, :with_avatar, description: 'foobar', tag_list: 'tag1, tag2') } + let_it_be(:project) { create(:project, :repository, :public, :with_avatar, description: 'foobar', topic_list: 'topic1, topic2') } it 'shows SoftwareSourceCode structured markup', :js do visit project_path(project) @@ -16,7 +16,7 @@ RSpec.describe 'Projects > Show > Schema Markup' do expect(page).to have_selector('[itemprop="identifier"]', text: "Project ID: #{project.id}") expect(page).to have_selector('[itemprop="description"]', text: project.description) expect(page).to have_selector('[itemprop="license"]', text: project.repository.license.name) - expect(find_all('[itemprop="keywords"]').map(&:text)).to match_array(project.tag_list.map(&:capitalize)) + expect(find_all('[itemprop="keywords"]').map(&:text)).to match_array(project.topic_list.map(&:capitalize)) expect(page).to have_selector('[itemprop="about"]') end end diff --git a/spec/features/projects/show/user_sees_collaboration_links_spec.rb b/spec/features/projects/show/user_sees_collaboration_links_spec.rb index ffdfbb9fe81..613033373e8 100644 --- a/spec/features/projects/show/user_sees_collaboration_links_spec.rb +++ b/spec/features/projects/show/user_sees_collaboration_links_spec.rb @@ -12,6 +12,10 @@ RSpec.describe 'Projects > Show > Collaboration links', :js do sign_in(user) end + def find_new_menu_toggle + find('#js-onboarding-new-project-link') + end + context 'with developer user' do before do project.add_developer(user) @@ -22,7 +26,7 @@ RSpec.describe 'Projects > Show > Collaboration links', :js do # The navigation bar page.within('.header-new') do - find('.qa-new-menu-toggle').click + find_new_menu_toggle.click aggregate_failures 'dropdown links in the navigation bar' do expect(page).to have_link('New issue') @@ -30,7 +34,7 @@ RSpec.describe 'Projects > Show > Collaboration links', :js do expect(page).to have_link('New snippet', href: new_project_snippet_path(project)) end - find('.qa-new-menu-toggle').click + find_new_menu_toggle.click end # The dropdown above the tree @@ -56,7 +60,7 @@ RSpec.describe 'Projects > Show > Collaboration links', :js do visit project_path(project) page.within('.header-new') do - find('.qa-new-menu-toggle').click + find_new_menu_toggle.click aggregate_failures 'dropdown links' do expect(page).not_to have_link('New issue') @@ -64,7 +68,7 @@ RSpec.describe 'Projects > Show > Collaboration links', :js do expect(page).not_to have_link('New snippet', href: new_project_snippet_path(project)) end - find('.qa-new-menu-toggle').click + find_new_menu_toggle.click end expect(page).not_to have_selector('.qa-add-to-tree') diff --git a/spec/features/projects/user_uses_shortcuts_spec.rb b/spec/features/projects/user_uses_shortcuts_spec.rb index 1350ecf6e75..2f7844ff615 100644 --- a/spec/features/projects/user_uses_shortcuts_spec.rb +++ b/spec/features/projects/user_uses_shortcuts_spec.rb @@ -3,11 +3,11 @@ require 'spec_helper' RSpec.describe 'User uses shortcuts', :js do - let(:project) { create(:project, :repository) } - let(:user) { create(:user) } + let_it_be(:project) { create(:project, :repository) } + + let(:user) { project.owner } before do - project.add_maintainer(user) sign_in(user) visit(project_path(project)) @@ -74,7 +74,7 @@ RSpec.describe 'User uses shortcuts', :js do find('body').native.send_key('g') find('body').native.send_key('p') - expect(page).to have_active_navigation('Project') + expect(page).to have_active_navigation(project.name) end context 'when feature flag :sidebar_refactor is disabled' do diff --git a/spec/features/projects/user_views_empty_project_spec.rb b/spec/features/projects/user_views_empty_project_spec.rb index 3d4d9a7ea96..cce38456df9 100644 --- a/spec/features/projects/user_views_empty_project_spec.rb +++ b/spec/features/projects/user_views_empty_project_spec.rb @@ -3,8 +3,8 @@ require 'spec_helper' RSpec.describe 'User views an empty project' do - let(:project) { create(:project, :empty_repo) } - let(:user) { create(:user) } + let_it_be(:project) { create(:project, :empty_repo) } + let_it_be(:user) { create(:user) } shared_examples 'allowing push to default branch' do it 'shows push-to-master instructions' do @@ -14,17 +14,25 @@ RSpec.describe 'User views an empty project' do end end - describe 'as a maintainer' do + context 'when user is a maintainer' do before do project.add_maintainer(user) sign_in(user) end it_behaves_like 'allowing push to default branch' + + it 'shows a link for inviting members and launches invite modal', :js do + visit project_path(project) + + click_button 'Invite members' + + expect(page).to have_content("You're inviting members to the") + end end - describe 'as an admin' do - let(:user) { create(:user, :admin) } + context 'when user is an admin' do + let_it_be(:user) { create(:user, :admin) } context 'when admin mode is enabled' do before do @@ -44,16 +52,17 @@ RSpec.describe 'User views an empty project' do end end - describe 'as a developer' do + context 'when user is a developer' do before do project.add_developer(user) sign_in(user) end - it 'does not show push-to-master instructions' do + it 'does not show push-to-master instructions nor invite members link', :aggregate_failures, :js do visit project_path(project) expect(page).not_to have_content('git push -u origin master') + expect(page).not_to have_button(text: 'Invite members') end end end diff --git a/spec/features/projects/wiki/user_views_wiki_empty_spec.rb b/spec/features/projects/wiki/user_views_wiki_empty_spec.rb index 1f460f39267..ea045ddb6a1 100644 --- a/spec/features/projects/wiki/user_views_wiki_empty_spec.rb +++ b/spec/features/projects/wiki/user_views_wiki_empty_spec.rb @@ -75,7 +75,7 @@ RSpec.describe 'Project > User views empty wiki' do context 'and Confluence is already enabled' do before do - create(:confluence_service, project: project) + create(:confluence_integration, project: project) end it_behaves_like 'empty wiki message', writable: true, issuable: true, confluence: false diff --git a/spec/features/projects/wiki/user_views_wiki_in_project_page_spec.rb b/spec/features/projects/wiki/user_views_wiki_in_project_page_spec.rb index 30b94495e3d..63ee89bd11f 100644 --- a/spec/features/projects/wiki/user_views_wiki_in_project_page_spec.rb +++ b/spec/features/projects/wiki/user_views_wiki_in_project_page_spec.rb @@ -3,15 +3,12 @@ require 'spec_helper' RSpec.describe 'Projects > Wiki > User views wiki in project page' do - let(:user) { create(:user) } - before do - project.add_maintainer(user) - sign_in(user) + sign_in(project.owner) end context 'when repository is disabled for project' do - let(:project) do + let_it_be(:project) do create(:project, :wiki_repo, :repository_disabled, |