cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix test failures

Browse source
This commit is contained in:
John Firebaugh 2013-11-15 15:36:54 -08:00
parent 44629832dd
commit e91956d0f7
58 changed files with 231 additions and 363 deletions
Download patch file Download diff file Expand all files Collapse all files

19
test/integration/client_application_test.rb
View file

@ -79,27 +79,16 @@ class ClientApplicationTest < ActionDispatch::IntegrationTest
##
# 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

20
test/integration/user_diaries_test.rb
View file

@ -36,21 +36,13 @@ class UserDiariesTest < ActionDispatch::IntegrationTest
# functional tests rather than this integration test
# There are some things that are specific to the integratio
# that need to be tested, which can't be tested in the functional tests
assert_select "html:root" do
assert_select "body" do
assert_select "div.wrapper", :count => 1 do
assert_select "div.content-heading", :count => 1 do
assert_select "h1", "New Diary Entry"
end
assert_select "div#content" do
assert_select "form[action='/diary/new']" do
assert_select "input[id=diary_entry_title]"
end
end
end
assert_select "div.content-heading", :count => 1 do
assert_select "h1", "New Diary Entry"
end
assert_select "div#content" do
assert_select "form[action='/diary/new']" do
assert_select "input[id=diary_entry_title]"
end
end
end
end

68
test/integration/user_login_test.rb
View file

