Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 1 deletions

diff --git a/spec/features/commit_spec.rb b/spec/features/commit_spec.rb
index a9672569a4a..a3208ca6d37 100644
--- a/spec/features/commit_spec.rb
+++ b/spec/features/commit_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe 'Commit', feature_category: :source_code_management do
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:user) { create(:user) }
 
-  describe "single commit view" do
+  shared_examples "single commit view" do
     let(:commit) do
       project.repository.commits(nil, limit: 100).find do |commit|
         commit.diffs.size > 1
@@ -69,4 +69,15 @@ RSpec.describe 'Commit', feature_category: :source_code_management do
       end
     end
   end
+
+  it_behaves_like "single commit view"
+
+  context "when super sidebar is enabled" do
+    before do
+      user.update!(use_new_navigation: true)
+      stub_feature_flags(super_sidebar_nav: true)
+    end
+
+    it_behaves_like "single commit view"
+  end
 end