From 72e9f0a95ed9fd8b78a86ba0ed8ca080af1e0e89 Mon Sep 17 00:00:00 2001 From: Katharina Irrgang Date: Wed, 8 Feb 2017 16:40:47 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=20delete=20all=20content=20if?= =?UTF-8?q?=20subscriber=20is=20associated=20with=20a=20post=20(#7962)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit closes #7875 - we need to delete the subscribers before deleting the posts --- core/server/api/db.js | 1 + core/test/integration/api/api_db_spec.js | 2 +- core/test/integration/api/api_subscription_spec.js | 2 +- core/test/utils/fixtures/data-generator.js | 2 ++ 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/server/api/db.js b/core/server/api/db.js index 9ced0d280a..030434aa68 100644 --- a/core/server/api/db.js +++ b/core/server/api/db.js @@ -92,6 +92,7 @@ db = { function deleteContent() { var collections = [ + models.Subscriber.findAll(queryOpts), models.Post.findAll(queryOpts), models.Tag.findAll(queryOpts) ]; diff --git a/core/test/integration/api/api_db_spec.js b/core/test/integration/api/api_db_spec.js index 89f3ef2149..fc0c3df402 100644 --- a/core/test/integration/api/api_db_spec.js +++ b/core/test/integration/api/api_db_spec.js @@ -9,7 +9,7 @@ describe('DB API', function () { // Keep the DB clean before(testUtils.teardown); afterEach(testUtils.teardown); - beforeEach(testUtils.setup('users:roles', 'settings', 'posts', 'perms:db', 'perms:init')); + beforeEach(testUtils.setup('users:roles', 'settings', 'posts', 'subscriber', 'perms:db', 'perms:init')); should.exist(dbAPI); diff --git a/core/test/integration/api/api_subscription_spec.js b/core/test/integration/api/api_subscription_spec.js index 1d878c5ec3..7c5cb29bb9 100644 --- a/core/test/integration/api/api_subscription_spec.js +++ b/core/test/integration/api/api_subscription_spec.js @@ -15,7 +15,7 @@ describe('Subscribers API', function () { // Keep the DB clean before(testUtils.teardown); afterEach(testUtils.teardown); - beforeEach(testUtils.setup('users:roles', 'perms:subscriber', 'perms:init', 'subscriber')); + beforeEach(testUtils.setup('users:roles', 'perms:subscriber', 'perms:init', 'posts', 'subscriber')); should.exist(SubscribersAPI); diff --git a/core/test/utils/fixtures/data-generator.js b/core/test/utils/fixtures/data-generator.js index 9c7ef188b8..30904e9660 100644 --- a/core/test/utils/fixtures/data-generator.js +++ b/core/test/utils/fixtures/data-generator.js @@ -314,6 +314,8 @@ DataGenerator.Content = { ] }; +DataGenerator.Content.subscribers[0].post_id = DataGenerator.Content.posts[0].id; + DataGenerator.forKnex = (function () { var posts, tags,