summaryrefslogtreecommitdiffstats
path: root/test/integration
diff options
context:
space:
mode:
Diffstat (limited to 'test/integration')
-rw-r--r--test/integration/admin_test.rb4
-rw-r--r--test/integration/routing_test.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/test/integration/admin_test.rb b/test/integration/admin_test.rb
index 62ddc533f..dd52859cf 100644
--- a/test/integration/admin_test.rb
+++ b/test/integration/admin_test.rb
@@ -22,9 +22,9 @@ class AdminTest < ActionController::IntegrationTest
def test_add_user
log_user("admin", "admin")
- get "/users/add"
+ get "/users/new"
assert_response :success
- assert_template "users/add"
+ assert_template "users/new"
post "/users/create", :user => { :login => "psmith", :firstname => "Paul", :lastname => "Smith", :mail => "psmith@somenet.foo", :language => "en" }, :password => "psmith09", :password_confirmation => "psmith09"
user = User.find_by_login("psmith")
diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb
index 74b7d990d..341efe3cd 100644
--- a/test/integration/routing_test.rb
+++ b/test/integration/routing_test.rb
@@ -246,7 +246,7 @@ class RoutingTest < ActionController::IntegrationTest
context "users" do
should_route :get, "/users", :controller => 'users', :action => 'index'
should_route :get, "/users/44", :controller => 'users', :action => 'show', :id => '44'
- should_route :get, "/users/new", :controller => 'users', :action => 'add'
+ should_route :get, "/users/new", :controller => 'users', :action => 'new'
should_route :get, "/users/444/edit", :controller => 'users', :action => 'edit', :id => '444'
should_route :get, "/users/222/edit/membership", :controller => 'users', :action => 'edit', :id => '222', :tab => 'membership'