validates_timeliness 3.0.15 → 4.0.0

data/spec/validates_timeliness/extensions/date_time_select_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ValidatesTimeliness::Extensions::DateTimeSelect do
+describe 'ValidatesTimeliness::Extensions::DateTimeSelect' do
   include ActionView::Helpers::DateHelper
   attr_reader :person, :params
 
@@ -111,7 +111,7 @@ describe ValidatesTimeliness::Extensions::DateTimeSelect do
       @output = date_select(:person, :birth_date, :include_blank => true, :discard_day => true)
       should_have_datetime_selected(:birth_date, :year => 2009, :month => 'February')
       should_not_have_datetime_selected(:birth_time, :day)
-      @output.should have_tag("input[id=person_birth_date_3i][type=hidden][value='1']")
+      expect(@output).to have_tag("input[id=person_birth_date_3i][type=hidden][value='1']")
     end
   end
 
@@ -150,14 +150,15 @@ describe ValidatesTimeliness::Extensions::DateTimeSelect do
   def should_have_datetime_selected(field, datetime_hash)
     datetime_hash.each do |key, value|
       index = {:year => 1, :month => 2, :day => 3, :hour => 4, :min => 5, :sec => 6}[key]
-      @output.should have_tag("select[id=person_#{field}_#{index}i] option[selected=selected]", value.to_s)
+      expect(@output).to have_tag("select[id=person_#{field}_#{index}i] option[selected=selected]", value.to_s)
     end
   end
 
   def should_not_have_datetime_selected(field, *attributes)
     attributes.each do |attribute|
       index = {:year => 1, :month => 2, :day => 3, :hour => 4, :min => 5, :sec => 6}[attribute]
-      @output.should_not have_tag("select[id=person_#{attribute}_#{index}i] option[selected=selected]")
+      expect(@output).not_to have_tag("select[id=person_#{attribute}_#{index}i] option[selected=selected]")
     end
   end
+  
 end

data/spec/validates_timeliness/extensions/multiparameter_handler_spec.rb

@@ -1,38 +1,38 @@
 require 'spec_helper'
 
-describe ValidatesTimeliness::Extensions::MultiparameterHandler do
+describe 'ValidatesTimeliness::Extensions::MultiparameterHandler' do
 
   context "time column" do
     it 'should assign a string value for invalid date portion' do
       employee = record_with_multiparameter_attribute(:birth_datetime, [2000, 2, 31, 12, 0, 0])
-      employee.birth_datetime_before_type_cast.should eq '2000-02-31 12:00:00'
+      expect(employee.birth_datetime_before_type_cast).to eq '2000-02-31 12:00:00'
     end
      
     it 'should assign a Time value for valid datetimes' do
       employee = record_with_multiparameter_attribute(:birth_datetime, [2000, 2, 28, 12, 0, 0])
-      employee.birth_datetime_before_type_cast.should eq Time.zone.local(2000, 2, 28, 12, 0, 0)
+      expect(employee.birth_datetime_before_type_cast).to eq Time.zone.local(2000, 2, 28, 12, 0, 0)
     end
 
     it 'should assign a string value for incomplete time' do
       employee = record_with_multiparameter_attribute(:birth_datetime, [2000, nil, nil])
-      employee.birth_datetime_before_type_cast.should eq '2000-00-00'
+      expect(employee.birth_datetime_before_type_cast).to eq '2000-00-00'
     end
   end
 
   context "date column" do
     it 'should assign a string value for invalid date' do
       employee = record_with_multiparameter_attribute(:birth_date, [2000, 2, 31])
-      employee.birth_date_before_type_cast.should eq '2000-02-31'
+      expect(employee.birth_date_before_type_cast).to eq '2000-02-31'
     end
 
     it 'should assign a Date value for valid date' do
       employee = record_with_multiparameter_attribute(:birth_date, [2000, 2, 28])
-      employee.birth_date_before_type_cast.should eq Date.new(2000, 2, 28)
+      expect(employee.birth_date_before_type_cast).to eq Date.new(2000, 2, 28)
     end
 
     it 'should assign a string value for incomplete date' do
       employee = record_with_multiparameter_attribute(:birth_date, [2000, nil, nil])
