diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /spec/views/shared | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) | |
download | gitlab-ce-a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4.tar.gz |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'spec/views/shared')
-rw-r--r-- | spec/views/shared/nav/_sidebar.html.haml_spec.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/spec/views/shared/nav/_sidebar.html.haml_spec.rb b/spec/views/shared/nav/_sidebar.html.haml_spec.rb index cf9452ba68c..2eeebdff7a8 100644 --- a/spec/views/shared/nav/_sidebar.html.haml_spec.rb +++ b/spec/views/shared/nav/_sidebar.html.haml_spec.rb @@ -25,13 +25,11 @@ RSpec.describe 'shared/nav/_sidebar.html.haml' do context 'when sidebar does not have a scope menu' do let(:scope_menu_view_path) { 'shared/nav/' } let(:scope_menu_view_name) { 'scope_menu.html.haml' } - let(:scope_menu_view) { "#{scope_menu_view_path}#{scope_menu_view_name}" } let(:scope_menu_partial) { "#{scope_menu_view_path}_#{scope_menu_view_name}" } let(:content) { 'Custom test content' } context 'when sidebar has a custom scope menu partial defined' do it 'renders the custom partial' do - allow(sidebar).to receive(:render_raw_scope_menu_partial).and_return(scope_menu_view) allow(view).to receive(:scope_menu).and_return(nil) stub_template(scope_menu_partial => content) |