X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/15b104f4ff4614aa78c01180b6a9b89dd5a1400f..84f6029ead0aef7a85b9690d7c6dec65782d94b1:/test/integration/client_applications_test.rb

diff --git a/test/integration/client_applications_test.rb b/test/integration/client_applications_test.rb
index 59f234c41..f8055ebc7 100644
--- a/test/integration/client_applications_test.rb
+++ b/test/integration/client_applications_test.rb
@@ -9,17 +9,17 @@ class ClientApplicationsTest < ActionDispatch::IntegrationTest
 
     get "/login"
     assert_response :redirect
-    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
+    assert_redirected_to login_path(:cookie_test => "true")
     follow_redirect!
     assert_response :success
     post "/login", :params => { "username" => user.email, "password" => "test", :referer => "/user/#{ERB::Util.u(user.display_name)}" }
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "user/view"
+    assert_template "users/show"
     get "/user/#{ERB::Util.u(user.display_name)}/account"
     assert_response :success
-    assert_template "user/account"
+    assert_template "users/account"
 
     # check that the form to allow new client application creations exists
     assert_in_heading do
@@ -76,19 +76,17 @@ class ClientApplicationsTest < ActionDispatch::IntegrationTest
     # tests, as its too tied into the HTTP headers and stuff that it signs.
   end
 
+  private
+
   ##
   # utility method to make the HTML screening easier to read.
-  def assert_in_heading
-    assert_select "div.content-heading" do
-      yield
-    end
+  def assert_in_heading(&block)
+    assert_select("div.content-heading", &block)
   end
 
   ##
   # utility method to make the HTML screening easier to read.
-  def assert_in_body
-    assert_select "div#content" do
-      yield
-    end
+  def assert_in_body(&block)
+    assert_select("div#content", &block)
   end
 end