Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

fix tests

Browse Source
This commit is contained in:
qfrery
2018-07-16 11:36:54 +01:00
parent 78e5c1866e
commit 43a0d92d2f
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/unit/API/JSON/v1/ServicesTest.php
View File

@ -6,7 +6,6 @@ use Codeception\Stub\Expected;
use MailPoet\API\JSON\v1\Services; use MailPoet\API\JSON\v1\Services;
use MailPoet\API\JSON\Response as APIResponse; use MailPoet\API\JSON\Response as APIResponse;
use MailPoet\Config\Installer; use MailPoet\Config\Installer;
use MailPoet\Models\Setting;
use MailPoet\Services\Bridge; use MailPoet\Services\Bridge;
class ServicesTest extends \MailPoetTest { class ServicesTest extends \MailPoetTest {
@ -275,8 +274,8 @@ class ServicesTest extends \MailPoetTest {
$this $this
); );
$response = $this->services_endpoint->checkMSSKey($this->data); $response = $this->services_endpoint->checkMSSKey($this->data);
expect(isset($response->data['public_id']))->true();
expect($response->data['public_id'])->notEmpty(); expect($response->data['public_id'])->notEmpty();
expect($response->data['public_id'])->equals(Setting::getValue('public_id'));
} }
function testItRespondsContainsPublicIdForPremium() { function testItRespondsContainsPublicIdForPremium() {
@ -288,8 +287,8 @@ class ServicesTest extends \MailPoetTest {
), ),
$this $this
); );
$response = $this->services_endpoint->checkMSSKey($this->data); $response = $this->services_endpoint->checkPremiumKey($this->data);
expect(isset($response->data['public_id']))->true();
expect($response->data['public_id'])->notEmpty(); expect($response->data['public_id'])->notEmpty();
expect($response->data['public_id'])->equals(Setting::getValue('public_id'));
} }
} }

13
tests/unit/Analytics/AnalyticsTest.php
View File

@ -107,25 +107,26 @@ class AnalyticsTest extends \MailPoetTest {
$fakePublicId = 'alk-ded-egrg-zaz-fvf-rtr-zdef'; $fakePublicId = 'alk-ded-egrg-zaz-fvf-rtr-zdef';
$analytics->setPublicId($fakePublicId); $analytics->setPublicId($fakePublicId);
expect($analytics->getValue('public_id'))->equals($fakePublicId); expect(Setting::getValue('public_id'))->equals($fakePublicId);
} }
function testIsPublicIdNew() { function testIsPublicIdNew() {
$analytics = new Analytics(new Reporter()); $analytics = new Analytics(new Reporter());
$fakePublicId = 'alk-ded-egrg-zaz-fvf-rtr-zdef'; $fakePublicId = 'alk-ded-egrg-zaz-fvf-rtr-zdef';
$analytics->setValue('new_public_id', 'false'); Setting::setValue('public_id', 'old-fake-public-id');
Setting::setValue('new_public_id', 'false');
$analytics->setPublicId($fakePublicId); $analytics->setPublicId($fakePublicId);
// When we update public_id it's marked as new // When we update public_id it's marked as new
expect($analytics->getValue('new_public_id'))->equals('true'); expect(Setting::getValue('new_public_id'))->equals('true');
expect($analytics->isPublicIdNew())->true(); expect($analytics->isPublicIdNew())->true();
expect($analytics->getValue('new_public_id'))->equals('false'); expect(Setting::getValue('new_public_id'))->equals('false');
$analytics->setPublicId($fakePublicId); $analytics->setPublicId($fakePublicId);
// We tried to update public_id with the same value, so it's not marked as new // We tried to update public_id with the same value, so it's not marked as new
expect($analytics->getValue('new_public_id'))->equals('false'); expect(Setting::getValue('new_public_id'))->equals('false');
expect($analytics->isPublicIdNew())->false(); expect($analytics->isPublicIdNew())->false();
expect($analytics->getValue('new_public_id'))->equals('false'); expect(Setting::getValue('new_public_id'))->equals('false');
} }
} }