diff --git a/Gemfile b/Gemfile index 87a0cff84c1fbb4a59fcf7efbbfa9074f5357db2..4861bb8808290d1a5f8df24450e45ae003450001 100644 --- a/Gemfile +++ b/Gemfile @@ -539,4 +539,4 @@ gem 'ipaddress', '~> 0.8.3' gem 'parslet', '~> 1.8' -gem 'ipynbdiff', '0.3.7' +gem 'ipynbdiff', '0.3.8' diff --git a/Gemfile.lock b/Gemfile.lock index 270ea4532f92de5db21905af69cb025b1c775766..42a0e00f1707b21b65725d8ee2a3b261fa832268 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -640,7 +640,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) @@ -1507,7 +1507,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) diff --git a/spec/lib/gitlab/diff/file_spec.rb b/spec/lib/gitlab/diff/file_spec.rb index 4b437397688cadc6b2f9edd8955b066c09240100..45a49a36fe2239ff312409f3695ce72164fce944 100644 --- a/spec/lib/gitlab/diff/file_spec.rb +++ b/spec/lib/gitlab/diff/file_spec.rb @@ -53,7 +53,7 @@ def delete_file(file_name) 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 @@ def delete_file(file_name) 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 @@ def delete_file(file_name) 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/support/helpers/test_env.rb b/spec/support/helpers/test_env.rb index acbc15f7b627111dbbef6641a8e68eab351249eb..24e0a571de31e8bfd92ee8169553d038467a6782 100644 --- a/spec/support/helpers/test_env.rb +++ b/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',