dalliance 0.2.9 → 0.3.0

data/spec/dalliance/asynchronous_delayed_job_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe DallianceModel do
+RSpec.describe DallianceModel do
   subject { DallianceModel.create }
 
   before(:all) do
@@ -35,8 +35,8 @@ describe DallianceModel do
       subject.dalliance_background_process
       subject.reload
 
-      subject.should_not be_successful
-      Delayed::Job.count.should == 1
+      expect(subject).not_to be_successful
+      expect(Delayed::Job.count).to eq(1)
     end
 
     it "should call the dalliance_method w/ a Delayed::Worker" do
@@ -44,8 +44,8 @@ describe DallianceModel do
       Delayed::Worker.new(:queues => [:dalliance]).work_off
       subject.reload
 
-      subject.should be_successful
-      Delayed::Job.count.should == 0
+      expect(subject).to be_successful
+      expect(Delayed::Job.count).to eq(0)
     end
 
     it "should set the dalliance_status to completed" do
@@ -53,7 +53,7 @@ describe DallianceModel do
       Delayed::Worker.new(:queues => [:dalliance]).work_off
       subject.reload
 
-      subject.should be_completed
+      expect(subject).to be_completed
     end
 
     it "should set the dalliance_progress to 100" do
@@ -61,17 +61,17 @@ describe DallianceModel do
       Delayed::Worker.new(:queues => [:dalliance]).work_off
       subject.reload
 
-      subject.dalliance_progress.should == 100
+      expect(subject.dalliance_progress).to eq(100)
     end
 
     it "should set the dalliance_duration" do
-      subject.dalliance_duration.should == nil
+      expect(subject.dalliance_duration).to eq(nil)
 
       subject.dalliance_background_process
       Delayed::Worker.new(:queues => [:dalliance]).work_off
       subject.reload
 
-      subject.dalliance_duration.should_not == nil
+      expect(subject.dalliance_duration).not_to eq(nil)
     end
 
     context "another_queue" do
@@ -86,8 +86,8 @@ describe DallianceModel do
         Delayed::Worker.new(:queues => [:dalliance]).work_off
         subject.reload
 
-        subject.should_not be_successful
-        Delayed::Job.count.should == 1
+        expect(subject).not_to be_successful
+        expect(Delayed::Job.count).to eq(1)
       end
 
       it "should call the dalliance_method w/ a Delayed::Worker (same queue)" do
@@ -95,8 +95,8 @@ describe DallianceModel do
         Delayed::Worker.new(:queues => [queue]).work_off
         subject.reload
 
-        subject.should be_successful
-        Delayed::Job.count.should == 0
+        expect(subject).to be_successful
+        expect(Delayed::Job.count).to eq(0)
       end
     end
   end
@@ -113,7 +113,7 @@ describe DallianceModel do
 
       Delayed::Worker.new(:queues => [:dalliance]).work_off
 
-      Delayed::Job.count.should == 0
+      expect(Delayed::Job.count).to eq(0)
     end
 
     it "should store the error" do
@@ -121,10 +121,10 @@ describe DallianceModel do
       Delayed::Worker.new(:queues => [:dalliance]).work_off
       subject.reload
 
-      subject.dalliance_error_hash.should_not be_empty
-      subject.dalliance_error_hash[:error].should == RuntimeError.name #We store the class name...
-      subject.dalliance_error_hash[:message].should == 'RuntimeError'
-      subject.dalliance_error_hash[:backtrace].should_not be_blank
+      expect(subject.dalliance_error_hash).not_to be_empty
+      expect(subject.dalliance_error_hash[:error]).to eq(RuntimeError.name) #We store the class name...
+      expect(subject.dalliance_error_hash[:message]).to eq('RuntimeError')
+      expect(subject.dalliance_error_hash[:backtrace]).not_to be_blank
     end
 
     it "should set the dalliance_status to processing_error" do
@@ -132,7 +132,7 @@ describe DallianceModel do
       Delayed::Worker.new(:queues => [:dalliance]).work_off
       subject.reload
 
-      subject.should be_processing_error
+      expect(subject).to be_processing_error
     end
 
     it "should set the dalliance_progress to 0" do
@@ -140,19 +140,20 @@ describe DallianceModel do
       Delayed::Worker.new(:queues => [:dalliance]).work_off
       subject.reload
 
-      subject.dalliance_progress.should == 0
+      expect(subject.dalliance_progress).to eq(0)
     end
 
     it "should handle persistance errors" do
