github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-26 18:33:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tweak mail extender (tests)

Browse Source 
- Use private over protected
- Use "public" API for building requests in tests
- Add more assertions
- Formatting
- Use correct parameter order for assertions

Refs #2012.
This commit is contained in:
Franz Liedke 2020-04-13 11:32:36 +02:00
parent 88bd7fc53f
commit cde69480bf
2 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/src/Extend/Mail.php
View File

@ -14,7 +14,7 @@ use Illuminate\Contracts\Container\Container;
class Mail implements ExtenderInterface class Mail implements ExtenderInterface
{ {
protected $drivers = []; private $drivers = [];
/** /**
* Add a mail driver. * Add a mail driver.

53
framework/core/tests/integration/extenders/MailTest.php
View File

@ -12,7 +12,6 @@ namespace Flarum\Tests\integration\extenders;
use Flarum\Extend; use Flarum\Extend;
use Flarum\Mail\DriverInterface; use Flarum\Mail\DriverInterface;
use Flarum\Settings\SettingsRepositoryInterface; use Flarum\Settings\SettingsRepositoryInterface;
use Flarum\Tests\integration\BuildsHttpRequests;
use Flarum\Tests\integration\RetrievesAuthorizedUsers; use Flarum\Tests\integration\RetrievesAuthorizedUsers;
use Flarum\Tests\integration\TestCase; use Flarum\Tests\integration\TestCase;
use Illuminate\Contracts\Validation\Factory; use Illuminate\Contracts\Validation\Factory;
@ -23,14 +22,12 @@ use Swift_Transport;
class MailTest extends TestCase class MailTest extends TestCase
{ {
use RetrievesAuthorizedUsers; use RetrievesAuthorizedUsers;
use BuildsHttpRequests;
protected function prepDb() protected function prepDb()
{ {
$this->prepareDatabase([ $this->prepareDatabase([
'users' => [ 'users' => [
$this->adminUser(), $this->adminUser(),
$this->normalUser(),
], ],
]); ]);
} }
@ -38,20 +35,29 @@ class MailTest extends TestCase
/** /**
* @test * @test
*/ */
public function custom_driver_doesnt_exist_by_default() public function drivers_are_unchanged_by_default()
{ {
$this->prepDb(); $this->prepDb();
$response = $this->send( $response = $this->send(
$this->requestAsUser( $this->request('GET', '/api/mail-settings', [
$this->request('GET', '/api/mail-settings'), 'authenticatedAs' => 1,
1 ])
)
); );
$drivers = json_decode($response->getBody(), true)['data']['attributes']['fields']; $fields = json_decode($response->getBody(), true)['data']['attributes']['fields'];
$this->assertArrayNotHasKey('custom', $drivers); // The custom driver does not exist
$this->assertArrayNotHasKey('custom', $fields);
// The SMTP driver has its normal fields
$this->assertEquals([
'mail_host' => '',
'mail_port' => '',
'mail_encryption' => '',
'mail_username' => '',
'mail_password' => '',
], $fields['smtp']);
} }
/** /**
@ -60,22 +66,22 @@ class MailTest extends TestCase
public function added_driver_appears_in_mail_settings() public function added_driver_appears_in_mail_settings()
{ {
$this->extend( $this->extend(
(new Extend\Mail()) (new Extend\Mail)
->driver('custom', CustomDriver::class) ->driver('custom', CustomDriver::class)
); );
$this->prepDb(); $this->prepDb();
$response = $this->send( $response = $this->send(
$this->requestAsUser( $this->request('GET', '/api/mail-settings', [
$this->request('GET', '/api/mail-settings'), 'authenticatedAs' => 1,
1 ])
)
); );
$drivers = json_decode($response->getBody(), true)['data']['attributes']['fields']; $fields = json_decode($response->getBody(), true)['data']['attributes']['fields'];
$this->assertArrayHasKey('custom', $drivers); $this->assertArrayHasKey('custom', $fields);
$this->assertEquals(['customSetting1' => ''], $fields['custom']);
} }
/** /**
@ -84,22 +90,21 @@ class MailTest extends TestCase
public function adding_driver_with_duplicate_name_overrides_fields() public function adding_driver_with_duplicate_name_overrides_fields()
{ {
$this->extend( $this->extend(
(new Extend\Mail()) (new Extend\Mail)
->driver('smtp', CustomDriver::class) ->driver('smtp', CustomDriver::class)
); );
$this->prepDb(); $this->prepDb();
$response = $this->send( $response = $this->send(
$this->requestAsUser( $this->request('GET', '/api/mail-settings', [
$this->request('GET', '/api/mail-settings'), 'authenticatedAs' => 1,
1 ])
)
); );
$requiredFields = json_decode($response->getBody(), true)['data']['attributes']['fields']['smtp']; $requiredFields = json_decode($response->getBody(), true)['data']['attributes']['fields']['smtp'];
$this->assertEquals($requiredFields, ['customSetting1' => '']); $this->assertEquals(['customSetting1' => ''], $requiredFields);
} }
} }
@ -122,6 +127,6 @@ class CustomDriver implements DriverInterface
public function buildTransport(SettingsRepositoryInterface $settings): Swift_Transport public function buildTransport(SettingsRepositoryInterface $settings): Swift_Transport
{ {
return new Swift_NullTransport(); return new Swift_NullTransport;
} }
} }