Merge branch '345963-nomethoderror-undefined-method-map-for-15-string-2' into 'master'

3Resolve "NoMethodError: undefined method `map' for "15":String"

See merge request gitlab-org/gitlab!74820

Gemfile

@@ -539,4 +539,4 @@ gem 'ipaddress', '~> 0.8.3'
 
 gem 'parslet', '~> 1.8'
 
-gem 'ipynbdiff', '0.3.7'
+gem 'ipynbdiff', '0.3.8'

Gemfile.lock

@@ -641,7 +641,7 @@ GEM
     invisible_captcha (1.1.0)
       rails (>= 4.2)
     ipaddress (0.8.3)
-    ipynbdiff (0.3.7)
+    ipynbdiff (0.3.8)
       diffy (= 3.3.0)
       json (= 2.5.1)
     jaeger-client (1.1.0)
@@ -1510,7 +1510,7 @@ DEPENDENCIES
   icalendar
   invisible_captcha (~> 1.1.0)
   ipaddress (~> 0.8.3)
-  ipynbdiff (= 0.3.7)
+  ipynbdiff (= 0.3.8)
   jira-ruby (~> 2.1.4)
   js_regex (~> 3.7)
   json (~> 2.5.1)

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

spec/support/helpers/test_env.rb

@@ -53,7 +53,7 @@ module TestEnv
     'wip'                                => 'b9238ee',
     'csv'                                => '3dd0896',
     'v1.1.0'                             => 'b83d6e3',
-    'add-ipython-files'                  => '2b5ef814',
+    'add-ipython-files'                  => '532c837',
     'add-pdf-file'                       => 'e774ebd',
     'squash-large-files'                 => '54cec52',
     'add-pdf-text-binary'                => '79faa7b',