From d57c64dcc26205becc2756ffb01c0ce4eb3eada0 Mon Sep 17 00:00:00 2001 From: Adam Meehan Date: Wed, 30 Dec 2015 12:06:42 +1100 Subject: [PATCH] Getting with the RSpec times --- .rspec | 1 + spec/validates_timeliness/attribute_methods_spec.rb | 4 +--- spec/validates_timeliness/conversion_spec.rb | 4 +--- spec/validates_timeliness/extensions/date_time_select_spec.rb | 4 +--- .../extensions/multiparameter_handler_spec.rb | 4 +--- spec/validates_timeliness/helper_methods_spec.rb | 4 +--- spec/validates_timeliness/orm/active_record_spec.rb | 4 +--- spec/validates_timeliness/validator/after_spec.rb | 4 +--- spec/validates_timeliness/validator/before_spec.rb | 4 +--- spec/validates_timeliness/validator/is_at_spec.rb | 4 +--- spec/validates_timeliness/validator/on_or_after_spec.rb | 4 +--- spec/validates_timeliness/validator/on_or_before_spec.rb | 4 +--- spec/validates_timeliness/validator_spec.rb | 4 +--- spec/validates_timeliness_spec.rb | 4 +--- 14 files changed, 14 insertions(+), 39 deletions(-) diff --git a/.rspec b/.rspec index 02136c8..04fbd3b 100644 --- a/.rspec +++ b/.rspec @@ -1,3 +1,4 @@ --format documentation --color +--require spec_helper --require byebug diff --git a/spec/validates_timeliness/attribute_methods_spec.rb b/spec/validates_timeliness/attribute_methods_spec.rb index 5106421..935f62f 100644 --- a/spec/validates_timeliness/attribute_methods_spec.rb +++ b/spec/validates_timeliness/attribute_methods_spec.rb @@ -1,6 +1,4 @@ -require 'spec_helper' - -describe ValidatesTimeliness::AttributeMethods do +RSpec.describe ValidatesTimeliness::AttributeMethods do it 'should define read_timeliness_attribute_before_type_cast instance method' do expect(PersonWithShim.new).to respond_to(:read_timeliness_attribute_before_type_cast) end diff --git a/spec/validates_timeliness/conversion_spec.rb b/spec/validates_timeliness/conversion_spec.rb index 8aa803f..7ca72b0 100644 --- a/spec/validates_timeliness/conversion_spec.rb +++ b/spec/validates_timeliness/conversion_spec.rb @@ -1,6 +1,4 @@ -require 'spec_helper' - -describe ValidatesTimeliness::Conversion do +RSpec.describe ValidatesTimeliness::Conversion do include ValidatesTimeliness::Conversion let(:options) { Hash.new } diff --git a/spec/validates_timeliness/extensions/date_time_select_spec.rb b/spec/validates_timeliness/extensions/date_time_select_spec.rb index 4181480..78d7421 100644 --- a/spec/validates_timeliness/extensions/date_time_select_spec.rb +++ b/spec/validates_timeliness/extensions/date_time_select_spec.rb @@ -1,6 +1,4 @@ -require 'spec_helper' - -describe 'ValidatesTimeliness::Extensions::DateTimeSelect' do +RSpec.describe 'ValidatesTimeliness::Extensions::DateTimeSelect' do include ActionView::Helpers::DateHelper attr_reader :person, :params diff --git a/spec/validates_timeliness/extensions/multiparameter_handler_spec.rb b/spec/validates_timeliness/extensions/multiparameter_handler_spec.rb index 76020c3..f4a914d 100644 --- a/spec/validates_timeliness/extensions/multiparameter_handler_spec.rb +++ b/spec/validates_timeliness/extensions/multiparameter_handler_spec.rb @@ -1,6 +1,4 @@ -require 'spec_helper' - -describe 'ValidatesTimeliness::Extensions::MultiparameterHandler' do +RSpec.describe 'ValidatesTimeliness::Extensions::MultiparameterHandler' do context "time column" do it 'should assign a string value for invalid date portion' do diff --git a/spec/validates_timeliness/helper_methods_spec.rb b/spec/validates_timeliness/helper_methods_spec.rb index dbc19be..0d4c0e9 100644 --- a/spec/validates_timeliness/helper_methods_spec.rb +++ b/spec/validates_timeliness/helper_methods_spec.rb @@ -1,6 +1,4 @@ -require 'spec_helper' - -describe ValidatesTimeliness, 'HelperMethods' do +RSpec.describe ValidatesTimeliness, 'HelperMethods' do let(:record) { Person.new } it 'should define class validation methods' do diff --git a/spec/validates_timeliness/orm/active_record_spec.rb b/spec/validates_timeliness/orm/active_record_spec.rb index cdcfeab..3afc9ae 100644 --- a/spec/validates_timeliness/orm/active_record_spec.rb +++ b/spec/validates_timeliness/orm/active_record_spec.rb @@ -1,6 +1,4 @@ -require 'spec_helper' - -describe ValidatesTimeliness, 'ActiveRecord' do +RSpec.describe ValidatesTimeliness, 'ActiveRecord' do context "validation methods" do let(:record) { Employee.new } diff --git a/spec/validates_timeliness/validator/after_spec.rb b/spec/validates_timeliness/validator/after_spec.rb index 995b2a6..bdb8563 100644 --- a/spec/validates_timeliness/validator/after_spec.rb +++ b/spec/validates_timeliness/validator/after_spec.rb @@ -1,6 +1,4 @@ -require 'spec_helper' - -describe ValidatesTimeliness::Validator, ":after option" do +RSpec.describe ValidatesTimeliness::Validator, ":after option" do describe "for date type" do before do Person.validates_date :birth_date, :after => Date.new(2010, 1, 1) diff --git a/spec/validates_timeliness/validator/before_spec.rb b/spec/validates_timeliness/validator/before_spec.rb index 5d81a9c..0276e88 100644 --- a/spec/validates_timeliness/validator/before_spec.rb +++ b/spec/validates_timeliness/validator/before_spec.rb @@ -1,6 +1,4 @@ -require 'spec_helper' - -describe ValidatesTimeliness::Validator, ":before option" do +RSpec.describe ValidatesTimeliness::Validator, ":before option" do describe "for date type" do before do Person.validates_date :birth_date, :before => Date.new(2010, 1, 1) diff --git a/spec/validates_timeliness/validator/is_at_spec.rb b/spec/validates_timeliness/validator/is_at_spec.rb index 14532b4..d47ca58 100644 --- a/spec/validates_timeliness/validator/is_at_spec.rb +++ b/spec/validates_timeliness/validator/is_at_spec.rb @@ -1,6 +1,4 @@ -require 'spec_helper' - -describe ValidatesTimeliness::Validator, ":is_at option" do +RSpec.describe ValidatesTimeliness::Validator, ":is_at option" do before do Timecop.freeze(Time.local(2010, 1, 1, 0, 0, 0)) end diff --git a/spec/validates_timeliness/validator/on_or_after_spec.rb b/spec/validates_timeliness/validator/on_or_after_spec.rb index 82eeb99..d497af6 100644 --- a/spec/validates_timeliness/validator/on_or_after_spec.rb +++ b/spec/validates_timeliness/validator/on_or_after_spec.rb @@ -1,6 +1,4 @@ -require 'spec_helper' - -describe ValidatesTimeliness::Validator, ":on_or_after option" do +RSpec.describe ValidatesTimeliness::Validator, ":on_or_after option" do describe "for date type" do before do Person.validates_date :birth_date, :on_or_after => Date.new(2010, 1, 1) diff --git a/spec/validates_timeliness/validator/on_or_before_spec.rb b/spec/validates_timeliness/validator/on_or_before_spec.rb index 0341d9f..b0425d9 100644 --- a/spec/validates_timeliness/validator/on_or_before_spec.rb +++ b/spec/validates_timeliness/validator/on_or_before_spec.rb @@ -1,6 +1,4 @@ -require 'spec_helper' - -describe ValidatesTimeliness::Validator, ":on_or_before option" do +RSpec.describe ValidatesTimeliness::Validator, ":on_or_before option" do describe "for date type" do before do Person.validates_date :birth_date, :on_or_before => Date.new(2010, 1, 1) diff --git a/spec/validates_timeliness/validator_spec.rb b/spec/validates_timeliness/validator_spec.rb index 3029ef2..69ec35a 100644 --- a/spec/validates_timeliness/validator_spec.rb +++ b/spec/validates_timeliness/validator_spec.rb @@ -1,6 +1,4 @@ -require 'spec_helper' - -describe ValidatesTimeliness::Validator do +RSpec.describe ValidatesTimeliness::Validator do before do Timecop.freeze(Time.local(2010, 1, 1, 0, 0, 0)) end diff --git a/spec/validates_timeliness_spec.rb b/spec/validates_timeliness_spec.rb index 5b47fb1..52e00b9 100644 --- a/spec/validates_timeliness_spec.rb +++ b/spec/validates_timeliness_spec.rb @@ -1,6 +1,4 @@ -require 'spec_helper' - -describe ValidatesTimeliness do +RSpec.describe ValidatesTimeliness do it 'should alias use_euro_formats to remove_us_formats on Timeliness gem' do expect(Timeliness).to respond_to(:remove_us_formats)