summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-11-21 22:06:09 -0800
committerStan Hu <stanhu@gmail.com>2016-11-21 22:06:09 -0800
commit7a155137a4fd965cb8ff512a9548a7e685b330f5 (patch)
tree3789cb5cfa282bcbcc97baaa8ed61acaae160440
parentfc40c3f28a67ecafa58191c0cd6065960dd59c7d (diff)
downloadgitlab-ce-7a155137a4fd965cb8ff512a9548a7e685b330f5.tar.gz
Fix spec for Bitbucket importer
-rw-r--r--lib/gitlab/bitbucket_import/importer.rb6
-rw-r--r--spec/lib/gitlab/bitbucket_import/importer_spec.rb2
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab/bitbucket_import/importer.rb b/lib/gitlab/bitbucket_import/importer.rb
index 729b465e861..08705afcabb 100644
--- a/lib/gitlab/bitbucket_import/importer.rb
+++ b/lib/gitlab/bitbucket_import/importer.rb
@@ -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
diff --git a/spec/lib/gitlab/bitbucket_import/importer_spec.rb b/spec/lib/gitlab/bitbucket_import/importer_spec.rb
index 36893751ee0..ef4fc9fd08e 100644
--- a/spec/lib/gitlab/bitbucket_import/importer_spec.rb
+++ b/spec/lib/gitlab/bitbucket_import/importer_spec.rb
@@ -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)