task_spec.rb in dorsale-3.1.0

- old
+ new

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Dorsale::Flyboy::Task do
   it { is_expected.to belong_to(:taskable) }
   it { is_expected.to belong_to :owner }
   it { is_expected.to have_many(:comments).dependent(:destroy) }
@@ -91,12 +91,11 @@
       task_1 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date-1, done: true)
       task_2 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date-1, done: false)
       task_3 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date-2, done: true)
       task_4 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date-2, done: false)
       tasks = ::Dorsale::Flyboy::Task.delayed
-      expect(tasks).to eq [task_2,task_4]
-      expect(tasks).to_not eq [task, task_1, task_3]
+      expect(tasks).to contain_exactly(task_2, task_4)
     end
   end
   describe ".today" do
     it "should have the scope" do
       expect(::Dorsale::Flyboy::Task).to respond_to :today
@@ -104,12 +103,11 @@
     it "should return today unfinished tasks" do
       task = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date+1)
       task_1 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date, done: true)
       task_2 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date, done: false)
       tasks = ::Dorsale::Flyboy::Task.today
-      expect(tasks).to eq [task_2]
-      expect(tasks).to_not eq [task, task_1]
+      expect(tasks).to contain_exactly(task_2)
     end
   end
   describe ".tomorrow" do
     it "should have the scope" do
       expect(::Dorsale::Flyboy::Task).to respond_to :tomorrow
@@ -117,12 +115,11 @@
     it "should return tomorrow unfinished tasks" do
       task = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date)
       task_1 = create(:flyboy_task, owner: @user1, term: Date.tomorrow, done: true)
       task_2 = create(:flyboy_task, owner: @user1, term: Date.tomorrow, done: false)
       tasks = ::Dorsale::Flyboy::Task.tomorrow
-      expect(tasks).to eq [task_2]
-      expect(tasks).to_not eq [task, task_1]
+      expect(tasks).to contain_exactly(task_2)
     end
   end
   describe ".this_week" do
     it "should have the scope" do
       expect(::Dorsale::Flyboy::Task).to respond_to :this_week
@@ -133,12 +130,11 @@
         task_1 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date+2, done: true)
         task_2 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date+2, done: false)
         task_3 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date+3, done: false)
         task_4 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date+5, done: false)
         tasks = ::Dorsale::Flyboy::Task.this_week
-        expect(tasks).to eq [task_2,task_3]
-        expect(tasks).to_not eq [task, task_1, task_4]
+        expect(tasks).to contain_exactly(task_2, task_3)
       end
     end
   end
   describe ".next_week" do
     it "should have the scope" do
@@ -150,11 +146,10 @@
         task_1 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date+7, done: true)
         task_2 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date+7, done: false)
         task_3 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date+9, done: false)
         task_4 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date+12, done: false)
         tasks = ::Dorsale::Flyboy::Task.next_week
-        expect(tasks).to eq [task_2,task_3]
-        expect(tasks).to_not eq [task, task_1, task_4]
+        expect(tasks).to contain_exactly(task_2, task_3)
       end
     end
   end
 end