-      employee.birth_date_before_type_cast.should eq '2000-00-00'
+      expect(employee.birth_date_before_type_cast).to eq '2000-00-00'
     end
   end
 
@@ -41,4 +41,5 @@ describe ValidatesTimeliness::Extensions::MultiparameterHandler do
     values.each_with_index {|value, index| hash["#{name}(#{index+1}i)"] = value.to_s }
     Employee.new(hash)
   end
+
 end

data/spec/validates_timeliness/helper_methods_spec.rb

@@ -4,27 +4,27 @@ describe ValidatesTimeliness, 'HelperMethods' do
   let(:record) { Person.new }
   
   it 'should define class validation methods' do
-    Person.should respond_to(:validates_date)
-    Person.should respond_to(:validates_time)
-    Person.should respond_to(:validates_datetime)
+    expect(Person).to respond_to(:validates_date)
+    expect(Person).to respond_to(:validates_time)
+    expect(Person).to respond_to(:validates_datetime)
   end
 
   it 'should define instance validation methods' do
-    record.should respond_to(:validates_date)
-    record.should respond_to(:validates_time)
-    record.should respond_to(:validates_datetime)
+    expect(record).to respond_to(:validates_date)
+    expect(record).to respond_to(:validates_time)
+    expect(record).to respond_to(:validates_datetime)
   end
 
   it 'should validate instance using class validation defined' do
     Person.validates_date :birth_date
     record.valid?
 
-    record.errors[:birth_date].should_not be_empty
+    expect(record.errors[:birth_date]).not_to be_empty
   end
 
   it 'should validate instance using instance valiation method' do
     record.validates_date :birth_date
 
-    record.errors[:birth_date].should_not be_empty
+    expect(record.errors[:birth_date]).not_to be_empty
   end
 end

data/spec/validates_timeliness/orm/active_record_spec.rb

@@ -6,41 +6,41 @@ describe ValidatesTimeliness, 'ActiveRecord' do
     let(:record) { Employee.new }
 
     it 'should be defined for the class' do
-      ActiveRecord::Base.should respond_to(:validates_date)
-      ActiveRecord::Base.should respond_to(:validates_time)
-      ActiveRecord::Base.should respond_to(:validates_datetime)
+      expect(ActiveRecord::Base).to respond_to(:validates_date)
+      expect(ActiveRecord::Base).to respond_to(:validates_time)
+      expect(ActiveRecord::Base).to respond_to(:validates_datetime)
     end
 
     it 'should defines for the instance' do
-      record.should respond_to(:validates_date)
-      record.should respond_to(:validates_time)
-      record.should respond_to(:validates_datetime)
+      expect(record).to respond_to(:validates_date)
+      expect(record).to respond_to(:validates_time)
+      expect(record).to respond_to(:validates_datetime)
     end
 
     it "should validate a valid value string" do
       record.birth_date = '2012-01-01'
 
       record.valid?
-      record.errors[:birth_date].should be_empty
+      expect(record.errors[:birth_date]).to be_empty
     end
 
     it "should validate a invalid value string" do
       record.birth_date = 'not a date'
 
       record.valid?
-      record.errors[:birth_date].should_not be_empty
+      expect(record.errors[:birth_date]).not_to be_empty
     end
 
     it "should validate a nil value" do
       record.birth_date = nil
 
       record.valid?
-      record.errors[:birth_date].should be_empty
+      expect(record.errors[:birth_date]).to be_empty
     end
   end
 
   it 'should determine type for attribute' do
-    Employee.timeliness_attribute_type(:birth_date).should eq :date
+    expect(Employee.timeliness_attribute_type(:birth_date)).to eq :date
   end
 
   context 'attribute timezone awareness' do
@@ -58,17 +58,17 @@ describe ValidatesTimeliness, 'ActiveRecord' do
 
     context 'for column attribute' do
       it 'should be detected from column type' do
-        klass.timeliness_attribute_timezone_aware?(:birth_date).should be_false
-        klass.timeliness_attribute_timezone_aware?(:birth_time).should be_false
-        klass.timeliness_attribute_timezone_aware?(:birth_datetime).should be_true
+        expect(klass.timeliness_attribute_timezone_aware?(:birth_date)).to be_falsey
+        expect(klass.timeliness_attribute_timezone_aware?(:birth_time)).to be_falsey
+        expect(klass.timeliness_attribute_timezone_aware?(:birth_datetime)).to be_truthy
       end
     end
 
     context 'for non-column attribute' do
       it 'should be detected from the validation type' do
