Require mocha >= 0.9.0 for AS tests

activesupport/test/abstract_unit.rb

@@ -7,10 +7,6 @@ $:.unshift "#{File.dirname(__FILE__)}/../lib"
 require 'active_support'
 require 'active_support/test_case'
 
-def uses_mocha(test_name, &block)
-  yield
-end
-
 def uses_memcached(test_name)
   require 'memcache'
   MemCache.new('localhost').stats

activesupport/test/caching_test.rb

@@ -45,7 +45,6 @@ class CacheStoreSettingTest < Test::Unit::TestCase
   end
 end
 
-uses_mocha 'high-level cache store tests' do
 class CacheStoreTest < Test::Unit::TestCase
   def setup
     @cache = ActiveSupport::Cache.lookup_store(:memory_store)
@@ -69,7 +68,6 @@ uses_mocha 'high-level cache store tests' do
     @cache.fetch('foo', :force => true) { 'bar' }
   end
 end
-end
 
 # Tests the base functionality that should be identical across all cache stores.
 module CacheStoreBehavior

activesupport/test/core_ext/array_ext_test.rb

@@ -290,7 +290,6 @@ class ArrayExtractOptionsTests < Test::Unit::TestCase
   end
 end
 
-uses_mocha "ArrayExtRandomTests" do
 class ArrayExtRandomTests < Test::Unit::TestCase
   def test_random_element_from_array
     assert_nil [].rand
@@ -302,4 +301,3 @@ uses_mocha "ArrayExtRandomTests" do
     assert_equal 2, [1, 2, 3].rand
   end
 end
-end

activesupport/test/core_ext/date_ext_test.rb

@@ -210,7 +210,6 @@ class DateExtCalculationsTest < Test::Unit::TestCase
     end
   end
 
-  uses_mocha 'past?, today? and future?' do
   def test_today
     Date.stubs(:current).returns(Date.new(2000, 1, 1))
     assert_equal false, Date.new(1999, 12, 31).today?
@@ -231,9 +230,7 @@ class DateExtCalculationsTest < Test::Unit::TestCase
     assert_equal false, Date.new(2000,1,1).future?
     assert_equal true, Date.new(2000,1,2).future?
   end
-  end
 
-  uses_mocha 'TestDateCurrent' do
   def test_current_returns_date_today_when_zone_default_not_set
     with_env_tz 'US/Central' do
       Time.stubs(:now).returns Time.local(1999, 12, 31, 23)
@@ -254,7 +251,6 @@ class DateExtCalculationsTest < Test::Unit::TestCase
   ensure
     Time.zone_default = nil
   end
-  end
 
   protected
     def with_env_tz(new_tz = 'US/Eastern')

activesupport/test/core_ext/date_time_ext_test.rb

@@ -207,7 +207,6 @@ class DateTimeExtCalculationsTest < Test::Unit::TestCase
     assert_match(/^2080-02-28T15:15:10-06:?00$/, DateTime.civil(2080, 2, 28, 15, 15, 10, -0.25).xmlschema)
   end
 
-  uses_mocha 'Test DateTime past?, today? and future?' do    
   def test_today_with_offset
     Date.stubs(:current).returns(Date.new(2000, 1, 1))
     assert_equal false, DateTime.civil(1999,12,31,23,59,59, Rational(-18000, 86400)).today?
@@ -251,9 +250,7 @@ class DateTimeExtCalculationsTest < Test::Unit::TestCase
     assert_equal false,  DateTime.civil(2005,2,10,20,30,45).future?
     assert_equal true,  DateTime.civil(2005,2,10,20,30,46).future?
   end
-  end
 
-  uses_mocha 'TestDateTimeCurrent' do
   def test_current_returns_date_today_when_zone_default_not_set
     with_env_tz 'US/Eastern' do
       Time.stubs(:now).returns Time.local(1999, 12, 31, 23, 59, 59)
@@ -270,7 +267,6 @@ class DateTimeExtCalculationsTest < Test::Unit::TestCase
   ensure
     Time.zone_default = nil
   end
-  end
 
   def test_current_without_time_zone
     assert DateTime.current.is_a?(DateTime)

activesupport/test/core_ext/duration_test.rb

@@ -40,7 +40,6 @@ class DurationTest < ActiveSupport::TestCase
     assert_equal 86400 * 1.7, 1.7.days
   end
 