@ -16,17 +16,17 @@ class UserLoginTest < ActionDispatch::IntegrationTest
follow_redirect!
assert_response :success
post '/login', {'username' => user.email, 'password' => "wrong", :referer => "/browse"}
post '/login', {'username' => user.email, 'password' => "wrong", :referer => "/history"}
assert_response :redirect
follow_redirect!
assert_response :success
assert_template 'login'
post '/login', {'username' => user.email, 'password' => "test", :referer => "/browse"}
post '/login', {'username' => user.email, 'password' => "test", :referer => "/history"}
assert_response :redirect
follow_redirect!
assert_response :success
assert_template 'changeset/list'
assert_template 'changeset/history'
end
def test_login_email_password_normal_upcase
@ -38,13 +38,13 @@ class UserLoginTest < ActionDispatch::IntegrationTest
follow_redirect!
assert_response :success
post '/login', {'username' => user.email.upcase, 'password' => "wrong", :referer => "/browse"}
post '/login', {'username' => user.email.upcase, 'password' => "wrong", :referer => "/history"}
assert_response :redirect
follow_redirect!
assert_response :success
assert_template 'login'
post '/login', {'username' => user.email.upcase, 'password' => "test", :referer => "/browse"}
post '/login', {'username' => user.email.upcase, 'password' => "test", :referer => "/history"}
assert_response :redirect
follow_redirect!
assert_response :success
@ -60,13 +60,13 @@ class UserLoginTest < ActionDispatch::IntegrationTest
follow_redirect!
assert_response :success
post '/login', {'username' => user.email.titlecase, 'password' => "wrong", :referer => "/browse"}
post '/login', {'username' => user.email.titlecase, 'password' => "wrong", :referer => "/history"}
assert_response :redirect
follow_redirect!
assert_response :success
assert_template 'login'
post '/login', {'username' => user.email.titlecase, 'password' => "test", :referer => "/browse"}
post '/login', {'username' => user.email.titlecase, 'password' => "test", :referer => "/history"}
assert_response :redirect
follow_redirect!
assert_response :success
@ -82,17 +82,17 @@ class UserLoginTest < ActionDispatch::IntegrationTest
follow_redirect!
assert_response :success
post '/login', {'username' => user.email, 'password' => "wrong", :referer => "/browse"}
post '/login', {'username' => user.email, 'password' => "wrong", :referer => "/history"}
assert_response :redirect
follow_redirect!
assert_response :success
assert_template 'login'
post '/login', {'username' => user.email, 'password' => "test", :referer => "/browse"}
post '/login', {'username' => user.email, 'password' => "test", :referer => "/history"}
assert_response :redirect
follow_redirect!
assert_response :success
assert_template 'changeset/list'
assert_template 'changeset/history'
end
def test_login_email_password_public_upcase
@ -104,17 +104,17 @@ class UserLoginTest < ActionDispatch::IntegrationTest
follow_redirect!
assert_response :success
post '/login', {'username' => user.email.upcase, 'password' => "wrong", :referer => "/browse"}
post '/login', {'username' => user.email.upcase, 'password' => "wrong", :referer => "/history"}
assert_response :redirect
follow_redirect!
assert_response :success
assert_template 'login'
post '/login', {'username' => user.email.upcase, 'password' => "test", :referer => "/browse"}
post '/login', {'username' => user.email.upcase, 'password' => "test", :referer => "/history"}
assert_response :redirect
follow_redirect!
assert_response :success
assert_template 'changeset/list'
assert_template 'changeset/history'
end
def test_login_email_password_public_titlecase
@ -126,17 +126,17 @@ class UserLoginTest < ActionDispatch::IntegrationTest
follow_redirect!
assert_response :success
post '/login', {'username' => user.email.titlecase, 'password' => "wrong", :referer => "/browse"}
post '/login', {'username' => user.email.titlecase, 'password' => "wrong", :referer => "/history"}
assert_response :redirect
follow_redirect!
assert_response :success
assert_template 'login'
post '/login', {'username' => user.email.titlecase, 'password' => "test", :referer => "/browse"}
post '/login', {'username' => user.email.titlecase, 'password' => "test", :referer => "/history"}
assert_response :redirect
follow_redirect!
assert_response :success
assert_template 'changeset/list'
assert_template 'changeset/history'
end
def test_login_username_password_normal
@ -148,17 +148,17 @@ class UserLoginTest < ActionDispatch::IntegrationTest
follow_redirect!
assert_response :success
post '/login', {'username' => user.display_name, 'password' => "wrong", :referer => "/browse"}
post '/login', {'username' => user.display_name, 'password' => "wrong", :referer => "/history"}
assert_response :redirect
follow_redirect!
assert_response :success
assert_template 'login'
post '/login', {'username' => user.display_name, 'password' => "test", :referer => "/browse"}
post '/login', {'username' => user.display_name, 'password' => "test", :referer => "/history"}
assert_response :redirect
follow_redirect!
assert_response :success
assert_template 'changeset/list'
assert_template 'changeset/history'
end
def test_login_username_password_normal_upcase
@ -170,13 +170,13 @@ class UserLoginTest < ActionDispatch::IntegrationTest
follow_redirect!
assert_response :success
post '/login', {'username' => user.display_name.upcase, 'password' => "wrong", :referer => "/browse"}
post '/login', {'username' => user.display_name.upcase, 'password' => "wrong", :referer => "/history"}
assert_response :redirect
follow_redirect!
assert_response :success
assert_template 'login'
post '/login', {'username' => user.display_name.upcase, 'password' => "test", :referer => "/browse"}
post '/login', {'username' => user.display_name.upcase, 'password' => "test", :referer => "/history"}
assert_response :redirect
follow_redirect!
assert_response :success
@ -192,13 +192,13 @@ class UserLoginTest < ActionDispatch::IntegrationTest
follow_redirect!
assert_response :success
post '/login', {'username' => user.display_name.titlecase, 'password' => "wrong", :referer => "/browse"}
post '/login', {'username' => user.display_name.titlecase, 'password' => "wrong", :referer => "/history"}
assert_response :redirect
follow_redirect!
assert_response :success
assert_template 'login'
post '/login', {'username' => user.display_name.titlecase, 'password' => "test", :referer => "/browse"}
post '/login', {'username' => user.display_name.titlecase, 'password' => "test", :referer => "/history"}
assert_response :redirect
follow_redirect!
assert_response :success
@ -214,17 +214,17 @@ class UserLoginTest < ActionDispatch::IntegrationTest
follow_redirect!
assert_response :success
post '/login', {'username' => user.display_name, 'password' => "wrong", :referer => "/browse"}
post '/login', {'username' => user.display_name, 'password' => "wrong", :referer => "/history"}
assert_response :redirect
follow_redirect!
assert_response :success
assert_template 'login'
post '/login', {'username' => user.display_name, 'password' => "test", :referer => "/browse"}
post '/login', {'username' => user.display_name, 'password' => "test", :referer => "/history"}
assert_response :redirect
follow_redirect!
assert_response :success
assert_template 'changeset/list'
assert_template 'changeset/history'
end
def test_login_username_password_public_upcase
@ -236,17 +236,17 @@ class UserLoginTest < ActionDispatch::IntegrationTest
follow_redirect!
assert_response :success
post '/login', {'username' => user.display_name.upcase, 'password' => "wrong", :referer => "/browse"}
post '/login', {'username' => user.display_name.upcase, 'password' => "wrong", :referer => "/history"}
assert_response :redirect
follow_redirect!
assert_response :success
assert_template 'login'
post '/login', {'username' => user.display_name.upcase, 'password' => "test", :referer => "/browse"}
post '/login', {'username' => user.display_name.upcase, 'password' => "test", :referer => "/history"}
assert_response :redirect
follow_redirect!
assert_response :success
assert_template 'changeset/list'
assert_template 'changeset/history'
end
def test_login_username_password_public_titlecase
@ -258,17 +258,17 @@ class UserLoginTest < ActionDispatch::IntegrationTest
follow_redirect!
assert_response :success
post '/login', {'username' => user.display_name.titlecase, 'password' => "wrong", :referer => "/browse"}
post '/login', {'username' => user.display_name.titlecase, 'password' => "wrong", :referer => "/history"}
assert_response :redirect
follow_redirect!
assert_response :success
assert_template 'login'
post '/login', {'username' => user.display_name.titlecase, 'password' => "test", :referer => "/browse"}
post '/login', {'username' => user.display_name.titlecase, 'password' => "test", :referer => "/history"}
assert_response :redirect
follow_redirect!
assert_response :success
assert_template 'changeset/list'
assert_template 'changeset/history'
end
def test_login_openid_success
@ -277,7 +277,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
follow_redirect!
assert_response :success
post '/login', {'openid_url' => "http://localhost:1123/john.doe?openid.success=true", :referer => "/browse"}
post '/login', {'openid_url' => "http://localhost:1123/john.doe?openid.success=true", :referer => "/history"}
assert_response :redirect
res = openid_request(@response.redirect_url)
@ -286,7 +286,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
assert_response :redirect
follow_redirect!
assert_response :success
assert_template 'changeset/list'
assert_template 'changeset/history'
end
def test_login_openid_cancel