From 428008e63d481eb374dc08b9508f49334b84a978 Mon Sep 17 00:00:00 2001
From: kirrg001 <katharina.irrgang@googlemail.com>
Date: Wed, 3 Jan 2018 13:38:06 +0100
Subject: [PATCH] =?UTF-8?q?Revert=20"=F0=9F=90=9B=20Fixed=20importer=20dup?=
 =?UTF-8?q?licate=20detection=20for=20posts"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

refs #8717

- we decided to not changing the current importer behaviour
- no slug duplication detection means, importing posts can result in duplicates
---
 core/server/data/importer/importers/data/index.js          | 1 -
 core/server/models/base/index.js                           | 6 ------
 core/test/integration/data/importer/importers/data_spec.js | 2 --
 3 files changed, 9 deletions(-)

diff --git a/core/server/data/importer/importers/data/index.js b/core/server/data/importer/importers/data/index.js
index 4d3a93bc68..3fbe61e2c3 100644
--- a/core/server/data/importer/importers/data/index.js
+++ b/core/server/data/importer/importers/data/index.js
@@ -42,7 +42,6 @@ DataImporter = {
         if (importOptions && importOptions.importPersistUser) {
             modelOptions.importPersistUser = importOptions.importPersistUser;
         }
-
         this.init(importData);
 
         return models.Base.transaction(function (transacting) {
diff --git a/core/server/models/base/index.js b/core/server/models/base/index.js
index ecfb243707..4c34db16c6 100644
--- a/core/server/models/base/index.js
+++ b/core/server/models/base/index.js
@@ -774,12 +774,6 @@ ghostBookshelf.Model = ghostBookshelf.Model.extend({
             if (!slug) {
                 slug = baseName;
             }
-
-            // CASE: no slug generation on import, see https://github.com/TryGhost/Ghost/issues/8717
-            if (options.importing) {
-                return slug;
-            }
-
             // Test for duplicate slugs.
             return checkIfSlugExists(slug);
         });
diff --git a/core/test/integration/data/importer/importers/data_spec.js b/core/test/integration/data/importer/importers/data_spec.js
index cd88e5df14..fad272df02 100644
--- a/core/test/integration/data/importer/importers/data_spec.js
+++ b/core/test/integration/data/importer/importers/data_spec.js
@@ -394,8 +394,6 @@ describe('Import', function () {
                 exportData = exported;
                 return dataImporter.doImport(exportData);
             }).then(function (importedData) {
-                importedData.data.posts.length.should.eql(1);
-
                 importedData.problems.length.should.eql(3);
                 importedData.problems[0].message.should.eql('Entry was not imported and ignored. Detected duplicated entry.');
                 importedData.problems[0].help.should.eql('Tag');