summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-11-19 23:00:30 +0200
committerValery Sizov <vsv2711@gmail.com>2015-11-19 23:00:30 +0200
commit22bbb379ae976d94d7ddd7addb7384e0b79ddfd9 (patch)
tree9cc413014e1e84d73d1fd0641b3baf430c4e91f0
parentbdf4007cb7b18ed6892455d0a9adf78476188563 (diff)
downloadgitlab-ce-22bbb379ae976d94d7ddd7addb7384e0b79ddfd9.tar.gz
fox testsemoji_votes
-rw-r--r--spec/models/note_spec.rb5
-rw-r--r--spec/services/notes/create_service_spec.rb50
2 files changed, 27 insertions, 28 deletions
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index 86b6c27a182..f347f537550 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -132,12 +132,11 @@ describe Note do
describe :grouped_awards do
before do
- create :note, note: "smile"
- create :note, note: "smile"
+ create :note, note: "smile", is_award: true
+ create :note, note: "smile", is_award: true
end
it "returns grouped array of notes" do
- grouped_array = Note.grouped_awards
expect(Note.grouped_awards.first.first).to eq("smile")
expect(Note.grouped_awards.first.last).to match_array(Note.all)
end
diff --git a/spec/services/notes/create_service_spec.rb b/spec/services/notes/create_service_spec.rb
index 066461f5a12..cc38d257792 100644
--- a/spec/services/notes/create_service_spec.rb
+++ b/spec/services/notes/create_service_spec.rb
@@ -26,36 +26,36 @@ describe Notes::CreateService do
end
describe "award emoji" do
- before do
- project.team << [user, :master]
- end
+ before do
+ project.team << [user, :master]
+ end
- it "creates emoji note" do
- opts = {
- note: ':smile: ',
- noteable_type: 'Issue',
- noteable_id: issue.id
- }
+ it "creates emoji note" 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
- end
+ expect(@note).to be_valid
+ expect(@note.note).to eq('smile')
+ expect(@note.is_award).to be_truthy
+ end
- it "creates regular note if emoji name is invalid" do
- opts = {
- note: ':smile: moretext: ',
- noteable_type: 'Issue',
- noteable_id: issue.id
- }
+ it "creates regular note if emoji name is invalid" do
+ opts = {
+ note: ':smile: moretext: ',
+ 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
- end
+ expect(@note).to be_valid
+ expect(@note.note).to eq(opts[:note])
+ expect(@note.is_award).to be_falsy
+ end
end
end