-        klass.timeliness_attribute_timezone_aware?(:some_date).should be_false
-        klass.timeliness_attribute_timezone_aware?(:some_time).should be_false
-        klass.timeliness_attribute_timezone_aware?(:some_datetime).should be_true
+        expect(klass.timeliness_attribute_timezone_aware?(:some_date)).to be_falsey
+        expect(klass.timeliness_attribute_timezone_aware?(:some_time)).to be_falsey
+        expect(klass.timeliness_attribute_timezone_aware?(:some_datetime)).to be_truthy
       end
     end
   end
@@ -88,7 +88,7 @@ describe ValidatesTimeliness, 'ActiveRecord' do
         it 'should store raw value' do
           record.birth_datetime = datetime_string = '2010-01-01 12:30'
 
-          record._timeliness_raw_value_for('birth_datetime').should eq datetime_string
+          expect(record.read_timeliness_attribute_before_type_cast('birth_datetime')).to eq datetime_string
         end
       end
 
@@ -96,7 +96,7 @@ describe ValidatesTimeliness, 'ActiveRecord' do
         it 'should store raw value' do
           record.birth_date = date_string = '2010-01-01'
 
-          record._timeliness_raw_value_for('birth_date').should eq date_string
+          expect(record.read_timeliness_attribute_before_type_cast('birth_date')).to eq date_string
         end
       end
 
@@ -104,7 +104,7 @@ describe ValidatesTimeliness, 'ActiveRecord' do
         it 'should store raw value' do
           record.birth_time = time_string = '12:12'
 
-          record._timeliness_raw_value_for('birth_time').should eq time_string
+          expect(record.read_timeliness_attribute_before_type_cast('birth_time')).to eq time_string
         end
       end
     end
@@ -122,13 +122,13 @@ describe ValidatesTimeliness, 'ActiveRecord' do
 
       context "for a date column" do
         it 'should parse a string value' do
-          Timeliness::Parser.should_receive(:parse)
+          expect(Timeliness::Parser).to receive(:parse)
 
           record.birth_date = '2010-01-01'
         end
 
         it 'should parse a invalid string value as nil' do
-          Timeliness::Parser.should_receive(:parse)
+          expect(Timeliness::Parser).to receive(:parse)
 
           record.birth_date = 'not valid'
         end
@@ -136,20 +136,20 @@ describe ValidatesTimeliness, 'ActiveRecord' do
         it 'should store a Date value after parsing string' do
           record.birth_date = '2010-01-01'
 
-          record.birth_date.should be_kind_of(Date)
-          record.birth_date.should eq Date.new(2010, 1, 1)
+          expect(record.birth_date).to be_kind_of(Date)
+          expect(record.birth_date).to eq Date.new(2010, 1, 1)
         end
       end
 
       context "for a time column" do
         it 'should parse a string value' do
-          Timeliness::Parser.should_receive(:parse)
+          expect(Timeliness::Parser).to receive(:parse)
 
           record.birth_time = '12:30'
         end
 
         it 'should parse a invalid string value as nil' do
-          Timeliness::Parser.should_receive(:parse)
+          expect(Timeliness::Parser).to receive(:parse)
 
           record.birth_time = 'not valid'
         end
@@ -157,8 +157,8 @@ describe ValidatesTimeliness, 'ActiveRecord' do
         it 'should store a Time value after parsing string' do
           record.birth_time = '12:30'
 
-          record.birth_time.should be_kind_of(Time)
-          record.birth_time.should eq Time.utc(2000, 1, 1, 12, 30)
+          expect(record.birth_time).to be_kind_of(Time)
+          expect(record.birth_time).to eq Time.utc(2000, 1, 1, 12, 30)
         end
       end
 
@@ -166,13 +166,13 @@ describe ValidatesTimeliness, 'ActiveRecord' do
         with_config(:default_timezone, 'Australia/Melbourne')
 
         it 'should parse a string value' do
