Added newsletter archiving tests

refs https://github.com/TryGhost/Team/issues/1477

ghost/admin/app/components/modals/newsletters/confirm-archive.hbs

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

ghost/admin/app/components/modals/newsletters/confirm-unarchive.hbs

@@ -1,5 +1,5 @@
 <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>
     </header>
     <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
             type="button"
             class="gh-btn"
+            data-test-button="cancel-newsletter-reactivate"
             {{on "click" (fn @close false)}}
         >
             <span>Cancel</span>
@@ -26,6 +27,7 @@
             @task={{@data.unarchiveNewsletterTask}}
             @taskArgs={{@data.newsletter}}
             @class="gh-btn gh-btn-black gh-btn-icon"
+            data-test-button="confirm-newsletter-reactivate"
         />
     </div>
 </div>

ghost/admin/app/components/settings/newsletters/newsletter-management.hbs

@@ -3,7 +3,7 @@
         <h4 class="gh-main-section-header small bn">Newsletters</h4>
         {{#if this.archivedNewsletters}}
             <div>
-                <div>
+                <div data-test-dropdown="newsletter-status-filter">
                     <PowerSelect
                         @selected={{this.statusFilter}}
                         @options={{this.statusFilters}}
@@ -97,14 +97,14 @@
                                                     </li>
                                                     {{#if (eq newsletter.status "active")}}
                                                         <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>
                                                             </button>
                                                         </li>
                                                     {{/if}}
                                                     {{#if (eq newsletter.status "archived")}}
                                                         <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>
                                                             </button>
                                                         </li>

ghost/admin/tests/acceptance/settings/newsletters-test.js

@@ -136,6 +136,7 @@ describe('Acceptance: Settings - Newsletters', function () {
         await fillIn('input#newsletter-title', name);
     }
 
+    describe('Creating newsletters', function () {
         it('can create new newsletter', async function () {
             await visit('/settings/newsletters');
             await click('[data-test-button="add-newsletter"]');
@@ -168,7 +169,9 @@ describe('Acceptance: Settings - Newsletters', function () {
             // Everything should be valid
             await checkSave({});
         });
+    });
 
+    describe('Editing newsletters', function () {
         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'});
@@ -376,3 +379,119 @@ describe('Acceptance: Settings - Newsletters', function () {
             });
         });
     });
+
+    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;
+        });
+
+        it('can reactivate newsletters if only archived newsletter left', async function () {
+            // Create an extra newsletter, to check counts
+            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);
+        });
+
+        it('can reactivate newsletters', async function () {
+            // Create an extra newsletter, to check counts
+            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'});
+            this.server.create('newsletter', {status: 'archived', name: 'test newsletter 3', slug: 'test-newsletter3'});
+            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(2);
+
+            // 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 still showing archived newsletters
+            expect(find('.gh-newsletters .gh-expandable-title').textContent.trim(), 'Title').to.equal('Archived newsletters');
+
+            // 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);
+        });
+    });
+});