Permalink
Browse files

Make it works with Rails 3.2

  • Loading branch information...
1 parent f31a233 commit ab15874a96252be9b4c0d2e4340c78dd206daaa5 @LaAzteca LaAzteca committed Mar 8, 2012
Showing with 42 additions and 44 deletions.
  1. +1 −1 Gemfile
  2. +40 −42 Gemfile.lock
  3. +1 −1 test/class_methods_test.rb
View
@@ -1,6 +1,6 @@
source :rubygems
-gem 'rails', '3.1.2'
+gem 'rails', '~> 3.1'
gem 'responders', '~> 0.6.0'
gem 'has_scope', '~> 0.5.0'
gem 'mocha'
View
@@ -1,77 +1,75 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.1.2)
- actionpack (= 3.1.2)
- mail (~> 2.3.0)
- actionpack (3.1.2)
- activemodel (= 3.1.2)
- activesupport (= 3.1.2)
+ actionmailer (3.2.2)
+ actionpack (= 3.2.2)
+ mail (~> 2.4.0)
+ actionpack (3.2.2)
+ activemodel (= 3.2.2)
+ activesupport (= 3.2.2)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- i18n (~> 0.6)
- rack (~> 1.3.5)
+ journey (~> 1.0.1)
+ rack (~> 1.4.0)
rack-cache (~> 1.1)
- rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.1.0)
- activemodel (3.1.2)
- activesupport (= 3.1.2)
+ sprockets (~> 2.1.2)
+ activemodel (3.2.2)
+ activesupport (= 3.2.2)
builder (~> 3.0.0)
- i18n (~> 0.6)
- activerecord (3.1.2)
- activemodel (= 3.1.2)
- activesupport (= 3.1.2)
- arel (~> 2.2.1)
+ activerecord (3.2.2)
+ activemodel (= 3.2.2)
+ activesupport (= 3.2.2)
+ arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.1.2)
- activemodel (= 3.1.2)
- activesupport (= 3.1.2)
- activesupport (3.1.2)
+ activeresource (3.2.2)
+ activemodel (= 3.2.2)
+ activesupport (= 3.2.2)
+ activesupport (3.2.2)
+ i18n (~> 0.6)
multi_json (~> 1.0)
- arel (2.2.1)
+ arel (3.0.2)
builder (3.0.0)
erubis (2.7.0)
has_scope (0.5.1)
hike (1.2.1)
i18n (0.6.0)
- json (1.6.3)
- mail (2.3.0)
+ journey (1.0.3)
+ json (1.6.5)
+ mail (2.4.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
mime-types (1.17.2)
mocha (0.10.0)
metaclass (~> 0.0.1)
- multi_json (1.0.4)
+ multi_json (1.1.0)
polyglot (0.3.3)
- rack (1.3.5)
- rack-cache (1.1)
+ rack (1.4.1)
+ rack-cache (1.2)
rack (>= 0.4)
- rack-mount (0.8.3)
- rack (>= 1.0.0)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.1.2)
- actionmailer (= 3.1.2)
- actionpack (= 3.1.2)
- activerecord (= 3.1.2)
- activeresource (= 3.1.2)
- activesupport (= 3.1.2)
+ rails (3.2.2)
+ actionmailer (= 3.2.2)
+ actionpack (= 3.2.2)
+ activerecord (= 3.2.2)
+ activeresource (= 3.2.2)
+ activesupport (= 3.2.2)
bundler (~> 1.0)
- railties (= 3.1.2)
- railties (3.1.2)
- actionpack (= 3.1.2)
- activesupport (= 3.1.2)
+ railties (= 3.2.2)
+ railties (3.2.2)
+ actionpack (= 3.2.2)
+ activesupport (= 3.2.2)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2.2)
- rdoc (3.11)
+ rdoc (3.12)
json (~> 1.4)
responders (0.6.4)
sprockets (2.1.2)
@@ -83,13 +81,13 @@ GEM
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.31)
+ tzinfo (0.3.32)
PLATFORMS
ruby
DEPENDENCIES
has_scope (~> 0.5.0)
mocha
- rails (= 3.1.2)
+ rails (~> 3.1)
responders (~> 0.6.0)
@@ -27,7 +27,7 @@ class ActionsClassMethodTest < ActionController::TestCase
tests BooksController
def test_cannot_render_actions
- assert_raise ActionController::UnknownAction do
+ assert_raise AbstractController::ActionNotFound do
get :new
end
end

0 comments on commit ab15874

Please sign in to comment.