diff options
| author | twinturbo <me@broadcastingadam.com> | 2012-04-28 22:33:11 -0700 |
|---|---|---|
| committer | twinturbo <me@broadcastingadam.com> | 2012-04-28 22:33:11 -0700 |
| commit | d7532c189f26e008fc6ef50336ed5e8168b8221c (patch) | |
| tree | 681436aa5d80ed5e4c9a867ccc891eab6852f124 /actionpack/test/controller/resources_test.rb | |
| parent | 2c136ae0543ea53dcb3a3ef9372b216b54d66172 (diff) | |
| parent | 6659252d9f0e6d77bee268adf587e03cfeb8f9ad (diff) | |
| download | rails-d7532c189f26e008fc6ef50336ed5e8168b8221c.tar.gz rails-d7532c189f26e008fc6ef50336ed5e8168b8221c.tar.bz2 rails-d7532c189f26e008fc6ef50336ed5e8168b8221c.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 |