summaryrefslogtreecommitdiffstats
path: root/test/functional/wiki_controller_test.rb
diff options
context:
space:
mode:
Diffstat (limited to 'test/functional/wiki_controller_test.rb')
-rw-r--r--test/functional/wiki_controller_test.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index 61e265925..fecde6159 100644
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -197,7 +197,7 @@ class WikiControllerTest < ActionController::TestCase
def test_destroy_child
@request.session[:user_id] = 2
post :destroy, :project_id => 1, :page => 'Child_1'
- assert_redirected_to :action => 'page_index', :project_id => 'ecookbook'
+ assert_redirected_to :action => 'index', :project_id => 'ecookbook'
end
def test_destroy_parent
@@ -214,7 +214,7 @@ class WikiControllerTest < ActionController::TestCase
assert_difference('WikiPage.count', -1) do
post :destroy, :project_id => 1, :page => 'Another_page', :todo => 'nullify'
end
- assert_redirected_to :action => 'page_index', :project_id => 'ecookbook'
+ assert_redirected_to :action => 'index', :project_id => 'ecookbook'
assert_nil WikiPage.find_by_id(2)
end
@@ -223,7 +223,7 @@ class WikiControllerTest < ActionController::TestCase
assert_difference('WikiPage.count', -3) do
post :destroy, :project_id => 1, :page => 'Another_page', :todo => 'destroy'
end
- assert_redirected_to :action => 'page_index', :project_id => 'ecookbook'
+ assert_redirected_to :action => 'index', :project_id => 'ecookbook'
assert_nil WikiPage.find_by_id(2)
assert_nil WikiPage.find_by_id(5)
end
@@ -233,15 +233,15 @@ class WikiControllerTest < ActionController::TestCase
assert_difference('WikiPage.count', -1) do
post :destroy, :project_id => 1, :page => 'Another_page', :todo => 'reassign', :reassign_to_id => 1
end
- assert_redirected_to :action => 'page_index', :project_id => 'ecookbook'
+ assert_redirected_to :action => 'index', :project_id => 'ecookbook'
assert_nil WikiPage.find_by_id(2)
assert_equal WikiPage.find(1), WikiPage.find_by_id(5).parent
end
- def test_page_index
- get :page_index, :project_id => 'ecookbook'
+ def test_index
+ get :index, :project_id => 'ecookbook'
assert_response :success
- assert_template 'page_index'
+ assert_template 'index'
pages = assigns(:pages)
assert_not_nil pages
assert_equal Project.find(1).wiki.pages.size, pages.size