Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-24 23:48:13 -05:00
Code Issues Activity

Fixed "and sent to..." text appearing in scheduled header when not sending

Browse source 
refs bd60c8089b

- added conditional for displaying the recipient text
- fixed tests not expecting newlines in html
This commit is contained in:
Kevin Ansfield 2021-06-11 12:10:28 +01:00
parent bd60c8089b
commit 937eac51ad
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ghost/admin/app/components/gh-editor-post-status.hbs
View file

@ -10,8 +10,10 @@
{{/if}} {{/if}}
{{else if @post.isScheduled}} {{else if @post.isScheduled}}
<time datetime="{{@post.publishedAtUTC}}" class="ml1 green f8" data-test-schedule-countdown> <time datetime="{{@post.publishedAtUTC}}" class="ml1 green f8" data-test-schedule-countdown>
Will be published and sent to Will be published
<GhRecipientFilterCount @filter={{@post.emailRecipientFilter}} /> {{#if @post.emailRecipientFilter}}
and sent to <GhRecipientFilterCount @filter={{@post.emailRecipientFilter}} />
{{/if}}
{{this.scheduledTime}} {{this.scheduledTime}}
</time> </time>
{{else if @post.isNew}} {{else if @post.isNew}}

8
ghost/admin/tests/acceptance/editor-test.js
View file

@ -351,7 +351,7 @@ describe('Acceptance: Editor', function () {
// expect countdown to show warning that post is scheduled to be published // expect countdown to show warning that post is scheduled to be published
expect(find('[data-test-schedule-countdown]').textContent.trim(), 'notification countdown') expect(find('[data-test-schedule-countdown]').textContent.trim(), 'notification countdown')
.to.match(/Will be published in (4|5) minutes/); .to.match(/Will be published\s+in (4|5) minutes/);
expect( expect(
find('[data-test-publishmenu-trigger]').textContent.trim(), find('[data-test-publishmenu-trigger]').textContent.trim(),
@ -361,7 +361,7 @@ describe('Acceptance: Editor', function () {
expect( expect(
find('[data-test-editor-post-status]').textContent.trim(), find('[data-test-editor-post-status]').textContent.trim(),
'scheduled post status' 'scheduled post status'
).to.match(/Will be published in (4|5) minutes/); ).to.match(/Will be published\s+in (4|5) minutes/);
// Re-schedule // Re-schedule
await click('[data-test-publishmenu-trigger]'); await click('[data-test-publishmenu-trigger]');
@ -388,7 +388,7 @@ describe('Acceptance: Editor', function () {
expect( expect(
find('[data-test-editor-post-status]').textContent.trim(), find('[data-test-editor-post-status]').textContent.trim(),
'scheduled status text' 'scheduled status text'
).to.match(/Will be published in (4|5) minutes/); ).to.match(/Will be published\s+in (4|5) minutes/);
// unschedule // unschedule
await click('[data-test-publishmenu-trigger]'); await click('[data-test-publishmenu-trigger]');
@ -543,7 +543,7 @@ describe('Acceptance: Editor', function () {
.to.equal('Scheduled'); .to.equal('Scheduled');
// expect countdown to show warning, that post is scheduled to be published // expect countdown to show warning, that post is scheduled to be published
expect(find('[data-test-schedule-countdown]').textContent.trim(), 'notification countdown') expect(find('[data-test-schedule-countdown]').textContent.trim(), 'notification countdown')
.to.match(/Will be published in (4|5) minutes/); .to.match(/Will be published\s+in (4|5) minutes/);
}); });
it('shows author token input and allows changing of authors in PSM', async function () { it('shows author token input and allows changing of authors in PSM', async function () {