-          Timeliness::Parser.should_receive(:parse)
+          expect(Timeliness::Parser).to receive(:parse)
 
           record.birth_datetime = '2010-01-01 12:00'
         end
 
         it 'should parse a invalid string value as nil' do
-          Timeliness::Parser.should_receive(:parse)
+          expect(Timeliness::Parser).to receive(:parse)
 
           record.birth_datetime = 'not valid'
         end
@@ -180,13 +180,13 @@ describe ValidatesTimeliness, 'ActiveRecord' do
         it 'should parse string into Time value' do
           record.birth_datetime = '2010-01-01 12:00'
 
-          record.birth_datetime.should be_kind_of(Time)
+          expect(record.birth_datetime).to be_kind_of(Time)
         end
 
         it 'should parse string as current timezone' do
           record.birth_datetime = '2010-06-01 12:00'
 
-          record.birth_datetime.utc_offset.should eq Time.zone.utc_offset
+          expect(record.birth_datetime.utc_offset).to eq Time.zone.utc_offset
         end
       end
     end
@@ -199,7 +199,7 @@ describe ValidatesTimeliness, 'ActiveRecord' do
       
       record.reload
 
-      record._timeliness_raw_value_for('birth_date').should be_nil
+      expect(record.read_timeliness_attribute_before_type_cast('birth_date')).to be_nil
     end
   end
 
@@ -207,13 +207,13 @@ describe ValidatesTimeliness, 'ActiveRecord' do
     let(:record) { Employee.new }
 
     it 'should be defined on class if ORM supports it' do
-      record.should respond_to(:birth_datetime_before_type_cast)
+      expect(record).to respond_to(:birth_datetime_before_type_cast)
     end
 
     it 'should return original value' do
       record.birth_datetime = date_string = '2010-01-01'
 
-      record.birth_datetime_before_type_cast.should eq date_string
+      expect(record.birth_datetime_before_type_cast).to eq date_string
     end
 
     it 'should return attribute if no attribute assignment has been made' do
@@ -221,7 +221,7 @@ describe ValidatesTimeliness, 'ActiveRecord' do
       Employee.create(:birth_datetime => datetime)
 
       record = Employee.last
