Skip to content

Commit

Permalink
Merge pull request #5167 from plataformatec/sp-fix-typos
Browse files Browse the repository at this point in the history
Fix typos
  • Loading branch information
tegon committed Nov 29, 2019
2 parents 14863ba + fb18c6c commit 43068ac
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion lib/devise/failure_app.rb
Expand Up @@ -152,7 +152,7 @@ def scope_url

# We need to add the rootpath to `script_name` manually for applications that use a Rails
# version lower than 5.1. Otherwise, it is going to generate a wrong path for Engines
# that use Devise. Remove it when the support of Rails 5.0 is droped.
# that use Devise. Remove it when the support of Rails 5.0 is dropped.
elsif root_path_defined?(context) && !rails_51_and_up?
rootpath = context.routes.url_helpers.root_path
opts[:script_name] = rootpath.chomp('/') if rootpath.length > 1
Expand Down
2 changes: 1 addition & 1 deletion lib/devise/test/integration_helpers.rb
Expand Up @@ -28,7 +28,7 @@ def self.included(base)
end
end

# Signs in a specific resource, mimicking a successfull sign in
# Signs in a specific resource, mimicking a successful sign in
# operation through +Devise::SessionsController#create+.
#
# * +resource+ - The resource that should be authenticated
Expand Down
4 changes: 2 additions & 2 deletions test/integration/database_authenticatable_test.rb
Expand Up @@ -65,7 +65,7 @@ class DatabaseAuthenticationTest < Devise::IntegrationTest
end
end

test 'sign in with invalid pasword should return to sign in form with error message' do
test 'sign in with invalid password should return to sign in form with error message' do
sign_in_as_admin do
fill_in 'password', with: 'abcdef'
end
Expand All @@ -80,7 +80,7 @@ class DatabaseAuthenticationTest < Devise::IntegrationTest
sign_in_as_user do
fill_in 'email', with: 'wrongemail@test.com'
end

assert_not_contain 'Not found in database'
assert_contain 'Invalid Email or password.'
end
Expand Down
2 changes: 1 addition & 1 deletion test/integration/timeoutable_test.rb
Expand Up @@ -77,7 +77,7 @@ def last_request_at
end
end

test 'time out user session after deault limit time and redirect to latest get request' do
test 'time out user session after default limit time and redirect to latest get request' do
user = sign_in_as_user
visit edit_form_user_path(user)

Expand Down
2 changes: 1 addition & 1 deletion test/mailers/reset_password_instructions_test.rb
Expand Up @@ -29,7 +29,7 @@ def mail
end
end

test 'email sent after reseting the user password' do
test 'email sent after resetting the user password' do
assert_not_nil mail
end

Expand Down
2 changes: 1 addition & 1 deletion test/models/recoverable_test.rb
Expand Up @@ -34,7 +34,7 @@ def setup
assert create_user.reset_password('123456789', '123456789')
end

test 'should clear reset password token while reseting the password' do
test 'should clear reset password token while resetting the password' do
user = create_user
assert_nil user.reset_password_token

Expand Down

0 comments on commit 43068ac

Please sign in to comment.