Download as
Browse Code »

Commit a2a0060034171e22962129d53cc74fb7bde54476

Authored by Riyad Preukschas
1 parent 06c1a8a9
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Rename Upvote role to Votes

Showing 8 changed files with 37 additions and 37 deletions   Show diff stats
app/models/issue.rb
  Diff comments   View file @a2a0060
1 1 class Issue < ActiveRecord::Base
2 2 include IssueCommonality
3   - include Upvote
  3 + include Votes
4 4  
5 5 acts_as_taggable_on :labels
6 6  
... ...
app/models/merge_request.rb
  Diff comments   View file @a2a0060
... ... @@ -2,7 +2,7 @@ require File.join(Rails.root, &quot;app/models/commit&quot;)
2 2  
3 3 class MergeRequest < ActiveRecord::Base
4 4 include IssueCommonality
5   - include Upvote
  5 + include Votes
6 6  
7 7 BROKEN_DIFF = "--broken-diff"
8 8  
... ...
app/roles/upvote.rb
View file @06c1a8a
... ... @@ -1,6 +0,0 @@
1   -module Upvote
2   - # Return the number of +1 comments (upvotes)
3   - def upvotes
4   - notes.select(&:upvote?).size
5   - end
6   -end
app/roles/votes.rb 0 → 100644
  Diff comments   View file @a2a0060
... ... @@ -0,0 +1,6 @@
  1 +module Votes
  2 + # Return the number of +1 comments (upvotes)
  3 + def upvotes
  4 + notes.select(&:upvote?).size
  5 + end
  6 +end
... ...
spec/models/issue_spec.rb
  Diff comments   View file @a2a0060
... ... @@ -12,7 +12,7 @@ describe Issue do
12 12  
13 13 describe 'modules' do
14 14 it { should include_module(IssueCommonality) }
15   - it { should include_module(Upvote) }
  15 + it { should include_module(Votes) }
16 16 end
17 17  
18 18 subject { Factory.create(:issue) }
... ...
spec/models/merge_request_spec.rb
  Diff comments   View file @a2a0060
... ... @@ -8,6 +8,6 @@ describe MergeRequest do
8 8  
9 9 describe 'modules' do
10 10 it { should include_module(IssueCommonality) }
11   - it { should include_module(Upvote) }
  11 + it { should include_module(Votes) }
12 12 end
13 13 end
... ...
spec/roles/upvote_spec.rb
View file @06c1a8a
... ... @@ -1,27 +0,0 @@
1   -require 'spec_helper'
2   -
3   -describe Issue, "Upvote" do
4   - let(:issue) { create(:issue) }
5   -
6   - it "with no notes has a 0/0 score" do
7   - issue.upvotes.should == 0
8   - end
9   -
10   - it "should recognize non-+1 notes" do
11   - issue.notes << create(:note, note: "No +1 here")
12   - issue.should have(1).note
13   - issue.notes.first.upvote?.should be_false
14   - issue.upvotes.should == 0
15   - end
16   -
17   - it "should recognize a single +1 note" do
18   - issue.notes << create(:note, note: "+1 This is awesome")
19   - issue.upvotes.should == 1
20   - end
21   -
22   - it "should recognize multiple +1 notes" do
23   - issue.notes << create(:note, note: "+1 This is awesome")
24   - issue.notes << create(:note, note: "+1 I want this")
25   - issue.upvotes.should == 2
26   - end
27   -end
spec/roles/votes_spec.rb 0 → 100644
  Diff comments   View file @a2a0060
... ... @@ -0,0 +1,27 @@
  1 +require 'spec_helper'
  2 +
  3 +describe Issue, "Upvote" do
  4 + let(:issue) { create(:issue) }
  5 +
  6 + it "with no notes has a 0/0 score" do
  7 + issue.upvotes.should == 0
  8 + end
  9 +
  10 + it "should recognize non-+1 notes" do
  11 + issue.notes << create(:note, note: "No +1 here")
  12 + issue.should have(1).note
  13 + issue.notes.first.upvote?.should be_false
  14 + issue.upvotes.should == 0
  15 + end
  16 +
  17 + it "should recognize a single +1 note" do
  18 + issue.notes << create(:note, note: "+1 This is awesome")
  19 + issue.upvotes.should == 1
  20 + end
  21 +
  22 + it "should recognize multiple +1 notes" do
  23 + issue.notes << create(:note, note: "+1 This is awesome")
  24 + issue.notes << create(:note, note: "+1 I want this")
  25 + issue.upvotes.should == 2
  26 + end
  27 +end
... ...