Switch to Rspec 3.0

Author: kovyrin

loops.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.description  = %q{Loops is a small and lightweight framework for Ruby on Rails, Merb and other ruby frameworks created to support simple background loops in your application which are usually used to do some background data processing on your servers (queue workers, batch tasks processors, etc).}
   s.rdoc_options = ['--charset=UTF-8']
 
-  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rspec', ' ~> 3.0.0'
   s.add_development_dependency 'yard'
 
   s.files            = `git ls-files`.split("\n")

spec/loop_lock_spec.rb

@@ -8,7 +8,7 @@
 
   describe '.lock' do
     it 'should lock unlocked entities' do
-      LoopLock.lock(@lock).should be_true
+      LoopLock.lock(@lock).should be(true)
     end
 
     it 'should create a lock record for unlocked entities' do
@@ -18,14 +18,14 @@
     end
 
     it 'should not lock an entity more than once' do
-      LoopLock.lock(@lock).should be_true
-      LoopLock.lock(@lock).should be_false
+      LoopLock.lock(@lock).should be(true)
+      LoopLock.lock(@lock).should be(false)
     end
 
     it 'should remove stale locks' do
       @lock[:timeout] = -1 # Expired 1 second ago :-)
-      LoopLock.lock(@lock).should be_true
-      LoopLock.lock(@lock).should be_true
+      LoopLock.lock(@lock).should be(true)
+      LoopLock.lock(@lock).should be(true)
     end
   end
 
@@ -36,26 +36,26 @@
 
     it 'should remove lock records for a locked entities' do
       expect {
-        LoopLock.unlock(@lock).should be_true
+        LoopLock.unlock(@lock).should be(true)
       }.to change { LoopLock.locked?(@lock) }.from(true).to(false)
     end
 
     it 'should gracefully handle situations where we unlock a non-locked entities' do
       LoopLock.reset!
       expect {
-        LoopLock.unlock(@lock).should be_false
+        LoopLock.unlock(@lock).should be(false)
       }.to_not change { LoopLock.locked?(@lock) }
     end
   end
 
   describe '.locked?' do
     it 'should return true for a locked entity' do
       LoopLock.lock(@lock)
-      LoopLock.locked?(@lock).should be_true
+      LoopLock.locked?(@lock).should be(true)
     end
 
     it 'should return false for a non-locked entity' do
-      LoopLock.locked?(@lock).should be_false
+      LoopLock.locked?(@lock).should be(false)
     end
   end
 end

spec/loops/base/with_lock_spec.rb

@@ -2,7 +2,7 @@
 
 describe Loops::Base, '#with_lock' do
   before :each do
-    @logger = mock('Logger').as_null_object
+    @logger = double('Logger').as_null_object
     @loop = Loops::Base.new(@logger, 'simple', {})
   end
 
@@ -11,18 +11,18 @@
       called = false
       @loop.with_lock(1, 'rspec', 60) do
         called = true
-        LoopLock.locked?(:loop => 'rspec', :entity_id => 1).should be_true
+        LoopLock.locked?(:loop => 'rspec', :entity_id => 1).should be(true)
       end
-      called.should be_true
+      called.should be(true)
     end
 
     it 'should release lock on an item' do
       called = false
       @loop.with_lock(1, 'rspec', 60) do
         called = true
       end
-      LoopLock.locked?(:loop => 'rspec', :entity_id => 1).should be_false
-      called.should be_true
+      LoopLock.locked?(:loop => 'rspec', :entity_id => 1).should be(false)
+      called.should be(true)
     end
 
     it 'should release lock on an item in case of error' do
@@ -33,28 +33,28 @@
           raise 'ouch'
         end
       }.to raise_error('ouch')
-      called.should be_true
-      LoopLock.locked?(:loop => 'rspec', :entity_id => 1).should be_false
+      called.should be(true)
+      LoopLock.locked?(:loop => 'rspec', :entity_id => 1).should be(false)
     end
 
     it 'should pass the lock timeout' do
       called = false
       @loop.with_lock(1, 'rspec', 0.2) do
         called = true
-        LoopLock.lock(:loop => 'rspec', :entity_id => 1).should be_false
+        LoopLock.lock(:loop => 'rspec', :entity_id => 1).should be(false)
         sleep(0.2)
-        LoopLock.lock(:loop => 'rspec', :entity_id => 1).should be_true
+        LoopLock.lock(:loop => 'rspec', :entity_id => 1).should be(true)
       end
-      called.should be_true
+      called.should be(true)
     end
 
     it 'should release the lock on an item' do
       called = false
       @loop.with_lock(1, 'rspec', 60) do
         called = true
       end
-      called.should be_true
-      LoopLock.locked?(:loop => 'rspec', :entity_id => 1).should be_false
+      called.should be(true)
+      LoopLock.locked?(:loop => 'rspec', :entity_id => 1).should be(false)
     end
 
     it 'should yield with entity_id value if block accepts the argument' do
@@ -63,7 +63,7 @@
         called = true
         entity_id.should == 1
       end
-      called.should be_true
+      called.should be(true)
     end
   end
 
@@ -77,16 +77,16 @@
       @loop.with_lock(1, 'rspec', 60) do
         called = true
       end
-      called.should be_false
+      called.should be(false)
     end
 
     it 'should should not touch the lock object' do
       called = false
       @loop.with_lock(1, 'rspec', 60) do
         called = true
       end
-      LoopLock.locked?(:loop => 'rspec', :entity_id => 1).should be_true
-      called.should be_false
+      LoopLock.locked?(:loop => 'rspec', :entity_id => 1).should be(true)
+      called.should be(false)
     end
   end
 end

spec/loops/base_spec.rb

@@ -3,7 +3,7 @@
 
 describe Loops::Base do
   before :each do
-    @logger = mock('Logger').as_null_object
+    @logger = double('Logger').as_null_object
     @loop = Loops::Base.new(@logger, 'simple', {})
   end
 

spec/loops/cli_spec.rb

@@ -108,11 +108,11 @@
       end
 
       it 'should load boot file' do
-        Object.const_defined?('RAILS_BOOT_LOADED').should be_true
+        Object.const_defined?('RAILS_BOOT_LOADED').should be(true)
       end
 
       it 'should load environment file' do
-        Object.const_defined?('RAILS_ENVIRONMENT_LOADED').should be_true
+        Object.const_defined?('RAILS_ENVIRONMENT_LOADED').should be(true)
       end
 
       it 'should inialize default logger' do

spec/spec_helper.rb

@@ -2,6 +2,23 @@
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'loops')
 
+RSpec.configure do |config|
+  # Mock Framework
+  config.mock_with :rspec
+
+  # Raise errors on rspec deprecations
+  config.raise_errors_for_deprecations!
+
+  # Enable old and new syntax for expectations and mocks
+  config.expect_with :rspec do |c|
+    c.syntax = [ :should, :expect ]
+  end
+  config.mock_with :rspec do |c|
+    c.syntax = [ :should, :expect ]
+  end
+end
+
+#---------------------------------------------------------------------------------------------------
 # Represents a lock object for a specific item.
 #
 # Usually you should use only {lock} and {unlock} methods to get