diff options
| author | Oscar Del Ben <info@oscardelben.com> | 2012-04-25 15:43:29 +0200 |
|---|---|---|
| committer | Oscar Del Ben <info@oscardelben.com> | 2012-04-25 15:43:29 +0200 |
| commit | 4179141a012c84afa4756aa565aca3a07e4693fa (patch) | |
| tree | baf0a7c97fda49455408ee86b73272911acd14f8 /actionpack/test/controller/resources_test.rb | |
| parent | ee4e7125a61c703332a8d591a0aee917ba828e62 (diff) | |
| parent | 4a3ce153f1e05c9c590e9ee74e818649336d929f (diff) | |
| download | rails-4179141a012c84afa4756aa565aca3a07e4693fa.tar.gz rails-4179141a012c84afa4756aa565aca3a07e4693fa.tar.bz2 rails-4179141a012c84afa4756aa565aca3a07e4693fa.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/test/controller/resources_test.rb')
| -rw-r--r-- | actionpack/test/controller/resources_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb index 3c0a5d36ca..9fc875014c 100644 --- a/actionpack/test/controller/resources_test.rb +++ b/actionpack/test/controller/resources_test.rb @@ -680,7 +680,7 @@ class ResourcesTest < ActionController::TestCase scope '/threads/:thread_id' do resources :messages, :as => 'thread_messages' do get :search, :on => :collection - match :preview, :on => :new + get :preview, :on => :new end end end @@ -698,7 +698,7 @@ class ResourcesTest < ActionController::TestCase scope '/admin' do resource :account, :as => :admin_account do get :login, :on => :member - match :preview, :on => :new + get :preview, :on => :new end end end |