Removes MyControllerTest#page_layout (#25297).

git-svn-id: http://svn.redmine.org/redmine/trunk@16385 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 3 insertions, 9 deletions

diff --git a/test/functional/my_controller_test.rb b/test/functional/my_controller_test.rb
index 043ab8cdf..e40dd91e3 100644
--- a/test/functional/my_controller_test.rb
+++ b/test/functional/my_controller_test.rb
@@ -233,25 +233,20 @@ class MyControllerTest < Redmine::ControllerTest
     assert_equal({:days => "14"}, user.reload.pref.my_page_settings('timelog'))
   end
 
-  def test_page_layout
-    get :page_layout
-    assert_response :success
-  end
-
   def test_add_block
     post :add_block, :block => 'issuesreportedbyme'
-    assert_redirected_to '/my/page_layout'
+    assert_redirected_to '/my/page'
     assert User.find(2).pref[:my_page_layout]['top'].include?('issuesreportedbyme')
   end
 
   def test_add_invalid_block_should_redirect
     post :add_block, :block => 'invalid'
-    assert_redirected_to '/my/page_layout'
+    assert_redirected_to '/my/page'
   end
 
   def test_remove_block
     post :remove_block, :block => 'issuesassignedtome'
-    assert_redirected_to '/my/page_layout'
+    assert_redirected_to '/my/page'
     assert !User.find(2).pref[:my_page_layout].values.flatten.include?('issuesassignedtome')
   end
 
diff --git a/test/integration/routing/my_test.rb b/test/integration/routing/my_test.rb
index c2291b01f..39b3b4fa1 100644
--- a/test/integration/routing/my_test.rb
+++ b/test/integration/routing/my_test.rb
@@ -36,7 +36,6 @@ class RoutingMyTest < Redmine::RoutingTest
     should_route 'GET /my/password' => 'my#password'
     should_route 'POST /my/password' => 'my#password'
 
-    should_route 'GET /my/page_layout' => 'my#page_layout'
     should_route 'POST /my/add_block' => 'my#add_block'
     should_route 'POST /my/remove_block' => 'my#remove_block'
     should_route 'POST /my/order_blocks' => 'my#order_blocks'