1 files changed, 30 insertions, 41 deletions

diff --git a/spec/lib/gitlab/git/diff_spec.rb b/spec/lib/gitlab/git/diff_spec.rb
index d50ccb0df30..4a7b06003fc 100644
--- a/spec/lib/gitlab/git/diff_spec.rb
+++ b/spec/lib/gitlab/git/diff_spec.rb
@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe Gitlab::Git::Diff, seed_helper: true do
-  let(:repository) { Gitlab::Git::Repository.new('default', TEST_REPO_PATH) }
+  let(:repository) { Gitlab::Git::Repository.new('default', TEST_REPO_PATH, '') }
 
   before do
     @raw_diff_hash = {
@@ -31,36 +31,6 @@ EOT
                                           [".gitmodules"]).patches.first
   end
 
-  describe 'size limit feature toggles' do
-    context 'when the feature gitlab_git_diff_size_limit_increase is enabled' do
-      before do
-        Feature.enable('gitlab_git_diff_size_limit_increase')
-      end
-
-      it 'returns 200 KB for size_limit' do
-        expect(described_class.size_limit).to eq(200.kilobytes)
-      end
-
-      it 'returns 100 KB for collapse_limit' do
-        expect(described_class.collapse_limit).to eq(100.kilobytes)
-      end
-    end
-
-    context 'when the feature gitlab_git_diff_size_limit_increase is disabled' do
-      before do
-        Feature.disable('gitlab_git_diff_size_limit_increase')
-      end
-
-      it 'returns 100 KB for size_limit' do
-        expect(described_class.size_limit).to eq(100.kilobytes)
-      end
-
-      it 'returns 10 KB for collapse_limit' do
-        expect(described_class.collapse_limit).to eq(10.kilobytes)
-      end
-    end
-  end
-
   describe '.new' do
     context 'using a Hash' do
       context 'with a small diff' do
@@ -77,7 +47,7 @@ EOT
 
       context 'using a diff that is too large' do
         it 'prunes the diff' do
-          diff = described_class.new(diff: 'a' * (described_class.size_limit + 1))
+          diff = described_class.new(diff: 'a' * 204800)
 
           expect(diff.diff).to be_empty
           expect(diff).to be_too_large
@@ -115,8 +85,8 @@ EOT
           # The patch total size is 200, with lines between 21 and 54.
           # This is a quick-and-dirty way to test this. Ideally, a new patch is
           # added to the test repo with a size that falls between the real limits.
-          allow(Gitlab::Git::Diff).to receive(:size_limit).and_return(150)
-          allow(Gitlab::Git::Diff).to receive(:collapse_limit).and_return(100)
+          stub_const("#{described_class}::SIZE_LIMIT", 150)
+          stub_const("#{described_class}::COLLAPSE_LIMIT", 100)
         end
 
         it 'prunes the diff as a large diff instead of as a collapsed diff' do
@@ -180,7 +150,7 @@ EOT
         let(:raw_patch) { @raw_diff_hash[:diff].encode(Encoding::ASCII_8BIT) }
 
         it 'encodes diff patch to UTF-8' do
-          expect(diff.diff.encoding).to eq(Encoding::UTF_8)
+          expect(diff.diff).to be_utf8
         end
       end
     end
@@ -241,7 +211,7 @@ EOT
   end
 
   describe '.filter_diff_options' do
-    let(:options) { { max_size: 100, invalid_opt: true } }
+    let(:options) { { max_files: 100, invalid_opt: true } }
 
     context "without default options" do
       let(:filtered_options) { described_class.filter_diff_options(options) }
@@ -253,7 +223,7 @@ EOT
 
     context "with default options" do
       let(:filtered_options) do
-        default_options = { max_size: 5, bad_opt: 1, ignore_whitespace: true }
+        default_options = { max_files: 5, bad_opt: 1, ignore_whitespace_change: true }
         described_class.filter_diff_options(options, default_options)
       end
 
@@ -263,16 +233,35 @@ EOT
       end
 
       it "should merge with default options" do
-        expect(filtered_options).to have_key(:ignore_whitespace)
+        expect(filtered_options).to have_key(:ignore_whitespace_change)
       end
 
       it "should override default options" do
-        expect(filtered_options).to have_key(:max_size)
-        expect(filtered_options[:max_size]).to eq(100)
+        expect(filtered_options).to have_key(:max_files)
+        expect(filtered_options[:max_files]).to eq(100)
       end
     end
   end
 
+  describe '#json_safe_diff' do
+    let(:project) { create(:project, :repository) }
+
+    it 'fake binary message when it detects binary' do
+      # Rugged will not detect this as binary, but we can fake it
+      diff_message = "Binary files files/images/icn-time-tracking.pdf and files/images/icn-time-tracking.pdf differ\n"
+      binary_diff = described_class.between(project.repository, 'add-pdf-text-binary', 'add-pdf-text-binary^').first
+
+      expect(binary_diff.diff).not_to be_empty
+      expect(binary_diff.json_safe_diff).to eq(diff_message)
+    end
+
+    it 'leave non-binary diffs as-is' do
+      diff = described_class.new(@rugged_diff)
+
+      expect(diff.json_safe_diff).to eq(diff.diff)
+    end
+  end
+
   describe '#submodule?' do
     before do
       commit = repository.lookup('5937ac0a7beb003549fc5fd26fc247adbce4a52e')
@@ -337,7 +326,7 @@ EOT
 
   describe '#collapsed?' do
     it 'returns true for a diff that is quite large' do
-      diff = described_class.new({ diff: 'a' * (described_class.collapse_limit + 1) }, expanded: false)
+      diff = described_class.new({ diff: 'a' * 20480 }, expanded: false)
 
       expect(diff).to be_collapsed
     end