Skip to content

[11.x] Pick up existing views and markdowns when creating mails #53308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 30, 2024
Merged

[11.x] Pick up existing views and markdowns when creating mails #53308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5b26f33
pick up the existing mail template when creating new mails.
kevinb1989 Oct 25, 2024
e3f7f6b
Existing markdowns will be picked up when creating emails.
kevinb1989 Oct 26, 2024
fc57dd0
display error messages when specified markdowns or views already exist.
kevinb1989 Oct 30, 2024
ca2b38b
update the test cases for the make:mail command when markdowns and vi…
kevinb1989 Oct 30, 2024
5a1301a
rename a test case for the make:mail command.
kevinb1989 Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/Illuminate/Foundation/Console/MailMakeCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ protected function writeMarkdownTemplate()
str_replace('.', '/', $this->getView()).'.blade.php'
);

if ($this->files->exists($path)) {
return $this->components->error(sprintf('%s [%s] already exists.', 'Markdown view', $path));
}

$this->files->ensureDirectoryExists(dirname($path));

$this->files->put($path, file_get_contents(__DIR__.'/stubs/markdown.stub'));
Expand All @@ -88,6 +92,10 @@ protected function writeView()
str_replace('.', '/', $this->getView()).'.blade.php'
);

if ($this->files->exists($path)) {
return $this->components->error(sprintf('%s [%s] already exists.', 'View', $path));
}

$this->files->ensureDirectoryExists(dirname($path));

$stub = str_replace(
Expand Down
51 changes: 51 additions & 0 deletions tests/Integration/Generators/MailMakeCommandTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,32 @@ public function testItCanGenerateMailFileWithMarkdownOption()
], 'resources/views/foo-mail.blade.php');
}

public function testErrorsWillBeDisplayedWhenMarkdownsAlreadyExist()
{
$existingMarkdownPath = 'resources/views/existing-markdown.blade.php';
$this->app['files']
->put(
$this->app->basePath($existingMarkdownPath),
'<x-mail::message>My existing markdown</x-mail::message>'
);
$this->artisan('make:mail', ['name' => 'FooMail', '--markdown' => 'existing-markdown'])
->expectsOutputToContain('already exists.')
->assertExitCode(0);

$this->assertFileContains([
'namespace App\Mail;',
'use Illuminate\Mail\Mailable;',
'class FooMail extends Mailable',
'return new Content(',
"markdown: 'existing-markdown',",
], 'app/Mail/FooMail.php');
$this->assertFileContains([
'<x-mail::message>',
'My existing markdown',
'</x-mail::message>',
], $existingMarkdownPath);
}

public function testItCanGenerateMailFileWithViewOption()
{
$this->artisan('make:mail', ['name' => 'FooMail', '--view' => 'foo-mail'])
Expand All @@ -63,6 +89,31 @@ public function testItCanGenerateMailFileWithViewOption()
$this->assertFilenameExists('resources/views/foo-mail.blade.php');
}

public function testErrorsWillBeDisplayedWhenViewsAlreadyExist()
{
$existingViewPath = 'resources/views/existing-template.blade.php';
$this->app['files']
->put(
$this->app->basePath($existingViewPath),
'<div>My existing template</div>'
);
$this->artisan('make:mail', ['name' => 'FooMail', '--view' => 'existing-template'])
->expectsOutputToContain('already exists.')
->assertExitCode(0);

$this->assertFileContains([
'namespace App\Mail;',
'use Illuminate\Mail\Mailable;',
'class FooMail extends Mailable',
'return new Content(',
"view: 'existing-template',",
], 'app/Mail/FooMail.php');
$this->assertFilenameExists($existingViewPath);
$this->assertFileContains([
'<div>My existing template</div>',
], $existingViewPath);
}

public function testItCanGenerateMailFileWithTest()
{
$this->artisan('make:mail', ['name' => 'FooMail', '--test' => true])
Expand Down