Merge pull request #8785 from jvanbaarsen/rspec-upgrade

Rspec upgrade

1 files changed, 34 insertions, 34 deletions

diff --git a/spec/lib/votes_spec.rb b/spec/lib/votes_spec.rb
index a88a10d927f..df243a26008 100644
--- a/spec/lib/votes_spec.rb
+++ b/spec/lib/votes_spec.rb
@@ -5,107 +5,107 @@ describe Issue, 'Votes' do
 
   describe "#upvotes" do
     it "with no notes has a 0/0 score" do
-      issue.upvotes.should == 0
+      expect(issue.upvotes).to eq(0)
     end
 
     it "should recognize non-+1 notes" do
       add_note "No +1 here"
-      issue.should have(1).note
-      issue.notes.first.upvote?.should be_false
-      issue.upvotes.should == 0
+      expect(issue.notes.size).to eq(1)
+      expect(issue.notes.first.upvote?).to be_falsey
+      expect(issue.upvotes).to eq(0)
     end
 
     it "should recognize a single +1 note" do
       add_note "+1 This is awesome"
-      issue.upvotes.should == 1
+      expect(issue.upvotes).to eq(1)
     end
 
     it 'should recognize multiple +1 notes' do
       add_note '+1 This is awesome', create(:user)
       add_note '+1 I want this', create(:user)
-      issue.upvotes.should == 2
+      expect(issue.upvotes).to eq(2)
     end
 
     it 'should not count 2 +1 votes from the same user' do
       add_note '+1 This is awesome'
       add_note '+1 I want this'
-      issue.upvotes.should == 1
+      expect(issue.upvotes).to eq(1)
     end
   end
 
   describe "#downvotes" do
     it "with no notes has a 0/0 score" do
-      issue.downvotes.should == 0
+      expect(issue.downvotes).to eq(0)
     end
 
     it "should recognize non--1 notes" do
       add_note "Almost got a -1"
-      issue.should have(1).note
-      issue.notes.first.downvote?.should be_false
-      issue.downvotes.should == 0
+      expect(issue.notes.size).to eq(1)
+      expect(issue.notes.first.downvote?).to be_falsey
+      expect(issue.downvotes).to eq(0)
     end
 
     it "should recognize a single -1 note" do
       add_note "-1 This is bad"
-      issue.downvotes.should == 1
+      expect(issue.downvotes).to eq(1)
     end
 
     it "should recognize multiple -1 notes" do
       add_note('-1 This is bad', create(:user))
       add_note('-1 Away with this', create(:user))
-      issue.downvotes.should == 2
+      expect(issue.downvotes).to eq(2)
     end
   end
 
   describe "#votes_count" do
     it "with no notes has a 0/0 score" do
-      issue.votes_count.should == 0
+      expect(issue.votes_count).to eq(0)
     end
 
     it "should recognize non notes" do
       add_note "No +1 here"
-      issue.should have(1).note
-      issue.votes_count.should == 0
+      expect(issue.notes.size).to eq(1)
+      expect(issue.votes_count).to eq(0)
     end
 
     it "should recognize a single +1 note" do
       add_note "+1 This is awesome"
-      issue.votes_count.should == 1
+      expect(issue.votes_count).to eq(1)
     end
 
     it "should recognize a single -1 note" do
       add_note "-1 This is bad"
-      issue.votes_count.should == 1
+      expect(issue.votes_count).to eq(1)
     end
 
     it "should recognize multiple notes" do
       add_note('+1 This is awesome', create(:user))
       add_note('-1 This is bad', create(:user))
       add_note('+1 I want this', create(:user))
-      issue.votes_count.should == 3
+      expect(issue.votes_count).to eq(3)
     end
 
     it 'should not count 2 -1 votes from the same user' do
       add_note '-1 This is suspicious'
       add_note '-1 This is bad'
-      issue.votes_count.should == 1
+      expect(issue.votes_count).to eq(1)
     end
   end
 
   describe "#upvotes_in_percent" do
     it "with no notes has a 0% score" do
-      issue.upvotes_in_percent.should == 0
+      expect(issue.upvotes_in_percent).to eq(0)
     end
 
     it "should count a single 1 note as 100%" do
       add_note "+1 This is awesome"
-      issue.upvotes_in_percent.should == 100
+      expect(issue.upvotes_in_percent).to eq(100)
     end
 
     it 'should count multiple +1 notes as 100%' do
       add_note('+1 This is awesome', create(:user))
       add_note('+1 I want this', create(:user))
-      issue.upvotes_in_percent.should == 100
+      expect(issue.upvotes_in_percent).to eq(100)
     end
 
     it 'should count fractions for multiple +1 and -1 notes correctly' do
@@ -113,24 +113,24 @@ describe Issue, 'Votes' do
       add_note('+1 I want this', create(:user))
       add_note('-1 This is bad', create(:user))
       add_note('+1 me too', create(:user))
-      issue.upvotes_in_percent.should == 75
+      expect(issue.upvotes_in_percent).to eq(75)
     end
   end
 
   describe "#downvotes_in_percent" do
     it "with no notes has a 0% score" do
-      issue.downvotes_in_percent.should == 0
+      expect(issue.downvotes_in_percent).to eq(0)
     end
 
     it "should count a single -1 note as 100%" do
       add_note "-1 This is bad"
-      issue.downvotes_in_percent.should == 100
+      expect(issue.downvotes_in_percent).to eq(100)
     end
 
     it 'should count multiple -1 notes as 100%' do
       add_note('-1 This is bad', create(:user))
       add_note('-1 Away with this', create(:user))
-      issue.downvotes_in_percent.should == 100
+      expect(issue.downvotes_in_percent).to eq(100)
     end
 
     it 'should count fractions for multiple +1 and -1 notes correctly' do
@@ -138,7 +138,7 @@ describe Issue, 'Votes' do
       add_note('+1 I want this', create(:user))
       add_note('-1 This is bad', create(:user))
       add_note('+1 me too', create(:user))
-      issue.downvotes_in_percent.should == 25
+      expect(issue.downvotes_in_percent).to eq(25)
     end
   end
 
@@ -151,8 +151,8 @@ describe Issue, 'Votes' do
       add_note('+1 this looks good now')
       add_note('+1 This is awesome', create(:user))
       add_note('+1 me too', create(:user))
-      issue.downvotes.should == 0
-      issue.upvotes.should == 5
+      expect(issue.downvotes).to eq(0)
+      expect(issue.upvotes).to eq(5)
     end
 
     it 'should count each users vote only once' do
@@ -161,8 +161,8 @@ describe Issue, 'Votes' do
       add_note '+1 I still like this'
       add_note '+1 I really like this'
       add_note '+1 Give me this now!!!!'
-      issue.downvotes.should == 0
-      issue.upvotes.should == 1
+      expect(issue.downvotes).to eq(0)
+      expect(issue.upvotes).to eq(1)
     end
 
     it 'should count a users vote only once without caring about comments' do
@@ -171,8 +171,8 @@ describe Issue, 'Votes' do
       add_note 'Another comment'
       add_note '+1 vote'
       add_note 'final comment'
-      issue.downvotes.should == 0
-      issue.upvotes.should == 1
+      expect(issue.downvotes).to eq(0)
+      expect(issue.upvotes).to eq(1)
     end
 
   end