-  uses_mocha 'TestDurationSinceAndAgoWithCurrentTime' do
   def test_since_and_ago_with_fractional_days
     Time.stubs(:now).returns Time.local(2000)
     # since
@@ -112,7 +111,6 @@ class DurationTest < ActiveSupport::TestCase
   ensure
     Time.zone_default = nil
   end
-  end
 
   protected
     def with_env_tz(new_tz = 'US/Eastern')

activesupport/test/core_ext/hash_ext_test.rb

@@ -358,14 +358,12 @@ class HashExtTest < Test::Unit::TestCase
     assert_nothing_raised { original.except(:a) }
   end
 
-  uses_mocha 'except with expectation' do
   def test_except_with_mocha_expectation_on_original
     original = { :a => 'x', :b => 'y' }
     original.expects(:delete).never
     original.except(:a)
   end
 end
-end
 
 class IWriteMyOwnXML
   def to_xml(options = {})

activesupport/test/core_ext/time_ext_test.rb

@@ -515,7 +515,6 @@ class TimeExtCalculationsTest < Test::Unit::TestCase
     assert_equal 31, Time.days_in_month(12, 2005)
   end
 
-  uses_mocha 'TestTimeDaysInMonthWithoutYearArg' do
   def test_days_in_month_feb_in_common_year_without_year_arg
     Time.stubs(:now).returns(Time.utc(2007))
     assert_equal 28, Time.days_in_month(2)
@@ -525,7 +524,6 @@ class TimeExtCalculationsTest < Test::Unit::TestCase
     Time.stubs(:now).returns(Time.utc(2008))
     assert_equal 29, Time.days_in_month(2)
   end
-  end
 
   def test_time_with_datetime_fallback
     assert_equal Time.time_with_datetime_fallback(:utc, 2005, 2, 21, 17, 44, 30), Time.utc(2005, 2, 21, 17, 44, 30)
@@ -572,7 +570,6 @@ class TimeExtCalculationsTest < Test::Unit::TestCase
     assert_nothing_raised { Time.now.xmlschema }
   end
 
-  uses_mocha 'Test Time past?, today? and future?' do    
   def test_today_with_time_local
     Date.stubs(:current).returns(Date.new(2000, 1, 1))
     assert_equal false, Time.local(1999,12,31,23,59,59).today?
@@ -638,7 +635,6 @@ class TimeExtCalculationsTest < Test::Unit::TestCase
       assert_equal true,  Time.utc(2005,2,10,15,30,46).future?
     end
   end
-  end
 
   def test_acts_like_time
     assert Time.new.acts_like_time?

activesupport/test/core_ext/time_with_zone_test.rb

@@ -152,7 +152,6 @@ class TimeWithZoneTest < Test::Unit::TestCase
     assert_equal false, @twz.between?(Time.utc(2000,1,1,0,0,1), Time.utc(2000,1,1,0,0,2))
   end
 
-  uses_mocha 'TimeWithZone past?, today? and future?' do    
   def test_today
     Date.stubs(:current).returns(Date.new(2000, 1, 1))
     assert_equal false, ActiveSupport::TimeWithZone.new( nil, @time_zone, Time.utc(1999,12,31,23,59,59) ).today?
@@ -194,7 +193,6 @@ class TimeWithZoneTest < Test::Unit::TestCase
     assert_equal false,  ActiveSupport::TimeWithZone.new( nil, @time_zone, Time.local(2005,2,10,15,30,45)).future?
     assert_equal true,  ActiveSupport::TimeWithZone.new( nil, @time_zone, Time.local(2005,2,10,15,30,46)).future?
   end
-  end
 
   def test_eql?
     assert @twz.eql?(Time.utc(2000))
@@ -399,7 +397,6 @@ class TimeWithZoneTest < Test::Unit::TestCase
     end
   end
 
-  uses_mocha 'TestDatePartValueMethods' do
   def test_method_missing_with_non_time_return_value
     silence_warnings do # silence warnings raised by tzinfo gem
       @twz.time.expects(:foo).returns('bar')
@@ -422,7 +419,6 @@ class TimeWithZoneTest < Test::Unit::TestCase
       assert_equal 365, twz.yday
     end
   end
-  end
 
   def test_usec_returns_0_when_datetime_is_wrapped
     silence_warnings do # silence warnings raised by tzinfo gem
@@ -885,7 +881,6 @@ class TimeWithZoneMethodsForTimeAndDateTimeTest < Test::Unit::TestCase
     assert_equal nil, Time.zone
   end
 
-  uses_mocha 'TestTimeCurrent' do
   def test_current_returns_time_now_when_zone_default_not_set
     with_env_tz 'US/Eastern' do
       Time.stubs(:now).returns Time.local(2000)
@@ -907,7 +902,6 @@ class TimeWithZoneMethodsForTimeAndDateTimeTest < Test::Unit::TestCase
   ensure
     Time.zone_default = nil
   end
-  end
 
   protected
     def with_env_tz(new_tz = 'US/Eastern')

activesupport/test/i18n_test.rb

@@ -6,12 +6,10 @@ class I18nTest < Test::Unit::TestCase
     @time = Time.utc(2008, 7, 2, 16, 47, 1)
   end
   
-  uses_mocha 'I18nTimeZoneTest' do
   def test_time_zone_localization_with_default_format
     Time.zone.stubs(:now).returns Time.local(2000)
     assert_equal Time.zone.now.strftime("%a, %d %b %Y %H:%M:%S %z"), I18n.localize(Time.zone.now)
   end
-  end
   
   def test_date_localization_should_use_default_format
     assert_equal @date.strftime("%Y-%m-%d"), I18n.localize(@date)

activesupport/test/json/encoding_test.rb

@@ -126,7 +126,6 @@ class TestJSONEncoding < Test::Unit::TestCase
     end
 end
 
-uses_mocha 'JsonOptionsTests' do
 class JsonOptionsTests < Test::Unit::TestCase
   def test_enumerable_should_passthrough_options_to_elements
     json_options = { :include => :posts }
@@ -137,4 +136,3 @@ uses_mocha 'JsonOptionsTests' do
     [1, 2, 'foo'].to_json(json_options)
   end
 end
-end

activesupport/test/memoizable_test.rb

@@ -1,6 +1,5 @@
 require 'abstract_unit'
 
-uses_mocha 'Memoizable' do
 class MemoizableTest < Test::Unit::TestCase
   class Person
     extend ActiveSupport::Memoizable
@@ -215,4 +214,3 @@ uses_mocha 'Memoizable' do
     assert_raise(RuntimeError) { company.memoize :name }
   end
 end
-end

activesupport/test/multibyte_unicode_database_test.rb

@@ -1,11 +1,7 @@
 # encoding: utf-8
-
 require 'abstract_unit'
 
-uses_mocha "MultibyteUnicodeDatabaseTest" do
-
 class MultibyteUnicodeDatabaseTest < Test::Unit::TestCase
-
   def setup
     @ucd = ActiveSupport::Multibyte::UnicodeDatabase.new
   end
@@ -24,5 +20,3 @@ class MultibyteUnicodeDatabaseTest < Test::Unit::TestCase
     end
   end
 end
-
-end

activesupport/test/time_zone_test.rb

@@ -57,7 +57,6 @@ class TimeZoneTest < Test::Unit::TestCase
     end
   end
 
-  uses_mocha 'TestTimeZoneNowAndToday' do
   def test_now
     with_env_tz 'US/Eastern' do
       Time.stubs(:now).returns(Time.local(2000))
@@ -97,7 +96,6 @@ class TimeZoneTest < Test::Unit::TestCase
     Time.stubs(:now).returns(Time.utc(2000, 1, 2, 5)) # midnight Jan 2 EST
     assert_equal Date.new(2000, 1, 2), ActiveSupport::TimeZone['Eastern Time (US & Canada)'].today
   end
-  end
 
   def test_local
     silence_warnings do # silence warnings raised by tzinfo gem
@@ -206,14 +204,12 @@ class TimeZoneTest < Test::Unit::TestCase
     end
   end
 
-  uses_mocha 'TestParseWithIncompleteDate' do
   def test_parse_with_incomplete_date
     zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
     zone.stubs(:now).returns zone.local(1999,12,31)
     twz = zone.parse('19:00:00')
     assert_equal Time.utc(1999,12,31,19), twz.time
   end
-  end
 
   def test_utc_offset_lazy_loaded_from_tzinfo_when_not_passed_in_to_initialize
     silence_warnings do # silence warnings raised by tzinfo gem