diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-24 15:11:34 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-24 15:11:34 +0300 |
commit | d5f67e75b6ef8ebc1b304589005ccd91ea6674ff (patch) | |
tree | 8c9f80ba2df2e7d50cb4a413c4a591605c78ba6a /vendor | |
parent | fda0e422a7804d541454d86b50113645d8d516f8 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'vendor')
-rw-r--r-- | vendor/gems/ipynbdiff/lib/transformer.rb | 2 | ||||
-rw-r--r-- | vendor/gems/ipynbdiff/spec/transformer_spec.rb | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/vendor/gems/ipynbdiff/lib/transformer.rb b/vendor/gems/ipynbdiff/lib/transformer.rb index 1b2c63bb35c..9e666a20aa5 100644 --- a/vendor/gems/ipynbdiff/lib/transformer.rb +++ b/vendor/gems/ipynbdiff/lib/transformer.rb @@ -27,7 +27,7 @@ module IpynbDiff def validate_notebook(notebook) notebook_json = Oj::Parser.usual.parse(notebook) - return notebook_json if notebook_json.key?('cells') + return notebook_json if notebook_json&.key?('cells') raise InvalidNotebookError rescue EncodingError, Oj::ParseError, JSON::ParserError diff --git a/vendor/gems/ipynbdiff/spec/transformer_spec.rb b/vendor/gems/ipynbdiff/spec/transformer_spec.rb index c5873906ca9..660d0a2bd79 100644 --- a/vendor/gems/ipynbdiff/spec/transformer_spec.rb +++ b/vendor/gems/ipynbdiff/spec/transformer_spec.rb @@ -102,5 +102,16 @@ describe IpynbDiff::Transformer do end end end + + context 'when notebook can not be parsed' do + it 'raises error' do + notebook = '{"cells":[]}' + allow(Oj::Parser.usual).to receive(:parse).and_return(nil) + + expect do + IpynbDiff::Transformer.new.transform(notebook) + end.to raise_error(IpynbDiff::InvalidNotebookError) + end + end end end |