-      record.birth_datetime_before_type_cast.should match(/#{datetime.utc.to_s[0...-4]}/)
+      expect(record.birth_datetime_before_type_cast).to match(/#{datetime.utc.to_s[0...-4]}/)
     end
 
     context "with plugin parser" do
@@ -230,7 +230,7 @@ describe ValidatesTimeliness, 'ActiveRecord' do
       it 'should return original value' do
         record.birth_datetime = date_string = '2010-01-31'
 
-        record.birth_datetime_before_type_cast.should eq date_string
+        expect(record.birth_datetime_before_type_cast).to eq date_string
       end
     end
 
@@ -238,7 +238,7 @@ describe ValidatesTimeliness, 'ActiveRecord' do
 
   context "define_attribute_methods" do
     it "returns a falsy value if the attribute methods have already been generated" do
-      Employee.define_attribute_methods.should be_false
+      expect(Employee.define_attribute_methods).to be_falsey
     end
   end
 end

data/spec/validates_timeliness/validator/after_spec.rb

@@ -25,15 +25,15 @@ describe ValidatesTimeliness::Validator, ":after option" do
     end
 
     it "should not be valid for same time as restriction" do
-      invalid!(:birth_time, Time.local_time(2000, 1, 1, 12, 0, 0), 'must be after 12:00:00')
+      invalid!(:birth_time, Time.local(2000, 1, 1, 12, 0, 0), 'must be after 12:00:00')
     end
 
     it "should not be valid for time before restriction" do
-      invalid!(:birth_time, Time.local_time(2000, 1, 1, 11, 59, 59), 'must be after 12:00:00')
+      invalid!(:birth_time, Time.local(2000, 1, 1, 11, 59, 59), 'must be after 12:00:00')
     end
 
     it "should be valid for time after restriction" do
-      valid!(:birth_time, Time.local_time(2000, 1, 1, 12, 00, 01))
+      valid!(:birth_time, Time.local(2000, 1, 1, 12, 00, 01))
     end
   end
 

data/spec/validates_timeliness/validator/before_spec.rb

@@ -25,15 +25,15 @@ describe ValidatesTimeliness::Validator, ":before option" do
     end
 
     it "should not be valid for time after restriction" do
-      invalid!(:birth_time, Time.local_time(2000, 1, 1, 12, 00, 01), 'must be before 12:00:00')
+      invalid!(:birth_time, Time.local(2000, 1, 1, 12, 00, 01), 'must be before 12:00:00')
     end
 
     it "should not be valid for same time as restriction" do
-      invalid!(:birth_time, Time.local_time(2000, 1, 1, 12, 0, 0), 'must be before 12:00:00')
+      invalid!(:birth_time, Time.local(2000, 1, 1, 12, 0, 0), 'must be before 12:00:00')
     end
 
     it "should be valid for time before restriction" do
-      valid!(:birth_time, Time.local_time(2000, 1, 1, 11, 59, 59))
+      valid!(:birth_time, Time.local(2000, 1, 1, 11, 59, 59))
     end
   end
 

data/spec/validates_timeliness/validator/is_at_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe ValidatesTimeliness::Validator, ":is_at option" do
   before do
-    Timecop.freeze(Time.local_time(2010, 1, 1, 0, 0, 0))
+    Timecop.freeze(Time.local(2010, 1, 1, 0, 0, 0))
   end
 
   describe "for date type" do
@@ -29,15 +29,15 @@ describe ValidatesTimeliness::Validator, ":is_at option" do
     end
 
     it "should not be valid for time before restriction" do
-      invalid!(:birth_time, Time.local_time(2000, 1, 1, 11, 59, 59), 'must be at 12:00:00')
+      invalid!(:birth_time, Time.local(2000, 1, 1, 11, 59, 59), 'must be at 12:00:00')
     end
 
     it "should not be valid for time after restriction" do
-      invalid!(:birth_time, Time.local_time(2000, 1, 1, 12, 00, 01), 'must be at 12:00:00')
+      invalid!(:birth_time, Time.local(2000, 1, 1, 12, 00, 01), 'must be at 12:00:00')
     end
 
     it "should be valid for same time as restriction" do
-      valid!(:birth_time, Time.local_time(2000, 1, 1, 12, 0, 0))
+      valid!(:birth_time, Time.local(2000, 1, 1, 12, 0, 0))
     end
   end
 

data/spec/validates_timeliness/validator/on_or_after_spec.rb

@@ -25,15 +25,15 @@ describe ValidatesTimeliness::Validator, ":on_or_after option" do
     end
 
     it "should not be valid for time before restriction" do
-      invalid!(:birth_time, Time.local_time(2000, 1, 1, 11, 59, 59), 'must be on or after 12:00:00')
+      invalid!(:birth_time, Time.local(2000, 1, 1, 11, 59, 59), 'must be on or after 12:00:00')
     end
 
     it "should be valid for time after restriction" do
-      valid!(:birth_time, Time.local_time(2000, 1, 1, 12, 00, 01))
+      valid!(:birth_time, Time.local(2000, 1, 1, 12, 00, 01))
     end
 
     it "should be valid for same time as restriction" do
-      valid!(:birth_time, Time.local_time(2000, 1, 1, 12, 0, 0))
+      valid!(:birth_time, Time.local(2000, 1, 1, 12, 0, 0))
     end
   end
 

data/spec/validates_timeliness/validator/on_or_before_spec.rb

@@ -25,15 +25,15 @@ describe ValidatesTimeliness::Validator, ":on_or_before option" do
     end
 
     it "should not be valid for time after restriction" do
-      invalid!(:birth_time, Time.local_time(2000, 1, 1, 12, 00, 01), 'must be on or before 12:00:00')
+      invalid!(:birth_time, Time.local(2000, 1, 1, 12, 00, 01), 'must be on or before 12:00:00')
     end
 
     it "should be valid for time before restriction" do
-      valid!(:birth_time, Time.local_time(2000, 1, 1, 11, 59, 59))
+      valid!(:birth_time, Time.local(2000, 1, 1, 11, 59, 59))
     end
 
     it "should be valid for same time as restriction" do
-      valid!(:birth_time, Time.local_time(2000, 1, 1, 12, 0, 0))
+      valid!(:birth_time, Time.local(2000, 1, 1, 12, 0, 0))
     end
   end