-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
-class ClientApplicationTest < ActionController::IntegrationTest
+class ClientApplicationTest < ActionDispatch::IntegrationTest
fixtures :users, :client_applications
##
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'}
+ post '/login', 'username' => "test@example.com", 'password' => "test", :referer => '/user/test2'
assert_response :redirect
follow_redirect!
assert_response :success
end
assert_in_body do
assert_select "form[action='/user/test2/oauth_clients']" do
- [ :name, :url, :callback_url, :support_url ].each do |inp|
+ [:name, :url, :callback_url, :support_url].each do |inp|
assert_select "input[name=?]", "client_application[#{inp}]"
end
ClientApplication.all_permissions.each do |perm|
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/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'
assert_response :redirect
follow_redirect!
assert_response :success
##
# utility method to make the HTML screening easier to read.
def assert_in_heading
- assert_select "html:root" do
- assert_select "body" do
- assert_select "div.wrapper" do
- assert_select "div.content-heading" do
- yield
- end
- end
- end
+ 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 "html:root" do
- assert_select "body" do
- assert_select "div#content" do
- yield
- end
- end
+ assert_select "div#content" do
+ yield
end
end
-
end