models with rspec3 syntax

spec/models/report_spec.rb

@@ -21,11 +21,11 @@ describe Report do
       end
 
       it "returns a report with data" do
-        report.data.should be_present
+        expect(report.data).to be_present
       end
 
       it "returns today's visit" do
-        report.data.select { |v| v[:x].today? }.should be_present
+        expect(report.data.select { |v| v[:x].today? }).to be_present
       end
     end
   end
@@ -76,15 +76,15 @@ describe Report do
           end
 
           it "returns today's data" do
-            report.data.select { |v| v[:x].today? }.should be_present
+            expect(report.data.select { |v| v[:x].today? }).to be_present
           end
 
           it 'returns total data' do
-            report.total.should == 7
+            expect(report.total).to eq 7
           end
 
           it "returns previous 30 day's data" do
-            report.prev30Days.should == 1
+            expect(report.prev30Days).to eq 1
           end
         end
       end
@@ -93,7 +93,7 @@ describe Report do
   describe 'private messages' do
     let(:report) { Report.find('user_to_user_private_messages') }
 
-    it 'topic report should not include private messages' do
+    it 'topic report).to not include private messages' do
       Fabricate(:private_message_topic, created_at: 1.hour.ago)
       Fabricate(:topic, created_at: 1.hour.ago)
       report = Report.find('topics')
@@ -101,24 +101,24 @@ describe Report do
       expect(report.total).to eq(1)
     end
 
-    it 'post report should not include private messages' do
+    it 'post report).to not include private messages' do
       Fabricate(:private_message_post, created_at: 1.hour.ago)
       Fabricate(:post)
       report = Report.find('posts')
-      report.data[0][:y].should == 1
-      report.total.should == 1
+      expect(report.data[0][:y]).to eq 1
+      expect(report.total).to eq 1
     end
 
     context 'no private messages' do
       it 'returns an empty report' do
-        report.data.should be_blank
+        expect(report.data).to be_blank
       end
 
       context 'some public posts' do
         it 'returns an empty report' do
           Fabricate(:post); Fabricate(:post)
-          report.data.should be_blank
-          report.total.should == 0
+          expect(report.data).to be_blank
+          expect(report.total).to eq 0
         end
       end
     end
@@ -131,9 +131,9 @@ describe Report do
       end
 
       it 'returns correct data' do
-        report.data[0][:y].should == 1
-        report.data[1][:y].should == 2
-        report.total.should == 3
+        expect(report.data[0][:y]).to eq 1
+        expect(report.data[1][:y]).to eq 2
+        expect(report.total).to eq 3
       end
 
       context 'and some public posts' do
@@ -142,9 +142,9 @@ describe Report do
         end
 
         it 'returns correct data' do
-          report.data[0][:y].should == 1
-          report.data[1][:y].should == 2
-          report.total.should == 3
+          expect(report.data[0][:y]).to eq 1
+          expect(report.data[1][:y]).to eq 2
+          expect(report.total).to eq 3
         end
       end
     end
@@ -155,7 +155,7 @@ describe Report do
 
     context "no users" do
       it "returns an empty report" do
-        report.data.should be_blank
+        expect(report.data).to be_blank
       end
     end
 
@@ -167,11 +167,12 @@ describe Report do
       end
 
       it "returns a report with data" do
-        report.data.should be_present
-        report.data.find {|d| d[:x] == TrustLevel[0]}[:y].should == 3
-        report.data.find {|d| d[:x] == TrustLevel[2]}[:y].should == 2
-        report.data.find {|d| d[:x] == TrustLevel[4]}[:y].should == 1
+        expect(report.data).to be_present
+        expect(report.data.find {|d| d[:x] == TrustLevel[0]}[:y]).to eq 3
+        expect(report.data.find {|d| d[:x] == TrustLevel[2]}[:y]).to eq 2
+        expect(report.data.find {|d| d[:x] == TrustLevel[4]}[:y]).to eq 1
       end
     end
   end
 end
+