kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix spec for Bitbucket importer

This commit is contained in:
Stan Hu 2016-11-21 22:06:09 -08:00
parent fc40c3f28a
commit 7a155137a4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/gitlab/bitbucket_import/importer.rb
View File

@ -94,7 +94,7 @@ module Gitlab
import_pull_request_comments(pull_request, merge_request) if merge_request.persisted?
rescue ActiveRecord::RecordInvalid
nil
Rails.log.error("Bitbucket importer ERROR in #{project.path_with_namespace}: Invalid pull request #{e.message}")
end
end
end
@ -134,7 +134,7 @@ module Gitlab
merge_request.notes.create!(attributes)
rescue ActiveRecord::RecordInvalid => e
Rails.log.error("Bitbucket importer ERROR: Invalid pull request comment #{e.message}")
Rails.log.error("Bitbucket importer ERROR in #{project.path_with_namespace}: Invalid pull request comment #{e.message}")
nil
end
end
@ -145,7 +145,7 @@ module Gitlab
begin
merge_request.notes.create!(pull_request_comment_attributes(comment))
rescue ActiveRecord::RecordInvalid => e
Rails.log.error("Bitbucket importer ERROR: Invalid standalone pull request comment #{e.message}")
Rails.log.error("Bitbucket importer ERROR in #{project.path_with_namespace}: Invalid standalone pull request comment #{e.message}")
nil
end
end

2
spec/lib/gitlab/bitbucket_import/importer_spec.rb
View File

@ -98,7 +98,7 @@ describe Gitlab::BitbucketImport::Importer, lib: true do
it 'map statuses to open or closed' do
# HACK: Bitbucket::Representation.const_get('Issue') seems to return Issue without this
Bitbucket::Representation::Issue.new
Bitbucket::Representation::Issue.new({})
importer.execute
expect(project.issues.where(state: "closed").size).to eq(5)