Merge remote-tracking branch 'upstream/pull/3285'

[rails.git] / test / integration / client_applications_test.rb

diff --git a/test/integration/client_applications_test.rb b/test/integration/client_applications_test.rb
index 8c5e7078407b84371f30eaf3cea71f63b983d0f1..269d3633d0f8dc9c4568187b138184789fd004e4 100644 (file)
--- a/test/integration/client_applications_test.rb
+++ b/test/integration/client_applications_test.rb
@@ -9,38 +9,38 @@ class ClientApplicationsTest < ActionDispatch::IntegrationTest
 
     get "/login"
     assert_response :redirect
 
     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
     follow_redirect!
     assert_response :success

-    post "/login", :params => { "username" => user.email, "password" => "test", :referer => "/user/#{URI.encode(user.display_name)}" }
+    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_response :redirect
     follow_redirect!
     assert_response :success

-    assert_template "user/view"
-    get "/user/#{URI.encode(user.display_name)}/account"
+    assert_template "users/show"
+    get "/user/#{ERB::Util.u(user.display_name)}/account"

     assert_response :success
     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
 
     # check that the form to allow new client application creations exists
     assert_in_heading do

-      assert_select "ul.secondary-actions li a[href='/user/#{URI.encode(user.display_name)}/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
     end
 
     # now we follow the link to the oauth client list

-    get "/user/#{URI.encode(user.display_name)}/oauth_clients"
+    get "/user/#{ERB::Util.u(user.display_name)}/oauth_clients"

     assert_response :success
     assert_in_body do
     assert_response :success
     assert_in_body do

-      assert_select "a[href='/user/#{URI.encode(user.display_name)}/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
     end
 
     # now we follow the link to the new oauth client page

-    get "/user/#{URI.encode(user.display_name)}/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_response :success
     assert_in_heading do
       assert_select "h1", "Register a new application"
     end
     assert_in_body do

-      assert_select "form[action='/user/#{URI.encode(user.display_name)}/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
         [:name, :url, :callback_url, :support_url].each do |inp|
           assert_select "input[name=?]", "client_application[#{inp}]"
         end


@@ -50,7 +50,7 @@ class ClientApplicationsTest < ActionDispatch::IntegrationTest
       end
     end
 
       end
     end
 

-    post "/user/#{URI.encode(user.display_name)}/oauth_clients",
+    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",
          :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",


@@ -62,7 +62,7 @@ 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
     assert_equal "Registered the information successfully", flash[:notice]
 
     # now go back to the account page and check its listed under this user

-    get "/user/#{URI.encode(user.display_name)}/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_response :success
     assert_template "oauth_clients/index"
     assert_in_body { assert_select "div>a", "My New App" }


@@ -76,19 +76,17 @@ class ClientApplicationsTest < ActionDispatch::IntegrationTest
     # tests, as its too tied into the HTTP headers and stuff that it signs.
   end
 
     # 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.
   ##
   # 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.
   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
   end
 end