X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a182820139de22196d7f30e06047a81afc7323f5..420a7289a0b08eee091f6650c2e83166df3fbe69:/test/controllers/changeset_controller_test.rb diff --git a/test/controllers/changeset_controller_test.rb b/test/controllers/changeset_controller_test.rb index 40147ad46..2cda68b12 100644 --- a/test/controllers/changeset_controller_test.rb +++ b/test/controllers/changeset_controller_test.rb @@ -469,9 +469,9 @@ CHANGESET new_rel_id = doc.find("//diffResult/relation").first["new_id"].to_i # check the old IDs are all present and negative one - assert_equal -1, doc.find("//diffResult/node").first["old_id"].to_i - assert_equal -1, doc.find("//diffResult/way").first["old_id"].to_i - assert_equal -1, doc.find("//diffResult/relation").first["old_id"].to_i + assert_equal(-1, doc.find("//diffResult/node").first["old_id"].to_i) + assert_equal(-1, doc.find("//diffResult/way").first["old_id"].to_i) + assert_equal(-1, doc.find("//diffResult/relation").first["old_id"].to_i) # check the versions are present and equal one assert_equal 1, doc.find("//diffResult/node").first["new_version"].to_i @@ -1969,11 +1969,11 @@ CHANGESET def test_index_user_not_found get :index, :params => { :format => "html", :display_name => "Some random user" } assert_response :not_found - assert_template "user/no_such_user" + assert_template "users/no_such_user" get :index, :params => { :format => "html", :display_name => "Some random user", :list => "1" }, :xhr => true assert_response :not_found - assert_template "user/no_such_user" + assert_template "users/no_such_user" end ## @@ -1985,7 +1985,7 @@ CHANGESET get :index, :params => { :friends => true } assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :referer => friend_changesets_path + assert_redirected_to :controller => :users, :action => :login, :referer => friend_changesets_path session[:user] = private_user.id @@ -2009,7 +2009,7 @@ CHANGESET get :index, :params => { :nearby => true } assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :referer => nearby_changesets_path + assert_redirected_to :controller => :users, :action => :login, :referer => nearby_changesets_path session[:user] = private_user.id