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

Replace "Login" labels with "Log in" when used as a verb

Browse source
This commit is contained in:
Milan Cvetkovic 2024-03-05 15:07:28 +00:00
parent c91bd55222
commit e614faaf8a
4 changed files with 30 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/application_system_test_case.rb
View file

@ -29,7 +29,7 @@ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
within "form", :text => "Email Address or Username" do
fill_in "username", :with => user.email
fill_in "password", :with => "test"
click_on "Login"
click_on "Log in"
end
end

4
test/controllers/messages_controller_test.rb
View file

@ -245,7 +245,7 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest
# Check that we can't reply to somebody else's message
get message_reply_path(:message_id => unread_message)
assert_redirected_to login_path(:referer => message_reply_path(:message_id => unread_message.id))
assert_equal "You are logged in as `#{other_user.display_name}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply.", flash[:notice]
assert_equal "You are logged in as `#{other_user.display_name}' but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply.", flash[:notice]
# Login as the right user
session_for(recipient_user)
@ -291,7 +291,7 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest
# Check that we can't read the message
get message_path(:id => unread_message)
assert_redirected_to login_path(:referer => message_path(:id => unread_message.id))
assert_equal "You are logged in as `#{other_user.display_name}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it.", flash[:notice]
assert_equal "You are logged in as `#{other_user.display_name}' but the message you have asked to read was not sent by or to that user. Please log in as the correct user in order to read it.", flash[:notice]
# Login as the message sender
session_for(user)

3
test/helpers/user_helper_test.rb
View file

@ -116,7 +116,8 @@ class UserHelperTest < ActionView::TestCase
def test_auth_button
button = auth_button("google", "google")
assert_equal("<a class=\"auth_button\" title=\"Login with Google\" rel=\"nofollow\" data-method=\"post\" href=\"/auth/google\"><img alt=\"Login with a Google OpenID\" class=\"rounded-3\" src=\"/images/google.svg\" /></a>", button)
img_tag = "<img alt=\"Log in with a Google OpenID\" class=\"rounded-3\" src=\"/images/google.svg\" />"
assert_equal("<a class=\"auth_button\" title=\"Log in with Google\" rel=\"nofollow\" data-method=\"post\" href=\"/auth/google\">#{img_tag}</a>", button)
end
private