-      DallianceModel.dalliance_options[:dalliance_method] = :dalliance_error_method_with_state_machine_exception
+      DallianceModel.dalliance_options[:dalliance_method] = :dalliance_error_method
+      allow_any_instance_of(DallianceModel).to receive(:error_dalliance!).and_raise(RuntimeError.new)
 
       subject.dalliance_background_process
       Delayed::Worker.new(:queues => [:dalliance]).work_off
       subject.reload
 
-      subject.should be_processing_error
-      subject.dalliance_error_hash.should_not be_empty
-      subject.dalliance_error_hash[:error].should == 'Persistance Failure: See Logs'
+      expect(subject).to be_processing_error
+      expect(subject.dalliance_error_hash).not_to be_empty
+      expect(subject.dalliance_error_hash[:error]).to eq('Persistance Failure: See Logs')
     end
   end
 
@@ -168,8 +169,8 @@ describe DallianceModel do
       Delayed::Worker.new(:queues => [:dalliance]).work_off
       subject.reload
 
-      subject.dalliance_error_hash.should_not be_empty
-      subject.dalliance_error_hash[:successful].should == ['is invalid']
+      expect(subject.dalliance_error_hash).not_to be_empty
+      expect(subject.dalliance_error_hash[:successful]).to eq(['is invalid'])
     end
 
     it "should set the dalliance_status to validation_error" do
@@ -177,7 +178,7 @@ describe DallianceModel do
       Delayed::Worker.new(:queues => [:dalliance]).work_off
       subject.reload
 
-      subject.should be_validation_error
+      expect(subject).to be_validation_error
     end
 
     it "should set the dalliance_progress to 0" do
@@ -185,19 +186,20 @@ describe DallianceModel do
       Delayed::Worker.new(:queues => [:dalliance]).work_off
       subject.reload
 
-      subject.dalliance_progress.should == 0
+      expect(subject.dalliance_progress).to eq(0)
     end
 
     it "should handle persistance errors" do
-      DallianceModel.dalliance_options[:dalliance_method] = :dalliance_validation_error_method_with_state_machine_exception
+      DallianceModel.dalliance_options[:dalliance_method] = :dalliance_validation_error_method
+      allow_any_instance_of(DallianceModel).to receive(:validation_error_dalliance!).and_raise(RuntimeError.new)
 
       subject.dalliance_background_process
       Delayed::Worker.new(:queues => [:dalliance]).work_off
       subject.reload
 
-      subject.should be_validation_error
-      subject.dalliance_error_hash.should_not be_empty
-      subject.dalliance_error_hash[:error].should == 'Persistance Failure: See Logs'
+      expect(subject).to be_validation_error
+      expect(subject.dalliance_error_hash).not_to be_empty
+      expect(subject.dalliance_error_hash[:error]).to eq('Persistance Failure: See Logs')
     end
   end
 end

data/spec/dalliance/asynchronous_resque_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe DallianceModel do
+RSpec.describe DallianceModel do
   subject { DallianceModel.create }
 
   before(:all) do
@@ -35,8 +35,8 @@ describe DallianceModel do
       subject.dalliance_background_process
       subject.reload
 
-      subject.should_not be_successful
-      Resque.size(:dalliance).should == 1
+      expect(subject).not_to be_successful
+      expect(Resque.size(:dalliance)).to eq(1)
     end
 
     it "should call the dalliance_method w/ a Delayed::Worker" do
@@ -47,11 +47,11 @@ describe DallianceModel do
       Resque::Worker.new(:dalliance).process
       subject.reload
 
-      subject.should be_successful
-      Resque.size(:dalliance).should == 0
+      expect(subject).to be_successful
+      expect(Resque.size(:dalliance)).to eq(0)
 
-      Resque::Stat[:processed].should == 1
-      Resque::Stat[:failed].should == 0
+      expect(Resque::Stat[:processed]).to eq(1)
+      expect(Resque::Stat[:failed]).to eq(0)
     end
 
     it "should set the dalliance_status to completed" do
@@ -59,7 +59,7 @@ describe DallianceModel do
       Resque::Worker.new(:dalliance).process
       subject.reload
 
-      subject.should be_completed
+      expect(subject).to be_completed
     end
 
     it "should set the dalliance_progress to 100" do
@@ -67,17 +67,17 @@ describe DallianceModel do
       Resque::Worker.new(:dalliance).process
       subject.reload
 
-      subject.dalliance_progress.should == 100
+      expect(subject.dalliance_progress).to eq(100)
     end
 
     it "should set the dalliance_duration" do
-      subject.dalliance_duration.should == nil
+      expect(subject.dalliance_duration).to eq(nil)
 
       subject.dalliance_background_process
       Resque::Worker.new(:dalliance).process
       subject.reload
 
