X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/098d1fc2351be0bd53ae26b42a9b136894c63346..952188c814382b4ee0a90f6fc6084542dd113e75:/test/integration/client_applications_test.rb

diff --git a/test/integration/client_applications_test.rb b/test/integration/client_applications_test.rb
index 2cc15bd56..e7e5b7575 100644
--- a/test/integration/client_applications_test.rb
+++ b/test/integration/client_applications_test.rb
@@ -1,46 +1,45 @@
 require "test_helper"
 
 class ClientApplicationsTest < ActionDispatch::IntegrationTest
-  fixtures :users, :client_applications
-
   ##
   # run through the procedure of creating a client application and checking
   # that it shows up on the user's account page.
   def test_create_application
+    user = create(:user)
+
     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", "username" => "test@example.com", "password" => "test", :referer => "/user/test2"
+    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"
-    get "/user/test2/account"
+    assert_template "users/show"
+    get "/account/edit"
     assert_response :success
-    assert_template "user/account"
+    assert_template "accounts/edit"
 
     # check that the form to allow new client application creations exists
     assert_in_heading do
-      assert_select "ul.secondary-actions li a[href='/user/test2/oauth_clients']"
+      assert_select "ul.nav.nav-tabs li.nav-item a[href='/user/#{ERB::Util.u(user.display_name)}/oauth_clients']"
     end
 
     # now we follow the link to the oauth client list
-    get "/user/test2/oauth_clients"
+    get "/user/#{ERB::Util.u(user.display_name)}/oauth_clients"
     assert_response :success
     assert_in_body do
-      assert_select "a[href='/user/test2/oauth_clients/new']"
+      assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/oauth_clients/new']"
     end
 
     # now we follow the link to the new oauth client page
-    get "/user/test2/oauth_clients/new"
+    get "/user/#{ERB::Util.u(user.display_name)}/oauth_clients/new"
     assert_response :success
     assert_in_heading do
       assert_select "h1", "Register a new application"
     end
     assert_in_body do
-      assert_select "form[action='/user/test2/oauth_clients']" do
+      assert_select "form[action='/user/#{ERB::Util.u(user.display_name)}/oauth_clients']" do
         [:name, :url, :callback_url, :support_url].each do |inp|
           assert_select "input[name=?]", "client_application[#{inp}]"
         end
@@ -50,10 +49,11 @@ class ClientApplicationsTest < ActionDispatch::IntegrationTest
       end
     end
 
-    post "/user/test2/oauth_clients",       "client_application[name]" => "My New App",
-                                            "client_application[url]" => "http://my.new.app.org/",
-                                            "client_application[callback_url]" => "http://my.new.app.org/callback",
-                                            "client_application[support_url]" => "http://my.new.app.org/support"
+    post "/user/#{ERB::Util.u(user.display_name)}/oauth_clients",
+         :params => { "client_application[name]" => "My New App",
+                      "client_application[url]" => "http://my.new.app.org/",
+                      "client_application[callback_url]" => "http://my.new.app.org/callback",
+                      "client_application[support_url]" => "http://my.new.app.org/support" }
     assert_response :redirect
     follow_redirect!
     assert_response :success
@@ -61,10 +61,10 @@ class ClientApplicationsTest < ActionDispatch::IntegrationTest
     assert_equal "Registered the information successfully", flash[:notice]
 
     # now go back to the account page and check its listed under this user
-    get "/user/test2/oauth_clients"
+    get "/user/#{ERB::Util.u(user.display_name)}/oauth_clients"
     assert_response :success
     assert_template "oauth_clients/index"
-    assert_in_body { assert_select "div>a", "My New App" }
+    assert_in_body { assert_select "li>a", "My New App" }
   end
 
   ##
@@ -75,19 +75,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