spec/integration/shared/by_direction.rb in by_star-2.2.0.rc1 vs spec/integration/shared/by_direction.rb in by_star-2.2.0

@@ -4,22 +4,42 @@
 
   describe '#before' do
 
     context 'point-in-time' do
       subject { Post.before(Date.parse '2014-01-05') }
-      its(:count){ should eq 3 }
+      its(:count){ should eq 12 }
     end
 
     context 'timespan' do
       subject { Event.before(Time.parse '2014-01-05') }
-      its(:count){ should eq 4 }
+      its(:count){ should eq 13 }
     end
 
     context 'timespan strict' do
       subject { Event.before('2014-01-05', strict: true) }
+      its(:count){ should eq 13 }
+    end
+
+    context 'alternative field' do
+      subject { Event.before('2014-01-05', field: 'created_at') }
+      its(:count){ should eq 12 }
+    end
+
+    context 'with default scope' do
+      subject { Appointment.before('2014-01-05', field: 'created_at') }
       its(:count){ should eq 4 }
     end
+
+    context 'with scope as a query criteria' do
+      subject { Post.before('2014-01-05', field: 'created_at', scope: Post.where(day_of_month: 5)) }
+      its(:count){ should eq 1 }
+    end
+
+    context 'with scope as a proc' do
+      subject { Post.before('2014-01-05', field: 'created_at', scope: ->{ where(day_of_month: 5) }) }
+      its(:count){ should eq 1 }
+    end
   end
 
   describe '#after' do
 
     context 'point-in-time' do
@@ -34,10 +54,30 @@
 
     context 'timespan strict' do
       subject { Event.after('2014-01-05', strict: true) }
       its(:count){ should eq 9 }
     end
+
+    context 'alternative field' do
+      subject { Event.after('2014-01-05', field: 'created_at') }
+      its(:count){ should eq 10 }
+    end
+
+    context 'with default scope' do
+      subject { Appointment.after('2014-01-05', field: 'created_at') }
+      its(:count){ should eq 3 }
+    end
+
+    context 'with scope as a query criteria' do
+      subject { Post.after('2014-01-05', field: 'created_at', scope: Post.where(day_of_month: 5)) }
+      its(:count){ should eq 1 }
+    end
+
+    context 'with scope as a proc' do
+      subject { Post.after('2014-01-05', field: 'created_at', scope: ->{ where(day_of_month: 5) }) }
+      its(:count){ should eq 1 }
+    end
   end
 
   describe '#previous and #next' do
 
     context 'point-in-time' do
@@ -48,8 +88,27 @@
 
     context 'timespan' do
       subject { Event.where(start_time: Time.zone.parse('2014-01-05 17:00:00')).first }
       it{ subject.previous.start_time.should eq Time.zone.parse('2013-12-31 17:00:00') }
       it{ subject.next.start_time.should eq Time.zone.parse('2014-01-07 17:00:00') }
+    end
+
+    context 'with default scope' do
+      subject { Appointment.where(created_at: Time.zone.parse('2014-01-05 17:00:00')).first }
+      it{ subject.previous.created_at.should eq Time.zone.parse('2014-01-01 17:00:00') }
+      it{ subject.next.created_at.should eq Time.zone.parse('2014-02-01 17:00:00') }
+    end
+
+    context 'with scope as a query criteria' do
+      subject { Post.where(created_at: Time.zone.parse('2014-01-05 17:00:00')).first }
+      it{ subject.previous({ scope: Post.where(day_of_month: 5) }).created_at.should eq Time.zone.parse('2013-12-05 17:00:00')  }
+      it{ subject.next({ scope: Post.where(day_of_month: 1) }).created_at.should eq Time.zone.parse('2014-02-01 17:00:00')  }
+    end
+
+    context 'with scope as a proc' do
+      subject { Post.where(created_at: Time.zone.parse('2014-01-05 17:00:00')).first }
+      it{ subject.previous({ scope: Proc.new{ where(day_of_month: 5) } }).created_at.should eq Time.zone.parse('2013-12-05 17:00:00') }
+      it{ subject.next({ scope: ->{ where(day_of_month: 1) } }).created_at.should eq Time.zone.parse('2014-02-01 17:00:00') }
+      it{ subject.next({ scope: ->(klass){ klass.where(day_of_month: 1) } }).created_at.should eq Time.zone.parse('2014-02-01 17:00:00') }
     end
   end
 end