Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Updated tests for Craft 3.6.0 RC2
  • Loading branch information
Ben Croker committed Dec 15, 2020
1 parent d2868b8 commit d0a3ea0
Show file tree
Hide file tree
Showing 10 changed files with 36 additions and 92 deletions.
23 changes: 5 additions & 18 deletions src/test/fixtures/elements/CampaignElementFixture.php
Expand Up @@ -5,7 +5,8 @@

namespace putyourlightson\campaign\test\fixtures\elements;

use craft\test\fixtures\elements\ElementFixture;
use craft\base\ElementInterface;
use craft\test\fixtures\elements\BaseElementFixture;
use putyourlightson\campaign\Campaign;
use putyourlightson\campaign\elements\CampaignElement;

Expand All @@ -15,24 +16,13 @@
* @since 1.10.0
*/

abstract class CampaignElementFixture extends ElementFixture
abstract class CampaignElementFixture extends BaseElementFixture
{
// Public Properties
// =========================================================================

/**
* @inheritdoc
*/
public $modelClass = CampaignElement::class;

/**
* @var array
*/
public $campaignTypeIds = [];

// Public Methods
// =========================================================================

/**
* @inheritdoc
*/
Expand All @@ -45,14 +35,11 @@ public function load()
parent::load();
}

// Protected Methods
// =========================================================================

/**
* @inheritdoc
*/
protected function isPrimaryKey(string $key): bool
protected function createElement(): ElementInterface
{
return parent::isPrimaryKey($key) || in_array($key, ['campaignTypeId', 'title']);
return new CampaignElement();
}
}
20 changes: 5 additions & 15 deletions src/test/fixtures/elements/ContactElementFixture.php
Expand Up @@ -5,7 +5,8 @@

namespace putyourlightson\campaign\test\fixtures\elements;

use craft\test\fixtures\elements\ElementFixture;
use craft\base\ElementInterface;
use craft\test\fixtures\elements\BaseElementFixture;
use putyourlightson\campaign\elements\ContactElement;

/**
Expand All @@ -14,24 +15,13 @@
* @since 1.10.0
*/

abstract class ContactElementFixture extends ElementFixture
abstract class ContactElementFixture extends BaseElementFixture
{
// Public Properties
// =========================================================================

/**
* @inheritdoc
*/
public $modelClass = ContactElement::class;

// Protected Methods
// =========================================================================

/**
* @inheritdoc
*/
protected function isPrimaryKey(string $key): bool
protected function createElement(): ElementInterface
{
return parent::isPrimaryKey($key) || in_array($key, ['email']);
return new ContactElement();
}
}
23 changes: 5 additions & 18 deletions src/test/fixtures/elements/MailingListElementFixture.php
Expand Up @@ -5,7 +5,8 @@

namespace putyourlightson\campaign\test\fixtures\elements;

use craft\test\fixtures\elements\ElementFixture;
use craft\base\ElementInterface;
use craft\test\fixtures\elements\BaseElementFixture;
use putyourlightson\campaign\Campaign;
use putyourlightson\campaign\elements\MailingListElement;

Expand All @@ -15,24 +16,13 @@
* @since 1.10.0
*/

abstract class MailingListElementFixture extends ElementFixture
abstract class MailingListElementFixture extends BaseElementFixture
{
// Public Properties
// =========================================================================

/**
* @inheritdoc
*/
public $modelClass = MailingListElement::class;

/**
* @var array
*/
public $mailingListTypeIds = [];

// Public Methods
// =========================================================================

/**
* @inheritdoc
*/
Expand All @@ -45,14 +35,11 @@ public function load()
parent::load();
}

// Protected Methods
// =========================================================================

/**
* @inheritdoc
*/
protected function isPrimaryKey(string $key): bool
protected function createElement(): ElementInterface
{
return parent::isPrimaryKey($key) || in_array($key, ['mailingListTypeId', 'title']);
return new MailingListElement();
}
}
20 changes: 5 additions & 15 deletions src/test/fixtures/elements/SegmentElementFixture.php
Expand Up @@ -5,7 +5,8 @@

namespace putyourlightson\campaign\test\fixtures\elements;

use craft\test\fixtures\elements\ElementFixture;
use craft\base\ElementInterface;
use craft\test\fixtures\elements\BaseElementFixture;
use putyourlightson\campaign\elements\SegmentElement;

/**
Expand All @@ -14,24 +15,13 @@
* @since 1.13.0
*/

