diff options
author | James Lopez <james@jameslopez.es> | 2017-08-21 16:35:31 +0200 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2017-08-21 16:39:28 +0200 |
commit | fb9bd552c95883ed142111c9988f57fd2b531876 (patch) | |
tree | 92bb3edbd314628afae82fefaff5e731deb67f21 /spec/lib/gitlab/import_export/project_tree_saver_spec.rb | |
parent | 646aae3e4f0f9c547397fdf55cc2205b0171b565 (diff) | |
download | gitlab-ce-fb9bd552c95883ed142111c9988f57fd2b531876.tar.gz |
Fix fork MRs importing issue
Diffstat (limited to 'spec/lib/gitlab/import_export/project_tree_saver_spec.rb')
-rw-r--r-- | spec/lib/gitlab/import_export/project_tree_saver_spec.rb | 10 |
1 files changed, 10 insertions, 0 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 a278f89c1a1..065b0ec6658 100644 --- a/spec/lib/gitlab/import_export/project_tree_saver_spec.rb +++ b/spec/lib/gitlab/import_export/project_tree_saver_spec.rb @@ -11,6 +11,8 @@ describe Gitlab::ImportExport::ProjectTreeSaver do before do project.team << [user, :master] allow_any_instance_of(Gitlab::ImportExport).to receive(:storage_path).and_return(export_path) + allow_any_instance_of(MergeRequest).to receive(:source_branch_sha).and_return('ABCD') + allow_any_instance_of(MergeRequest).to receive(:target_branch_sha).and_return('DCBA') end after do @@ -43,6 +45,14 @@ describe Gitlab::ImportExport::ProjectTreeSaver do expect(saved_project_json['merge_requests'].first['milestone']).not_to be_empty end + it 'has merge request\'s source branch SHA' do + expect(saved_project_json['merge_requests'].first['source_branch_sha']).to eq('ABCD') + end + + it 'has merge request\'s target branch SHA' do + expect(saved_project_json['merge_requests'].first['target_branch_sha']).to eq('DCBA') + end + it 'has events' do expect(saved_project_json['merge_requests'].first['milestone']['events']).not_to be_empty end |