Page MenuHomePhorge
Files F117827177

D5080.1775300101.diff
No OneTemporary
Actions

Authored By
Unknown
Size
8 KB
Referenced Files
None
Subscribers
None

D5080.1775300101.diff
View Options

diff --git a/docker/tests/init.sh b/docker/tests/init.sh
--- a/docker/tests/init.sh
+++ b/docker/tests/init.sh
@@ -33,13 +33,6 @@
--verbose \
--testsuite Unit
- php \
- -dmemory_limit=-1 \
- vendor/bin/phpunit \
- --exclude-group "$EXCLUDE_GROUPS" \
- --verbose \
- --testsuite Functional
-
php \
-dmemory_limit=-1 \
vendor/bin/phpunit \
@@ -57,16 +50,6 @@
--stop-on-failure \
--testsuite Unit
- php \
- -dmemory_limit=-1 \
- vendor/bin/phpunit \
- --exclude-group "$EXCLUDE_GROUPS" \
- --verbose \
- --stop-on-defect \
- --stop-on-error \
- --stop-on-failure \
- --testsuite Functional
-
php \
-dmemory_limit=-1 \
vendor/bin/phpunit \
diff --git a/src/phpunit.xml b/src/phpunit.xml
--- a/src/phpunit.xml
+++ b/src/phpunit.xml
@@ -13,10 +13,6 @@
<directory suffix="Test.php">tests/Unit</directory>
</testsuite>
- <testsuite name="Functional">
- <directory suffix="Test.php">tests/Functional</directory>
- </testsuite>
-
<testsuite name="Feature">
<directory suffix="Test.php">tests/Feature</directory>
</testsuite>
diff --git a/src/tests/Functional/HorizonTest.php b/src/tests/Feature/Controller/HorizonTest.php
rename from src/tests/Functional/HorizonTest.php
rename to src/tests/Feature/Controller/HorizonTest.php
--- a/src/tests/Functional/HorizonTest.php
+++ b/src/tests/Feature/Controller/HorizonTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Tests\Functional;
+namespace Tests\Feature\Controller;
use Tests\TestCase;
@@ -19,14 +19,17 @@
$response->assertStatus(200);
}
- /*
public function testRegularAccess()
{
+ if (!file_exists('public/vendor/horizon/mix-manifest.json')) {
+ $this->markTestSkipped();
+ }
+
$this->useRegularUrl();
$response = $this->get('horizon/dashboard');
+ // TODO: We should make it 404
$response->assertStatus(200);
}
- */
}
diff --git a/src/tests/Feature/DomainTest.php b/src/tests/Feature/DomainTest.php
--- a/src/tests/Feature/DomainTest.php
+++ b/src/tests/Feature/DomainTest.php
@@ -418,6 +418,72 @@
);
}
+ /**
+ * Test domain suspending/unsuspending
+ */
+ public function testSuspendAndUnsuspend()
+ {
+ Queue::fake();
+
+ $domain = $this->getTestDomain('gmail.com', ['type' => Domain::TYPE_EXTERNAL]);
+
+ // Verify we can suspend an active domain
+ $domain->status = Domain::STATUS_CONFIRMED | Domain::STATUS_VERIFIED | Domain::STATUS_ACTIVE;
+
+ $this->assertFalse($domain->isSuspended());
+ $this->assertTrue($domain->isActive());
+
+ $domain->suspend();
+
+ $this->assertTrue($domain->isSuspended());
+ $this->assertFalse($domain->isActive());
+
+ // Verify we can unsuspend a suspended domain
+ $domain->status = Domain::STATUS_CONFIRMED | Domain::STATUS_VERIFIED | Domain::STATUS_SUSPENDED;
+
+ $this->assertTrue($domain->isSuspended());
+ $this->assertFalse($domain->isActive());
+
+ $domain->unsuspend();
+
+ $this->assertFalse($domain->isSuspended());
+ $this->assertTrue($domain->isActive());
+
+ // Verify we can unsuspend a suspended domain that wasn't confirmed
+ $domain->status = Domain::STATUS_NEW | Domain::STATUS_SUSPENDED;
+
+ $this->assertTrue($domain->isNew());
+ $this->assertTrue($domain->isSuspended());
+ $this->assertFalse($domain->isActive());
+ $this->assertFalse($domain->isConfirmed());
+ $this->assertFalse($domain->isVerified());
+
+ $domain->unsuspend();
+
+ $this->assertTrue($domain->isNew());
+ $this->assertFalse($domain->isSuspended());
+ $this->assertFalse($domain->isActive());
+ $this->assertFalse($domain->isConfirmed());
+ $this->assertFalse($domain->isVerified());
+
+ // Verify we can unsuspend a suspended domain that was verified but not confirmed
+ $domain->status = Domain::STATUS_NEW | Domain::STATUS_SUSPENDED | Domain::STATUS_VERIFIED;
+
+ $this->assertTrue($domain->isNew());
+ $this->assertTrue($domain->isSuspended());
+ $this->assertFalse($domain->isActive());
+ $this->assertFalse($domain->isConfirmed());
+ $this->assertTrue($domain->isVerified());
+
+ $domain->unsuspend();
+
+ $this->assertTrue($domain->isNew());
+ $this->assertFalse($domain->isSuspended());
+ $this->assertFalse($domain->isActive());
+ $this->assertFalse($domain->isConfirmed());
+ $this->assertTrue($domain->isVerified());
+ }
+
/**
* Tests for Domain::walletOwner() (from EntitleableTrait)
*/
diff --git a/src/tests/Functional/Methods/DomainTest.php b/src/tests/Functional/Methods/DomainTest.php
deleted file mode 100644
--- a/src/tests/Functional/Methods/DomainTest.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-
-namespace Tests\Functional\Methods;
-
-use Illuminate\Support\Facades\Queue;
-use Tests\TestCase;
-
-class DomainTest extends TestCase
-{
- protected $domain;
-
- public function setUp(): void
- {
- parent::setUp();
-
- $this->deleteTestDomain('test.domain');
-
- $this->domain = $this->getTestDomain(
- 'test.domain',
- [
- 'status' => \App\Domain::STATUS_CONFIRMED | \App\Domain::STATUS_VERIFIED,
- 'type' => \App\Domain::TYPE_EXTERNAL
- ]
- );
- }
-
- public function tearDown(): void
- {
- $this->deleteTestDomain('test.domain');
-
- parent::tearDown();
- }
-
- /**
- * Verify we can suspend an active domain.
- */
- public function testSuspendForActiveDomain()
- {
- Queue::fake();
-
- $this->domain->status |= \App\Domain::STATUS_ACTIVE;
-
- $this->assertFalse($this->domain->isSuspended());
- $this->assertTrue($this->domain->isActive());
-
- $this->domain->suspend();
-
- $this->assertTrue($this->domain->isSuspended());
- $this->assertFalse($this->domain->isActive());
- }
-
- /**
- * Verify we can unsuspend a suspended domain
- */
- public function testUnsuspendForSuspendedDomain()
- {
- Queue::fake();
-
- $this->domain->status |= \App\Domain::STATUS_SUSPENDED;
-
- $this->assertTrue($this->domain->isSuspended());
- $this->assertFalse($this->domain->isActive());
-
- $this->domain->unsuspend();
-
- $this->assertFalse($this->domain->isSuspended());
- $this->assertTrue($this->domain->isActive());
- }
-
- /**
- * Verify we can unsuspend a suspended domain that wasn't confirmed
- */
- public function testUnsuspendForSuspendedUnconfirmedDomain()
- {
- Queue::fake();
-
- $this->domain->status = \App\Domain::STATUS_NEW | \App\Domain::STATUS_SUSPENDED;
-
- $this->assertTrue($this->domain->isNew());
- $this->assertTrue($this->domain->isSuspended());
- $this->assertFalse($this->domain->isActive());
- $this->assertFalse($this->domain->isConfirmed());
- $this->assertFalse($this->domain->isVerified());
-
- $this->domain->unsuspend();
-
- $this->assertTrue($this->domain->isNew());
- $this->assertFalse($this->domain->isSuspended());
- $this->assertFalse($this->domain->isActive());
- $this->assertFalse($this->domain->isConfirmed());
- $this->assertFalse($this->domain->isVerified());
- }
-
- /**
- * Verify we can unsuspend a suspended domain that was verified but not confirmed
- */
- public function testUnsuspendForSuspendedVerifiedUnconfirmedDomain()
- {
- Queue::fake();
-
- $this->domain->status = \App\Domain::STATUS_NEW | \App\Domain::STATUS_SUSPENDED | \App\Domain::STATUS_VERIFIED;
-
- $this->assertTrue($this->domain->isNew());
- $this->assertTrue($this->domain->isSuspended());
- $this->assertFalse($this->domain->isActive());
- $this->assertFalse($this->domain->isConfirmed());
- $this->assertTrue($this->domain->isVerified());
-
- $this->domain->unsuspend();
-
- $this->assertTrue($this->domain->isNew());
- $this->assertFalse($this->domain->isSuspended());
- $this->assertFalse($this->domain->isActive());
- $this->assertFalse($this->domain->isConfirmed());
- $this->assertTrue($this->domain->isVerified());
- }
-}

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 4, 10:55 AM (22 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
18827280
Default Alt Text
D5080.1775300101.diff (8 KB)

Event Timeline