-      subject.dalliance_duration.should_not == nil
+      expect(subject.dalliance_duration).not_to eq(nil)
     end
 
     context "another_queue" do
@@ -96,8 +96,8 @@ describe DallianceModel do
         Resque::Worker.new(:dalliance).process
         subject.reload
 
-        subject.should_not be_successful
-        Resque.size(queue).should == 1
+        expect(subject).not_to be_successful
+        expect(Resque.size(queue)).to eq(1)
       end
 
       it "should call the dalliance_method w/ a Delayed::Worker (same queue)" do
@@ -105,8 +105,8 @@ describe DallianceModel do
         Resque::Worker.new(queue).process
         subject.reload
 
-        subject.should be_successful
-        Resque.size(queue).should == 0
+        expect(subject).to be_successful
+        expect(Resque.size(queue)).to eq(0)
       end
     end
   end
@@ -126,10 +126,10 @@ describe DallianceModel do
 
       Resque::Worker.new(:dalliance).process
 
-      Resque.size(:dalliance).should == 0
+      expect(Resque.size(:dalliance)).to eq(0)
 
-      Resque::Stat[:processed].should == 1
-      Resque::Stat[:failed].should == 1
+      expect(Resque::Stat[:processed]).to eq(1)
+      expect(Resque::Stat[:failed]).to eq(1)
     end
 
     it "should store the error" do
@@ -137,10 +137,10 @@ describe DallianceModel do
       Resque::Worker.new(:dalliance).process
       subject.reload
 
-      subject.dalliance_error_hash.should_not be_empty
-      subject.dalliance_error_hash[:error].should == RuntimeError.name #We store the class name...
-      subject.dalliance_error_hash[:message].should == 'RuntimeError'
-      subject.dalliance_error_hash[:backtrace].should_not be_blank
+      expect(subject.dalliance_error_hash).not_to be_empty
+      expect(subject.dalliance_error_hash[:error]).to eq(RuntimeError.name) #We store the class name...
+      expect(subject.dalliance_error_hash[:message]).to eq('RuntimeError')
+      expect(subject.dalliance_error_hash[:backtrace]).not_to be_blank
     end
 
     it "should set the dalliance_status to processing_error" do
@@ -148,7 +148,7 @@ describe DallianceModel do
       Resque::Worker.new(:dalliance).process
       subject.reload
 
-      subject.should be_processing_error
+      expect(subject).to be_processing_error
     end
 
     it "should set the dalliance_progress to 0" do
@@ -156,19 +156,20 @@ describe DallianceModel do
       Resque::Worker.new(:dalliance).process
       subject.reload
 
-      subject.dalliance_progress.should == 0
+      expect(subject.dalliance_progress).to eq(0)
     end
 
     it "should handle persistance errors" do
-      DallianceModel.dalliance_options[:dalliance_method] = :dalliance_error_method_with_state_machine_exception
+      DallianceModel.dalliance_options[:dalliance_method] = :dalliance_error_method
+      allow_any_instance_of(DallianceModel).to receive(:error_dalliance!).and_raise(RuntimeError.new)
 
       subject.dalliance_background_process
       Resque::Worker.new(:dalliance).process
       subject.reload
 
-      subject.should be_processing_error
-      subject.dalliance_error_hash.should_not be_empty
-      subject.dalliance_error_hash[:error].should == 'Persistance Failure: See Logs'
+      expect(subject).to be_processing_error
+      expect(subject.dalliance_error_hash).not_to be_empty
+      expect(subject.dalliance_error_hash[:error]).to eq('Persistance Failure: See Logs')
     end
   end
 
@@ -184,8 +185,8 @@ describe DallianceModel do
       Resque::Worker.new(:dalliance).process
       subject.reload
 
-      subject.dalliance_error_hash.should_not be_empty
-      subject.dalliance_error_hash[:successful].should == ['is invalid']
+      expect(subject.dalliance_error_hash).not_to be_empty
+      expect(subject.dalliance_error_hash[:successful]).to eq(['is invalid'])
     end
 
     it "should set the dalliance_status to validation_error" do
@@ -193,7 +194,7 @@ describe DallianceModel do
       Resque::Worker.new(:dalliance).process
       subject.reload
 
-      subject.should be_validation_error
+      expect(subject).to be_validation_error
     end
 
     it "should set the dalliance_progress to 0" do
@@ -201,19 +202,20 @@ describe DallianceModel do
       Resque::Worker.new(:dalliance).process
       subject.reload
 
-      subject.dalliance_progress.should == 0
+      expect(subject.dalliance_progress).to eq(0)
     end
 
     it "should handle persistance errors" do
