Merge remote-tracking branch 'origin/master' into routing

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

diff --git a/test/integration/client_application_test.rb b/test/integration/client_application_test.rb
index d4fd68a14d028c43a170db6dca7657ed73778933..a2361d618f88c02df824f90628512384aa1e04a2 100644 (file)
--- a/test/integration/client_application_test.rb
+++ b/test/integration/client_application_test.rb
@@ -1,21 +1,29 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
-class ClientApplicationTest < ActionController::IntegrationTest
+class ClientApplicationTest < 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
-    post '/login', {'user[email]' => "test@example.com", 'user[password]' => "test", :referer => '/user/test2'}
+    get '/login'
+    assert_response :redirect
+    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
+    follow_redirect!
+    assert_response :success
+    post '/login', {'username' => "test@example.com", 'password' => "test", :referer => '/user/test2'}
     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_template 'user/view'
+    get '/user/test2/account'
+    assert_response :success
+    assert_template 'user/account'
 
     # check that the form to allow new client application creations exists
-    assert_in_body do
-      assert_select "a[href='/user/test2/oauth_clients']"
+    assert_in_heading do
+      assert_select "ul.secondary-actions li a[href='/user/test2/oauth_clients']"
     end
 
     # now we follow the link to the oauth client list
@@ -28,8 +36,10 @@ class ClientApplicationTest < ActionController::IntegrationTest
     # now we follow the link to the new oauth client page
     get '/user/test2/oauth_clients/new'
     assert_response :success
-    assert_in_body do
+    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
         [ :name, :url, :callback_url, :support_url ].each do |inp|
           assert_select "input[name=?]", "client_application[#{inp}]"
@@ -68,14 +78,17 @@ class ClientApplicationTest < ActionController::IntegrationTest
 
   ##
   # utility method to make the HTML screening easier to read.
-  def assert_in_body
-    assert_select "html:root" do
-      assert_select "body" do
-        assert_select "div#content" do
-          yield
-        end
-      end
+  def assert_in_heading
+    assert_select "div.content-heading" do
+      yield
     end
   end
 
+  ##
+  # utility method to make the HTML screening easier to read.
+  def assert_in_body
+    assert_select "div#content" do
+      yield
+    end
+  end
 end