diff options
Diffstat (limited to 'spec/views/layouts')
6 files changed, 59 insertions, 18 deletions
diff --git a/spec/views/layouts/_header_search.html.haml_spec.rb b/spec/views/layouts/_header_search.html.haml_spec.rb index 3ab4ae6a483..3a21bb3a92c 100644 --- a/spec/views/layouts/_header_search.html.haml_spec.rb +++ b/spec/views/layouts/_header_search.html.haml_spec.rb @@ -8,7 +8,7 @@ RSpec.describe 'layouts/_header_search' do let(:scope) { nil } let(:ref) { nil } let(:code_search) { false } - let(:for_snippets) { false} + let(:for_snippets) { false } let(:header_search_context) do { diff --git a/spec/views/layouts/_published_experiments.html.haml_spec.rb b/spec/views/layouts/_published_experiments.html.haml_spec.rb index 84894554bd9..072e4f2074e 100644 --- a/spec/views/layouts/_published_experiments.html.haml_spec.rb +++ b/spec/views/layouts/_published_experiments.html.haml_spec.rb @@ -13,10 +13,10 @@ RSpec.describe 'layouts/_published_experiments', :experiment do test_variant: :variant_name ) - experiment(:test_control) { } + experiment(:test_control) {} experiment(:test_excluded) { |e| e.exclude! } - experiment(:test_candidate) { |e| e.candidate { } } - experiment(:test_variant) { |e| e.variant(:variant_name) { } } + experiment(:test_candidate) { |e| e.candidate {} } + experiment(:test_variant) { |e| e.variant(:variant_name) {} } experiment(:test_published_only).publish render diff --git a/spec/views/layouts/fullscreen.html.haml_spec.rb b/spec/views/layouts/fullscreen.html.haml_spec.rb index 0ae2c76ebcb..14b382bc238 100644 --- a/spec/views/layouts/fullscreen.html.haml_spec.rb +++ b/spec/views/layouts/fullscreen.html.haml_spec.rb @@ -9,5 +9,46 @@ RSpec.describe 'layouts/fullscreen' do allow(view).to receive(:current_user_mode).and_return(Gitlab::Auth::CurrentUserMode.new(user)) end + it 'renders a flex container' do + render + + expect(rendered).to have_selector(".gl--flex-full.gl-h-full") + expect(rendered).to have_selector(".gl--flex-full.gl-w-full") + end + it_behaves_like 'a layout which reflects the application theme setting' + + describe 'sidebar' do + context 'when nav is set' do + before do + allow(view).to receive(:nav).and_return("admin") + render + end + + it 'renders the sidebar' do + expect(rendered).to render_template("layouts/nav/sidebar/_admin") + expect(rendered).to have_selector("aside.nav-sidebar") + end + + it 'adds the proper classes' do + expect(rendered).to have_selector(".layout-page.gl-mt-0\\!") + end + end + + describe 'when nav is not set' do + before do + allow(view).to receive(:nav).and_return(nil) + render + end + + it 'does not render the sidebar' do + expect(rendered).not_to render_template("layouts/nav/sidebar/_admin") + expect(rendered).not_to have_selector("aside.nav-sidebar") + end + + it 'not add classes' do + expect(rendered).not_to have_selector(".layout-page.gl-mt-0\\!") + end + end + end end diff --git a/spec/views/layouts/header/_new_dropdown.haml_spec.rb b/spec/views/layouts/header/_new_dropdown.haml_spec.rb index 79c22871b44..17251049c57 100644 --- a/spec/views/layouts/header/_new_dropdown.haml_spec.rb +++ b/spec/views/layouts/header/_new_dropdown.haml_spec.rb @@ -166,7 +166,7 @@ RSpec.describe 'layouts/header/_new_dropdown' do let(:user) { create(:user, :external) } it 'is nil' do - # We have to us `view.render` because `render` causes issues + # We have to use `view.render` because `render` causes issues # https://github.com/rails/rails/issues/41320 expect(view.render("layouts/header/new_dropdown")).to be_nil end 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 428e9cc8490..472a2f3cb34 100644 --- a/spec/views/layouts/nav/sidebar/_group.html.haml_spec.rb +++ b/spec/views/layouts/nav/sidebar/_group.html.haml_spec.rb @@ -109,7 +109,7 @@ RSpec.describe 'layouts/nav/sidebar/_group' do end end - describe 'Packages & Registries' do + describe 'Packages and registries' do it 'has a link to the package registry page' do stub_config(packages: { enabled: true }) @@ -178,10 +178,10 @@ RSpec.describe 'layouts/nav/sidebar/_group' do expect(rendered).to have_link('Applications', href: group_settings_applications_path(group)) end - it 'has a link to the Package & Registries settings page' do + it 'has a link to the Package and registry settings page' do render - expect(rendered).to have_link('Packages & Registries', href: group_settings_packages_and_registries_path(group)) + expect(rendered).to have_link('Packages and registries', href: group_settings_packages_and_registries_path(group)) end end end 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 9ae3f814679..e7d9a8a4708 100644 --- a/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb +++ b/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb @@ -70,8 +70,8 @@ RSpec.describe 'layouts/nav/sidebar/_project' do describe 'Learn GitLab' do it 'has a link to the learn GitLab' do allow(view).to receive(:learn_gitlab_enabled?).and_return(true) - allow_next_instance_of(LearnGitlab::Onboarding) do |onboarding| - expect(onboarding).to receive(:completed_percentage).and_return(20) + allow_next_instance_of(Onboarding::Completion) do |onboarding| + expect(onboarding).to receive(:percentage).and_return(20) end render @@ -559,7 +559,7 @@ RSpec.describe 'layouts/nav/sidebar/_project' do it 'top level navigation link is visible and points to package registry page' do render - expect(rendered).to have_link('Packages & Registries', href: project_packages_path(project)) + expect(rendered).to have_link('Packages and registries', href: project_packages_path(project)) end describe 'Packages Registry' do @@ -908,7 +908,7 @@ RSpec.describe 'layouts/nav/sidebar/_project' do end end - describe 'Packages & Registries' do + describe 'Packages and registries' do let(:packages_enabled) { false } before do @@ -919,20 +919,20 @@ RSpec.describe 'layouts/nav/sidebar/_project' do context 'when registry is enabled' do let(:registry_enabled) { true } - it 'has a link to the Packages & Registries settings' do + it 'has a link to the Package and registry settings' do render - expect(rendered).to have_link('Packages & Registries', href: project_settings_packages_and_registries_path(project)) + expect(rendered).to have_link('Packages and registries', href: project_settings_packages_and_registries_path(project)) end end context 'when registry is not enabled' do let(:registry_enabled) { false } - it 'does not have a link to the Packages & Registries settings' do + it 'does not have a link to the Package and registry settings' do render - expect(rendered).not_to have_link('Packages & Registries', href: project_settings_packages_and_registries_path(project)) + expect(rendered).not_to have_link('Packages and registries', href: project_settings_packages_and_registries_path(project)) end end @@ -940,10 +940,10 @@ RSpec.describe 'layouts/nav/sidebar/_project' do let(:registry_enabled) { false } let(:packages_enabled) { true } - it 'has a link to the Packages & Registries settings' do + it 'has a link to the Package and registry settings' do render - expect(rendered).to have_link('Packages & Registries', href: project_settings_packages_and_registries_path(project)) + expect(rendered).to have_link('Packages and registries', href: project_settings_packages_and_registries_path(project)) end end end |