diff options
author | James Lopez <james@jameslopez.es> | 2016-05-13 12:33:13 +0200 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-05-13 12:33:13 +0200 |
commit | 25a1c6541aa3dfb41ef006d42ba280d5a1d4103d (patch) | |
tree | 5ca5419641746e035c042c9f7807b02db57e1db8 /spec/lib | |
parent | 78cd39e480eea7db7a2e34576c9d6a4446167486 (diff) | |
download | gitlab-ce-25a1c6541aa3dfb41ef006d42ba280d5a1d4103d.tar.gz |
add message to notes about missing author on import
Diffstat (limited to 'spec/lib')
-rw-r--r-- | spec/lib/gitlab/import_export/members_mapper_spec.rb | 8 | ||||
-rw-r--r-- | spec/lib/gitlab/import_export/project_tree_restorer_spec.rb | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/spec/lib/gitlab/import_export/members_mapper_spec.rb b/spec/lib/gitlab/import_export/members_mapper_spec.rb index a4d3d6d122f..78706f64fb7 100644 --- a/spec/lib/gitlab/import_export/members_mapper_spec.rb +++ b/spec/lib/gitlab/import_export/members_mapper_spec.rb @@ -42,9 +42,11 @@ describe Gitlab::ImportExport::MembersMapper, services: true do it 'defaults to importer project member if it does not exist' do expect(members_mapper.map[-1]).to eq(user.id) end - end - def project_member_user_id(id) - members_mapper.map[id] + it 'updates missing author IDs on missing project member' do + members_mapper.map[-1] + + expect(members_mapper.note_member_list.first).to eq(-1) + end end end diff --git a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb index 7c6a14fc8a8..6464b0141f3 100644 --- a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb +++ b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb @@ -7,12 +7,9 @@ describe Gitlab::ImportExport::ProjectTreeRestorer, services: true do let(:namespace) { create(:namespace, owner: user) } let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: "../../../spec/lib/gitlab/import_export/", project_path: 'path') } let(:project_tree_restorer) { described_class.new(user: user, shared: shared, namespace_id: namespace.id) } + let!(:restored_project_json) { project_tree_restorer.restore } context 'JSON' do - let(:restored_project_json) do - project_tree_restorer.restore - end - it 'restores models based on JSON' do expect(restored_project_json).to be true end |