Fix dependencies in integration tests

[MAILPOET-3269]
This commit is contained in:
Jan Lysý
2021-05-28 12:52:15 +02:00
committed by Veljko V
parent 7d49d39efc
commit f106d6f2f2
7 changed files with 17 additions and 7 deletions

View File

@@ -8,6 +8,7 @@ use MailPoet\Entities\NewsletterEntity;
use MailPoet\Newsletter\NewslettersRepository; use MailPoet\Newsletter\NewslettersRepository;
use MailPoet\Newsletter\Statistics\NewsletterStatistics; use MailPoet\Newsletter\Statistics\NewsletterStatistics;
use MailPoet\Newsletter\Statistics\NewsletterStatisticsRepository; use MailPoet\Newsletter\Statistics\NewsletterStatisticsRepository;
use MailPoet\Newsletter\Url;
use MailPoetVendor\Doctrine\ORM\EntityManager; use MailPoetVendor\Doctrine\ORM\EntityManager;
class NewslettersResponseBuilderTest extends \MailPoetTest { class NewslettersResponseBuilderTest extends \MailPoetTest {
@@ -35,7 +36,8 @@ class NewslettersResponseBuilderTest extends \MailPoetTest {
'getStatistics' => new NewsletterStatistics(4, 6, 2, 10, null), 'getStatistics' => new NewsletterStatistics(4, 6, 2, 10, null),
]); ]);
$newsletterRepository = Stub::make(NewslettersRepository::class); $newsletterRepository = Stub::make(NewslettersRepository::class);
$responseBuilder = new NewslettersResponseBuilder($em, $newsletterRepository, $newsletterStatsRepository); $newsletterUrl = $this->diContainer->get(Url::class);
$responseBuilder = new NewslettersResponseBuilder($em, $newsletterRepository, $newsletterStatsRepository, $newsletterUrl);
$response = $responseBuilder->build($newsletter, [ $response = $responseBuilder->build($newsletter, [
NewslettersResponseBuilder::RELATION_CHILDREN_COUNT, NewslettersResponseBuilder::RELATION_CHILDREN_COUNT,
NewslettersResponseBuilder::RELATION_TOTAL_SENT, NewslettersResponseBuilder::RELATION_TOTAL_SENT,

View File

@@ -168,7 +168,8 @@ class ViewInBrowserRendererTest extends \MailPoetTest {
$emoji, $emoji,
$this->diContainer->get(SettingsController::class), $this->diContainer->get(SettingsController::class),
$this->diContainer->get(Shortcodes::class), $this->diContainer->get(Shortcodes::class),
$this->diContainer->get(Renderer::class) $this->diContainer->get(Renderer::class),
$this->diContainer->get(Links::class)
); );
$renderedBody = $viewInBrowser->render( $renderedBody = $viewInBrowser->render(
$preview = false, $preview = false,

View File

@@ -68,7 +68,7 @@ class ClicksTest extends \MailPoetTest {
$this->entityManager->persist($link); $this->entityManager->persist($link);
$this->entityManager->flush(); $this->entityManager->flush();
$subscriberModel = Subscriber::findOne($subscriber->getId()); $subscriberModel = Subscriber::findOne($subscriber->getId());
$linkTokens = new LinkTokens; $linkTokens = $this->diContainer->get(LinkTokens::class);
// build track data // build track data
$this->trackData = (object)[ $this->trackData = (object)[
'queue' => $queue, 'queue' => $queue,

View File

@@ -59,7 +59,7 @@ class OpensTest extends \MailPoetTest {
$this->entityManager->flush(); $this->entityManager->flush();
$this->queue = $queue; $this->queue = $queue;
$linkTokens = new LinkTokens; $linkTokens = $this->diContainer->get(LinkTokens::class);
// build track data // build track data
$this->trackData = (object)[ $this->trackData = (object)[
'queue' => $queue, 'queue' => $queue,

View File

@@ -52,6 +52,7 @@ class ConfirmationEmailMailerTest extends \MailPoetTest {
$mailer, $mailer,
$this->diContainer->get(WPFunctions::class), $this->diContainer->get(WPFunctions::class),
$this->diContainer->get(SettingsController::class), $this->diContainer->get(SettingsController::class),
$this->diContainer->get(SubscribersRepository::class),
$subcriptionUrlFacroryMock $subcriptionUrlFacroryMock
); );
@@ -95,6 +96,7 @@ class ConfirmationEmailMailerTest extends \MailPoetTest {
$mailer, $mailer,
$this->diContainer->get(WPFunctions::class), $this->diContainer->get(WPFunctions::class),
$this->diContainer->get(SettingsController::class), $this->diContainer->get(SettingsController::class),
$this->diContainer->get(SubscribersRepository::class),
$this->diContainer->get(SubscriptionUrlFactory::class) $this->diContainer->get(SubscriptionUrlFactory::class)
); );
@@ -122,6 +124,7 @@ class ConfirmationEmailMailerTest extends \MailPoetTest {
$mailer, $mailer,
$this->diContainer->get(WPFunctions::class), $this->diContainer->get(WPFunctions::class),
$this->diContainer->get(SettingsController::class), $this->diContainer->get(SettingsController::class),
$this->diContainer->get(SubscribersRepository::class),
$this->diContainer->get(SubscriptionUrlFactory::class) $this->diContainer->get(SubscriptionUrlFactory::class)
); );
@@ -149,6 +152,7 @@ class ConfirmationEmailMailerTest extends \MailPoetTest {
$mailer, $mailer,
$this->diContainer->get(WPFunctions::class), $this->diContainer->get(WPFunctions::class),
$this->diContainer->get(SettingsController::class), $this->diContainer->get(SettingsController::class),
$this->diContainer->get(SubscribersRepository::class),
$this->diContainer->get(SubscriptionUrlFactory::class) $this->diContainer->get(SubscriptionUrlFactory::class)
); );
@@ -177,6 +181,7 @@ class ConfirmationEmailMailerTest extends \MailPoetTest {
$mailer, $mailer,
$this->diContainer->get(WPFunctions::class), $this->diContainer->get(WPFunctions::class),
$this->diContainer->get(SettingsController::class), $this->diContainer->get(SettingsController::class),
$this->diContainer->get(SubscribersRepository::class),
$this->diContainer->get(SubscriptionUrlFactory::class) $this->diContainer->get(SubscriptionUrlFactory::class)
); );

View File

@@ -7,6 +7,7 @@ use MailPoet\Models\SendingQueue;
use MailPoet\Models\StatisticsNewsletters; use MailPoet\Models\StatisticsNewsletters;
use MailPoet\Models\StatisticsOpens; use MailPoet\Models\StatisticsOpens;
use MailPoet\Models\Subscriber; use MailPoet\Models\Subscriber;
use MailPoet\Newsletter\Url;
class NewslettersExporterTest extends \MailPoetTest { class NewslettersExporterTest extends \MailPoetTest {
@@ -15,7 +16,7 @@ class NewslettersExporterTest extends \MailPoetTest {
public function _before() { public function _before() {
parent::_before(); parent::_before();
$this->exporter = new NewslettersExporter(); $this->exporter = new NewslettersExporter($this->diContainer->get(Url::class));
} }
public function testExportWorksWhenSubscriberNotFound() { public function testExportWorksWhenSubscriberNotFound() {

View File

@@ -4,10 +4,10 @@ namespace MailPoet\Test\Subscription;
use MailPoet\Config\Populator; use MailPoet\Config\Populator;
use MailPoet\Models\Subscriber; use MailPoet\Models\Subscriber;
use MailPoet\Newsletter\Url;
use MailPoet\Router\Router; use MailPoet\Router\Router;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
use MailPoet\Settings\SettingsRepository; use MailPoet\Settings\SettingsRepository;
use MailPoet\Subscribers\LinkTokens;
use MailPoet\Subscription\SubscriptionUrlFactory; use MailPoet\Subscription\SubscriptionUrlFactory;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
@@ -23,8 +23,9 @@ class UrlTest extends \MailPoetTest {
parent::_before(); parent::_before();
$this->settings = $this->diContainer->get(SettingsController::class); $this->settings = $this->diContainer->get(SettingsController::class);
$populator = $this->diContainer->get(Populator::class); $populator = $this->diContainer->get(Populator::class);
$url = $this->diContainer->get(Url::class);
$populator->up(); $populator->up();
$this->url = new SubscriptionUrlFactory(WPFunctions::get(), $this->settings, new LinkTokens); $this->url = new SubscriptionUrlFactory(WPFunctions::get(), $this->settings, $url);
} }
public function testItReturnsTheDefaultPageUrlIfNoPageIsSetInSettings() { public function testItReturnsTheDefaultPageUrlIfNoPageIsSetInSettings() {