1 files changed, 24 insertions, 18 deletions
diff --git a/spec/features/commit_spec.rb b/spec/features/commit_spec.rb
index a9672569a4a..dd96b763e55 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
@@ -16,7 +16,6 @@ RSpec.describe 'Commit', feature_category: :source_code_management do
     let(:files) { commit.diffs.diff_files.to_a }
 
     before do
-      stub_feature_flags(async_commit_diff_files: false)
       project.add_maintainer(user)
       sign_in(user)
     end
@@ -28,15 +27,9 @@ RSpec.describe 'Commit', feature_category: :source_code_management do
         visit project_commit_path(project, commit)
       end
 
-      it "shows the short commit message" do
+      it "shows the short commit message, number of total changes and stats", :js, :aggregate_failures do
         expect(page).to have_content(commit.title)
-      end
-
-      it "reports the correct number of total changes" do
         expect(page).to have_content("Changes #{commit.diffs.size}")
-      end
-
-      it 'renders diff stats', :js do
         expect(page).to have_selector(".diff-stats")
       end
 
@@ -50,23 +43,36 @@ RSpec.describe 'Commit', feature_category: :source_code_management do
         visit project_commit_path(project, commit)
       end
 
-      it "shows an adjusted count for changed files on this page", :js do
-        expect(page).to have_content("Showing 1 changed file")
+      def diff_files_on_page
+        page.all('.files .diff-file').pluck(:id)
       end
 
-      it "shows only the first diff on the first page" do
-        expect(page).to have_selector(".files ##{files[0].file_hash}")
-        expect(page).not_to have_selector(".files ##{files[1].file_hash}")
-      end
+      it "shows paginated content and controls to navigate", :js, :aggregate_failures do
+        expect(page).to have_content("Showing 1 changed file")
+
+        wait_for_requests
+
+        expect(diff_files_on_page).to eq([files[0].file_hash])
 
-      it "can navigate to the second page" do
         within(".files .gl-pagination") do
           click_on("2")
         end
 
-        expect(page).not_to have_selector(".files ##{files[0].file_hash}")
-        expect(page).to have_selector(".files ##{files[1].file_hash}")
+        wait_for_requests
+
+        expect(diff_files_on_page).to eq([files[1].file_hash])
       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