Commit f7bce9de authored by Eduardo Bonet's avatar Eduardo Bonet

Upgrading ipynbdiff to 0.3.8

This fixes a few issues related to unexpected .ipynb structure,
mainly source being a single string rather than a list. /

Changelog: fixed
parent 0df08101
...@@ -539,4 +539,4 @@ gem 'ipaddress', '~> 0.8.3' ...@@ -539,4 +539,4 @@ gem 'ipaddress', '~> 0.8.3'
gem 'parslet', '~> 1.8' gem 'parslet', '~> 1.8'
gem 'ipynbdiff', '0.3.7' gem 'ipynbdiff', '0.3.8'
...@@ -640,7 +640,7 @@ GEM ...@@ -640,7 +640,7 @@ GEM
invisible_captcha (1.1.0) invisible_captcha (1.1.0)
rails (>= 4.2) rails (>= 4.2)
ipaddress (0.8.3) ipaddress (0.8.3)
ipynbdiff (0.3.7) ipynbdiff (0.3.8)
diffy (= 3.3.0) diffy (= 3.3.0)
json (= 2.5.1) json (= 2.5.1)
jaeger-client (1.1.0) jaeger-client (1.1.0)
...@@ -1507,7 +1507,7 @@ DEPENDENCIES ...@@ -1507,7 +1507,7 @@ DEPENDENCIES
icalendar icalendar
invisible_captcha (~> 1.1.0) invisible_captcha (~> 1.1.0)
ipaddress (~> 0.8.3) ipaddress (~> 0.8.3)
ipynbdiff (= 0.3.7) ipynbdiff (= 0.3.8)
jira-ruby (~> 2.1.4) jira-ruby (~> 2.1.4)
js_regex (~> 3.7) js_regex (~> 3.7)
json (~> 2.5.1) json (~> 2.5.1)
......
...@@ -53,7 +53,7 @@ RSpec.describe Gitlab::Diff::File do ...@@ -53,7 +53,7 @@ RSpec.describe Gitlab::Diff::File do
describe 'initialize' do describe 'initialize' do
context 'when file is ipynb with a change after transformation' 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) { commit.raw_diffs.first }
let(:diff_file) { described_class.new(diff, diff_refs: commit.diff_refs, repository: project.repository) } 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 ...@@ -63,7 +63,7 @@ RSpec.describe Gitlab::Diff::File do
end end
it 'recreates the diff by transforming the files' do 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
end end
...@@ -73,7 +73,7 @@ RSpec.describe Gitlab::Diff::File do ...@@ -73,7 +73,7 @@ RSpec.describe Gitlab::Diff::File do
end end
it 'does not recreate the diff' do 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 end
end end
......
...@@ -53,7 +53,7 @@ module TestEnv ...@@ -53,7 +53,7 @@ module TestEnv
'wip' => 'b9238ee', 'wip' => 'b9238ee',
'csv' => '3dd0896', 'csv' => '3dd0896',
'v1.1.0' => 'b83d6e3', 'v1.1.0' => 'b83d6e3',
'add-ipython-files' => '2b5ef814', 'add-ipython-files' => '532c837',
'add-pdf-file' => 'e774ebd', 'add-pdf-file' => 'e774ebd',
'squash-large-files' => '54cec52', 'squash-large-files' => '54cec52',
'add-pdf-text-binary' => '79faa7b', 'add-pdf-text-binary' => '79faa7b',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment