diff options
Diffstat (limited to 'activeresource')
| -rw-r--r-- | activeresource/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | activeresource/test/cases/base_test.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/activeresource/CHANGELOG.md b/activeresource/CHANGELOG.md index 8d251bdce2..e77980f3b5 100644 --- a/activeresource/CHANGELOG.md +++ b/activeresource/CHANGELOG.md @@ -1,3 +1,5 @@ +## Rails 3.2.11 ## + ## Rails 3.2.10 ## ## Rails 3.2.9 (Nov 12, 2012) ## diff --git a/activeresource/test/cases/base_test.rb b/activeresource/test/cases/base_test.rb index 7b42f64a35..5ef8a51ef7 100644 --- a/activeresource/test/cases/base_test.rb +++ b/activeresource/test/cases/base_test.rb @@ -10,7 +10,7 @@ require "fixtures/subscription_plan" require 'active_support/json' require 'active_support/ordered_hash' require 'active_support/core_ext/hash/conversions' -require 'mocha' +require 'mocha/setup' class BaseTest < Test::Unit::TestCase def setup |