diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /spec/views | |
parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'spec/views')
92 files changed, 208 insertions, 214 deletions
diff --git a/spec/views/admin/application_settings/_eks.html.haml_spec.rb b/spec/views/admin/application_settings/_eks.html.haml_spec.rb index 52434557d3a..2f45eaadc9f 100644 --- a/spec/views/admin/application_settings/_eks.html.haml_spec.rb +++ b/spec/views/admin/application_settings/_eks.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'admin/application_settings/_eks' do +RSpec.describe 'admin/application_settings/_eks' do let_it_be(:admin) { create(:admin) } let(:page) { Capybara::Node::Simple.new(rendered) } diff --git a/spec/views/admin/application_settings/_repository_storage.html.haml_spec.rb b/spec/views/admin/application_settings/_repository_storage.html.haml_spec.rb index 63236dbb0c4..2915fe1964f 100644 --- a/spec/views/admin/application_settings/_repository_storage.html.haml_spec.rb +++ b/spec/views/admin/application_settings/_repository_storage.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'admin/application_settings/_repository_storage.html.haml' do +RSpec.describe 'admin/application_settings/_repository_storage.html.haml' do let(:app_settings) { create(:application_setting) } let(:repository_storages_weighted_attributes) { [:repository_storages_weighted_default, :repository_storages_weighted_mepmep, :repository_storages_weighted_foobar]} let(:repository_storages_weighted) do diff --git a/spec/views/admin/application_settings/general.html.haml_spec.rb b/spec/views/admin/application_settings/general.html.haml_spec.rb index d8ca5dd1b49..5343847d755 100644 --- a/spec/views/admin/application_settings/general.html.haml_spec.rb +++ b/spec/views/admin/application_settings/general.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'admin/application_settings/general.html.haml' do +RSpec.describe 'admin/application_settings/general.html.haml' do let(:app_settings) { build(:application_setting) } let(:user) { create(:admin) } diff --git a/spec/views/admin/application_settings/repository.html.haml_spec.rb b/spec/views/admin/application_settings/repository.html.haml_spec.rb new file mode 100644 index 00000000000..b110bc277ac --- /dev/null +++ b/spec/views/admin/application_settings/repository.html.haml_spec.rb @@ -0,0 +1,46 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe 'admin/application_settings/repository.html.haml' do + let(:app_settings) { build(:application_setting) } + let(:user) { create(:admin) } + + before do + assign(:application_setting, app_settings) + allow(view).to receive(:current_user).and_return(user) + end + + describe 'default initial branch name' do + context 'when the feature flag is disabled' do + before do + stub_feature_flags(global_default_branch_name: false) + end + + it 'does not show the setting section' do + render + + expect(rendered).not_to have_css("#js-default-branch-name") + end + end + + context 'when the feature flag is enabled' do + before do + stub_feature_flags(global_default_branch_name: true) + end + + it 'has the setting section' do + render + + expect(rendered).to have_css("#js-default-branch-name") + end + + it 'renders the correct setting section content' do + render + + expect(rendered).to have_content("Default initial branch name") + expect(rendered).to have_content("Set the default name of the initial branch when creating new repositories through the user interface.") + end + end + end +end diff --git a/spec/views/admin/dashboard/index.html.haml_spec.rb b/spec/views/admin/dashboard/index.html.haml_spec.rb index 93fedde6e96..569a20e8f08 100644 --- a/spec/views/admin/dashboard/index.html.haml_spec.rb +++ b/spec/views/admin/dashboard/index.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'admin/dashboard/index.html.haml' do +RSpec.describe 'admin/dashboard/index.html.haml' do include Devise::Test::ControllerHelpers before do diff --git a/spec/views/admin/sessions/new.html.haml_spec.rb b/spec/views/admin/sessions/new.html.haml_spec.rb index b52ad0f9505..94870f0bdba 100644 --- a/spec/views/admin/sessions/new.html.haml_spec.rb +++ b/spec/views/admin/sessions/new.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'admin/sessions/new.html.haml' do +RSpec.describe 'admin/sessions/new.html.haml' do let(:user) { create(:admin) } before do diff --git a/spec/views/admin/sessions/two_factor.html.haml_spec.rb b/spec/views/admin/sessions/two_factor.html.haml_spec.rb index 2c061c7707b..9c5ff9925c1 100644 --- a/spec/views/admin/sessions/two_factor.html.haml_spec.rb +++ b/spec/views/admin/sessions/two_factor.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'admin/sessions/two_factor.html.haml' do +RSpec.describe 'admin/sessions/two_factor.html.haml' do before do allow(view).to receive(:current_user).and_return(user) end diff --git a/spec/views/admin/users/_user.html.haml_spec.rb b/spec/views/admin/users/_user.html.haml_spec.rb index de5a291a6f8..aed05e4ea9b 100644 --- a/spec/views/admin/users/_user.html.haml_spec.rb +++ b/spec/views/admin/users/_user.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'admin/users/_user.html.haml' do +RSpec.describe 'admin/users/_user.html.haml' do before do allow(view).to receive(:user).and_return(user) end diff --git a/spec/views/ci/status/_badge.html.haml_spec.rb b/spec/views/ci/status/_badge.html.haml_spec.rb index 59db828a0c7..6cbd9a61e98 100644 --- a/spec/views/ci/status/_badge.html.haml_spec.rb +++ b/spec/views/ci/status/_badge.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'ci/status/_badge' do +RSpec.describe 'ci/status/_badge' do let(:user) { create(:user) } let(:project) { create(:project, :private) } let(:pipeline) { create(:ci_pipeline, project: project) } diff --git a/spec/views/ci/status/_icon.html.haml_spec.rb b/spec/views/ci/status/_icon.html.haml_spec.rb index 626159fc512..d0579734451 100644 --- a/spec/views/ci/status/_icon.html.haml_spec.rb +++ b/spec/views/ci/status/_icon.html.haml_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -describe 'ci/status/_icon' do +RSpec.describe 'ci/status/_icon' do let(:user) { create(:user) } let(:project) { create(:project, :private) } let(:pipeline) { create(:ci_pipeline, project: project) } diff --git a/spec/views/dashboard/projects/_blank_state_admin_welcome.haml_spec.rb b/spec/views/dashboard/projects/_blank_state_admin_welcome.haml_spec.rb index bc92278bb22..9c064596f09 100644 --- a/spec/views/dashboard/projects/_blank_state_admin_welcome.haml_spec.rb +++ b/spec/views/dashboard/projects/_blank_state_admin_welcome.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'dashboard/projects/_blank_state_admin_welcome.html.haml' do +RSpec.describe 'dashboard/projects/_blank_state_admin_welcome.html.haml' do let(:user) { create(:admin) } before do diff --git a/spec/views/dashboard/projects/_nav.html.haml_spec.rb b/spec/views/dashboard/projects/_nav.html.haml_spec.rb index 61b6bfef120..a592c4e44d2 100644 --- a/spec/views/dashboard/projects/_nav.html.haml_spec.rb +++ b/spec/views/dashboard/projects/_nav.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'dashboard/projects/_nav.html.haml' do +RSpec.describe 'dashboard/projects/_nav.html.haml' do it 'highlights All tab by default' do render diff --git a/spec/views/devise/sessions/new.html.haml_spec.rb b/spec/views/devise/sessions/new.html.haml_spec.rb index 27bd683bbf0..b5c69f4f04d 100644 --- a/spec/views/devise/sessions/new.html.haml_spec.rb +++ b/spec/views/devise/sessions/new.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'devise/sessions/new' do +RSpec.describe 'devise/sessions/new' do describe 'ldap' do include LdapHelpers diff --git a/spec/views/devise/shared/_signin_box.html.haml_spec.rb b/spec/views/devise/shared/_signin_box.html.haml_spec.rb index dfd8c315e50..8b1af1866dc 100644 --- a/spec/views/devise/shared/_signin_box.html.haml_spec.rb +++ b/spec/views/devise/shared/_signin_box.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'devise/shared/_signin_box' do +RSpec.describe 'devise/shared/_signin_box' do describe 'Crowd form' do before do stub_devise diff --git a/spec/views/errors/access_denied.html.haml_spec.rb b/spec/views/errors/access_denied.html.haml_spec.rb index b2e82847ab9..276d94111c6 100644 --- a/spec/views/errors/access_denied.html.haml_spec.rb +++ b/spec/views/errors/access_denied.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'errors/access_denied' do +RSpec.describe 'errors/access_denied' do it 'does not fail to render when there is no message provided' do expect { render }.not_to raise_error end diff --git a/spec/views/events/event/_push.html.haml_spec.rb b/spec/views/events/event/_push.html.haml_spec.rb index d33a8aa86fc..f4d3258ff67 100644 --- a/spec/views/events/event/_push.html.haml_spec.rb +++ b/spec/views/events/event/_push.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'events/event/_push.html.haml' do +RSpec.describe 'events/event/_push.html.haml' do let(:event) { build_stubbed(:push_event) } context 'with a branch' do diff --git a/spec/views/groups/_home_panel.html.haml_spec.rb b/spec/views/groups/_home_panel.html.haml_spec.rb index 8960dfa67db..b8168b20450 100644 --- a/spec/views/groups/_home_panel.html.haml_spec.rb +++ b/spec/views/groups/_home_panel.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'groups/_home_panel' do +RSpec.describe 'groups/_home_panel' do let(:group) { create(:group) } before do diff --git a/spec/views/groups/edit.html.haml_spec.rb b/spec/views/groups/edit.html.haml_spec.rb index 9fc850841ee..83623ea7bb4 100644 --- a/spec/views/groups/edit.html.haml_spec.rb +++ b/spec/views/groups/edit.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'groups/edit.html.haml' do +RSpec.describe 'groups/edit.html.haml' do include Devise::Test::ControllerHelpers describe '"Share with group lock" setting' do diff --git a/spec/views/help/index.html.haml_spec.rb b/spec/views/help/index.html.haml_spec.rb index 3831ddacb72..c59790a346e 100644 --- a/spec/views/help/index.html.haml_spec.rb +++ b/spec/views/help/index.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'help/index' do +RSpec.describe 'help/index' do include StubVersion describe 'version information' do diff --git a/spec/views/help/instance_configuration.html.haml_spec.rb b/spec/views/help/instance_configuration.html.haml_spec.rb index 81d569b5cf4..7b431bb4180 100644 --- a/spec/views/help/instance_configuration.html.haml_spec.rb +++ b/spec/views/help/instance_configuration.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'help/instance_configuration' do +RSpec.describe 'help/instance_configuration' do describe 'General Sections:' do let(:instance_configuration) { build(:instance_configuration)} let(:settings) { instance_configuration.settings } diff --git a/spec/views/help/show.html.haml_spec.rb b/spec/views/help/show.html.haml_spec.rb index 539c647c1d3..ab303919673 100644 --- a/spec/views/help/show.html.haml_spec.rb +++ b/spec/views/help/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'help/show' do +RSpec.describe 'help/show' do describe 'Markdown rendering' do before do assign(:path, 'ssh/README') diff --git a/spec/views/import/gitlab_projects/new.html.haml_spec.rb b/spec/views/import/gitlab_projects/new.html.haml_spec.rb index 17636c99cbc..c09c798f487 100644 --- a/spec/views/import/gitlab_projects/new.html.haml_spec.rb +++ b/spec/views/import/gitlab_projects/new.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'import/gitlab_projects/new.html.haml' do +RSpec.describe 'import/gitlab_projects/new.html.haml' do include Devise::Test::ControllerHelpers let(:namespace) { build_stubbed(:namespace) } diff --git a/spec/views/layouts/_head.html.haml_spec.rb b/spec/views/layouts/_head.html.haml_spec.rb index 7011fa23327..25fcbeb61df 100644 --- a/spec/views/layouts/_head.html.haml_spec.rb +++ b/spec/views/layouts/_head.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'layouts/_head' do +RSpec.describe 'layouts/_head' do include StubConfiguration before do diff --git a/spec/views/layouts/application.html.haml_spec.rb b/spec/views/layouts/application.html.haml_spec.rb index 4270bbf1924..679d0b1ff60 100644 --- a/spec/views/layouts/application.html.haml_spec.rb +++ b/spec/views/layouts/application.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'layouts/application' do +RSpec.describe 'layouts/application' do let(:user) { create(:user) } before do diff --git a/spec/views/layouts/header/_new_dropdown.haml_spec.rb b/spec/views/layouts/header/_new_dropdown.haml_spec.rb index 1a04ffed103..cf33ec9884b 100644 --- a/spec/views/layouts/header/_new_dropdown.haml_spec.rb +++ b/spec/views/layouts/header/_new_dropdown.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'layouts/header/_new_dropdown' do +RSpec.describe 'layouts/header/_new_dropdown' do let(:user) { create(:user) } context 'group-specific links' do diff --git a/spec/views/layouts/nav/sidebar/_admin.html.haml_spec.rb b/spec/views/layouts/nav/sidebar/_admin.html.haml_spec.rb index 2f8a75a81c8..d1e756422d5 100644 --- a/spec/views/layouts/nav/sidebar/_admin.html.haml_spec.rb +++ b/spec/views/layouts/nav/sidebar/_admin.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'layouts/nav/sidebar/_admin' do +RSpec.describe 'layouts/nav/sidebar/_admin' do shared_examples 'page has active tab' do |title| it "activates #{title} tab" do render diff --git a/spec/views/layouts/nav/sidebar/_group.html.haml_spec.rb b/spec/views/layouts/nav/sidebar/_group.html.haml_spec.rb index 24b66a0e767..b3c8450fb48 100644 --- a/spec/views/layouts/nav/sidebar/_group.html.haml_spec.rb +++ b/spec/views/layouts/nav/sidebar/_group.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'layouts/nav/sidebar/_group' do +RSpec.describe 'layouts/nav/sidebar/_group' do let(:group) { create(:group) } before do diff --git a/spec/views/layouts/nav/sidebar/_instance_statistics.html.haml_spec.rb b/spec/views/layouts/nav/sidebar/_instance_statistics.html.haml_spec.rb index 7f7f5637035..d3b57f6dfcf 100644 --- a/spec/views/layouts/nav/sidebar/_instance_statistics.html.haml_spec.rb +++ b/spec/views/layouts/nav/sidebar/_instance_statistics.html.haml_spec.rb @@ -2,6 +2,6 @@ require 'spec_helper' -describe 'layouts/nav/sidebar/_instance_statistics' do +RSpec.describe 'layouts/nav/sidebar/_instance_statistics' do it_behaves_like 'has nav sidebar' end diff --git a/spec/views/layouts/nav/sidebar/_profile.html.haml_spec.rb b/spec/views/layouts/nav/sidebar/_profile.html.haml_spec.rb index 6b820ab0b4c..0f6dcf8e57f 100644 --- a/spec/views/layouts/nav/sidebar/_profile.html.haml_spec.rb +++ b/spec/views/layouts/nav/sidebar/_profile.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'layouts/nav/sidebar/_profile' do +RSpec.describe 'layouts/nav/sidebar/_profile' do let(:user) { create(:user) } before do diff --git a/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb b/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb index 881ea818cb0..bf0bf63e164 100644 --- a/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb +++ b/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'layouts/nav/sidebar/_project' do +RSpec.describe 'layouts/nav/sidebar/_project' do let(:project) { create(:project, :repository) } before do @@ -76,7 +76,7 @@ describe 'layouts/nav/sidebar/_project' do it 'does not show the wiki tab' do render - expect(rendered).not_to have_link('Wiki', href: wiki_path(project.wiki)) + expect(rendered).not_to have_link('Wiki') end end end @@ -109,6 +109,38 @@ describe 'layouts/nav/sidebar/_project' do end end + describe 'confluence tab' do + let!(:service) { create(:confluence_service, project: project, active: active) } + + before do + render + end + + context 'when the Confluence integration is active' do + let(:active) { true } + + it 'shows the Confluence tab' do + expect(rendered).to have_link('Confluence', href: project_wikis_confluence_path(project)) + end + + it 'does not show the GitLab wiki tab' do + expect(rendered).not_to have_link('Wiki') + end + end + + context 'when it is disabled' do + let(:active) { false } + + it 'does not show the Confluence tab' do + expect(rendered).not_to have_link('Confluence') + end + + it 'shows the GitLab wiki tab' do + expect(rendered).to have_link('Wiki', href: wiki_path(project.wiki)) + end + end + end + describe 'ci/cd settings tab' do before do project.update!(archived: project_archived) diff --git a/spec/views/notify/changed_milestone_email.html.haml_spec.rb b/spec/views/notify/changed_milestone_email.html.haml_spec.rb index 194b58840a3..50a06683409 100644 --- a/spec/views/notify/changed_milestone_email.html.haml_spec.rb +++ b/spec/views/notify/changed_milestone_email.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'notify/changed_milestone_email.html.haml' do +RSpec.describe 'notify/changed_milestone_email.html.haml' do let(:milestone) { create(:milestone, title: 'some-milestone') } let(:milestone_link) { milestone_url(milestone) } diff --git a/spec/views/notify/pipeline_failed_email.html.haml_spec.rb b/spec/views/notify/pipeline_failed_email.html.haml_spec.rb index 80dc14b523d..b41933f9c36 100644 --- a/spec/views/notify/pipeline_failed_email.html.haml_spec.rb +++ b/spec/views/notify/pipeline_failed_email.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'notify/pipeline_failed_email.html.haml' do +RSpec.describe 'notify/pipeline_failed_email.html.haml' do it_behaves_like 'pipeline status changes email' do let(:title) { 'Your pipeline has failed' } let(:status) { :failed } diff --git a/spec/views/notify/pipeline_failed_email.text.erb_spec.rb b/spec/views/notify/pipeline_failed_email.text.erb_spec.rb index 9a4cea408a6..a5c31632b0d 100644 --- a/spec/views/notify/pipeline_failed_email.text.erb_spec.rb +++ b/spec/views/notify/pipeline_failed_email.text.erb_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -describe 'notify/pipeline_failed_email.text.erb' do +RSpec.describe 'notify/pipeline_failed_email.text.erb' do include Devise::Test::ControllerHelpers let(:user) { create(:user, developer_projects: [project]) } diff --git a/spec/views/notify/pipeline_fixed_email.html.haml_spec.rb b/spec/views/notify/pipeline_fixed_email.html.haml_spec.rb index 382fc5ecdd3..2b3b08f8e8c 100644 --- a/spec/views/notify/pipeline_fixed_email.html.haml_spec.rb +++ b/spec/views/notify/pipeline_fixed_email.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'notify/pipeline_fixed_email.html.haml' do +RSpec.describe 'notify/pipeline_fixed_email.html.haml' do it_behaves_like 'pipeline status changes email' do let(:title) { 'Your pipeline has been fixed!' } let(:status) { :success } diff --git a/spec/views/notify/pipeline_fixed_email.text.erb_spec.rb b/spec/views/notify/pipeline_fixed_email.text.erb_spec.rb index ec540dc3f77..8640998acaa 100644 --- a/spec/views/notify/pipeline_fixed_email.text.erb_spec.rb +++ b/spec/views/notify/pipeline_fixed_email.text.erb_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'notify/pipeline_fixed_email.text.erb' do +RSpec.describe 'notify/pipeline_fixed_email.text.erb' do it_behaves_like 'pipeline status changes email' do let(:title) { 'Your pipeline has been fixed!' } let(:status) { :success } diff --git a/spec/views/notify/pipeline_success_email.html.haml_spec.rb b/spec/views/notify/pipeline_success_email.html.haml_spec.rb index 417909fd67b..51ea7ef5066 100644 --- a/spec/views/notify/pipeline_success_email.html.haml_spec.rb +++ b/spec/views/notify/pipeline_success_email.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'notify/pipeline_success_email.html.haml' do +RSpec.describe 'notify/pipeline_success_email.html.haml' do it_behaves_like 'pipeline status changes email' do let(:title) { 'Your pipeline has passed' } let(:status) { :success } diff --git a/spec/views/notify/pipeline_success_email.text.erb_spec.rb b/spec/views/notify/pipeline_success_email.text.erb_spec.rb index 4a914cab85e..3acf4dd3e26 100644 --- a/spec/views/notify/pipeline_success_email.text.erb_spec.rb +++ b/spec/views/notify/pipeline_success_email.text.erb_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'notify/pipeline_success_email.text.erb' do +RSpec.describe 'notify/pipeline_success_email.text.erb' do it_behaves_like 'pipeline status changes email' do let(:title) { 'Your pipeline has passed' } let(:status) { :success } diff --git a/spec/views/notify/push_to_merge_request_email.text.haml_spec.rb b/spec/views/notify/push_to_merge_request_email.text.haml_spec.rb new file mode 100644 index 00000000000..ce402533496 --- /dev/null +++ b/spec/views/notify/push_to_merge_request_email.text.haml_spec.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true +require 'spec_helper' + +RSpec.describe 'notify/push_to_merge_request_email.text.haml' do + let(:user) { create(:user, developer_projects: [project]) } + let(:project) { create(:project, :repository) } + let(:merge_request) { create(:merge_request, :simple, source_project: project) } + let(:new_commits) { project.repository.commits_between('be93687618e4b132087f430a4d8fc3a609c9b77c', '54fcc214b94e78d7a41a9a8fe6d87a5e59500e51') } + + before do + assign(:updated_by_user, user) + assign(:project, project) + assign(:merge_request, merge_request) + assign(:existing_commits, []) + assign(:new_commits, new_commits) + end + + it_behaves_like 'renders plain text email correctly' +end diff --git a/spec/views/profiles/preferences/show.html.haml_spec.rb b/spec/views/profiles/preferences/show.html.haml_spec.rb index 2e50e329cfd..5acfbfb9db1 100644 --- a/spec/views/profiles/preferences/show.html.haml_spec.rb +++ b/spec/views/profiles/preferences/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'profiles/preferences/show' do +RSpec.describe 'profiles/preferences/show' do using RSpec::Parameterized::TableSyntax let_it_be(:user) { build(:user) } diff --git a/spec/views/profiles/show.html.haml_spec.rb b/spec/views/profiles/show.html.haml_spec.rb index 14e6feed3ab..daa1d20e6b1 100644 --- a/spec/views/profiles/show.html.haml_spec.rb +++ b/spec/views/profiles/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'profiles/show' do +RSpec.describe 'profiles/show' do let(:user) { create(:user) } before do diff --git a/spec/views/projects/_home_panel.html.haml_spec.rb b/spec/views/projects/_home_panel.html.haml_spec.rb index 9956144b601..548dba7874a 100644 --- a/spec/views/projects/_home_panel.html.haml_spec.rb +++ b/spec/views/projects/_home_panel.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/_home_panel' do +RSpec.describe 'projects/_home_panel' do include ProjectForksHelper context 'notifications' do diff --git a/spec/views/projects/blob/_viewer.html.haml_spec.rb b/spec/views/projects/blob/_viewer.html.haml_spec.rb index a798a72fa76..893cfec1491 100644 --- a/spec/views/projects/blob/_viewer.html.haml_spec.rb +++ b/spec/views/projects/blob/_viewer.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/blob/_viewer.html.haml' do +RSpec.describe 'projects/blob/_viewer.html.haml' do include FakeBlobHelpers let(:project) { build(:project) } diff --git a/spec/views/projects/buttons/_dropdown.html.haml_spec.rb b/spec/views/projects/buttons/_dropdown.html.haml_spec.rb index 2bc1de040d5..fc9d7c3ea91 100644 --- a/spec/views/projects/buttons/_dropdown.html.haml_spec.rb +++ b/spec/views/projects/buttons/_dropdown.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/buttons/_dropdown' do +RSpec.describe 'projects/buttons/_dropdown' do let(:user) { create(:user) } context 'user with all abilities' do diff --git a/spec/views/projects/ci/lints/show.html.haml_spec.rb b/spec/views/projects/ci/lints/show.html.haml_spec.rb index 8c3cf04bae6..bcfb952ca66 100644 --- a/spec/views/projects/ci/lints/show.html.haml_spec.rb +++ b/spec/views/projects/ci/lints/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/ci/lints/show' do +RSpec.describe 'projects/ci/lints/show' do include Devise::Test::ControllerHelpers let(:project) { create(:project, :repository) } let(:config_processor) { Gitlab::Ci::YamlProcessor.new(YAML.dump(content)) } 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 1cb2f9a4301..bf5cb6fb25d 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 @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'clusters/clusters/gcp/_form' do +RSpec.describe 'clusters/clusters/gcp/_form' do let(:admin) { create(:admin) } let(:environment) { create(:environment) } let(:gcp_cluster) { create(:cluster, :provided_by_gcp) } diff --git a/spec/views/projects/commit/_commit_box.html.haml_spec.rb b/spec/views/projects/commit/_commit_box.html.haml_spec.rb index 07c530670d2..9c97696493e 100644 --- a/spec/views/projects/commit/_commit_box.html.haml_spec.rb +++ b/spec/views/projects/commit/_commit_box.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/commit/_commit_box.html.haml' do +RSpec.describe 'projects/commit/_commit_box.html.haml' do let(:user) { create(:user) } let(:project) { create(:project, :repository) } diff --git a/spec/views/projects/commit/branches.html.haml_spec.rb b/spec/views/projects/commit/branches.html.haml_spec.rb index 0fe7165a790..f1064be3047 100644 --- a/spec/views/projects/commit/branches.html.haml_spec.rb +++ b/spec/views/projects/commit/branches.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/commit/branches.html.haml' do +RSpec.describe 'projects/commit/branches.html.haml' do let(:project) { create(:project, :repository) } before do diff --git a/spec/views/projects/commit/show.html.haml_spec.rb b/spec/views/projects/commit/show.html.haml_spec.rb index af28a8f9193..c2970abbe9f 100644 --- a/spec/views/projects/commit/show.html.haml_spec.rb +++ b/spec/views/projects/commit/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/commit/show.html.haml' do +RSpec.describe 'projects/commit/show.html.haml' do let(:project) { create(:project, :repository) } let(:commit) { project.commit } diff --git a/spec/views/projects/commits/_commit.html.haml_spec.rb b/spec/views/projects/commits/_commit.html.haml_spec.rb index 1c01a7f9a9c..898d3baae19 100644 --- a/spec/views/projects/commits/_commit.html.haml_spec.rb +++ b/spec/views/projects/commits/_commit.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/commits/_commit.html.haml' do +RSpec.describe 'projects/commits/_commit.html.haml' do let(:template) { 'projects/commits/commit.html.haml' } let(:project) { create(:project, :repository) } let(:commit) { project.repository.commit(ref) } diff --git a/spec/views/projects/deployments/_confirm_rollback_modal_spec.html_spec.rb b/spec/views/projects/deployments/_confirm_rollback_modal_spec.html_spec.rb index 9168bc8e833..2fb7b6187eb 100644 --- a/spec/views/projects/deployments/_confirm_rollback_modal_spec.html_spec.rb +++ b/spec/views/projects/deployments/_confirm_rollback_modal_spec.html_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/deployments/_confirm_rollback_modal' do +RSpec.describe 'projects/deployments/_confirm_rollback_modal' do let(:environment) { create(:environment, :with_review_app) } let(:deployments) { environment.deployments } let(:project) { environment.project } diff --git a/spec/views/projects/diffs/_stats.html.haml_spec.rb b/spec/views/projects/diffs/_stats.html.haml_spec.rb index eb853596f98..f0580b50349 100644 --- a/spec/views/projects/diffs/_stats.html.haml_spec.rb +++ b/spec/views/projects/diffs/_stats.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/diffs/_stats.html.haml' do +RSpec.describe 'projects/diffs/_stats.html.haml' do let(:project) { create(:project, :repository) } let(:commit) { project.commit('570e7b2abdd848b95f2f578043fc23bd6f6fd24d') } diff --git a/spec/views/projects/diffs/_viewer.html.haml_spec.rb b/spec/views/projects/diffs/_viewer.html.haml_spec.rb index 27f271bb178..305c44190b4 100644 --- a/spec/views/projects/diffs/_viewer.html.haml_spec.rb +++ b/spec/views/projects/diffs/_viewer.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/diffs/_viewer.html.haml' do +RSpec.describe 'projects/diffs/_viewer.html.haml' do include FakeBlobHelpers let(:project) { create(:project, :repository) } diff --git a/spec/views/projects/edit.html.haml_spec.rb b/spec/views/projects/edit.html.haml_spec.rb index 0c0f74a41f0..b44d07d2ee4 100644 --- a/spec/views/projects/edit.html.haml_spec.rb +++ b/spec/views/projects/edit.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/edit' do +RSpec.describe 'projects/edit' do include Devise::Test::ControllerHelpers include ProjectForksHelper diff --git a/spec/views/projects/environments/terminal.html.haml_spec.rb b/spec/views/projects/environments/terminal.html.haml_spec.rb index b0b08a84f8d..bfb88f0f72b 100644 --- a/spec/views/projects/environments/terminal.html.haml_spec.rb +++ b/spec/views/projects/environments/terminal.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/environments/terminal' do +RSpec.describe 'projects/environments/terminal' do let!(:environment) { create(:environment, :with_review_app) } before do diff --git a/spec/views/projects/imports/new.html.haml_spec.rb b/spec/views/projects/imports/new.html.haml_spec.rb index 6cca369b9f6..edf9eadf924 100644 --- a/spec/views/projects/imports/new.html.haml_spec.rb +++ b/spec/views/projects/imports/new.html.haml_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -describe "projects/imports/new.html.haml" do +RSpec.describe "projects/imports/new.html.haml" do let(:user) { create(:user) } context 'when import fails' do diff --git a/spec/views/projects/issues/_related_branches.html.haml_spec.rb b/spec/views/projects/issues/_related_branches.html.haml_spec.rb index 6c9bbaea38c..ba6f7068024 100644 --- a/spec/views/projects/issues/_related_branches.html.haml_spec.rb +++ b/spec/views/projects/issues/_related_branches.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/issues/_related_branches' do +RSpec.describe 'projects/issues/_related_branches' do include Devise::Test::ControllerHelpers let(:pipeline) { build(:ci_pipeline, :success) } diff --git a/spec/views/projects/issues/import_csv/_button.html.haml_spec.rb b/spec/views/projects/issues/import_csv/_button.html.haml_spec.rb index 440edd376e0..8bc0a00d71c 100644 --- a/spec/views/projects/issues/import_csv/_button.html.haml_spec.rb +++ b/spec/views/projects/issues/import_csv/_button.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/issues/import_csv/_button' do +RSpec.describe 'projects/issues/import_csv/_button' do include Devise::Test::ControllerHelpers context 'when the user does not have edit permissions' do diff --git a/spec/views/projects/issues/show.html.haml_spec.rb b/spec/views/projects/issues/show.html.haml_spec.rb index 60a541916e9..b2d208f038a 100644 --- a/spec/views/projects/issues/show.html.haml_spec.rb +++ b/spec/views/projects/issues/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/issues/show' do +RSpec.describe 'projects/issues/show' do include_context 'project show action' context 'when the issue is closed' do @@ -23,7 +23,7 @@ describe 'projects/issues/show' do project.add_developer(user) end - it 'shows "Closed (moved)" if an issue has been moved' do + it 'shows "Closed (moved)" if an issue has been moved and closed' do render expect(rendered).to have_selector('.status-box-issue-closed:not(.hidden)', text: 'Closed (moved)') @@ -41,6 +41,14 @@ describe 'projects/issues/show' do expect(rendered).to have_selector("a[href=\"#{issue_path(new_issue)}\"]", text: 'moved') end + + it 'does not show "closed (moved)" if an issue has been moved and reopened (not closed)' do + allow(issue).to receive(:closed?).and_return(false) + + render + + expect(rendered).not_to have_selector('.status-box-issue-closed:not(.hidden)', text: 'Closed (moved)') + end end context 'when user cannot see moved issue' do diff --git a/spec/views/projects/jobs/_build.html.haml_spec.rb b/spec/views/projects/jobs/_build.html.haml_spec.rb index 681df77ea99..4256df9ce9a 100644 --- a/spec/views/projects/jobs/_build.html.haml_spec.rb +++ b/spec/views/projects/jobs/_build.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/ci/jobs/_build' do +RSpec.describe 'projects/ci/jobs/_build' do include Devise::Test::ControllerHelpers let(:project) { create(:project, :repository) } diff --git a/spec/views/projects/jobs/_generic_commit_status.html.haml_spec.rb b/spec/views/projects/jobs/_generic_commit_status.html.haml_spec.rb index f193ce0a552..9be2a6f0ce4 100644 --- a/spec/views/projects/jobs/_generic_commit_status.html.haml_spec.rb +++ b/spec/views/projects/jobs/_generic_commit_status.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/generic_commit_statuses/_generic_commit_status.html.haml' do +RSpec.describe 'projects/generic_commit_statuses/_generic_commit_status.html.haml' do include Devise::Test::ControllerHelpers let(:project) { create(:project, :repository) } diff --git a/spec/views/projects/jobs/show.html.haml_spec.rb b/spec/views/projects/jobs/show.html.haml_spec.rb index 903a16d9e53..83a00135629 100644 --- a/spec/views/projects/jobs/show.html.haml_spec.rb +++ b/spec/views/projects/jobs/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/jobs/show' do +RSpec.describe 'projects/jobs/show' do let(:user) { create(:user) } let(:project) { create(:project, :repository) } let(:build) { create(:ci_build, pipeline: pipeline) } diff --git a/spec/views/projects/merge_requests/_commits.html.haml_spec.rb b/spec/views/projects/merge_requests/_commits.html.haml_spec.rb index 755a40a7e4c..fd77c4eb372 100644 --- a/spec/views/projects/merge_requests/_commits.html.haml_spec.rb +++ b/spec/views/projects/merge_requests/_commits.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/merge_requests/_commits.html.haml', :sidekiq_might_not_need_inline do +RSpec.describe 'projects/merge_requests/_commits.html.haml', :sidekiq_might_not_need_inline do include Devise::Test::ControllerHelpers include ProjectForksHelper diff --git a/spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb b/spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb index f7db4a4d614..038a94fe7c3 100644 --- a/spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb +++ b/spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/merge_requests/creations/_new_submit.html.haml' do +RSpec.describe 'projects/merge_requests/creations/_new_submit.html.haml' do let(:merge_request) { create(:merge_request) } let!(:pipeline) { create(:ci_empty_pipeline) } diff --git a/spec/views/projects/merge_requests/diffs/_diffs.html.haml_spec.rb b/spec/views/projects/merge_requests/diffs/_diffs.html.haml_spec.rb index a82ef3c04b5..7cdc817d784 100644 --- a/spec/views/projects/merge_requests/diffs/_diffs.html.haml_spec.rb +++ b/spec/views/projects/merge_requests/diffs/_diffs.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/merge_requests/diffs/_diffs.html.haml' do +RSpec.describe 'projects/merge_requests/diffs/_diffs.html.haml' do include Devise::Test::ControllerHelpers let(:user) { create(:user) } diff --git a/spec/views/projects/merge_requests/edit.html.haml_spec.rb b/spec/views/projects/merge_requests/edit.html.haml_spec.rb index 74d9067076c..55a74dc8229 100644 --- a/spec/views/projects/merge_requests/edit.html.haml_spec.rb +++ b/spec/views/projects/merge_requests/edit.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/merge_requests/edit.html.haml' do +RSpec.describe 'projects/merge_requests/edit.html.haml' do include Devise::Test::ControllerHelpers include ProjectForksHelper diff --git a/spec/views/projects/merge_requests/show.html.haml_spec.rb b/spec/views/projects/merge_requests/show.html.haml_spec.rb index e0acf5d1507..32819fc2cb0 100644 --- a/spec/views/projects/merge_requests/show.html.haml_spec.rb +++ b/spec/views/projects/merge_requests/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/merge_requests/show.html.haml' do +RSpec.describe 'projects/merge_requests/show.html.haml' do before do allow(view).to receive(:experiment_enabled?).and_return(false) end diff --git a/spec/views/projects/notes/_more_actions_dropdown.html.haml_spec.rb b/spec/views/projects/notes/_more_actions_dropdown.html.haml_spec.rb index a07523a4423..3776af9e757 100644 --- a/spec/views/projects/notes/_more_actions_dropdown.html.haml_spec.rb +++ b/spec/views/projects/notes/_more_actions_dropdown.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/notes/_more_actions_dropdown' do +RSpec.describe 'projects/notes/_more_actions_dropdown' do let(:author_user) { create(:user) } let(:not_author_user) { create(:user) } diff --git a/spec/views/projects/pages/show.html.haml_spec.rb b/spec/views/projects/pages/show.html.haml_spec.rb index 63b66616f31..fac46d08f0c 100644 --- a/spec/views/projects/pages/show.html.haml_spec.rb +++ b/spec/views/projects/pages/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/pages/show' do +RSpec.describe 'projects/pages/show' do include LetsEncryptHelpers let(:project) { create(:project, :repository) } diff --git a/spec/views/projects/pages_domains/show.html.haml_spec.rb b/spec/views/projects/pages_domains/show.html.haml_spec.rb index 2de82a63560..d2abe3dfa56 100644 --- a/spec/views/projects/pages_domains/show.html.haml_spec.rb +++ b/spec/views/projects/pages_domains/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/pages_domains/show' do +RSpec.describe 'projects/pages_domains/show' do let(:project) { create(:project, :repository) } before do diff --git a/spec/views/projects/pipeline_schedules/_pipeline_schedule.html.haml_spec.rb b/spec/views/projects/pipeline_schedules/_pipeline_schedule.html.haml_spec.rb index daf799ec13f..e650e183bc8 100644 --- a/spec/views/projects/pipeline_schedules/_pipeline_schedule.html.haml_spec.rb +++ b/spec/views/projects/pipeline_schedules/_pipeline_schedule.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/pipeline_schedules/_pipeline_schedule' do +RSpec.describe 'projects/pipeline_schedules/_pipeline_schedule' do let(:owner) { create(:user) } let(:maintainer) { create(:user) } let(:project) { create(:project) } diff --git a/spec/views/projects/pipelines/_stage.html.haml_spec.rb b/spec/views/projects/pipelines/_stage.html.haml_spec.rb index 591602859c3..c8f6784a0f6 100644 --- a/spec/views/projects/pipelines/_stage.html.haml_spec.rb +++ b/spec/views/projects/pipelines/_stage.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/pipelines/_stage' do +RSpec.describe 'projects/pipelines/_stage' do let(:project) { create(:project, :repository) } let(:pipeline) { create(:ci_pipeline, project: project) } let(:stage) { build(:ci_stage, pipeline: pipeline) } @@ -54,7 +54,7 @@ describe 'projects/pipelines/_stage' do context 'when there are multiple builds' do before do - HasStatus::AVAILABLE_STATUSES.each do |status| + Ci::HasStatus::AVAILABLE_STATUSES.each do |status| create_build(status) end end @@ -62,7 +62,7 @@ describe 'projects/pipelines/_stage' do it 'shows them in order' do render - expect(rendered).to have_text(HasStatus::ORDERED_STATUSES.join(" ")) + expect(rendered).to have_text(Ci::HasStatus::ORDERED_STATUSES.join(" ")) end def create_build(status) diff --git a/spec/views/projects/services/_form.haml_spec.rb b/spec/views/projects/services/_form.haml_spec.rb index 720e0aaf450..f5c4e79a082 100644 --- a/spec/views/projects/services/_form.haml_spec.rb +++ b/spec/views/projects/services/_form.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/services/_form' do +RSpec.describe 'projects/services/_form' do let(:project) { create(:redmine_project) } let(:user) { create(:admin) } diff --git a/spec/views/projects/services/edit.html.haml_spec.rb b/spec/views/projects/services/edit.html.haml_spec.rb index 12e1cda2c00..785af6a5344 100644 --- a/spec/views/projects/services/edit.html.haml_spec.rb +++ b/spec/views/projects/services/edit.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/services/edit' do +RSpec.describe 'projects/services/edit' do let(:service) { create(:drone_ci_service, project: project) } let(:project) { create(:project) } diff --git a/spec/views/projects/settings/ci_cd/_autodevops_form.html.haml_spec.rb b/spec/views/projects/settings/ci_cd/_autodevops_form.html.haml_spec.rb index d25860ab301..b3f59a59ac8 100644 --- a/spec/views/projects/settings/ci_cd/_autodevops_form.html.haml_spec.rb +++ b/spec/views/projects/settings/ci_cd/_autodevops_form.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/settings/ci_cd/_autodevops_form' do +RSpec.describe 'projects/settings/ci_cd/_autodevops_form' do let(:project) { create(:project, :repository) } before do 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 7d6faae0f5a..1f0b0ea76bf 100644 --- a/spec/views/projects/settings/operations/show.html.haml_spec.rb +++ b/spec/views/projects/settings/operations/show.html.haml_spec.rb @@ -2,9 +2,16 @@ require 'spec_helper' -describe 'projects/settings/operations/show' do - let(:project) { create(:project) } - let(:user) { create(:user) } +RSpec.describe 'projects/settings/operations/show' do + let_it_be(:project) { create(:project) } + let_it_be(:user) { create(:user) } + + let(:operations_show_locals) do + { + prometheus_service: project.find_or_initialize_service('prometheus'), + alerts_service: project.find_or_initialize_service('alerts') + } + end before do assign :project, project @@ -20,13 +27,13 @@ describe 'projects/settings/operations/show' do allow(view).to receive(:incident_management_available?) { false } end - let!(:error_tracking_setting) do + let_it_be(:error_tracking_setting) do create(:project_error_tracking_setting, project: project) end context 'Settings page ' do it 'renders the Operations Settings page' do - render template: "projects/settings/operations/show", locals: { prometheus_service: project.find_or_initialize_service('prometheus') } + render template: 'projects/settings/operations/show', locals: operations_show_locals expect(rendered).to have_content _('Error Tracking') expect(rendered).to have_content _('To link Sentry to GitLab, enter your Sentry URL and Auth Token') diff --git a/spec/views/projects/show.html.haml_spec.rb b/spec/views/projects/show.html.haml_spec.rb deleted file mode 100644 index c28260f422c..00000000000 --- a/spec/views/projects/show.html.haml_spec.rb +++ /dev/null @@ -1,41 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -describe 'projects/show.html.haml' do - include Devise::Test::ControllerHelpers - - let(:user) { create(:admin) } - let(:project) { create(:project, :repository) } - - before do - presented_project = project.present(current_user: user) - - allow(presented_project).to receive(:default_view).and_return('customize_workflow') - allow(controller).to receive(:current_user).and_return(user) - - assign(:project, presented_project) - end - - context 'commit signatures' do - context 'with vue tree view enabled' do - it 'are not rendered via js-signature-container' do - render - - expect(rendered).not_to have_css('.js-signature-container') - end - end - - context 'with vue tree view disabled' do - before do - stub_feature_flags(vue_file_list: false) - end - - it 'rendered via js-signature-container' do - render - - expect(rendered).to have_css('.js-signature-container') - end - end - end -end diff --git a/spec/views/projects/tags/index.html.haml_spec.rb b/spec/views/projects/tags/index.html.haml_spec.rb index 08fbada9c9c..4d501b82238 100644 --- a/spec/views/projects/tags/index.html.haml_spec.rb +++ b/spec/views/projects/tags/index.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/tags/index.html.haml' do +RSpec.describe 'projects/tags/index.html.haml' do let(:project) { create(:project, :repository) } let(:tags) { TagsFinder.new(project.repository, {}).execute } let(:git_tag) { project.repository.tags.last } diff --git a/spec/views/projects/tree/_tree_header.html.haml_spec.rb b/spec/views/projects/tree/_tree_header.html.haml_spec.rb deleted file mode 100644 index 69ad331f880..00000000000 --- a/spec/views/projects/tree/_tree_header.html.haml_spec.rb +++ /dev/null @@ -1,55 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -describe 'projects/tree/_tree_header' do - let(:project) { create(:project, :repository) } - let(:current_user) { create(:user) } - let(:repository) { project.repository } - - before do - stub_feature_flags(vue_file_list: false) - - assign(:project, project) - assign(:repository, repository) - assign(:id, File.join('master', '')) - assign(:ref, 'master') - - allow(view).to receive(:current_user).and_return(current_user) - allow(view).to receive(:can_collaborate_with_project?) { true } - end - - it 'renders the WebIDE button when user can collaborate but not create fork or MR' do - allow(view).to receive(:can?) { false } - - render - - expect(rendered).to have_link('Web IDE') - end - - it 'renders the WebIDE button when user can create fork and can open MR in project' do - allow(view).to receive(:can?) { true } - - render - - expect(rendered).to have_link('Web IDE') - end - - it 'opens a popup confirming a fork if the user can create fork/MR but cannot collaborate with the project' do - allow(view).to receive(:can?) { true } - allow(view).to receive(:can_collaborate_with_project?) { false } - - render - - expect(rendered).to have_link('Web IDE', href: '#modal-confirm-fork') - end - - it 'does not render the WebIDE button when user cannot collaborate or create mr' do - allow(view).to receive(:can?) { false } - allow(view).to receive(:can_collaborate_with_project?) { false } - - render - - expect(rendered).not_to have_link('Web IDE') - end -end diff --git a/spec/views/projects/tree/_tree_row.html.haml_spec.rb b/spec/views/projects/tree/_tree_row.html.haml_spec.rb index 864272fc146..43a37934afd 100644 --- a/spec/views/projects/tree/_tree_row.html.haml_spec.rb +++ b/spec/views/projects/tree/_tree_row.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/tree/_tree_row' do +RSpec.describe 'projects/tree/_tree_row' do let(:project) { create(:project, :repository) } let(:repository) { project.repository } diff --git a/spec/views/projects/tree/show.html.haml_spec.rb b/spec/views/projects/tree/show.html.haml_spec.rb index 8c6b229247d..bdf9b08d8f5 100644 --- a/spec/views/projects/tree/show.html.haml_spec.rb +++ b/spec/views/projects/tree/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/tree/show' do +RSpec.describe 'projects/tree/show' do include Devise::Test::ControllerHelpers let(:project) { create(:project, :repository) } @@ -39,26 +39,4 @@ describe 'projects/tree/show' do expect(rendered).to have_css('.js-project-refs-dropdown .dropdown-toggle-text', text: ref) end end - - context 'commit signatures' do - context 'with vue tree view disabled' do - before do - stub_feature_flags(vue_file_list: false) - end - - it 'rendered via js-signature-container' do - render - - expect(rendered).to have_css('.js-signature-container') - end - end - - context 'with vue tree view enabled' do - it 'are not rendered via js-signature-container' do - render - - expect(rendered).not_to have_css('.js-signature-container') - end - end - end end diff --git a/spec/views/search/_filter.html.haml_spec.rb b/spec/views/search/_filter.html.haml_spec.rb index d2cd636f8c6..eb32528e3c7 100644 --- a/spec/views/search/_filter.html.haml_spec.rb +++ b/spec/views/search/_filter.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'search/_filter' do +RSpec.describe 'search/_filter' do context 'when the search page is opened' do it 'displays the correct elements' do render diff --git a/spec/views/search/_form.html.haml_spec.rb b/spec/views/search/_form.html.haml_spec.rb index 69f40895d86..073a39e4ed6 100644 --- a/spec/views/search/_form.html.haml_spec.rb +++ b/spec/views/search/_form.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'search/_form' do +RSpec.describe 'search/_form' do context 'when the search page is opened' do it 'displays the correct elements' do render diff --git a/spec/views/search/_results.html.haml_spec.rb b/spec/views/search/_results.html.haml_spec.rb index 3243758c650..cd7a3559538 100644 --- a/spec/views/search/_results.html.haml_spec.rb +++ b/spec/views/search/_results.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'search/_results' do +RSpec.describe 'search/_results' do before do controller.params[:action] = 'show' diff --git a/spec/views/search/show.html.haml_spec.rb b/spec/views/search/show.html.haml_spec.rb index 483b913f2cc..9ddfe08c8f3 100644 --- a/spec/views/search/show.html.haml_spec.rb +++ b/spec/views/search/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'search/show' do +RSpec.describe 'search/show' do let(:search_term) { nil } before do diff --git a/spec/views/shared/_label_row.html.haml_spec.rb b/spec/views/shared/_label_row.html.haml_spec.rb index 0764f8480c8..1e2ed41bafc 100644 --- a/spec/views/shared/_label_row.html.haml_spec.rb +++ b/spec/views/shared/_label_row.html.haml_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -describe 'shared/_label_row.html.haml' do +RSpec.describe 'shared/_label_row.html.haml' do label_types = { 'project label': :label, 'group label': :group_label diff --git a/spec/views/shared/milestones/_issuable.html.haml_spec.rb b/spec/views/shared/milestones/_issuable.html.haml_spec.rb index 6e81fec79d4..46f79f60bbe 100644 --- a/spec/views/shared/milestones/_issuable.html.haml_spec.rb +++ b/spec/views/shared/milestones/_issuable.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'shared/milestones/_issuable.html.haml' do +RSpec.describe 'shared/milestones/_issuable.html.haml' do let_it_be(:project) { create(:project) } let_it_be(:user) { create(:user) } let_it_be(:milestone) { create(:milestone, project: project) } diff --git a/spec/views/shared/milestones/_issuables.html.haml_spec.rb b/spec/views/shared/milestones/_issuables.html.haml_spec.rb index f77c14a687b..70ab6914580 100644 --- a/spec/views/shared/milestones/_issuables.html.haml_spec.rb +++ b/spec/views/shared/milestones/_issuables.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'shared/milestones/_issuables.html.haml' do +RSpec.describe 'shared/milestones/_issuables.html.haml' do let(:issuables_size) { 100 } before do diff --git a/spec/views/shared/milestones/_top.html.haml_spec.rb b/spec/views/shared/milestones/_top.html.haml_spec.rb index 2d72e278706..1aa971709f1 100644 --- a/spec/views/shared/milestones/_top.html.haml_spec.rb +++ b/spec/views/shared/milestones/_top.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'shared/milestones/_top.html.haml' do +RSpec.describe 'shared/milestones/_top.html.haml' do let_it_be(:group) { create(:group) } let(:project) { create(:project, group: group) } let(:milestone) { create(:milestone, project: project) } diff --git a/spec/views/shared/notes/_form.html.haml_spec.rb b/spec/views/shared/notes/_form.html.haml_spec.rb index d354c2f0100..b7bad4c5d78 100644 --- a/spec/views/shared/notes/_form.html.haml_spec.rb +++ b/spec/views/shared/notes/_form.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'shared/notes/_form' do +RSpec.describe 'shared/notes/_form' do include Devise::Test::ControllerHelpers let(:user) { create(:user) } diff --git a/spec/views/shared/projects/_list.html.haml_spec.rb b/spec/views/shared/projects/_list.html.haml_spec.rb index d6043921fc8..037f988257b 100644 --- a/spec/views/shared/projects/_list.html.haml_spec.rb +++ b/spec/views/shared/projects/_list.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'shared/projects/_list' do +RSpec.describe 'shared/projects/_list' do let(:group) { create(:group) } before do diff --git a/spec/views/shared/projects/_project.html.haml_spec.rb b/spec/views/shared/projects/_project.html.haml_spec.rb index 8c3b8768469..62f23338c48 100644 --- a/spec/views/shared/projects/_project.html.haml_spec.rb +++ b/spec/views/shared/projects/_project.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'shared/projects/_project.html.haml' do +RSpec.describe 'shared/projects/_project.html.haml' do let_it_be(:project) { create(:project) } before do diff --git a/spec/views/shared/runners/show.html.haml_spec.rb b/spec/views/shared/runners/show.html.haml_spec.rb index 5e92928b143..5e2812eb48a 100644 --- a/spec/views/shared/runners/show.html.haml_spec.rb +++ b/spec/views/shared/runners/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'shared/runners/show.html.haml' do +RSpec.describe 'shared/runners/show.html.haml' do include PageLayoutHelper let(:runner) do |