abstract class SegmentElementFixture extends ElementFixture
abstract class SegmentElementFixture extends BaseElementFixture
{
// Public Properties
// =========================================================================

/**
* @inheritdoc
*/
public $modelClass = SegmentElement::class;

// Protected Methods
// =========================================================================

/**
* @inheritdoc
*/
protected function isPrimaryKey(string $key): bool
protected function createElement(): ElementInterface
{
return parent::isPrimaryKey($key) || in_array($key, ['title']);
return new SegmentElement();
}
}
23 changes: 5 additions & 18 deletions src/test/fixtures/elements/SendoutElementFixture.php
Expand Up @@ -5,7 +5,8 @@

namespace putyourlightson\campaign\test\fixtures\elements;

use craft\test\fixtures\elements\ElementFixture;
use craft\base\ElementInterface;
use craft\test\fixtures\elements\BaseElementFixture;
use putyourlightson\campaign\elements\CampaignElement;
use putyourlightson\campaign\elements\MailingListElement;
use putyourlightson\campaign\elements\SegmentElement;
Expand All @@ -17,16 +18,8 @@
* @since 1.10.0
*/

abstract class SendoutElementFixture extends ElementFixture
abstract class SendoutElementFixture extends BaseElementFixture
{
// Public Properties
// =========================================================================

/**
* @inheritdoc
*/
public $modelClass = SendoutElement::class;

/**
* @var int|null
*/
Expand All @@ -42,9 +35,6 @@ abstract class SendoutElementFixture extends ElementFixture
*/
public $segmentIds;

// Public Methods
// =========================================================================

/**
* @inheritdoc
*/
Expand All @@ -62,14 +52,11 @@ public function load()
parent::load();
}

// Protected Methods
// =========================================================================

/**
* @inheritdoc
*/
protected function isPrimaryKey(string $key): bool
protected function createElement(): ElementInterface
{
return parent::isPrimaryKey($key) || in_array($key, ['title']);
return new SendoutElement();
}
}
4 changes: 2 additions & 2 deletions tests/fixtures/CampaignTypesFixture.php
Expand Up @@ -5,7 +5,7 @@

namespace putyourlightson\campaigntests\fixtures;

use craft\test\Fixture;
use craft\test\ActiveFixture;
use putyourlightson\campaign\records\CampaignTypeRecord;

/**
Expand All @@ -14,7 +14,7 @@
* @since 1.10.0
*/

class CampaignTypesFixture extends Fixture
class CampaignTypesFixture extends ActiveFixture
{
// Public Properties
// =========================================================================
Expand Down
4 changes: 2 additions & 2 deletions tests/fixtures/LinksFixture.php
Expand Up @@ -5,7 +5,7 @@

namespace putyourlightson\campaigntests\fixtures;

use craft\test\Fixture;
use craft\test\ActiveFixture;
use putyourlightson\campaign\elements\CampaignElement;
use putyourlightson\campaign\records\LinkRecord;

Expand All @@ -15,7 +15,7 @@
* @since 1.12.2
*/

class LinksFixture extends Fixture
class LinksFixture extends ActiveFixture
{
// Public Properties
// =========================================================================
Expand Down
4 changes: 2 additions & 2 deletions tests/fixtures/MailingListTypesFixture.php
Expand Up @@ -5,7 +5,7 @@

namespace putyourlightson\campaigntests\fixtures;

use craft\test\Fixture;
use craft\test\ActiveFixture;
use putyourlightson\campaign\records\MailingListTypeRecord;

/**
Expand All @@ -14,7 +14,7 @@
* @since 1.10.0
*/

class MailingListTypesFixture extends Fixture
class MailingListTypesFixture extends ActiveFixture
{
// Public Properties
// =========================================================================
Expand Down
4 changes: 2 additions & 2 deletions tests/fixtures/PendingContactsFixture.php
Expand Up @@ -5,7 +5,7 @@

namespace putyourlightson\campaigntests\fixtures;

use craft\test\Fixture;
use craft\test\ActiveFixture;
use putyourlightson\campaign\elements\MailingListElement;
use putyourlightson\campaign\records\PendingContactRecord;

Expand All @@ -15,7 +15,7 @@
* @since 1.10.0
*/

class PendingContactsFixture extends Fixture
class PendingContactsFixture extends ActiveFixture
{
// Public Properties
// =========================================================================
Expand Down
3 changes: 3 additions & 0 deletions tests/unit/services/ContactsServiceTest.php
Expand Up @@ -67,5 +67,8 @@ public function testSaveContactWithSameEmail()

// Assert that a contact with the same email can be saved if the other contact was soft-deleted
$this->assertTrue($elementsService->saveElement($newContact));

// Now delete the contact so future tests won't fail
$elementsService->deleteElement($this->contact, true);
}
}

0 comments on commit d0a3ea0

Please sign in to comment.