diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-04-21 15:19:23 +0200 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-04-24 12:30:36 +0200 |
commit | 0ff778c0f4a3b599d0f36a1deee5607d03e52b9a (patch) | |
tree | ad89737763ed27faedec8e28ac338a4b1fb94b34 /spec | |
parent | 27af24c1c951385bccd298c98044d57ff22ccd1c (diff) | |
download | gitlab-ce-0ff778c0f4a3b599d0f36a1deee5607d03e52b9a.tar.gz |
Link cross-project cross-reference notes to correct project.
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/note_spec.rb | 22 | ||||
-rw-r--r-- | spec/services/git_push_service_spec.rb | 10 | ||||
-rw-r--r-- | spec/services/notification_service_spec.rb | 4 | ||||
-rw-r--r-- | spec/support/mentionable_shared_examples.rb | 6 |
4 files changed, 21 insertions, 21 deletions
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb index 095eb1500a9..4a6bfdb2910 100644 --- a/spec/models/note_spec.rb +++ b/spec/models/note_spec.rb @@ -335,7 +335,7 @@ describe Note do # roles, to ensure that the correct information can be inferred from any argument. context 'issue from a merge request' do - subject { Note.create_cross_reference_note(issue, mergereq, author, project) } + subject { Note.create_cross_reference_note(issue, mergereq, author) } it { is_expected.to be_valid } @@ -361,7 +361,7 @@ describe Note do end context 'issue from a commit' do - subject { Note.create_cross_reference_note(issue, commit, author, project) } + subject { Note.create_cross_reference_note(issue, commit, author) } it { is_expected.to be_valid } @@ -377,7 +377,7 @@ describe Note do end context 'merge request from an issue' do - subject { Note.create_cross_reference_note(mergereq, issue, author, project) } + subject { Note.create_cross_reference_note(mergereq, issue, author) } it { is_expected.to be_valid } @@ -398,7 +398,7 @@ describe Note do end context 'commit from a merge request' do - subject { Note.create_cross_reference_note(commit, mergereq, author, project) } + subject { Note.create_cross_reference_note(commit, mergereq, author) } it { is_expected.to be_valid } @@ -419,13 +419,13 @@ describe Note do end context 'commit contained in a merge request' do - subject { Note.create_cross_reference_note(mergereq.commits.first, mergereq, author, project) } + subject { Note.create_cross_reference_note(mergereq.commits.first, mergereq, author) } it { is_expected.to be_nil } end context 'commit from issue' do - subject { Note.create_cross_reference_note(commit, issue, author, project) } + subject { Note.create_cross_reference_note(commit, issue, author) } it { is_expected.to be_valid } @@ -452,7 +452,7 @@ describe Note do context 'commit from commit' do let(:parent_commit) { commit.parents.first } - subject { Note.create_cross_reference_note(commit, parent_commit, author, project) } + subject { Note.create_cross_reference_note(commit, parent_commit, author) } it { is_expected.to be_valid } @@ -486,7 +486,7 @@ describe Note do let(:commit1) { project.commit('HEAD~2') } before do - Note.create_cross_reference_note(issue, commit0, author, project) + Note.create_cross_reference_note(issue, commit0, author) end it 'detects if a mentionable has already been mentioned' do @@ -499,7 +499,7 @@ describe Note do context 'commit on commit' do before do - Note.create_cross_reference_note(commit0, commit1, author, project) + Note.create_cross_reference_note(commit0, commit1, author) end it { expect(Note.cross_reference_exists?(commit0, commit1)).to be_truthy } @@ -527,7 +527,7 @@ describe Note do let(:author) { create :user } let(:issue0) { create :issue, project: project } let(:issue1) { create :issue, project: second_project } - let!(:note) { Note.create_cross_reference_note(issue0, issue1, author, project) } + let!(:note) { Note.create_cross_reference_note(issue0, issue1, author) } it 'detects if a mentionable has already been mentioned' do expect(Note.cross_reference_exists?(issue0, issue1)).to be_truthy @@ -562,7 +562,7 @@ describe Note do end it 'should identify cross-reference notes as system notes' do - @note = Note.create_cross_reference_note(issue, other, author, project) + @note = Note.create_cross_reference_note(issue, other, author) expect(@note).to be_system end diff --git a/spec/services/git_push_service_spec.rb b/spec/services/git_push_service_spec.rb index 246bc1cc33d..af37e8319a4 100644 --- a/spec/services/git_push_service_spec.rb +++ b/spec/services/git_push_service_spec.rb @@ -164,22 +164,22 @@ describe GitPushService do end it "creates a note if a pushed commit mentions an issue" do - expect(Note).to receive(:create_cross_reference_note).with(issue, commit, commit_author, project) + expect(Note).to receive(:create_cross_reference_note).with(issue, commit, commit_author) service.execute(project, user, @oldrev, @newrev, @ref) end it "only creates a cross-reference note if one doesn't already exist" do - Note.create_cross_reference_note(issue, commit, user, project) + Note.create_cross_reference_note(issue, commit, user) - expect(Note).not_to receive(:create_cross_reference_note).with(issue, commit, commit_author, project) + expect(Note).not_to receive(:create_cross_reference_note).with(issue, commit, commit_author) service.execute(project, user, @oldrev, @newrev, @ref) end it "defaults to the pushing user if the commit's author is not known" do commit.stub(author_name: 'unknown name', author_email: 'unknown@email.com') - expect(Note).to receive(:create_cross_reference_note).with(issue, commit, user, project) + expect(Note).to receive(:create_cross_reference_note).with(issue, commit, user) service.execute(project, user, @oldrev, @newrev, @ref) end @@ -188,7 +188,7 @@ describe GitPushService do allow(project.repository).to receive(:commits_between).with(@blankrev, @newrev).and_return([]) allow(project.repository).to receive(:commits_between).with("master", @newrev).and_return([commit]) - expect(Note).to receive(:create_cross_reference_note).with(issue, commit, commit_author, project) + expect(Note).to receive(:create_cross_reference_note).with(issue, commit, commit_author) service.execute(project, user, @blankrev, @newrev, 'refs/heads/other') end diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb index 6d2bc41c2b9..2a54b2e920a 100644 --- a/spec/services/notification_service_spec.rb +++ b/spec/services/notification_service_spec.rb @@ -57,7 +57,7 @@ describe NotificationService do end it 'filters out "mentioned in" notes' do - mentioned_note = Note.create_cross_reference_note(mentioned_issue, issue, issue.author, issue.project) + mentioned_note = Note.create_cross_reference_note(mentioned_issue, issue, issue.author) expect(Notify).not_to receive(:note_issue_email) notification.new_note(mentioned_note) @@ -128,7 +128,7 @@ describe NotificationService do end it 'filters out "mentioned in" notes' do - mentioned_note = Note.create_cross_reference_note(mentioned_issue, issue, issue.author, issue.project) + mentioned_note = Note.create_cross_reference_note(mentioned_issue, issue, issue.author) expect(Notify).not_to receive(:note_issue_email) notification.new_note(mentioned_note) diff --git a/spec/support/mentionable_shared_examples.rb b/spec/support/mentionable_shared_examples.rb index 25ec5cbe6f2..dde80b1e1dd 100644 --- a/spec/support/mentionable_shared_examples.rb +++ b/spec/support/mentionable_shared_examples.rb @@ -83,14 +83,14 @@ shared_examples 'a mentionable' do mentioned_objects.each do |referenced| expect(Note).to receive(:create_cross_reference_note). - with(referenced, subject.local_reference, author, project) + with(referenced, subject.local_reference, author) end subject.create_cross_references!(project, author) end it 'detects existing cross-references' do - Note.create_cross_reference_note(mentioned_issue, subject.local_reference, author, project) + Note.create_cross_reference_note(mentioned_issue, subject.local_reference, author) expect(subject).to have_mentioned(mentioned_issue) expect(subject).not_to have_mentioned(mentioned_mr) @@ -132,7 +132,7 @@ shared_examples 'an editable mentionable' do # These two issues are new and should receive reference notes new_issues.each do |newref| expect(Note).to receive(:create_cross_reference_note). - with(newref, subject.local_reference, author, project) + with(newref, subject.local_reference, author) end subject.save |