diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-07-22 16:23:59 +0200 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-07-22 16:23:59 +0200 |
| commit | 46fef6f21dd4331d6436f67c0a875eefffd95bd0 (patch) | |
| tree | a788cf3f7ffa8f21b412caa851f4e502cfb5b543 | |
| parent | 7e2e48cf6e02cf9bfa12d0ddfcc7a946ddf9d818 (diff) | |
| download | gitlab-ce-resolve-remaining-import-export-differences.tar.gz | |
Backport import/export spec changes from EEresolve-remaining-import-export-differences
This backports remaining import/export spec changes from EE to CE.
| -rw-r--r-- | spec/lib/gitlab/import_export/project_tree_saver_spec.rb | 7 | ||||
| -rw-r--r-- | spec/lib/gitlab/import_export/relation_rename_service_spec.rb | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/spec/lib/gitlab/import_export/project_tree_saver_spec.rb b/spec/lib/gitlab/import_export/project_tree_saver_spec.rb index bc4f867e891..5f56c30c7e0 100644 --- a/spec/lib/gitlab/import_export/project_tree_saver_spec.rb +++ b/spec/lib/gitlab/import_export/project_tree_saver_spec.rb @@ -42,6 +42,10 @@ describe Gitlab::ImportExport::ProjectTreeSaver do expect(saved_project_json).to include({ 'description' => 'description', 'visibility_level' => 20 }) end + it 'has approvals_before_merge set' do + expect(saved_project_json['approvals_before_merge']).to eq(1) + end + it 'has milestones' do expect(saved_project_json['milestones']).not_to be_empty end @@ -287,7 +291,8 @@ describe Gitlab::ImportExport::ProjectTreeSaver do issues: [issue], snippets: [snippet], releases: [release], - group: group + group: group, + approvals_before_merge: 1 ) project_label = create(:label, project: project) group_label = create(:group_label, group: group) diff --git a/spec/lib/gitlab/import_export/relation_rename_service_spec.rb b/spec/lib/gitlab/import_export/relation_rename_service_spec.rb index a20a844a492..15748407f0c 100644 --- a/spec/lib/gitlab/import_export/relation_rename_service_spec.rb +++ b/spec/lib/gitlab/import_export/relation_rename_service_spec.rb @@ -28,6 +28,7 @@ describe Gitlab::ImportExport::RelationRenameService do before do allow(shared).to receive(:export_path).and_return(import_path) + allow(ActiveSupport::JSON).to receive(:decode).and_call_original allow(ActiveSupport::JSON).to receive(:decode).with(file_content).and_return(json_file) end |