spec/every_spec.rb in rufus-scheduler-2.0.6 vs spec/every_spec.rb in rufus-scheduler-2.0.7

@@ -3,49 +3,49 @@
 # Specifying rufus-scheduler
 #
 # Sun Mar 22 12:26:07 JST 2009
 #
 
-require File.dirname(__FILE__) + '/spec_base'
+require File.join(File.dirname(__FILE__), 'spec_base')
 
 
 describe "#{SCHEDULER_CLASS}#every" do
 
-  before do
+  before(:each) do
     @s = start_scheduler
   end
-  after do
+  after(:each) do
     stop_scheduler(@s)
   end
 
-  it 'should have job ids with the class name in it' do
+  it 'has job ids with the class name in it' do
 
     j0 = @s.every(1) {}
-    j0.job_id.should.match(/Rufus::Scheduler::EveryJob/)
+    j0.job_id.should match(/Rufus::Scheduler::EveryJob/)
   end
 
-  it 'should compute frequency' do
+  it 'computes frequency' do
 
     job = @s.every '2h1m' do
     end
-    job.frequency.should.equal(7260)
+    job.frequency.should == 7260
   end
 
-  it 'should schedule every 1s' do
+  it 'schedules every 1s' do
 
     var = 0
 
     job = @s.every '1s' do
       var += 1
     end
 
     sleep 3.7
 
-    var.should.equal(3)
+    var.should == 3
   end
 
-  it 'should be punctilious' do
+  it 'is punctilious' do
 
     hits = []
 
     job = @s.every '1s' do
       hits << Time.now.to_f
@@ -56,14 +56,14 @@
     hh = nil
     deltas = []
     hits.each { |h| f = h; deltas << (f - hh) if hh; hh = f }
 
     #puts; p deltas
-    deltas.max.should.satisfy { |d| d < 1.200 }
+    deltas.max.should satisfy { |d| d < 1.200 }
   end
 
-  it 'should unschedule' do
+  it 'unschedules' do
 
     var = 0
 
     job = @s.every '1s' do
       var += 1
@@ -71,59 +71,59 @@
 
     sleep 2.7
 
     @s.unschedule(job.job_id)
 
-    var.should.equal(2)
+    var.should == 2
 
     sleep 1.7
 
-    var.should.equal(2)
+    var.should == 2
   end
 
-  it 'should accept tags for jobs' do
+  it 'accepts tags for jobs' do
 
     job = @s.every '1s', :tags => 'spec' do
     end
 
     wait_next_tick
 
-    @s.find_by_tag('spec').size.should.equal(1)
-    @s.find_by_tag('spec').first.job_id.should.equal(job.job_id)
+    @s.find_by_tag('spec').size.should == 1
+    @s.find_by_tag('spec').first.job_id.should == job.job_id
   end
 
-  it 'should honour :first_at' do
+  it 'honours :first_at' do
 
     counter = 0
 
     job = @s.every '1s', :first_at => Time.now + 2 do
       counter += 1
     end
 
     sleep 1
-    counter.should.equal(0)
+    counter.should == 0
 
     sleep 2.5
-    counter.should.equal(2)
+    counter.should == 2
   end
 
-  it 'should honour :first_in' do
+  it 'honours :first_in' do
 
     counter = 0
 
     job = @s.every '1s', :first_in => 2 do
       counter += 1
     end
 
     sleep 1
-    counter.should.equal(0)
+    counter.should == 0
 
     sleep 2.5
-    counter.should.equal(2)
+    counter.should == 2
   end
 
-  #it 'should honour :dont_reschedule' do
+  #it 'honours :dont_reschedule' do
   #  stack = []
   #  @s.every 0.400 do |job|
   #    if stack.size > 3
   #      stack << 'done'
   #      job.params[:dont_reschedule] = true
@@ -134,11 +134,11 @@
   #  sleep 4
   #  @s.jobs.size.should.equal(0)
   #  stack.should.equal(%w[ ok ok ok ok done ])
   #end
 
-  it 'should accept job.unschedule within the job' do
+  it 'accepts job.unschedule within the job' do
 
     stack = []
 
     @s.every 0.400 do |job|
       if stack.size > 3
@@ -149,45 +149,83 @@
       end
     end
 
     sleep 4
 
-    @s.jobs.size.should.equal(0)
-    stack.should.equal(%w[ ok ok ok ok done ])
+    @s.jobs.size.should == 0
+    stack.should == %w[ ok ok ok ok done ]
   end
 
-  it 'should respect :blocking => true' do
+  it 'respects :blocking => true' do
 
     stack = []
 
     @s.every '1s', :blocking => true do |job|
       stack << 'ok'
       sleep 2
     end
 
     sleep 5
 
-    stack.should.equal(%w[ ok ok ])
+    stack.should == %w[ ok ok ]
   end
 
+  it 'lists the "trigger threads"' do
+
+    @s.every '1s' do
+      sleep 10
+    end
+    sleep 5
+
+    @s.trigger_threads.size.should == 4
+  end
 end
 
 describe Rufus::Scheduler::EveryJob do
 
-  before do
+  before(:each) do
     @s = start_scheduler
   end
-  after do
+  after(:each) do
     stop_scheduler(@s)
   end
 
-  it 'should respond to #next_time' do
+  it 'responds to #next_time' do
 
     t = Time.now + 3 * 3600
 
     job = @s.every '3h' do
     end
 
-    job.next_time.to_i.should.equal(t.to_i)
+    job.next_time.to_i.should == t.to_i
+  end
+
+
+  it 'does not allow a job to overlap execution if set !allow_overlapping' do
+
+    stack = []
+
+    @s.every '1s', :allow_overlapping => false do |job|
+      stack << 'ok'
+      sleep 2
+    end
+
+    sleep 5
+
+    stack.size.should == 2
+  end
+
+  it 'allows a job to overlap execution (backward compatibility?)' do
+
+    stack = []
+
+    @s.every '1s' do |job|
+      stack << 'ok'
+      sleep 2
+    end
+
+    sleep 5
+
+    stack.size.should == 4
   end
 end