test/routes_test.rb in devise-1.1.rc2 vs test/routes_test.rb in devise-1.1.0

@@ -1,81 +1,101 @@
 require 'test_helper'
 
-class MapRoutingTest < ActionController::TestCase
-
+class DefaultRoutingTest < ActionController::TestCase
   test 'map new user session' do
     assert_recognizes({:controller => 'devise/sessions', :action => 'new'}, {:path => 'users/sign_in', :method => :get})
+    assert_named_route "/users/sign_in", :new_user_session_path
   end
 
   test 'map create user session' do
     assert_recognizes({:controller => 'devise/sessions', :action => 'create'}, {:path => 'users/sign_in', :method => :post})
+    assert_named_route "/users/sign_in", :user_session_path
   end
 
   test 'map destroy user session' do
     assert_recognizes({:controller => 'devise/sessions', :action => 'destroy'}, {:path => 'users/sign_out', :method => :get})
+    assert_named_route "/users/sign_out", :destroy_user_session_path
   end
 
   test 'map new user confirmation' do
     assert_recognizes({:controller => 'devise/confirmations', :action => 'new'}, 'users/confirmation/new')
+    assert_named_route "/users/confirmation/new", :new_user_confirmation_path
   end
 
   test 'map create user confirmation' do
     assert_recognizes({:controller => 'devise/confirmations', :action => 'create'}, {:path => 'users/confirmation', :method => :post})
+    assert_named_route "/users/confirmation", :user_confirmation_path
   end
 
   test 'map show user confirmation' do
     assert_recognizes({:controller => 'devise/confirmations', :action => 'show'}, {:path => 'users/confirmation', :method => :get})
   end
 
   test 'map new user password' do
     assert_recognizes({:controller => 'devise/passwords', :action => 'new'}, 'users/password/new')
+    assert_named_route "/users/password/new", :new_user_password_path
   end
 
   test 'map create user password' do
     assert_recognizes({:controller => 'devise/passwords', :action => 'create'}, {:path => 'users/password', :method => :post})
+    assert_named_route "/users/password", :user_password_path
   end
 
   test 'map edit user password' do
     assert_recognizes({:controller => 'devise/passwords', :action => 'edit'}, 'users/password/edit')
+    assert_named_route "/users/password/edit", :edit_user_password_path
   end
 
   test 'map update user password' do
     assert_recognizes({:controller => 'devise/passwords', :action => 'update'}, {:path => 'users/password', :method => :put})
   end
 
   test 'map new user unlock' do
     assert_recognizes({:controller => 'devise/unlocks', :action => 'new'}, 'users/unlock/new')
+    assert_named_route "/users/unlock/new", :new_user_unlock_path
   end
 
   test 'map create user unlock' do
     assert_recognizes({:controller => 'devise/unlocks', :action => 'create'}, {:path => 'users/unlock', :method => :post})
+    assert_named_route "/users/unlock", :user_unlock_path
   end
 
   test 'map show user unlock' do
     assert_recognizes({:controller => 'devise/unlocks', :action => 'show'}, {:path => 'users/unlock', :method => :get})
   end
 
   test 'map new user registration' do
     assert_recognizes({:controller => 'devise/registrations', :action => 'new'}, 'users/sign_up')
+    assert_named_route "/users/sign_up", :new_user_registration_path
   end
 
   test 'map create user registration' do
     assert_recognizes({:controller => 'devise/registrations', :action => 'create'}, {:path => 'users', :method => :post})
+    assert_named_route "/users", :user_registration_path
   end
 
   test 'map edit user registration' do
     assert_recognizes({:controller => 'devise/registrations', :action => 'edit'}, {:path => 'users/edit', :method => :get})
+    assert_named_route "/users/edit", :edit_user_registration_path
   end
 
   test 'map update user registration' do
     assert_recognizes({:controller => 'devise/registrations', :action => 'update'}, {:path => 'users', :method => :put})
   end
 
   test 'map destroy user registration' do
     assert_recognizes({:controller => 'devise/registrations', :action => 'destroy'}, {:path => 'users', :method => :delete})
   end
 
+  protected
+
+  def assert_named_route(result, name)
+    assert_equal result, @routes.url_helpers.send(name)
+  end
+end
+
+class CustomizedRoutingTest < ActionController::TestCase
   test 'map admin with :path option' do
     assert_recognizes({:controller => 'devise/registrations', :action => 'new'}, {:path => 'admin_area/sign_up', :method => :get})
   end
 
   test 'map admin with :controllers option' do
@@ -108,7 +128,19 @@
     assert_recognizes({:controller => 'devise/unlocks', :action => 'new', :locale => 'en'}, '/en/accounts/unblock/new')
   end
 
   test 'map account with custom path name for registration' do
     assert_recognizes({:controller => 'devise/registrations', :action => 'new', :locale => 'en'}, '/en/accounts/management/register')
+  end
+end
+
+class ScopedRoutingTest < ActionController::TestCase
+  test 'map publisher account' do
+    assert_recognizes({:controller => 'publisher/registrations', :action => 'new'}, {:path => '/publisher/accounts/sign_up', :method => :get})
+    assert_equal '/publisher/accounts/sign_up', @routes.url_helpers.new_publisher_account_registration_path
+  end
+
+  test 'map publisher account merges path names' do
+    assert_recognizes({:controller => 'publisher/sessions', :action => 'new'}, {:path => '/publisher/accounts/get_in', :method => :get})
+    assert_equal '/publisher/accounts/get_in', @routes.url_helpers.new_publisher_account_session_path
   end
 end