summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/github_import/importer/diff_note_importer_spec.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-07 00:07:51 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-07 00:07:51 +0000
commit4e375367b78bb44bd00957522cd9fc3e6d403fef (patch)
tree059b1ce541e4128bf03683407d7b5bbbc2094ed5 /spec/lib/gitlab/github_import/importer/diff_note_importer_spec.rb
parent99ddca0d88f1e4e49d61b1aa9d41b5785528d1dc (diff)
downloadgitlab-ce-4e375367b78bb44bd00957522cd9fc3e6d403fef.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/github_import/importer/diff_note_importer_spec.rb')
-rw-r--r--spec/lib/gitlab/github_import/importer/diff_note_importer_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/lib/gitlab/github_import/importer/diff_note_importer_spec.rb b/spec/lib/gitlab/github_import/importer/diff_note_importer_spec.rb
index 484458289af..66909976b43 100644
--- a/spec/lib/gitlab/github_import/importer/diff_note_importer_spec.rb
+++ b/spec/lib/gitlab/github_import/importer/diff_note_importer_spec.rb
@@ -144,9 +144,9 @@ describe Gitlab::GithubImport::Importer::DiffNoteImporter do
describe '#find_merge_request_id' do
it 'returns a merge request ID' do
- expect_any_instance_of(Gitlab::GithubImport::IssuableFinder)
- .to receive(:database_id)
- .and_return(10)
+ expect_next_instance_of(Gitlab::GithubImport::IssuableFinder) do |instance|
+ expect(instance).to receive(:database_id).and_return(10)
+ end
expect(importer.find_merge_request_id).to eq(10)
end