Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion public/de-AT/password_reset.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<h1>{{appName}}</h1>
<h1>Reset Your Password</h1>
<noscript><p>We apologize, but resetting your password requires javascript</p></noscript>
<p>You can set a new Password for your account: {{username}}</p>
<p>You can set a new Password{{#username}} for your account: {{username}}{{/username}}</p>
<br />
<p>{{error}}</p>
<form id='form' action='{{publicServerUrl}}/apps/{{appId}}/request_password_reset' method='POST'>
Expand Down
2 changes: 1 addition & 1 deletion public/de/password_reset.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<h1>{{appName}}</h1>
<h1>Reset Your Password</h1>
<noscript><p>We apologize, but resetting your password requires javascript</p></noscript>
<p>You can set a new Password for your account: {{username}}</p>
<p>You can set a new Password{{#username}} for your account: {{username}}{{/username}}</p>
<br />
<p>{{error}}</p>
<form id='form' action='{{publicServerUrl}}/apps/{{appId}}/request_password_reset' method='POST'>
Expand Down
2 changes: 1 addition & 1 deletion public/password_reset.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<h1>{{appName}}</h1>
<h1>Reset Your Password</h1>
<noscript><p>We apologize, but resetting your password requires javascript</p></noscript>
<p>You can set a new Password for your account: {{username}}</p>
<p>You can set a new Password{{#username}} for your account: {{username}}{{/username}}</p>
<br />
<p>{{error}}</p>
<form id='form' action='{{publicServerUrl}}/apps/{{appId}}/request_password_reset' method='POST'>
Expand Down
18 changes: 18 additions & 0 deletions spec/PagesRouter.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,24 @@ describe('Pages Router', () => {
expect(replacedContent.text).not.toContain('{{error}}');
});

it('omits the username clause on the password reset page when no username is set', async () => {
await expectAsync(router.goToPage(req, pages.passwordReset)).toBeResolved();

const replacedContent = await pageResponse.calls.all()[0].returnValue;
expect(replacedContent.text).not.toContain('for your account:');
expect(replacedContent.text).not.toContain('undefined');
});

it('shows the username on the password reset page when a username is set', async () => {
req.params = { appId: config.appId };
req.query.username = 'exampleUsername';

await expectAsync(router.passwordReset(req)).toBeResolved();

const replacedContent = await pageResponse.calls.all()[0].returnValue;
expect(replacedContent.text).toContain('for your account: exampleUsername');
});

it('fills placeholders from config object', async () => {
config.pages.enableLocalization = false;
config.pages.placeholders = {
Expand Down
Loading