From 6511a475241a953815e22f7e29549da280803a08 Mon Sep 17 00:00:00 2001
From: Peter Zimon <zimo@ghost.org>
Date: Tue, 7 Jul 2020 18:18:00 +0200
Subject: [PATCH] Fixed tests

no refs.
---
 ghost/admin/app/components/modal-import-members.hbs       | 4 ++--
 ghost/admin/app/services/member-import-validator.js       | 8 ++++----
 .../integration/components/modal-import-members-test.js   | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ghost/admin/app/components/modal-import-members.hbs b/ghost/admin/app/components/modal-import-members.hbs
index f71f9b0fc8..cbf8a227f1 100644
--- a/ghost/admin/app/components/modal-import-members.hbs
+++ b/ghost/admin/app/components/modal-import-members.hbs
@@ -12,7 +12,7 @@
 {{#if this.importResponse}}
     {{!-- post upload step with import stats --}}
 
-    <div class="modaly-body">
+    <div class="modal-body">
         
         {{!-- Summary --}}
         <div class="ba b--whitegrey br3 middarkgrey bg-whitegrey-l2">
@@ -29,7 +29,7 @@
         </div>
 
         {{#if this.importResponse.invalid.count}}
-            <div class="modal-body mt6 gh-members-upload-errorcontainer error">
+            <div class="mt6 gh-members-upload-errorcontainer error">
                 <div class="flex items-start">
                     {{svg-jar "warning" class="w5 h5 fill-red nudge-top--3 mr3"}}
                     <div class="flex-grow w-100">
diff --git a/ghost/admin/app/services/member-import-validator.js b/ghost/admin/app/services/member-import-validator.js
index 74d50c9174..a8482fe0f6 100644
--- a/ghost/admin/app/services/member-import-validator.js
+++ b/ghost/admin/app/services/member-import-validator.js
@@ -62,6 +62,7 @@ export default Service.extend({
             // check can be done on whole set as it won't be too slow
             const {invalidCount, emptyCount, duplicateCount} = this._checkEmails(data, mapping);
             if (invalidCount) {
+                // @TODO: Remove error from displayed errors
                 validationErrors.push(new MemberImportError({
                     message: `Invalid email address (${invalidCount})`,
                     type: 'warning'
@@ -76,6 +77,7 @@ export default Service.extend({
             }
 
             if (duplicateCount) {
+                // @TODO: Remove error from displayed errors
                 validationErrors.push(new MemberImportError({
                     message: `Duplicate email address (${duplicateCount})`,
                     type: 'warning'
@@ -192,13 +194,11 @@ export default Service.extend({
             }
 
             if (emailValue && !validator.isEmail(emailValue)) {
-                // Temporarily not returning this error
-                // invalidCount += 1;
+                invalidCount += 1;
             } else if (emailValue) {
                 if (emailMap[emailValue]) {
                     emailMap[emailValue] += 1;
-                    // Temporarily not returning this error
-                    // duplicateCount += 1;
+                    duplicateCount += 1;
                 } else {
                     emailMap[emailValue] = 1;
                 }
diff --git a/ghost/admin/tests/integration/components/modal-import-members-test.js b/ghost/admin/tests/integration/components/modal-import-members-test.js
index 37e7f3639b..2c420ff5f5 100644
--- a/ghost/admin/tests/integration/components/modal-import-members-test.js
+++ b/ghost/admin/tests/integration/components/modal-import-members-test.js
@@ -55,7 +55,7 @@ describe('Integration: Component: modal-import-members-test', function () {
         expect(find('h1').textContent.trim(), 'default header')
             .to.equal('Import members');
         expect(find('.description').textContent.trim(), 'upload label')
-            .to.equal('Select or drag-and-drop a CSV File');
+            .to.equal('Select or drag-and-drop a CSV file');
     });
 
     it('generates request to supplied endpoint', async function () {