summaryrefslogtreecommitdiff
path: root/spec/services
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <zegerjan@gitlab.com>2016-04-25 20:10:20 +0200
committerZeger-Jan van de Weg <zegerjan@gitlab.com>2016-05-10 12:03:13 +0200
commitdccf8a9fc8d4dde91942944f6b47387bfb13c380 (patch)
tree7574eea0adcc0cd46bf3d685fccec0d08c37b252 /spec/services
parent4eb16290e4e95c0a9bcf3d01ecc8060d91eec021 (diff)
downloadgitlab-ce-dccf8a9fc8d4dde91942944f6b47387bfb13c380.tar.gz
Add tests on Awardables and Award Emoji
Diffstat (limited to 'spec/services')
-rw-r--r--spec/services/notes/create_service_spec.rb20
-rw-r--r--spec/services/todo_service_spec.rb17
-rw-r--r--spec/services/toggle_award_emoji_service_spec.rb39
3 files changed, 56 insertions, 20 deletions
diff --git a/spec/services/notes/create_service_spec.rb b/spec/services/notes/create_service_spec.rb
index ff23f13e1cb..93e8a7094e2 100644
--- a/spec/services/notes/create_service_spec.rb
+++ b/spec/services/notes/create_service_spec.rb
@@ -14,7 +14,7 @@ describe Notes::CreateService, services: true do
noteable_type: 'Issue',
noteable_id: issue.id
}
-
+
@note = Notes::CreateService.new(project, user, opts).execute
end
@@ -28,18 +28,16 @@ describe Notes::CreateService, services: true do
project.team << [user, :master]
end
- it "creates emoji note" do
+ it "creates an award emoji" do
opts = {
note: ':smile: ',
noteable_type: 'Issue',
noteable_id: issue.id
}
+ note = Notes::CreateService.new(project, user, opts).execute
- @note = Notes::CreateService.new(project, user, opts).execute
-
- expect(@note).to be_valid
- expect(@note.note).to eq('smile')
- expect(@note.is_award).to be_truthy
+ expect(note).to be_valid
+ expect(note.name).to eq('smile')
end
it "creates regular note if emoji name is invalid" do
@@ -48,12 +46,10 @@ describe Notes::CreateService, services: true do
noteable_type: 'Issue',
noteable_id: issue.id
}
+ note = Notes::CreateService.new(project, user, opts).execute
- @note = Notes::CreateService.new(project, user, opts).execute
-
- expect(@note).to be_valid
- expect(@note.note).to eq(opts[:note])
- expect(@note.is_award).to be_falsy
+ expect(note).to be_valid
+ expect(note.note).to eq(opts[:note])
end
end
end
diff --git a/spec/services/todo_service_spec.rb b/spec/services/todo_service_spec.rb
index 82b7fbfa816..455b19c89cc 100644
--- a/spec/services/todo_service_spec.rb
+++ b/spec/services/todo_service_spec.rb
@@ -137,7 +137,6 @@ describe TodoService, services: true do
let(:note_on_commit) { create(:note_on_commit, project: project, author: john_doe, note: mentions) }
let(:note_on_confidential_issue) { create(:note_on_issue, noteable: confidential_issue, project: project, note: mentions) }
let(:note_on_project_snippet) { create(:note_on_project_snippet, project: project, author: john_doe, note: mentions) }
- let(:award_note) { create(:note, :award, project: project, noteable: issue, author: john_doe, note: 'thumbsup') }
let(:system_note) { create(:system_note, project: project, noteable: issue) }
it 'mark related pending todos to the noteable for the note author as done' do
@@ -150,13 +149,6 @@ describe TodoService, services: true do
expect(second_todo.reload).to be_done
end
- it 'mark related pending todos to the noteable for the award note author as done' do
- service.new_note(award_note, john_doe)
-
- expect(first_todo.reload).to be_done
- expect(second_todo.reload).to be_done
- end
-
it 'does not mark related pending todos it is a system note' do
service.new_note(system_note, john_doe)
@@ -286,6 +278,15 @@ describe TodoService, services: true do
expect(second_todo.reload).to be_done
end
end
+
+ describe '#new_award_emoji' do
+ it 'marks related pending todos to the target for the user as done' do
+ todo = create(:todo, user: john_doe, project: project, target: mr_assigned, author: author)
+ service.new_award_emoji(mr_assigned, john_doe)
+
+ expect(todo.reload).to be_done
+ end
+ end
end
def should_create_todo(attributes = {})
diff --git a/spec/services/toggle_award_emoji_service_spec.rb b/spec/services/toggle_award_emoji_service_spec.rb
new file mode 100644
index 00000000000..3d2f497fdec
--- /dev/null
+++ b/spec/services/toggle_award_emoji_service_spec.rb
@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe ToggleAwardEmoji, services: true do
+ let(:project) { create(:project) }
+ let(:user) { create(:user) }
+ let(:issue) { create(:issue, project: project) }
+
+ before do
+ project.team << [user, :master]
+ end
+
+ describe '#execute' do
+ it 'removes related todos' do
+ expect_any_instance_of(TodoService).to receive(:new_award_emoji).with(issue, user)
+
+ ToggleAwardEmojiService.new(project, user).execute(issue, "thumbsdown")
+ end
+
+ it 'normalizes the emoji name' do
+ expect(issue).to receive(:toggle_award_emoji).with("thumbsup", user)
+
+ ToggleAwardEmojiService.new(project, user).execute(issue, ":+1:")
+ end
+
+ context 'when the emoji is set' do
+ it 'removes the emoji' do
+ create(:award_emoji, awardable: issue, user: user)
+
+ expect { ToggleAwardEmojiService.new(project, user).execute(issue, ":+1:") }.to change { AwardEmoji.count }.by(-1)
+ end
+ end
+
+ context 'when the award is not set yet' do
+ it 'awards the emoji' do
+ expect { ToggleAwardEmojiService.new(project, user).execute(issue, ":+1:") }.to change { AwardEmoji.count }.by(1)
+ end
+ end
+ end
+end