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

@@ -3,163 +3,162 @@
 # Specifying rufus-scheduler
 #
 # Sat Mar 21 17:36:36 JST 2009
 #
 
-require File.dirname(__FILE__) + '/spec_base'
+require File.join(File.dirname(__FILE__), 'spec_base')
 
 
 describe "#{SCHEDULER_CLASS}#in" 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.in(1) {}
-    j0.job_id.should.match(/Rufus::Scheduler::InJob/)
+    j0.job_id.should match(/Rufus::Scheduler::InJob/)
   end
 
-  it 'should track scheduled in jobs' do
+  it 'tracks scheduled in jobs' do
 
     @s.in(1) {}
 
     wait_next_tick
-    @s.jobs.size.should.equal(1)
+    @s.jobs.size.should == 1
 
     sleep 1.5
 
-    @s.jobs.size.should.equal(0)
+    @s.jobs.size.should == 0
   end
 
-  it 'should schedule in 1' do
+  it 'schedules in 1' do
 
     var = nil
 
     @s.in 1 do
       var = true
     end
 
-    var.should.be.nil
+    var.should == nil
     sleep 1.5
 
-    var.should.be.true
+    var.should == true
   end
 
-  it 'should schedule in 1.0' do
+  it 'schedules in 1.0' do
 
     var = nil
 
     @s.in 1.0 do
       var = true
     end
 
-    var.should.be.nil
+    var.should == nil
     sleep 1.5
 
-    var.should.be.true
+    var.should == true
   end
 
-  it 'should schedule in 1s' do
+  it 'schedules in 1s' do
 
     var = nil
 
     @s.in '1s' do
       var = true
     end
 
-    var.should.be.nil
+    var.should == nil
     sleep 1.5
 
-    var.should.be.true
+    var.should == true
   end
 
-  it 'should trigger [almost] immediately jobs in the past' do
+  it 'triggers [almost] immediately jobs in the past' do
 
     var = nil
 
     @s.in -2 do
       var = true
     end
 
     #wait_next_tick
     sleep 0.550
 
-    var.should.be.true
-    @s.jobs.should.be.empty
+    var.should == true
+    @s.jobs.should == {}
   end
 
-  it 'should not trigger jobs in the past when :discard_past => true' do
+  it 'does not trigger jobs in the past when :discard_past => true' do
 
     var = nil
 
     @s.in -2, :discard_past => true do
       var = true
     end
 
-    var.should.be.nil
-    @s.jobs.should.be.empty
+    var.should == nil
+    @s.jobs.should == {}
   end
 
-  it 'should unschedule job' do
+  it 'unschedules jobs' do
 
     job = @s.in '2d' do
     end
 
     wait_next_tick
 
-    @s.jobs.size.should.equal(1)
+    @s.jobs.size.should == 1
 
     @s.unschedule(job.job_id)
 
-    @s.jobs.size.should.equal(0)
+    @s.jobs.size.should == 0
   end
 
-  it 'should accept tags for jobs' do
+  it 'accepts tags for jobs' do
 
     job = @s.in '2d', :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
-
 end
 
 describe Rufus::Scheduler::InJob do
 
-  before do
+  before(:each) do
     @s = start_scheduler
   end
-  after do
+  after(:each) do
     stop_scheduler(@s)
   end
 
-  it 'should unschedule itself' do
+  it 'unschedules itself' do
 
     job = @s.in '2d' do
     end
 
     wait_next_tick
 
     job.unschedule
 
-    @s.jobs.size.should.equal(0)
+    @s.jobs.size.should == 0
   end
 
-  it 'should respond to #next_time' do
+  it 'responds to #next_time' do
 
     t = Time.now + 3 * 3600
 
     job = @s.in '3h' do
     end
 
-    job.next_time.to_i.should.equal(t.to_i)
+    job.next_time.to_i.should == t.to_i
   end
 end