1 files changed, 17 insertions, 23 deletions
diff --git a/spec/controllers/projects/merge_requests/diffs_controller_spec.rb b/spec/controllers/projects/merge_requests/diffs_controller_spec.rb
index a5c59b7e22d..367781c0e76 100644
--- a/spec/controllers/projects/merge_requests/diffs_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests/diffs_controller_spec.rb
@@ -220,29 +220,6 @@ RSpec.describe Projects::MergeRequests::DiffsController do
       end
     end
 
-    context "with the :default_merge_ref_for_diffs flag on" do
-      let(:diffable_merge_ref) { true }
-
-      subject do
-        go(diff_head: true,
-           diff_id: merge_request.merge_request_diff.id,
-           start_sha: merge_request.merge_request_diff.start_commit_sha)
-      end
-
-      it "correctly generates the right diff between versions" do
-        MergeRequests::MergeToRefService.new(project: project, current_user: merge_request.author).execute(merge_request)
-
-        expect_next_instance_of(CompareService) do |service|
-          expect(service).to receive(:execute).with(
-            project,
-            merge_request.merge_request_diff.head_commit_sha,
-            straight: true)
-        end
-
-        subject
-      end
-    end
-
     context 'with diff_head param passed' do
       before do
         allow(merge_request).to receive(:diffable_merge_ref?)
@@ -259,6 +236,23 @@ RSpec.describe Projects::MergeRequests::DiffsController do
 
           expect(response).to have_gitlab_http_status(:ok)
         end
+
+        context 'when diff_id and start_sha are set' do
+          it 'correctly generates the right diff between versions' do
+            MergeRequests::MergeToRefService.new(project: project, current_user: merge_request.author).execute(merge_request)
+
+            expect_next_instance_of(CompareService) do |service|
+              expect(service).to receive(:execute).with(
+                project,
+                merge_request.merge_request_diff.head_commit_sha,
+                straight: true)
+            end
+
+            go(diff_head: true,
+               diff_id: merge_request.merge_request_diff.id,
+               start_sha: merge_request.merge_request_diff.start_commit_sha)
+          end
+        end
       end
 
       context 'the merge request cannot be compared with head' do