0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-17 23:44:39 -05:00

Added newsletter archiving tests

refs https://github.com/TryGhost/Team/issues/1477
This commit is contained in:
Simon Backx 2022-06-02 10:39:17 +02:00
parent fb1b9b5f1f
commit 557e268445
4 changed files with 323 additions and 200 deletions

View file

@ -18,6 +18,7 @@
type="button" type="button"
class="gh-btn" class="gh-btn"
{{on "click" (fn @close false)}} {{on "click" (fn @close false)}}
data-test-button="cancel-newsletter-archive"
> >
<span>Cancel</span> <span>Cancel</span>
</button> </button>
@ -29,6 +30,7 @@
@task={{@data.archiveNewsletterTask}} @task={{@data.archiveNewsletterTask}}
@taskArgs={{@data.newsletter}} @taskArgs={{@data.newsletter}}
@class="gh-btn gh-btn-black gh-btn-icon" @class="gh-btn gh-btn-black gh-btn-icon"
data-test-button="confirm-newsletter-archive"
/> />
</div> </div>
</div> </div>

View file

@ -1,5 +1,5 @@
<div class="modal-content"> <div class="modal-content">
<header class="modal-header" data-test-modal="confirm-newsletter-unarchive"> <header class="modal-header" data-test-modal="confirm-newsletter-reactivate">
<h1>Reactivate newsletter</h1> <h1>Reactivate newsletter</h1>
</header> </header>
<button type="button" class="close" role="button" title="Close" {{on "click" (fn @close false)}}>{{svg-jar "close"}}<span class="hidden">Close</span></button> <button type="button" class="close" role="button" title="Close" {{on "click" (fn @close false)}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
@ -14,6 +14,7 @@
<button <button
type="button" type="button"
class="gh-btn" class="gh-btn"
data-test-button="cancel-newsletter-reactivate"
{{on "click" (fn @close false)}} {{on "click" (fn @close false)}}
> >
<span>Cancel</span> <span>Cancel</span>
@ -26,6 +27,7 @@
@task={{@data.unarchiveNewsletterTask}} @task={{@data.unarchiveNewsletterTask}}
@taskArgs={{@data.newsletter}} @taskArgs={{@data.newsletter}}
@class="gh-btn gh-btn-black gh-btn-icon" @class="gh-btn gh-btn-black gh-btn-icon"
data-test-button="confirm-newsletter-reactivate"
/> />
</div> </div>
</div> </div>

View file

@ -3,7 +3,7 @@
<h4 class="gh-main-section-header small bn">Newsletters</h4> <h4 class="gh-main-section-header small bn">Newsletters</h4>
{{#if this.archivedNewsletters}} {{#if this.archivedNewsletters}}
<div> <div>
<div> <div data-test-dropdown="newsletter-status-filter">
<PowerSelect <PowerSelect
@selected={{this.statusFilter}} @selected={{this.statusFilter}}
@options={{this.statusFilters}} @options={{this.statusFilters}}
@ -97,14 +97,14 @@
</li> </li>
{{#if (eq newsletter.status "active")}} {{#if (eq newsletter.status "active")}}
<li> <li>
<button class="mr2" type="button" {{on "click" (fn this.archiveNewsletter newsletter)}}> <button class="mr2" type="button" {{on "click" (fn this.archiveNewsletter newsletter)}} data-test-button="archive-newsletter">
<span>Archive</span> <span>Archive</span>
</button> </button>
</li> </li>
{{/if}} {{/if}}
{{#if (eq newsletter.status "archived")}} {{#if (eq newsletter.status "archived")}}
<li> <li>
<button class="mr2" type="button" {{on "click" (fn this.unarchiveNewsletter newsletter)}}> <button class="mr2" type="button" {{on "click" (fn this.unarchiveNewsletter newsletter)}} data-test-button="reactivate-newsletter">
<span>Reactivate</span> <span>Reactivate</span>
</button> </button>
</li> </li>

View file

@ -136,157 +136,55 @@ describe('Acceptance: Settings - Newsletters', function () {
await fillIn('input#newsletter-title', name); await fillIn('input#newsletter-title', name);
} }
it('can create new newsletter', async function () { describe('Creating newsletters', function () {
await visit('/settings/newsletters'); it('can create new newsletter', async function () {
await click('[data-test-button="add-newsletter"]'); await visit('/settings/newsletters');
await click('[data-test-button="add-newsletter"]');
// Check if modal opens // Check if modal opens
expect(find('[data-test-modal="create-newsletter"]'), 'Create newsletter modal').to.exist; expect(find('[data-test-modal="create-newsletter"]'), 'Create newsletter modal').to.exist;
// Fill in the newsletter name // Fill in the newsletter name
await fillName('My new newsletter'); await fillName('My new newsletter');
// Fill in the newsletter description // Fill in the newsletter description
await fillIn('textarea#newsletter-description', 'My newsletter description'); await fillIn('textarea#newsletter-description', 'My newsletter description');
await checkSave({}); await checkSave({});
});
it('validates create newsletter before saving', async function () {
await visit('/settings/newsletters');
await click('[data-test-button="add-newsletter"]');
// Check if modal opens
expect(find('[data-test-modal="create-newsletter"]'), 'Create newsletter modal').to.exist;
// Invalid name error when you try to save
await checkValidationError({'input#newsletter-title': /Please enter a name./});
// Fill in the newsletter name
await fillName('My new newsletter');
// Everything should be valid
await checkSave({});
});
it('can edit via menu if multiple newsletters', async function () {
// Create an extra newsletter
this.server.create('newsletter', {status: 'active', name: 'test newsletter', slug: 'test-newsletter'});
await visit('/settings/newsletters');
await click('[data-test-newsletter-menu-trigger]');
await click('[data-test-button="customize-newsletter"]');
// Check if modal opens
expect(find('[data-test-modal="edit-newsletter"]'), 'Edit newsletter modal').to.exist;
});
it('validates edit fields before saving', async function () {
await visit('/settings/newsletters');
// When we only have a single newsletter, the customize button is shown instead of the menu button
await click('[data-test-button="customize-newsletter"]');
// Check if modal opens
expect(find('[data-test-modal="edit-newsletter"]'), 'Edit newsletter modal').to.exist;
// Clear newsletter name
await fillName('');
// Invalid name error when you try to save
await checkValidationError({'input#newsletter-title': /Please enter a name./});
// Fill in the newsletter name
await fillName('My new newsletter');
// Enter an invalid email
await openTab('general.email');
await fillIn('input#newsletter-sender-email', 'invalid-email');
// Check if it complains about the invalid email
await checkValidationError({
'input#newsletter-sender-email': /Invalid email./
}); });
await fillIn('input#newsletter-sender-email', 'valid-email@email.com'); it('validates create newsletter before saving', async function () {
await visit('/settings/newsletters');
await click('[data-test-button="add-newsletter"]');
// Everything should be valid // Check if modal opens
await checkSave({ expect(find('[data-test-modal="create-newsletter"]'), 'Create newsletter modal').to.exist;
edit: true,
verifyEmail: /default email address \(noreply/ // Invalid name error when you try to save
await checkValidationError({'input#newsletter-title': /Please enter a name./});
// Fill in the newsletter name
await fillName('My new newsletter');
// Everything should be valid
await checkSave({});
}); });
}); });
it('can open / close all tabs', async function () { describe('Editing newsletters', function () {
await visit('/settings/newsletters'); it('can edit via menu if multiple newsletters', async function () {
// Create an extra newsletter
this.server.create('newsletter', {status: 'active', name: 'test newsletter', slug: 'test-newsletter'});
await visit('/settings/newsletters');
// When we only have a single newsletter, the customize button is shown instead of the menu button await click('[data-test-newsletter-menu-trigger]');
await click('[data-test-button="customize-newsletter"]'); await click('[data-test-button="customize-newsletter"]');
// Check if modal opens // Check if modal opens
expect(find('[data-test-modal="edit-newsletter"]'), 'Edit newsletter modal').to.exist; expect(find('[data-test-modal="edit-newsletter"]'), 'Edit newsletter modal').to.exist;
await openTab('general.name', false);
await closeTab('general.name', false);
await openTab('general.email', false);
await closeTab('general.email', false);
await openTab('general.member', false);
await closeTab('general.member', false);
await openTab('design.header', false);
await closeTab('design.header', false);
await openTab('design.body', false);
await closeTab('design.body', false);
await openTab('design.footer', false);
await closeTab('design.footer', false);
});
it('shows current sender email in verify modal', async function () {
this.server.create('newsletter', {status: 'active', name: 'test newsletter', slug: 'test-newsletter', senderEmail: 'test@example.com'});
await visit('/settings/newsletters');
// Edit the last newsletter
await click('[data-test-newsletter="test-newsletter"] [data-test-newsletter-menu-trigger]');
await click('[data-test-button="customize-newsletter"]');
// Check if modal opens
expect(find('[data-test-modal="edit-newsletter"]'), 'Edit newsletter modal').to.exist;
await openTab('general.email');
await fillIn('input#newsletter-sender-email', 'valid-email@email.com');
// Everything should be valid
await checkSave({
edit: true,
verifyEmail: /previous email address \(test@example\.com\)/
}); });
});
it('does not ask to confirm saved changes', async function () { it('validates edit fields before saving', async function () {
await visit('/settings/newsletters');
// When we only have a single newsletter, the customize button is shown instead of the menu button
await click('[data-test-button="customize-newsletter"]');
// Check if modal opens
expect(find('[data-test-modal="edit-newsletter"]'), 'Edit newsletter modal').to.exist;
// Make no changes
// Everything should be valid
await checkCancel({
edit: true,
shouldConfirm: false
});
});
it('asks to confirm unsaved changes', async function () {
async function doCheck(tabName, field) {
await visit('/settings/newsletters'); await visit('/settings/newsletters');
// When we only have a single newsletter, the customize button is shown instead of the menu button // When we only have a single newsletter, the customize button is shown instead of the menu button
@ -295,84 +193,305 @@ describe('Acceptance: Settings - Newsletters', function () {
// Check if modal opens // Check if modal opens
expect(find('[data-test-modal="edit-newsletter"]'), 'Edit newsletter modal').to.exist; expect(find('[data-test-modal="edit-newsletter"]'), 'Edit newsletter modal').to.exist;
// Make a change // Clear newsletter name
await openTab(tabName, false); await fillName('');
if (field.input) {
await fillIn(field.input, field.value ?? 'my changed value');
} else if (field.toggle) {
await click(field.toggle);
} else if (field.dropdown) {
// Open dropdown
await click(`${field.dropdown} .ember-basic-dropdown-trigger`);
// Click first not-selected option // Invalid name error when you try to save
await click(`${field.dropdown} li.ember-power-select-option[aria-current="false"]`); await checkValidationError({'input#newsletter-title': /Please enter a name./});
}
// Fill in the newsletter name
await fillName('My new newsletter');
// Enter an invalid email
await openTab('general.email');
await fillIn('input#newsletter-sender-email', 'invalid-email');
// Check if it complains about the invalid email
await checkValidationError({
'input#newsletter-sender-email': /Invalid email./
});
await fillIn('input#newsletter-sender-email', 'valid-email@email.com');
// Everything should be valid
await checkSave({
edit: true,
verifyEmail: /default email address \(noreply/
});
});
it('can open / close all tabs', async function () {
await visit('/settings/newsletters');
// When we only have a single newsletter, the customize button is shown instead of the menu button
await click('[data-test-button="customize-newsletter"]');
// Check if modal opens
expect(find('[data-test-modal="edit-newsletter"]'), 'Edit newsletter modal').to.exist;
await openTab('general.name', false);
await closeTab('general.name', false);
await openTab('general.email', false);
await closeTab('general.email', false);
await openTab('general.member', false);
await closeTab('general.member', false);
await openTab('design.header', false);
await closeTab('design.header', false);
await openTab('design.body', false);
await closeTab('design.body', false);
await openTab('design.footer', false);
await closeTab('design.footer', false);
});
it('shows current sender email in verify modal', async function () {
this.server.create('newsletter', {status: 'active', name: 'test newsletter', slug: 'test-newsletter', senderEmail: 'test@example.com'});
await visit('/settings/newsletters');
// Edit the last newsletter
await click('[data-test-newsletter="test-newsletter"] [data-test-newsletter-menu-trigger]');
await click('[data-test-button="customize-newsletter"]');
// Check if modal opens
expect(find('[data-test-modal="edit-newsletter"]'), 'Edit newsletter modal').to.exist;
await openTab('general.email');
await fillIn('input#newsletter-sender-email', 'valid-email@email.com');
// Everything should be valid
await checkSave({
edit: true,
verifyEmail: /previous email address \(test@example\.com\)/
});
});
it('does not ask to confirm saved changes', async function () {
await visit('/settings/newsletters');
// When we only have a single newsletter, the customize button is shown instead of the menu button
await click('[data-test-button="customize-newsletter"]');
// Check if modal opens
expect(find('[data-test-modal="edit-newsletter"]'), 'Edit newsletter modal').to.exist;
// Make no changes
// Everything should be valid // Everything should be valid
await checkCancel({ await checkCancel({
edit: true, edit: true,
shouldConfirm: true shouldConfirm: false
}); });
}
// General name
await doCheck('general.name', {
input: '#newsletter-title'
}); });
await doCheck('general.name', { it('asks to confirm unsaved changes', async function () {
input: '#newsletter-description' async function doCheck(tabName, field) {
await visit('/settings/newsletters');
// When we only have a single newsletter, the customize button is shown instead of the menu button
await click('[data-test-button="customize-newsletter"]');
// Check if modal opens
expect(find('[data-test-modal="edit-newsletter"]'), 'Edit newsletter modal').to.exist;
// Make a change
await openTab(tabName, false);
if (field.input) {
await fillIn(field.input, field.value ?? 'my changed value');
} else if (field.toggle) {
await click(field.toggle);
} else if (field.dropdown) {
// Open dropdown
await click(`${field.dropdown} .ember-basic-dropdown-trigger`);
// Click first not-selected option
await click(`${field.dropdown} li.ember-power-select-option[aria-current="false"]`);
}
// Everything should be valid
await checkCancel({
edit: true,
shouldConfirm: true
});
}
// General name
await doCheck('general.name', {
input: '#newsletter-title'
});
await doCheck('general.name', {
input: '#newsletter-description'
});
// General email
await doCheck('general.email', {
input: '#newsletter-sender-name'
});
await doCheck('general.email', {
input: '#newsletter-sender-email'
});
await doCheck('general.email', {
input: '#newsletter-reply-to',
value: 'support'
});
// Member settings
await doCheck.call(this, 'general.member', {
toggle: '[data-test-toggle="subscribeOnSignup"]'
});
// Design header
await doCheck.call(this, 'design.header', {
toggle: '[data-test-toggle="showHeaderTitle"]'
});
await doCheck.call(this, 'design.header', {
toggle: '[data-test-toggle="showHeaderName"]'
});
// Design body
await doCheck.call(this, 'design.body', {
dropdown: '[data-test-input="titleFontCategory"]'
});
await doCheck.call(this, 'design.body', {
toggle: '#newsletter-title-alignment button:not(.gh-btn-group-selected)'
});
await doCheck.call(this, 'design.body', {
dropdown: '[data-test-input="bodyFontCategory"]'
});
await doCheck.call(this, 'design.body', {
toggle: '#show-feature-image'
});
// Design footer
await doCheck('design.footer', {
input: '[contenteditable="true"]'
});
});
});
describe('Archiving newsletters', function () {
it('can archive newsletters', async function () {
// Create an extra newsletter, because we cannot archive the last one
this.server.create('newsletter', {status: 'active', name: 'test newsletter', slug: 'test-newsletter'});
await visit('/settings/newsletters');
// Check total newsletters shown
expect(findAll('[data-test-newsletter]').length, 'Total newsletters shown').to.equal(2);
// Toggle is hidden
expect(find('[data-test-dropdown="newsletter-status-filter"] .ember-power-select-trigger')).not.to.exist;
await click('[data-test-newsletter-menu-trigger]');
await click('[data-test-button="archive-newsletter"]');
// Check if confimation modal opens
expect(find('[data-test-modal="confirm-newsletter-archive"]'), 'Archive newsletter modal').to.exist;
// Confirm archive
await click('[data-test-button="confirm-newsletter-archive"]');
// Check total newsletters equals 1
expect(findAll('[data-test-newsletter]').length, 'Total newsletters shown').to.equal(1);
// Toggle is shown now
expect(find('[data-test-dropdown="newsletter-status-filter"] .ember-power-select-trigger')).to.exist;
}); });
// General email it('can reactivate newsletters if only archived newsletter left', async function () {
await doCheck('general.email', { // Create an extra newsletter, to check counts
input: '#newsletter-sender-name' this.server.create('newsletter', {status: 'active', name: 'test newsletter', slug: 'test-newsletter'});
// Create an archived newsletter, beacuse the toggle is invisible otherwise
this.server.create('newsletter', {status: 'archived', name: 'test newsletter 2', slug: 'test-newsletter2'});
await visit('/settings/newsletters');
// Check total newsletters shown
expect(findAll('[data-test-newsletter]').length, 'Total newsletters shown').to.equal(2);
// Go to archived newsletters
await click('[data-test-dropdown="newsletter-status-filter"] .ember-power-select-trigger');
await click('.ember-power-select-option[aria-selected="false"]');
// Check title okay
expect(find('.gh-newsletters .gh-expandable-title').textContent.trim(), 'Title').to.equal('Archived newsletters');
// Check total newsletters shown
expect(findAll('[data-test-newsletter]').length, 'Total archived newsletters shown').to.equal(1);
// Reactivate the newsletter
await click('[data-test-newsletter-menu-trigger]');
await click('[data-test-button="reactivate-newsletter"]');
// Check if confimation modal opens
expect(find('[data-test-modal="confirm-newsletter-reactivate"]'), 'Reactivate newsletter modal').to.exist;
// Confirm archive
await click('[data-test-button="confirm-newsletter-reactivate"]');
// Check automatically went back to all (because no newsletters archived)
// Check title okay
expect(find('.gh-newsletters .gh-expandable-title').textContent.trim(), 'Title').to.equal('Active newsletters');
// Check total newsletters shown
expect(findAll('[data-test-newsletter]').length, 'Total newsletters shown').to.equal(3);
}); });
await doCheck('general.email', { it('can reactivate newsletters', async function () {
input: '#newsletter-sender-email' // Create an extra newsletter, to check counts
}); this.server.create('newsletter', {status: 'active', name: 'test newsletter', slug: 'test-newsletter'});
await doCheck('general.email', { // Create an archived newsletter, beacuse the toggle is invisible otherwise
input: '#newsletter-reply-to', this.server.create('newsletter', {status: 'archived', name: 'test newsletter 2', slug: 'test-newsletter2'});
value: 'support' this.server.create('newsletter', {status: 'archived', name: 'test newsletter 3', slug: 'test-newsletter3'});
}); await visit('/settings/newsletters');
// Member settings // Check total newsletters shown
await doCheck.call(this, 'general.member', { expect(findAll('[data-test-newsletter]').length, 'Total newsletters shown').to.equal(2);
toggle: '[data-test-toggle="subscribeOnSignup"]'
});
// Design header // Go to archived newsletters
await doCheck.call(this, 'design.header', { await click('[data-test-dropdown="newsletter-status-filter"] .ember-power-select-trigger');
toggle: '[data-test-toggle="showHeaderTitle"]' await click('.ember-power-select-option[aria-selected="false"]');
});
await doCheck.call(this, 'design.header', { // Check title okay
toggle: '[data-test-toggle="showHeaderName"]' expect(find('.gh-newsletters .gh-expandable-title').textContent.trim(), 'Title').to.equal('Archived newsletters');
});
// Design body // Check total newsletters shown
await doCheck.call(this, 'design.body', { expect(findAll('[data-test-newsletter]').length, 'Total archived newsletters shown').to.equal(2);
dropdown: '[data-test-input="titleFontCategory"]'
});
await doCheck.call(this, 'design.body', { // Reactivate the newsletter
toggle: '#newsletter-title-alignment button:not(.gh-btn-group-selected)' await click('[data-test-newsletter-menu-trigger]');
}); await click('[data-test-button="reactivate-newsletter"]');
await doCheck.call(this, 'design.body', { // Check if confimation modal opens
dropdown: '[data-test-input="bodyFontCategory"]' expect(find('[data-test-modal="confirm-newsletter-reactivate"]'), 'Reactivate newsletter modal').to.exist;
});
await doCheck.call(this, 'design.body', { // Confirm archive
toggle: '#show-feature-image' await click('[data-test-button="confirm-newsletter-reactivate"]');
});
// Design footer // Check still showing archived newsletters
await doCheck('design.footer', { expect(find('.gh-newsletters .gh-expandable-title').textContent.trim(), 'Title').to.equal('Archived newsletters');
input: '[contenteditable="true"]'
// Go to active newsletters
await click('[data-test-dropdown="newsletter-status-filter"] .ember-power-select-trigger');
await click('.ember-power-select-option[aria-selected="false"]');
// Check automatically went back to all (because no newsletters archived)
// Check title okay
expect(find('.gh-newsletters .gh-expandable-title').textContent.trim(), 'Title').to.equal('Active newsletters');
// Check total newsletters shown
expect(findAll('[data-test-newsletter]').length, 'Total newsletters shown').to.equal(3);
}); });
}); });
}); });