Merge pull request #1409 from riyad/update-votes

Update votes for issues and merge requests

3 files changed, 17 insertions, 10 deletions

diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index ca6307e72b1..34192da94ad 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -12,7 +12,7 @@ describe Issue do
 
   describe 'modules' do
     it { should include_module(IssueCommonality) }
-    it { should include_module(Upvote) }
+    it { should include_module(Votes) }
   end
 
   subject { Factory.create(:issue) }
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index d1253b35ae5..523e823de34 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -8,6 +8,6 @@ describe MergeRequest do
 
   describe 'modules' do
     it { should include_module(IssueCommonality) }
-    it { should include_module(Upvote) }
+    it { should include_module(Votes) }
   end
 end
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index dddfd34c499..7809953f5b3 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -24,6 +24,13 @@ describe Note do
     it "recognizes a neutral note" do
       note = Factory(:note, note: "This is not a +1 note")
       note.should_not be_upvote
+      note.should_not be_downvote
+    end
+
+    it "recognizes a neutral emoji note" do
+      note = build(:note, note: "I would :+1: this, but I don't want to")
+      note.should_not be_upvote
+      note.should_not be_downvote
     end
 
     it "recognizes a +1 note" do
@@ -31,19 +38,19 @@ describe Note do
       note.should be_upvote
     end
 
-    it "recognizes a -1 note as no vote" do
-      note = Factory(:note, note: "-1 for this")
-      note.should_not be_upvote
-    end
-
     it "recognizes a +1 emoji as a vote" do
       note = build(:note, note: ":+1: for this")
       note.should be_upvote
     end
 
-    it "recognizes a neutral emoji note" do
-      note = build(:note, note: "I would :+1: this, but I don't want to")
-      note.should_not be_upvote
+    it "recognizes a -1 note" do
+      note = Factory(:note, note: "-1 for this")
+      note.should be_downvote
+    end
+
+    it "recognizes a -1 emoji as a vote" do
+      note = build(:note, note: ":-1: for this")
+      note.should be_downvote
     end
   end