-      DallianceModel.dalliance_options[:dalliance_method] = :dalliance_validation_error_method_with_state_machine_exception
+      DallianceModel.dalliance_options[:dalliance_method] = :dalliance_validation_error_method
+      allow_any_instance_of(DallianceModel).to receive(:validation_error_dalliance!).and_raise(RuntimeError.new)
 
       subject.dalliance_background_process
       Resque::Worker.new(:dalliance).process
       subject.reload
 
-      subject.should be_validation_error
-      subject.dalliance_error_hash.should_not be_empty
-      subject.dalliance_error_hash[:error].should == 'Persistance Failure: See Logs'
+      expect(subject).to be_validation_error
+      expect(subject.dalliance_error_hash).not_to be_empty
+      expect(subject.dalliance_error_hash[:error]).to eq('Persistance Failure: See Logs')
     end
   end
 end

data/spec/dalliance/dalliance_spec.rb

@@ -1,4 +1,4 @@
 require 'spec_helper'
 
-describe 'Dalliance' do
+RSpec.describe 'Dalliance' do
 end

data/spec/dalliance/synchronous_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe DallianceModel do
+RSpec.describe DallianceModel do
   subject { DallianceModel.create }
 
   before(:all) do
@@ -14,24 +14,24 @@ describe DallianceModel do
     end
 
     it "should call the dalliance_method" do
-      lambda { subject.dalliance_background_process }.should change(subject, :successful).from(false).to(true)
+      expect { subject.dalliance_background_process }.to change(subject, :successful).from(false).to(true)
     end
 
     it "should set the dalliance_status to completed" do
-      lambda { subject.dalliance_background_process }.should change(subject, :dalliance_status).from('pending').to('completed')
+      expect { subject.dalliance_background_process }.to change(subject, :dalliance_status).from('pending').to('completed')
     end
 
     it "should set the dalliance_progress to 100" do
-      lambda { subject.dalliance_background_process }.should change(subject, :dalliance_progress).from(0).to(100)
+      expect { subject.dalliance_background_process }.to change(subject, :dalliance_progress).from(0).to(100)
     end
 
     it "should set the dalliance_duration" do
-      subject.dalliance_duration.should == nil
+      expect(subject.dalliance_duration).to eq(nil)
 
       subject.dalliance_background_process
       subject.reload
 
-      subject.dalliance_duration.should_not == nil
+      expect(subject.dalliance_duration).not_to eq(nil)
     end
   end
 
@@ -47,32 +47,33 @@ describe DallianceModel do
     it "should store the error" do
       expect { subject.dalliance_background_process }.to raise_error(RuntimeError)
 
-      subject.dalliance_error_hash.should_not be_empty
-      subject.dalliance_error_hash[:error].should == RuntimeError.name #We store the class name...
-      subject.dalliance_error_hash[:message].should == 'RuntimeError'
-      subject.dalliance_error_hash[:backtrace].should_not be_blank
+      expect(subject.dalliance_error_hash).not_to be_empty
+      expect(subject.dalliance_error_hash[:error]).to eq(RuntimeError.name) #We store the class name...
+      expect(subject.dalliance_error_hash[:message]).to eq('RuntimeError')
+      expect(subject.dalliance_error_hash[:backtrace]).not_to be_blank
     end
 
     it "should set the dalliance_status to processing_error" do
       expect { subject.dalliance_background_process }.to raise_error(RuntimeError)
 
-      subject.should be_processing_error
+      expect(subject).to be_processing_error
     end
 
     it "should set the dalliance_progress to 0" do
       expect { subject.dalliance_background_process }.to raise_error(RuntimeError)
 
-      subject.dalliance_progress.should == 0
+      expect(subject.dalliance_progress).to eq(0)
     end
 
     it "should handle persistance errors" do
-      DallianceModel.dalliance_options[:dalliance_method] = :dalliance_error_method_with_state_machine_exception
+      DallianceModel.dalliance_options[:dalliance_method] = :dalliance_error_method
+      allow_any_instance_of(DallianceModel).to receive(:error_dalliance!).and_raise(RuntimeError.new)
 
       expect { subject.dalliance_background_process }.to raise_error(RuntimeError)
 
-      subject.should be_processing_error
-      subject.dalliance_error_hash.should_not be_empty
-      subject.dalliance_error_hash[:error].should == 'Persistance Failure: See Logs'
+      expect(subject).to be_processing_error
+      expect(subject.dalliance_error_hash).not_to be_empty
+      expect(subject.dalliance_error_hash[:error]).to eq('Persistance Failure: See Logs')
     end
   end
 
@@ -84,57 +85,58 @@ describe DallianceModel do
     it "should store the error" do
       subject.dalliance_background_process
 
