From c59c13f5e29db1c0946ad07eabfae895ff18d5ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Jakes=CC=8C?= Date: Thu, 3 Oct 2019 09:54:14 +0200 Subject: [PATCH] Move dynamic segment tests to test namespace [MAILPOET-2382] --- .../API/JSON/v1/DynamicSegmentsTest.php | 38 +++++++++---------- .../Filters/EmailActionTest.php | 2 +- .../DynamicSegments/Filters/UserRoleTest.php | 2 +- .../Filters/WooCommerceCategoryTest.php | 2 +- .../AddToNewslettersSegmentsTest.php | 12 +++--- .../AddToSubscribersFiltersTest.php | 16 ++++---- ...endingNewslettersSubscribersFinderTest.php | 14 ++++--- .../SubscribersBulkActionHandlerTest.php | 4 +- .../SubscribersListingsHandlerFactoryTest.php | 4 +- .../Mappers/FormDataMapperTest.php | 22 +++++------ .../Persistence/Loading/LoaderTest.php | 20 +++++----- .../Loading/SingleSegmentLoaderTest.php | 14 +++---- .../Loading/SubscribersCountTest.php | 6 +-- .../Loading/SubscribersIdsTest.php | 6 +-- .../DynamicSegments/Persistence/SaverTest.php | 12 +++--- .../SubscribersInDynamicSegmentTest.php | 4 +- 16 files changed, 90 insertions(+), 88 deletions(-) diff --git a/tests/integration/API/JSON/v1/DynamicSegmentsTest.php b/tests/integration/API/JSON/v1/DynamicSegmentsTest.php index 350c45574a..433019ba1c 100644 --- a/tests/integration/API/JSON/v1/DynamicSegmentsTest.php +++ b/tests/integration/API/JSON/v1/DynamicSegmentsTest.php @@ -1,18 +1,18 @@ bulk_action = ContainerWrapper::getInstance()->getPremiumContainer()->get(BulkActionController::class); - $this->listing_handler = ContainerWrapper::getInstance()->getPremiumContainer()->get(Handler::class); + $this->bulk_action = ContainerWrapper::getInstance()->get(BulkActionController::class); + $this->listing_handler = ContainerWrapper::getInstance()->get(Handler::class); } function testGetReturnsResponse() { - $loader = Stub::makeEmpty('\MailPoet\Premium\DynamicSegments\Persistence\Loading\SingleSegmentLoader', [ + $loader = Stub::makeEmpty('\MailPoet\DynamicSegments\Persistence\Loading\SingleSegmentLoader', [ 'load' => function () { $dynamic_segment = DynamicSegment::create(); $dynamic_segment->hydrate([ @@ -59,7 +59,7 @@ class DynamicSegmentsTest extends \MailPoetTest { } function testGetReturnsError() { - $loader = Stub::makeEmpty('\MailPoet\Premium\DynamicSegments\Persistence\Loading\SingleSegmentLoader', [ + $loader = Stub::makeEmpty('\MailPoet\DynamicSegments\Persistence\Loading\SingleSegmentLoader', [ 'load' => function () { throw new \InvalidArgumentException('segment not found'); }, @@ -71,7 +71,7 @@ class DynamicSegmentsTest extends \MailPoetTest { } function testSaverSavesData() { - $mapper = Stub::makeEmpty('\MailPoet\Premium\DynamicSegments\Mappers\FormDataMapper', ['mapDataToDB' => Expected::once(function () { + $mapper = Stub::makeEmpty('\MailPoet\DynamicSegments\Mappers\FormDataMapper', ['mapDataToDB' => Expected::once(function () { $dynamic_segment = DynamicSegment::create(); $dynamic_segment->hydrate([ 'name' => 'name', @@ -79,7 +79,7 @@ class DynamicSegmentsTest extends \MailPoetTest { ]); return $dynamic_segment; })]); - $saver = Stub::makeEmpty('\MailPoet\Premium\DynamicSegments\Persistence\Saver', ['save' => Expected::once()]); + $saver = Stub::makeEmpty('\MailPoet\DynamicSegments\Persistence\Saver', ['save' => Expected::once()]); $endpoint = new DynamicSegments($this->bulk_action, $this->listing_handler, $mapper, $saver); $response = $endpoint->save([]); @@ -88,10 +88,10 @@ class DynamicSegmentsTest extends \MailPoetTest { } function testSaverReturnsErrorOnInvalidData() { - $mapper = Stub::makeEmpty('\MailPoet\Premium\DynamicSegments\Mappers\FormDataMapper', ['mapDataToDB' => Expected::once(function () { + $mapper = Stub::makeEmpty('\MailPoet\DynamicSegments\Mappers\FormDataMapper', ['mapDataToDB' => Expected::once(function () { throw new InvalidSegmentTypeException(); })]); - $saver = Stub::makeEmpty('\MailPoet\Premium\DynamicSegments\Persistence\Saver', ['save' => Expected::never()]); + $saver = Stub::makeEmpty('\MailPoet\DynamicSegments\Persistence\Saver', ['save' => Expected::never()]); $endpoint = new DynamicSegments($this->bulk_action, $this->listing_handler, $mapper, $saver); $response = $endpoint->save([]); @@ -100,7 +100,7 @@ class DynamicSegmentsTest extends \MailPoetTest { } function testSaverReturnsErrorOnSave() { - $mapper = Stub::makeEmpty('\MailPoet\Premium\DynamicSegments\Mappers\FormDataMapper', ['mapDataToDB' => Expected::once(function () { + $mapper = Stub::makeEmpty('\MailPoet\DynamicSegments\Mappers\FormDataMapper', ['mapDataToDB' => Expected::once(function () { $dynamic_segment = DynamicSegment::create(); $dynamic_segment->hydrate([ 'name' => 'name', @@ -108,7 +108,7 @@ class DynamicSegmentsTest extends \MailPoetTest { ]); return $dynamic_segment; })]); - $saver = Stub::makeEmpty('\MailPoet\Premium\DynamicSegments\Persistence\Saver', ['save' => Expected::once(function () { + $saver = Stub::makeEmpty('\MailPoet\DynamicSegments\Persistence\Saver', ['save' => Expected::once(function () { throw new ErrorSavingException('Error saving data', Model::DUPLICATE_RECORD); })]); @@ -125,7 +125,7 @@ class DynamicSegmentsTest extends \MailPoetTest { 'name' => 'Trash test', 'description' => 'description', ]); - $loader = Stub::makeEmpty('\MailPoet\Premium\DynamicSegments\Persistence\Loading\SingleSegmentLoader', [ + $loader = Stub::makeEmpty('\MailPoet\DynamicSegments\Persistence\Loading\SingleSegmentLoader', [ 'load' => function () use($dynamic_segment) { return $dynamic_segment; }, @@ -150,7 +150,7 @@ class DynamicSegmentsTest extends \MailPoetTest { 'name' => 'Restore test', 'description' => 'description', ]); - $loader = Stub::makeEmpty('\MailPoet\Premium\DynamicSegments\Persistence\Loading\SingleSegmentLoader', [ + $loader = Stub::makeEmpty('\MailPoet\DynamicSegments\Persistence\Loading\SingleSegmentLoader', [ 'load' => function () use($dynamic_segment) { return $dynamic_segment; }, @@ -178,7 +178,7 @@ class DynamicSegmentsTest extends \MailPoetTest { $filter = DynamicSegmentFilter::createOrUpdate([ 'segment_id' => $dynamic_segment->id, ]); - $loader = Stub::makeEmpty('\MailPoet\Premium\DynamicSegments\Persistence\Loading\SingleSegmentLoader', [ + $loader = Stub::makeEmpty('\MailPoet\DynamicSegments\Persistence\Loading\SingleSegmentLoader', [ 'load' => function () use($dynamic_segment) { return $dynamic_segment; }, diff --git a/tests/integration/DynamicSegments/Filters/EmailActionTest.php b/tests/integration/DynamicSegments/Filters/EmailActionTest.php index c8ff75c333..85319395b3 100644 --- a/tests/integration/DynamicSegments/Filters/EmailActionTest.php +++ b/tests/integration/DynamicSegments/Filters/EmailActionTest.php @@ -1,6 +1,6 @@ '', ]); - $segment_loader = Stub::makeEmpty('\MailPoet\Premium\DynamicSegments\Persistence\Loading\Loader', ['load' => Expected::once(function () { + $segment_loader = Stub::makeEmpty('\MailPoet\DynamicSegments\Persistence\Loading\Loader', ['load' => Expected::once(function () { return []; })]); - $subscribers_count_loader = Stub::makeEmpty('\MailPoet\Premium\DynamicSegments\Persistence\Loading\SubscribersCount', ['getSubscribersCount' => Expected::never()]); + $subscribers_count_loader = Stub::makeEmpty('\MailPoet\DynamicSegments\Persistence\Loading\SubscribersCount', ['getSubscribersCount' => Expected::never()]); $filter = new AddToNewslettersSegments($segment_loader, $subscribers_count_loader); $result = $filter->add([$dynamic_segment]); @@ -34,11 +34,11 @@ class AddToNewslettersSegmentsTest extends \MailPoetTest { 'id' => 1, ]); - $segment_loader = Stub::makeEmpty('\MailPoet\Premium\DynamicSegments\Persistence\Loading\Loader', ['load' => Expected::once(function () use ($dynamic_segment) { + $segment_loader = Stub::makeEmpty('\MailPoet\DynamicSegments\Persistence\Loading\Loader', ['load' => Expected::once(function () use ($dynamic_segment) { return [$dynamic_segment]; })]); - $subscribers_count_loader = Stub::makeEmpty('\MailPoet\Premium\DynamicSegments\Persistence\Loading\SubscribersCount', ['getSubscribersCount']); + $subscribers_count_loader = Stub::makeEmpty('\MailPoet\DynamicSegments\Persistence\Loading\SubscribersCount', ['getSubscribersCount']); $subscribers_count_loader ->expects($this->once()) ->method('getSubscribersCount') diff --git a/tests/integration/DynamicSegments/FreePluginConnectors/AddToSubscribersFiltersTest.php b/tests/integration/DynamicSegments/FreePluginConnectors/AddToSubscribersFiltersTest.php index 807802ef88..40f38476a6 100644 --- a/tests/integration/DynamicSegments/FreePluginConnectors/AddToSubscribersFiltersTest.php +++ b/tests/integration/DynamicSegments/FreePluginConnectors/AddToSubscribersFiltersTest.php @@ -1,10 +1,10 @@ '', ]; - $segment_loader = Stub::makeEmpty('\MailPoet\Premium\DynamicSegments\Persistence\Loading\Loader', ['load' => Expected::once(function () { + $segment_loader = Stub::makeEmpty('\MailPoet\DynamicSegments\Persistence\Loading\Loader', ['load' => Expected::once(function () { return []; })]); - $subscribers_count_loader = Stub::makeEmpty('\MailPoet\Premium\DynamicSegments\Persistence\Loading\SubscribersCount', ['getSubscribersCount' => Expected::never()]); + $subscribers_count_loader = Stub::makeEmpty('\MailPoet\DynamicSegments\Persistence\Loading\SubscribersCount', ['getSubscribersCount' => Expected::never()]); $filter = new AddToSubscribersFilters($segment_loader, $subscribers_count_loader); $result = $filter->add([$original_segment]); @@ -33,11 +33,11 @@ class AddToSubscribersFiltersTest extends \MailPoetTest { 'id' => 1, ]); - $segment_loader = Stub::makeEmpty('\MailPoet\Premium\DynamicSegments\Persistence\Loading\Loader', ['load' => Expected::once(function () use ($dynamic_segment) { + $segment_loader = Stub::makeEmpty('\MailPoet\DynamicSegments\Persistence\Loading\Loader', ['load' => Expected::once(function () use ($dynamic_segment) { return [$dynamic_segment]; })]); - $subscribers_count_loader = Stub::makeEmpty('\MailPoet\Premium\DynamicSegments\Persistence\Loading\SubscribersCount', ['getSubscribersCount']); + $subscribers_count_loader = Stub::makeEmpty('\MailPoet\DynamicSegments\Persistence\Loading\SubscribersCount', ['getSubscribersCount']); $subscribers_count_loader ->expects($this->once()) ->method('getSubscribersCount') @@ -69,7 +69,7 @@ class AddToSubscribersFiltersTest extends \MailPoetTest { ]); $segment_loader = Stub::makeEmpty( - '\MailPoet\Premium\DynamicSegments\Persistence\Loading\Loader', + '\MailPoet\DynamicSegments\Persistence\Loading\Loader', [ 'load' => Expected::once(function () use ($dynamic_segment1, $dynamic_segment2) { return [$dynamic_segment1, $dynamic_segment2]; @@ -77,7 +77,7 @@ class AddToSubscribersFiltersTest extends \MailPoetTest { ] ); - $subscribers_count_loader = Stub::makeEmpty('\MailPoet\Premium\DynamicSegments\Persistence\Loading\SubscribersCount', ['getSubscribersCount']); + $subscribers_count_loader = Stub::makeEmpty('\MailPoet\DynamicSegments\Persistence\Loading\SubscribersCount', ['getSubscribersCount']); $subscribers_count_loader ->expects($this->exactly(2)) ->method('getSubscribersCount') diff --git a/tests/integration/DynamicSegments/FreePluginConnectors/SendingNewslettersSubscribersFinderTest.php b/tests/integration/DynamicSegments/FreePluginConnectors/SendingNewslettersSubscribersFinderTest.php index 6f25aea4af..93e1725e0c 100644 --- a/tests/integration/DynamicSegments/FreePluginConnectors/SendingNewslettersSubscribersFinderTest.php +++ b/tests/integration/DynamicSegments/FreePluginConnectors/SendingNewslettersSubscribersFinderTest.php @@ -1,26 +1,28 @@ single_segment_loader = Stub::makeEmpty('\MailPoet\Premium\DynamicSegments\Persistence\Loading\SingleSegmentLoader'); - $this->subscribers_ids_loader = Stub::makeEmpty('\MailPoet\Premium\DynamicSegments\Persistence\Loading\SubscribersIds'); + $this->single_segment_loader = Stub::makeEmpty('\MailPoet\DynamicSegments\Persistence\Loading\SingleSegmentLoader'); + $this->subscribers_ids_loader = Stub::makeEmpty('\MailPoet\DynamicSegments\Persistence\Loading\SubscribersIds'); $this->subscribers_in_segments_finder = new SendingNewslettersSubscribersFinder($this->single_segment_loader, $this->subscribers_ids_loader); } diff --git a/tests/integration/DynamicSegments/FreePluginConnectors/SubscribersBulkActionHandlerTest.php b/tests/integration/DynamicSegments/FreePluginConnectors/SubscribersBulkActionHandlerTest.php index 6c731b07c5..e1e3a038ec 100644 --- a/tests/integration/DynamicSegments/FreePluginConnectors/SubscribersBulkActionHandlerTest.php +++ b/tests/integration/DynamicSegments/FreePluginConnectors/SubscribersBulkActionHandlerTest.php @@ -1,8 +1,8 @@ '', 'segmentType' => '', ]; - $this->setExpectedException('\MailPoet\Premium\DynamicSegments\Exceptions\InvalidSegmentTypeException'); + $this->setExpectedException('\MailPoet\DynamicSegments\Exceptions\InvalidSegmentTypeException'); $this->mapper->mapDataToDB($data); } @@ -29,7 +29,7 @@ class FormDataMapperTest extends \MailPoetTest { 'description' => '', 'segmentType' => 'invalid', ]; - $this->setExpectedException('\MailPoet\Premium\DynamicSegments\Exceptions\InvalidSegmentTypeException'); + $this->setExpectedException('\MailPoet\DynamicSegments\Exceptions\InvalidSegmentTypeException'); $this->mapper->mapDataToDB($data); } @@ -41,7 +41,7 @@ class FormDataMapperTest extends \MailPoetTest { 'wordpressRole' => 'administrator', ]; $segment = $this->mapper->mapDataToDB($data); - $this->assertInstanceOf('\MailPoet\Premium\Models\DynamicSegment', $segment); + $this->assertInstanceOf('\MailPoet\Models\DynamicSegment', $segment); $this->assertEquals('Name', $segment->name); $this->assertEquals('Description', $segment->description); $this->assertNull($segment->id); @@ -54,7 +54,7 @@ class FormDataMapperTest extends \MailPoetTest { 'description' => 'Description', 'segmentType' => 'woocommerce', ]; - $this->setExpectedException('\MailPoet\Premium\DynamicSegments\Exceptions\InvalidSegmentTypeException'); + $this->setExpectedException('\MailPoet\DynamicSegments\Exceptions\InvalidSegmentTypeException'); $this->mapper->mapDataToDB($data); } @@ -67,13 +67,13 @@ class FormDataMapperTest extends \MailPoetTest { 'action' => 'purchasedCategory', ]; $segment = $this->mapper->mapDataToDB($data); - $this->assertInstanceOf('\MailPoet\Premium\Models\DynamicSegment', $segment); + $this->assertInstanceOf('\MailPoet\Models\DynamicSegment', $segment); $this->assertEquals('Name', $segment->name); $this->assertEquals('Description', $segment->description); $this->assertNull($segment->id); $filters = $segment->getFilters(); $this->assertCount(1, $filters); - $this->assertInstanceOf('\MailPoet\Premium\DynamicSegments\Filters\WooCommerceCategory', $filters[0]); + $this->assertInstanceOf('\MailPoet\DynamicSegments\Filters\WooCommerceCategory', $filters[0]); } public function testItCreatesWooCommerceProductFilter() { @@ -85,13 +85,13 @@ class FormDataMapperTest extends \MailPoetTest { 'action' => 'purchasedProduct', ]; $segment = $this->mapper->mapDataToDB($data); - $this->assertInstanceOf('\MailPoet\Premium\Models\DynamicSegment', $segment); + $this->assertInstanceOf('\MailPoet\Models\DynamicSegment', $segment); $this->assertEquals('Name', $segment->name); $this->assertEquals('Description', $segment->description); $this->assertNull($segment->id); $filters = $segment->getFilters(); $this->assertCount(1, $filters); - $this->assertInstanceOf('\MailPoet\Premium\DynamicSegments\Filters\WooCommerceProduct', $filters[0]); + $this->assertInstanceOf('\MailPoet\DynamicSegments\Filters\WooCommerceProduct', $filters[0]); } public function testItSetsIdOnEdit() { @@ -111,4 +111,4 @@ class FormDataMapperTest extends \MailPoetTest { } -} \ No newline at end of file +} diff --git a/tests/integration/DynamicSegments/Persistence/Loading/LoaderTest.php b/tests/integration/DynamicSegments/Persistence/Loading/LoaderTest.php index 5132104deb..e40cc8dc9f 100644 --- a/tests/integration/DynamicSegments/Persistence/Loading/LoaderTest.php +++ b/tests/integration/DynamicSegments/Persistence/Loading/LoaderTest.php @@ -1,11 +1,11 @@ loader->load(); expect($data)->count(2); - expect($data[0])->isInstanceOf('\MailPoet\Premium\Models\DynamicSegment'); - expect($data[1])->isInstanceOf('\MailPoet\Premium\Models\DynamicSegment'); + expect($data[0])->isInstanceOf('\MailPoet\Models\DynamicSegment'); + expect($data[1])->isInstanceOf('\MailPoet\Models\DynamicSegment'); } function testItDoesNotLoadTrashedSegments() { $this->segments[0]->trash(); $data = $this->loader->load(); expect($data)->count(1); - expect($data[0])->isInstanceOf('\MailPoet\Premium\Models\DynamicSegment'); + expect($data[0])->isInstanceOf('\MailPoet\Models\DynamicSegment'); expect($data[0]->name)->equals('segment 2'); } @@ -71,8 +71,8 @@ class LoaderTest extends \MailPoetTest { $filters1 = $data[1]->getFilters(); expect($filters0)->count(1); expect($filters1)->count(1); - expect($filters0[0])->isInstanceOf('\MailPoet\Premium\DynamicSegments\Filters\UserRole'); - expect($filters1[0])->isInstanceOf('\MailPoet\Premium\DynamicSegments\Filters\UserRole'); + expect($filters0[0])->isInstanceOf('\MailPoet\DynamicSegments\Filters\UserRole'); + expect($filters1[0])->isInstanceOf('\MailPoet\DynamicSegments\Filters\UserRole'); expect($filters0[0]->getRole())->equals('Editor'); expect($filters1[0]->getRole())->equals('Administrator'); } diff --git a/tests/integration/DynamicSegments/Persistence/Loading/SingleSegmentLoaderTest.php b/tests/integration/DynamicSegments/Persistence/Loading/SingleSegmentLoaderTest.php index be7b06d3e5..a438444b2a 100644 --- a/tests/integration/DynamicSegments/Persistence/Loading/SingleSegmentLoaderTest.php +++ b/tests/integration/DynamicSegments/Persistence/Loading/SingleSegmentLoaderTest.php @@ -1,11 +1,11 @@ loader->load($this->segment->id); - expect($data)->isInstanceOf('\MailPoet\Premium\Models\DynamicSegment'); + expect($data)->isInstanceOf('\MailPoet\Models\DynamicSegment'); } function testItThrowsForUnknownSegment() { @@ -51,7 +51,7 @@ class SingleSegmentLoaderTest extends \MailPoetTest { $data = $this->loader->load($this->segment->id); $filters0 = $data->getFilters(); expect($filters0)->count(1); - expect($filters0[0])->isInstanceOf('\MailPoet\Premium\DynamicSegments\Filters\UserRole'); + expect($filters0[0])->isInstanceOf('\MailPoet\DynamicSegments\Filters\UserRole'); expect($filters0[0]->getRole())->equals('Administrator'); } diff --git a/tests/integration/DynamicSegments/Persistence/Loading/SubscribersCountTest.php b/tests/integration/DynamicSegments/Persistence/Loading/SubscribersCountTest.php index fa8b163a5b..4f6c759e31 100644 --- a/tests/integration/DynamicSegments/Persistence/Loading/SubscribersCountTest.php +++ b/tests/integration/DynamicSegments/Persistence/Loading/SubscribersCountTest.php @@ -1,11 +1,11 @@ 'desc2', 'id' => $dynamic_segment1->id, ]); - $this->setExpectedException('\MailPoet\Premium\DynamicSegments\Exceptions\ErrorSavingException', 'Another record already exists. Please specify a different "PRIMARY".', Model::DUPLICATE_RECORD); + $this->setExpectedException('\MailPoet\DynamicSegments\Exceptions\ErrorSavingException', 'Another record already exists. Please specify a different "PRIMARY".', Model::DUPLICATE_RECORD); $this->saver->save($dynamic_segment2); } @@ -59,7 +59,7 @@ class SaverTest extends \MailPoetTest { $dynamic_segment->setFilters([new UserRole('editor', 'and')]); $id = $this->saver->save($dynamic_segment); $loaded = DynamicSegmentFilter::select('*')->where('segment_id', $id)->findOne(); - expect($loaded)->isInstanceOf('\MailPoet\Premium\Models\DynamicSegmentFilter'); + expect($loaded)->isInstanceOf('\MailPoet\Models\DynamicSegmentFilter'); } } diff --git a/tests/integration/Models/SubscribersInDynamicSegmentTest.php b/tests/integration/Models/SubscribersInDynamicSegmentTest.php index c573d2537c..327555699a 100644 --- a/tests/integration/Models/SubscribersInDynamicSegmentTest.php +++ b/tests/integration/Models/SubscribersInDynamicSegmentTest.php @@ -1,10 +1,10 @@