diff options
Diffstat (limited to 'spec/views/projects')
5 files changed, 34 insertions, 88 deletions
diff --git a/spec/views/projects/clusters/clusters/gcp/_form.html.haml_spec.rb b/spec/views/projects/clusters/clusters/gcp/_form.html.haml_spec.rb index bf5cb6fb25d..5120998ded6 100644 --- a/spec/views/projects/clusters/clusters/gcp/_form.html.haml_spec.rb +++ b/spec/views/projects/clusters/clusters/gcp/_form.html.haml_spec.rb @@ -23,16 +23,4 @@ RSpec.describe 'clusters/clusters/gcp/_form' do expect(rendered).to have_selector("input[id='cluster_provider_gcp_attributes_cloud_run']") end end - - context 'with cloud run feature flag disabled' do - before do - stub_feature_flags(create_cloud_run_clusters: false) - end - - it 'does not have a cloud run checkbox' do - render - - expect(rendered).not_to have_selector("input[id='cluster_provider_gcp_attributes_cloud_run']") - end - end end diff --git a/spec/views/projects/empty.html.haml_spec.rb b/spec/views/projects/empty.html.haml_spec.rb index dd7b1bd94a9..7fa95507f75 100644 --- a/spec/views/projects/empty.html.haml_spec.rb +++ b/spec/views/projects/empty.html.haml_spec.rb @@ -46,47 +46,36 @@ RSpec.describe 'projects/empty' do end end - describe 'invite_members_empty_project_version_a experiment' do + context 'with invite button on empty projects' do let(:can_import_members) { true } before do allow(view).to receive(:can_import_members?).and_return(can_import_members) end - shared_examples_for 'no invite member info' do - it 'does not show invite member info' do - render + it 'shows invite members info', :aggregate_failures do + render - expect(rendered).not_to have_content('Invite your team') - end + expect(rendered).to have_selector('[data-track-event=render]') + expect(rendered).to have_selector('[data-track-label=invite_members_empty_project]') + expect(rendered).to have_content('Invite your team') + expect(rendered).to have_content('Add members to this project and start collaborating with your team.') + expect(rendered).to have_selector('.js-invite-members-trigger') + expect(rendered).to have_selector('.js-invite-members-modal') + expect(rendered).to have_selector('[data-label=invite_members_empty_project]') + expect(rendered).to have_selector('[data-event=click_button]') end - context 'when experiment is enabled' do - it 'shows invite members info', :aggregate_failures do - render - - expect(rendered).to have_selector('[data-track-event=render]') - expect(rendered).to have_selector('[data-track-label=invite_members_empty_project]', count: 2) - expect(rendered).to have_content('Invite your team') - expect(rendered).to have_content('Add members to this project and start collaborating with your team.') - expect(rendered).to have_link('Invite members', href: project_project_members_path(project, sort: :access_level_desc)) - expect(rendered).to have_selector('[data-track-event=click_button]') - end + context 'when user does not have permissions to invite members' do + let(:can_import_members) { false } - context 'when user does not have permissions to invite members' do - let(:can_import_members) { false } - - it_behaves_like 'no invite member info' - end - end + it 'does not show invite member info', :aggregate_failures do + render - context 'when experiment is not enabled' do - before do - allow(view).to receive(:experiment_enabled?) - .with(:invite_members_empty_project_version_a).and_return(false) + expect(rendered).not_to have_content('Invite your team') + expect(rendered).not_to have_selector('.js-invite-members-trigger') + expect(rendered).not_to have_selector('.js-invite-members-modal') end - - it_behaves_like 'no invite member info' end end end diff --git a/spec/views/projects/services/_form.haml_spec.rb b/spec/views/projects/services/_form.haml_spec.rb index 4ca64eb3129..f063e73dae4 100644 --- a/spec/views/projects/services/_form.haml_spec.rb +++ b/spec/views/projects/services/_form.haml_spec.rb @@ -11,19 +11,18 @@ RSpec.describe 'projects/services/_form' do allow(controller).to receive(:current_user).and_return(user) - allow(view).to receive_messages(current_user: user, - can?: true, - current_application_settings: Gitlab::CurrentSettings.current_application_settings, - request: double(referrer: '/services')) + allow(view).to receive_messages( + current_user: user, + can?: true, + current_application_settings: Gitlab::CurrentSettings.current_application_settings, + integration: project.redmine_service, + request: double(referer: '/services') + ) end context 'commit_events and merge_request_events' do - before do - assign(:service, project.redmine_service) - end - it 'display merge_request_events and commit_events descriptions' do - allow(RedmineService).to receive(:supported_events).and_return(%w(commit merge_request)) + allow(Integrations::Redmine).to receive(:supported_events).and_return(%w(commit merge_request)) render diff --git a/spec/views/projects/services/edit.html.haml_spec.rb b/spec/views/projects/services/edit.html.haml_spec.rb index 785af6a5344..a5460adbd2c 100644 --- a/spec/views/projects/services/edit.html.haml_spec.rb +++ b/spec/views/projects/services/edit.html.haml_spec.rb @@ -3,12 +3,12 @@ require 'spec_helper' RSpec.describe 'projects/services/edit' do - let(:service) { create(:drone_ci_service, project: project) } + let(:integration) { create(:drone_ci_integration, project: project) } let(:project) { create(:project) } before do assign :project, project - assign :service, service + assign :integration, integration end it do @@ -17,7 +17,7 @@ RSpec.describe 'projects/services/edit' do expect(rendered).not_to have_text('Recent Deliveries') end - context 'service using WebHooks' do + context 'integration using WebHooks' do before do assign(:web_hook_logs, []) end diff --git a/spec/views/projects/settings/operations/show.html.haml_spec.rb b/spec/views/projects/settings/operations/show.html.haml_spec.rb index ab868eb78b8..43c064e1a2b 100644 --- a/spec/views/projects/settings/operations/show.html.haml_spec.rb +++ b/spec/views/projects/settings/operations/show.html.haml_spec.rb @@ -36,7 +36,7 @@ RSpec.describe 'projects/settings/operations/show' do it 'renders the Operations Settings page' do render - expect(rendered).to have_content _('Alert integrations') + expect(rendered).to have_content _('Alerts') expect(rendered).to have_content _('Display alerts from all configured monitoring tools.') end end @@ -59,7 +59,7 @@ RSpec.describe 'projects/settings/operations/show' do expect(rendered).to have_content _('Prometheus') expect(rendered).to have_content _('Link Prometheus monitoring to GitLab.') - expect(rendered).to have_content _('To enable the installation of Prometheus on your clusters, deactivate the manual configuration.') + expect(rendered).to have_content _('To use a Prometheus installed on a cluster, deactivate the manual configuration.') end end @@ -77,41 +77,11 @@ RSpec.describe 'projects/settings/operations/show' do end describe 'Operations > Tracing' do - context 'with project.tracing_external_url' do - it 'links to project.tracing_external_url' do - render - - expect(rendered).to have_link('Tracing', href: tracing_setting.external_url) - end - - context 'with malicious external_url' do - let(:malicious_tracing_url) { "https://replaceme.com/'><script>alert(document.cookie)</script>" } - let(:cleaned_url) { "https://replaceme.com/'>" } - - before do - tracing_setting.update_column(:external_url, malicious_tracing_url) - end - - it 'sanitizes external_url' do - render - - expect(tracing_setting.external_url).to eq(malicious_tracing_url) - expect(rendered).to have_link('Tracing', href: cleaned_url) - end - end - end - - context 'without project.tracing_external_url' do - let(:tracing_setting) { build(:project_tracing_setting, project: project) } - - before do - tracing_setting.external_url = nil - end - - it 'links to Tracing page' do + context 'Settings page ' do + it 'renders the Tracing Settings page' do render - expect(rendered).to have_link('Tracing', href: project_tracing_path(project)) + expect(rendered).to have_content _('Embed an image of your existing Jaeger server in GitLab.') end end end |