-      subject.dalliance_error_hash.should_not be_empty
-      subject.dalliance_error_hash[:successful].should == ['is invalid']
+      expect(subject.dalliance_error_hash).not_to be_empty
+      expect(subject.dalliance_error_hash[:successful]).to eq(['is invalid'])
     end
 
     it "should set the dalliance_status to validation_error" do
-      lambda { subject.dalliance_background_process }.should change(subject, :dalliance_status).from('pending').to('validation_error')
+      expect { subject.dalliance_background_process }.to change(subject, :dalliance_status).from('pending').to('validation_error')
     end
 
     it "should set the dalliance_progress to 0" do
       subject.dalliance_background_process
 
-      subject.dalliance_progress.should == 0
+      expect(subject.dalliance_progress).to eq(0)
     end
 
     it "should handle persistance errors" do
-      DallianceModel.dalliance_options[:dalliance_method] = :dalliance_validation_error_method_with_state_machine_exception
+      DallianceModel.dalliance_options[:dalliance_method] = :dalliance_validation_error_method
+      allow_any_instance_of(DallianceModel).to receive(:validation_error_dalliance!).and_raise(RuntimeError.new)
 
       subject.dalliance_background_process
 
-      subject.should be_validation_error
-      subject.dalliance_error_hash.should_not be_empty
-      subject.dalliance_error_hash[:error].should == 'Persistance Failure: See Logs'
+      expect(subject).to be_validation_error
+      expect(subject.dalliance_error_hash).not_to be_empty
+      expect(subject.dalliance_error_hash[:error]).to eq('Persistance Failure: See Logs')
     end
   end
 
    context "destroy" do
     it "should return false when pending?" do
       subject.update_column(:dalliance_status, 'pending')
-      subject.destroy.should be_false
-      subject.errors[:dalliance_status].should == ['is invalid']
+      expect(subject.destroy).to be_falsey
+      expect(subject.errors[:dalliance_status]).to eq(['is invalid'])
     end
 
     it "should return false when processing?" do
       subject.update_column(:dalliance_status, 'processing')
-      subject.destroy.should be_false
-      subject.errors[:dalliance_status].should == ['is invalid']
+      expect(subject.destroy).to be_falsey
+      expect(subject.errors[:dalliance_status]).to eq(['is invalid'])
     end
 
     it "should return true when validation_error?" do
       subject.update_column(:dalliance_status, 'validation_error')
-      subject.destroy.should be_true
+      expect(subject.destroy).to be_truthy
     end
 
     it "should return true when processing_error?" do
       subject.update_column(:dalliance_status, 'processing_error')
-      subject.destroy.should be_true
+      expect(subject.destroy).to be_truthy
     end
 
     it "should return true when completed?" do
       subject.update_column(:dalliance_status, 'completed')
-      subject.destroy.should be_true
+      expect(subject.destroy).to be_truthy
     end
   end
 end

data/spec/spec_helper.rb

@@ -13,6 +13,16 @@ require 'resque'
 require 'dalliance'
 
 RSpec.configure do |config|
+  config.raise_errors_for_deprecations!
+
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+
+  config.mock_with :rspec
+
+  config.expose_dsl_globally = false
+
   #http://blog.rubyhead.com/2010/04/27/database-during-tests/
   # config.before do
   #   ActiveRecord::Base.connection.begin_db_transaction

data/spec/support/active_record.rb

@@ -12,7 +12,7 @@ ActiveRecord::Schema.define do
     t.integer :total_count
     t.integer :progress
 
-    t.timestamps
+    t.timestamps null: false
   end
 
   add_index     :dalliance_progress_meters, [:dalliance_progress_model_id, :dalliance_progress_model_type], :name => 'by_dalliance_progress_model'
@@ -27,7 +27,7 @@ ActiveRecord::Schema.define do
     table.datetime :failed_at
     table.string   :locked_by
     table.string   :queue
-    table.timestamps
+    table.timestamps  null: false
   end
 
   add_index :delayed_jobs, [:priority, :run_at], :name => 'delayed_jobs_priority'
@@ -62,16 +62,4 @@ class DallianceModel < ActiveRecord::Base
 
     store_dalliance_validation_error!
   end
-
-  def dalliance_error_method_with_state_machine_exception
-    self.stub(:error_dalliance!).and_raise(RuntimeError.new)
-
-    dalliance_error_method
-  end
-
-  def dalliance_validation_error_method_with_state_machine_exception
-    self.stub(:validation_error_dalliance!).and_raise(RuntimeError.new)
-
-    dalliance_validation_error_method
-  end
 end