Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Store routing context when mounting engine, Fix i18n path #14

Merged
merged 10 commits into from
Mar 8, 2018
Merged

Store routing context when mounting engine, Fix i18n path #14

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2dbb14d
Store routing context when mounting for re-use in mailer/templates
Mar 3, 2018
0cd1f58
Shorten line 🐺
Mar 3, 2018
f62c66e
:) ok
Mar 3, 2018
c57ea91
Adds basic integration test and fix i18n path
Mar 7, 2018
5a8eebb
Fix lint issues
Mar 7, 2018
9a90c5b
Rename `Passwordless.router_context` to `Passwordless.mounted_as`
Mar 7, 2018
fbc7e17
Fix lint issue (line too long)
Mar 7, 2018
6e5e00d
Keep routes the way they were
Mar 7, 2018
6283b61
Revert locale change and adjust integration test expectation
Mar 8, 2018
7392e9e
Removes obsolete helper method
Mar 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert locale change and adjust integration test expectation
  • Loading branch information
Gregory Igelmund committed Mar 8, 2018
commit 6283b61df666f7e60edb6423280ea449017ac129
2 changes: 1 addition & 1 deletion config/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ en:
sessions:
create:
session_expired: 'Your session has expired, please sign in again.'
email_sent_if_record_found: "If we found you in the system, we have sent you an email."
email_sent_if_record_found: "If we found you in the system, we've sent you an email."
new:
submit: 'Send magic link'
mailer:
Expand Down
4 changes: 1 addition & 3 deletions test/integration/navigation_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ class NavigationTest < ActionDispatch::IntegrationTest
},
headers: { 'HTTP_USER_AGENT' => 'Mosaic v.1' }
assert_equal 200, status
assert response.body.include?(
'If we found you in the system, we have sent you an email.'
)
assert response.body.include?('If we found you in the system')

# Expect session created for alice
session = Passwordless::Session.find_by! authenticatable: alice
Expand Down