Merge branch '8.4' into 9.4

laravel · Jul 18, 2023 · 2a2db11 · 2a2db11
2 parents 96e064b + e3c7083
commit 2a2db11
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/app/Nova/Snippet.php b/app/Nova/Snippet.php
@@ -49,8 +49,9 @@ public function fields(NovaRequest $request)
                     return [
                         'php' => 'PHP',
                         'markdown' => 'Markdown',
-                        'json' => 'json',
+                        'json' => 'JSON',
                         'javascript' => 'JavaScript',
+                        'yaml' => 'YAML',
                     ];
                 })->default('json')
                 ->displayUsingLabels(),

diff --git a/tests/Browser/AttachTest.php b/tests/Browser/AttachTest.php
@@ -175,9 +175,11 @@ public function test_it_can_attach_different_relation_groups()
                 ->visit(new Detail('users', 1))
                 ->runAttachRelation('books', 'giftBooks')
                 ->assertSeeIn('h1', 'Attach Book')
-                ->selectAttachable(4)
-                ->type('@price', '39')
-                ->typeOnDateTimeLocal('input[dusk="purchased_at"]', $now)
+                ->within(new FormComponent, function ($browser) use ($now) {
+                    $browser->selectAttachable(4)
+                        ->type('@price', '39')
+                        ->typeOnDateTimeLocal('input[dusk="purchased_at"]', $now);
+                })
                 ->create()
                 ->waitForText('The resource was attached!')
                 ->on(new Detail('users', 1))