Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

3 files changed, 65 insertions, 17 deletions

diff --git a/spec/lib/gitlab/diff/custom_diff_spec.rb b/spec/lib/gitlab/diff/custom_diff_spec.rb
new file mode 100644
index 00000000000..246508d2e1e
--- /dev/null
+++ b/spec/lib/gitlab/diff/custom_diff_spec.rb
@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::Diff::CustomDiff do
+  include RepoHelpers
+
+  let(:project) { create(:project, :repository) }
+  let(:repository) { project.repository }
+  let(:ipynb_blob) { repository.blob_at('f6b7a707', 'files/ipython/markdown-table.ipynb') }
+  let(:blob) { repository.blob_at('HEAD', 'files/ruby/regex.rb') }
+
+  describe '#preprocess_before_diff' do
+    context 'for ipynb files' do
+      it 'transforms the diff' do
+        expect(described_class.preprocess_before_diff(ipynb_blob.path, nil, ipynb_blob)).not_to include('cells')
+      end
+
+      it 'adds the blob to the list of transformed blobs' do
+        described_class.preprocess_before_diff(ipynb_blob.path, nil, ipynb_blob)
+
+        expect(described_class.transformed_for_diff?(ipynb_blob)).to be_truthy
+      end
+    end
+
+    context 'for other files' do
+      it 'returns nil' do
+        expect(described_class.preprocess_before_diff(blob.path, nil, blob)).to be_nil
+      end
+
+      it 'does not add the blob to the list of transformed blobs' do
+        described_class.preprocess_before_diff(blob.path, nil, blob)
+
+        expect(described_class.transformed_for_diff?(blob)).to be_falsey
+      end
+    end
+  end
+
+  describe '#transformed_blob_data' do
+    it 'transforms blob data if file was processed' do
+      described_class.preprocess_before_diff(ipynb_blob.path, nil, ipynb_blob)
+
+      expect(described_class.transformed_blob_data(ipynb_blob)).not_to include('cells')
+    end
+
+    it 'does not transform blob data if file was not processed' do
+      expect(described_class.transformed_blob_data(ipynb_blob)).to be_nil
+    end
+  end
+
+  describe '#transformed_blob_language' do
+    it 'is md when file was preprocessed' do
+      described_class.preprocess_before_diff(ipynb_blob.path, nil, ipynb_blob)
+
+      expect(described_class.transformed_blob_language(ipynb_blob)).to eq('md')
+    end
+
+    it 'is nil for a .ipynb blob that was not preprocessed' do
+      expect(described_class.transformed_blob_language(ipynb_blob)).to be_nil
+    end
+  end
+end
diff --git a/spec/lib/gitlab/diff/file_spec.rb b/spec/lib/gitlab/diff/file_spec.rb
index 4b437397688..45a49a36fe2 100644
--- a/spec/lib/gitlab/diff/file_spec.rb
+++ b/spec/lib/gitlab/diff/file_spec.rb
@@ -53,7 +53,7 @@ RSpec.describe Gitlab::Diff::File do
 
   describe 'initialize' do
     context 'when file is ipynb with a change after transformation' do
-      let(:commit) { project.commit("f6b7a707") }
+      let(:commit) { project.commit("532c837") }
       let(:diff) { commit.raw_diffs.first }
       let(:diff_file) { described_class.new(diff, diff_refs: commit.diff_refs, repository: project.repository) }
 
@@ -63,7 +63,7 @@ RSpec.describe Gitlab::Diff::File do
         end
 
         it 'recreates the diff by transforming the files' do
-          expect(diff_file.diff.diff).not_to include('"| Fake')
+          expect(diff_file.diff.diff).not_to include('cell_type')
         end
       end
 
@@ -73,7 +73,7 @@ RSpec.describe Gitlab::Diff::File do
         end
 
         it 'does not recreate the diff' do
-          expect(diff_file.diff.diff).to include('"| Fake')
+          expect(diff_file.diff.diff).to include('cell_type')
         end
       end
     end
diff --git a/spec/lib/gitlab/diff/highlight_spec.rb b/spec/lib/gitlab/diff/highlight_spec.rb
index 94b28c38fa2..624160d2f48 100644
--- a/spec/lib/gitlab/diff/highlight_spec.rb
+++ b/spec/lib/gitlab/diff/highlight_spec.rb
@@ -151,20 +151,6 @@ RSpec.describe Gitlab::Diff::Highlight do
         expect(subject[2].rich_text).to eq(%Q{ <span id="LC7" class="line" lang="">  def popen(cmd, path=nil)</span>\n})
         expect(subject[2].rich_text).to be_html_safe
       end
-
-      context 'when limited_diff_highlighting is disabled' do
-        before do
-          stub_feature_flags(limited_diff_highlighting: false)
-          stub_feature_flags(diff_line_syntax_highlighting: false)
-        end
-
-        it 'blobs are highlighted as plain text with loading all data' do
-          expect(diff_file.blob).to receive(:load_all_data!).twice
-
-          code = %Q{ <span id="LC7" class="line" lang="">  def popen(cmd, path=nil)</span>\n}
-          expect(subject[2].rich_text).to eq(code)
-        end
-      end
     end
   end
 end