diff options
Diffstat (limited to 'spec/views')
6 files changed, 50 insertions, 41 deletions
diff --git a/spec/views/admin/dashboard/index.html.haml_spec.rb b/spec/views/admin/dashboard/index.html.haml_spec.rb index 70fb77944cc..e9223c84674 100644 --- a/spec/views/admin/dashboard/index.html.haml_spec.rb +++ b/spec/views/admin/dashboard/index.html.haml_spec.rb @@ -37,7 +37,7 @@ RSpec.describe 'admin/dashboard/index.html.haml' do render expect(rendered).not_to have_content "Users in License" - expect(rendered).not_to have_content "Active Users" + expect(rendered).not_to have_content "Billable Users" expect(rendered).not_to have_content "Maximum Users" expect(rendered).not_to have_content "Users over License" end 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 777dc0c8571..2c37565328a 100644 --- a/spec/views/layouts/nav/sidebar/_admin.html.haml_spec.rb +++ b/spec/views/layouts/nav/sidebar/_admin.html.haml_spec.rb @@ -92,7 +92,11 @@ RSpec.describe 'layouts/nav/sidebar/_admin' do end context 'on settings' do + let(:gitlab_com?) { false } + before do + allow(::Gitlab).to receive(:com?) { gitlab_com? } + render end @@ -100,6 +104,20 @@ RSpec.describe 'layouts/nav/sidebar/_admin' do expect(rendered).to have_link('General', href: general_admin_application_settings_path) end + context 'when GitLab.com' do + let(:gitlab_com?) { true } + + it 'does not include Integrations link' do + expect(rendered).not_to have_link('Integrations', href: integrations_admin_application_settings_path) + end + end + + context 'when not GitLab.com' do + it 'includes Integrations link' do + expect(rendered).to have_link('Integrations', href: integrations_admin_application_settings_path) + end + end + context 'when GitLab FOSS' do it 'does not include Templates link' do expect(rendered).not_to have_link('Templates', href: '/admin/application_settings/templates') diff --git a/spec/views/profiles/preferences/show.html.haml_spec.rb b/spec/views/profiles/preferences/show.html.haml_spec.rb index 1b8b28367c1..1dae953227d 100644 --- a/spec/views/profiles/preferences/show.html.haml_spec.rb +++ b/spec/views/profiles/preferences/show.html.haml_spec.rb @@ -20,6 +20,14 @@ RSpec.describe 'profiles/preferences/show' do it 'has an id for anchoring' do expect(rendered).to have_css('#navigation-theme') end + + it 'has correct stylesheet tags' do + Gitlab::Themes.each do |theme| + next unless theme.css_filename + + expect(rendered).to have_selector("link[href*=\"themes/#{theme.css_filename}\"]", visible: false) + end + end end context 'syntax highlighting theme' do 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 deleted file mode 100644 index 7cdc817d784..00000000000 --- a/spec/views/projects/merge_requests/diffs/_diffs.html.haml_spec.rb +++ /dev/null @@ -1,38 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -RSpec.describe 'projects/merge_requests/diffs/_diffs.html.haml' do - include Devise::Test::ControllerHelpers - - let(:user) { create(:user) } - let(:project) { create(:project, :public, :repository) } - let(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project, author: user) } - - before do - allow(view).to receive(:url_for).and_return(controller.request.fullpath) - - assign(:merge_request, merge_request) - assign(:environment, merge_request.environments_for(user).last) - assign(:diffs, merge_request.diffs) - assign(:merge_request_diffs, merge_request.diffs) - assign(:diff_notes_disabled, true) # disable note creation - assign(:use_legacy_diff_notes, false) - assign(:grouped_diff_discussions, {}) - assign(:notes, []) - end - - context 'for a commit' do - let(:commit) { merge_request.commits.last } - - before do - assign(:commit, commit) - end - - it "shows the commit scope" do - render - - expect(rendered).to have_content "Only comments from the following commit are shown below" - end - end -end diff --git a/spec/views/search/_results.html.haml_spec.rb b/spec/views/search/_results.html.haml_spec.rb index 9e95dc40ff8..033b2304e33 100644 --- a/spec/views/search/_results.html.haml_spec.rb +++ b/spec/views/search/_results.html.haml_spec.rb @@ -60,6 +60,28 @@ RSpec.describe 'search/_results' do expect(rendered).to have_selector('#js-search-filter-by-state') end + + context 'Feature search_filter_by_confidential' do + context 'when disabled' do + before do + stub_feature_flags(search_filter_by_confidential: false) + end + + it 'does not render the confidential drop down' do + render + + expect(rendered).not_to have_selector('#js-search-filter-by-confidential') + end + end + + context 'when enabled' do + it 'renders the confidential drop down' do + render + + expect(rendered).to have_selector('#js-search-filter-by-confidential') + end + end + end end end end diff --git a/spec/views/shared/milestones/_issuables.html.haml_spec.rb b/spec/views/shared/milestones/_issuables.html.haml_spec.rb index 70ab6914580..5eed2c96a45 100644 --- a/spec/views/shared/milestones/_issuables.html.haml_spec.rb +++ b/spec/views/shared/milestones/_issuables.html.haml_spec.rb @@ -6,8 +6,7 @@ RSpec.describe 'shared/milestones/_issuables.html.haml' do let(:issuables_size) { 100 } before do - allow(view).to receive_messages(title: nil, id: nil, show_project_name: nil, - show_full_project_name: nil, dom_class: '', + allow(view).to receive_messages(title: nil, id: nil, show_project_name: nil, dom_class: '', issuables: double(length: issuables_size).as_null_object) stub_template 'shared/milestones/_issuable.html.haml' => '' |