Add latest changes from gitlab-org/gitlab@master

2 files changed, 28 insertions, 0 deletions

diff --git a/spec/features/snippets/show_spec.rb b/spec/features/snippets/show_spec.rb
index a6e0bc32d42..2870f729765 100644
--- a/spec/features/snippets/show_spec.rb
+++ b/spec/features/snippets/show_spec.rb
@@ -24,4 +24,30 @@ RSpec.describe 'Snippet', :js, feature_category: :source_code_management do
 
     subject { visit snippet_path(snippet) }
   end
+
+  it_behaves_like 'a dashboard page with sidebar', :dashboard_snippets_path, :snippets
+
+  context 'when unauthenticated' do
+    it 'does not have the sidebar' do
+      visit snippet_path(snippet)
+
+      expect(page).to have_title _('Snippets')
+      expect(page).not_to have_css('aside.nav-sidebar')
+    end
+  end
+
+  context 'when authenticated as a different user' do
+    let_it_be(:different_user) { create(:user) }
+
+    before do
+      sign_in(different_user)
+    end
+
+    it 'does not have the sidebar' do
+      visit snippet_path(snippet)
+
+      expect(page).to have_title _('Snippets')
+      expect(page).not_to have_css('aside.nav-sidebar')
+    end
+  end
 end
diff --git a/spec/features/snippets/user_creates_snippet_spec.rb b/spec/features/snippets/user_creates_snippet_spec.rb
index 064250c5673..03f569fe4b0 100644
--- a/spec/features/snippets/user_creates_snippet_spec.rb
+++ b/spec/features/snippets/user_creates_snippet_spec.rb
@@ -21,6 +21,8 @@ RSpec.describe 'User creates snippet', :js, feature_category: :source_code_manag
     visit new_snippet_path
   end
 
+  it_behaves_like 'a dashboard page with sidebar', :new_snippet_path, :snippets
+
   def fill_form
     snippet_fill_in_form(title: title, content: file_content, description: md_description)
   end