Fix specs

Author: seejohnrun

spec/examples/_no_active_support_spec.rb

@@ -4,11 +4,10 @@
 # ActiveSupport gets loaded by other specs.
 
 module IceCube
-  describe TimeUtil, :if_active_support_time => false do
+  describe TimeUtil do
 
     before do
-      expect_any_instance_of(Time).to receive(:respond_to?).with(:time_zone).
-        at_least(1).times.and_return(false)
+      raise 'ActiveSupport should not be loaded' if defined?(ActiveSuppport)
     end
 
     WORLD_TIME_ZONES.each do |zone|

spec/examples/schedule_spec.rb

@@ -757,7 +757,7 @@
             expect(schedule.occurs_on?(Time.new(2010, 7, 3,  0,  0,  1, "+11:15"))).to be_falsey
           end
 
-          specify 'should determine if it occurs on the day of a given ActiveSupport::Time', :if_active_support_time => true do
+          specify 'should determine if it occurs on the day of a given ActiveSupport::Time' do
             Time.zone = "Pacific/Honolulu"
             expect(schedule.occurs_on?(Time.zone.parse('2010-07-01 23:59:59'))).to be_falsey
             expect(schedule.occurs_on?(Time.zone.parse('2010-07-02 00:00:01'))).to be_truthy
@@ -784,7 +784,7 @@
         include_examples 'occurring on a given day'
       end
 
-      context 'starting from an ActiveSupport::Time', :if_active_support_time => true do
+      context 'starting from an ActiveSupport::Time' do
         let(:start_time) { Time.new(2010, 7, 2, 10, 0, 0, '-07:00').in_time_zone('America/Vancouver') }
         include_examples 'occurring on a given day'
       end

spec/examples/to_s_es_spec.rb

@@ -137,7 +137,6 @@
   end
 
   it 'should work with a single rrule' do
-    pending 'remove dependency'
     schedule = IceCube::Schedule.new Time.local(2010, 3, 20)
     schedule.add_recurrence_rule IceCube::Rule.weekly.day_of_week(:monday => [1])
     expect(schedule.to_s).to eq(schedule.rrules[0].to_s)
@@ -154,9 +153,8 @@
   end
 
   it 'should be able to say the second to last monday of the month' do
-    pending 'penultimo'
     rule_str = IceCube::Rule.monthly.day_of_week(:thursday => [-2]).to_s
-    expect(rule_str).to eq('Mensualmente del segundo al último Jueves del mes')
+    expect(rule_str).to eq('Mensualmente en el penúltimo Jueves')
   end
 
   it 'should be able to say the days of the month something happens' do

spec/examples/to_yaml_spec.rb

@@ -144,7 +144,7 @@ module IceCube
 
     # This test will fail when not run in Eastern Time
     # This is a bug because to_datetime will always convert to system local time
-    it 'should be able to roll forward times and get back times in an array - TimeWithZone', :if_active_support_time => true do
+    it 'should be able to roll forward times and get back times in an array - TimeWithZone' do
       Time.zone = "Eastern Time (US & Canada)"
       start_time = Time.zone.local(2011, 11, 5, 12, 0, 0)
       schedule = Schedule.new(start_time)

spec/spec_helper.rb

@@ -23,18 +23,6 @@
 
   config.include WarningHelpers
 
-  config.around :each, :if_active_support_time => true do |example|
-    example.run if defined? ActiveSupport
-  end
-
-  config.around :each, :if_active_support_time => false do |example|
-    unless defined? ActiveSupport
-      stubbed_active_support = ::ActiveSupport = Module.new
-      example.run
-      Object.send :remove_const, :ActiveSupport
-    end
-  end
-
   config.around :each do |example|
     if zone = example.metadata[:system_time_zone]
       @orig_zone = ENV['TZ']
@@ -46,8 +34,8 @@
     end
   end
 
-  config.before :each do
-    if time_args = @example.metadata[:system_time]
+  config.before :each do |example|
+    if time_args = example.metadata[:system_time]
       case time_args
       when Array then allow(Time).to receive(:now).and_return Time.local(*time_args)
       when Time  then allow(Time).to receive(:now).and_return time_args