diff options
author | Robert Speicher <rspeicher@gmail.com> | 2019-07-15 15:46:59 +0000 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2019-07-15 15:46:59 +0000 |
commit | 96277bb9d61b5aaf5c2edc388c5eabfc743478f0 (patch) | |
tree | 97b8dd4c4b8f6f61ebca38c7e0253c35ec311007 /spec/lib | |
parent | ca56311d0e8acde5417ec890c74cb684cf96af92 (diff) | |
parent | ec512406857aecabc577b3fc70ec321982dd65a8 (diff) | |
download | gitlab-ce-96277bb9d61b5aaf5c2edc388c5eabfc743478f0.tar.gz |
Merge branch 'georgekoltsov/63955-fix-import-with-source-branch-deleted' into 'master'
Always return MR diff_refs if importing
See merge request gitlab-org/gitlab-ce!30630
Diffstat (limited to 'spec/lib')
-rw-r--r-- | spec/lib/gitlab/import_export/attribute_cleaner_spec.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/spec/lib/gitlab/import_export/attribute_cleaner_spec.rb b/spec/lib/gitlab/import_export/attribute_cleaner_spec.rb index 99669285d5b..873728f9909 100644 --- a/spec/lib/gitlab/import_export/attribute_cleaner_spec.rb +++ b/spec/lib/gitlab/import_export/attribute_cleaner_spec.rb @@ -22,7 +22,9 @@ describe Gitlab::ImportExport::AttributeCleaner do 'some_html' => '<p>dodgy html</p>', 'legit_html' => '<p>legit html</p>', '_html' => '<p>perfectly ordinary html</p>', - 'cached_markdown_version' => 12345 + 'cached_markdown_version' => 12345, + 'group_id' => 99, + 'commit_id' => 99 } end @@ -31,7 +33,9 @@ describe Gitlab::ImportExport::AttributeCleaner do 'project_id' => 99, 'user_id' => 99, 'random_id_in_the_middle' => 99, - 'notid' => 99 + 'notid' => 99, + 'group_id' => 99, + 'commit_id' => 99 } end @@ -59,6 +63,6 @@ describe Gitlab::ImportExport::AttributeCleaner do it 'does not remove excluded key if not listed' do parsed_hash = described_class.clean(relation_hash: unsafe_hash, relation_class: relation_class) - expect(parsed_hash.keys).to eq post_safe_hash.keys + excluded_keys + expect(parsed_hash.keys).to match_array post_safe_hash.keys + excluded_keys end end |