dvkei/Pterodactyl-Panel
1
0
Fork 0
forked from Alex/Pterodactyl-Panel
Code Issues Pull Requests Projects Releases Wiki Activity

Fix improperly named mailgun environment variable, closes #942

Browse Source
This commit is contained in:
Dane Everitt 2018-02-17 13:00:11 -06:00
parent 8e1aa15dba
commit 303b64ced1
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/Environment/EmailSettingsCommand.php
View File

@ -126,7 +126,7 @@ class EmailSettingsCommand extends Command
trans('command/messages.environment.mail.ask_mailgun_domain'), $this->config->get('services.mailgun.domain')
);
$this->variables['MAILGUN_KEY'] = $this->option('password') ?? $this->ask(
$this->variables['MAILGUN_SECRET'] = $this->option('password') ?? $this->ask(
trans('command/messages.environment.mail.ask_mailgun_secret'), $this->config->get('services.mailgun.secret')
);
}

6
tests/Unit/Commands/Environment/EmailSettingsCommandTest.php
View File

@ -126,7 +126,7 @@ class EmailSettingsCommandTest extends CommandTestCase
$data = [
'MAIL_DRIVER' => 'mailgun',
'MAILGUN_DOMAIN' => 'domain.com',
'MAILGUN_KEY' => '123456',
'MAILGUN_SECRET' => '123456',
'MAIL_FROM' => 'mail@from.com',
'MAIL_FROM_NAME' => 'MailName',
'MAIL_ENCRYPTION' => 'tls',
@ -147,7 +147,7 @@ class EmailSettingsCommandTest extends CommandTestCase
$data = [
'MAIL_DRIVER' => 'mailgun',
'MAILGUN_DOMAIN' => 'domain.com',
'MAILGUN_KEY' => '123456',
'MAILGUN_SECRET' => '123456',
'MAIL_FROM' => 'mail@from.com',
'MAIL_FROM_NAME' => 'MailName',
'MAIL_ENCRYPTION' => 'tls',
@ -160,7 +160,7 @@ class EmailSettingsCommandTest extends CommandTestCase
'--from' => $data['MAIL_FROM_NAME'],
'--encryption' => $data['MAIL_ENCRYPTION'],
'--host' => $data['MAILGUN_DOMAIN'],
'--password' => $data['MAILGUN_KEY'],
'--password' => $data['MAILGUN_SECRET'],
]);
$this->assertNotEmpty($display);