Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-07-06 11:08:42 +0300
committerRémy Coutable <remy@rymai.me>2016-07-06 11:08:42 +0300
commit19e15ae244776d4d148e6a65a1443f94bb59398c (patch)
tree28513f1de3cc72592b78395b47c50e18fb4a62be /spec
parent4834e2e60936d9f59f3dd315d6d9d4ef82eecd66 (diff)
Use a more future-proof check for Note/LegacyDiffNote
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'spec')
-rw-r--r--spec/models/event_spec.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb
index 00925591a5e..6ac19756f15 100644
--- a/spec/models/event_spec.rb
+++ b/spec/models/event_spec.rb
@@ -55,8 +55,8 @@ describe Event, models: true do
it { is_expected.to be_note }
end
- context 'merge request note event' do
- let(:target) { create(:note_on_merge_request) }
+ context 'merge request diff note event' do
+ let(:target) { create(:note_on_merge_request_diff) }
it { is_expected.to be_note }
end
@@ -129,10 +129,10 @@ describe Event, models: true do
end
end
- context 'merge request note event' do
+ context 'merge request diff note event' do
let(:project) { create(:project, :public) }
let(:merge_request) { create(:merge_request, source_project: project, author: author, assignee: assignee) }
- let(:note_on_merge_request) { create(:note_on_merge_request, noteable: merge_request, project: project) }
+ let(:note_on_merge_request) { create(:note_on_merge_request_diff, noteable: merge_request, project: project) }
let(:target) { note_on_merge_request }
it { expect(event.visible_to_user?(non_member)).to eq true }