Merge branch '4.x'

src/Http/Controllers/CP/Navigation/NavigationController.php

@@ -40,7 +40,7 @@ public function edit($nav)
     {
         $nav = Nav::find($nav);
 
-        $this->authorize('edit', $nav, __('You are not authorized to configure navs.'));
+        $this->authorize('configure', $nav, __('You are not authorized to configure navs.'));
 
         $values = [
             'title' => $nav->title(),

src/Policies/NavPolicy.php

@@ -41,6 +41,11 @@ public function store($user)
         // handled by before()
     }
 
+    public function configure($user)
+    {
+        // handled by before()
+    }
+
     public function view($user, $nav)
     {
         $user = User::fromUser($user);

src/Routing/ResolveRedirect.php

@@ -36,14 +36,14 @@ public function item($redirect, $parent = null, $localize = false)
             return null;
         }
 
-        if ($redirect === '@child') {
-            return $this->firstChild($parent);
-        }
-
         if (is_array($redirect)) {
             $redirect = $redirect['url'];
         }
 
+        if ($redirect === '@child') {
+            return $this->firstChild($parent);
+        }
+
         if ($redirect instanceof Values) {
             // Assume it's a `group` fieldtype with a `url` subfield.
             return $redirect->url->value();

tests/Data/Entries/EntryTest.php

@@ -630,8 +630,12 @@ public function a_localized_entry_in_a_structured_collection_without_a_route_for
         $this->assertNull($entry->url());
     }
 
-    /** @test */
-    public function it_gets_urls_for_first_child_redirects()
+    /**
+     * @test
+     *
+     * @dataProvider firstChildRedirectProvider
+     */
+    public function it_gets_urls_for_first_child_redirects($value)
     {
         \Event::fake(); // Don't invalidate static cache etc when saving entries.
 
@@ -641,9 +645,9 @@ public function it_gets_urls_for_first_child_redirects()
 
         $collection = tap((new Collection)->handle('pages')->routes('{parent_uri}/{slug}'))->save();
 
-        $parent = tap((new Entry)->id('1')->locale('en')->collection($collection)->slug('parent')->set('redirect', '@child'))->save();
+        $parent = tap((new Entry)->id('1')->locale('en')->collection($collection)->slug('parent')->set('redirect', $value))->save();
         $child = tap((new Entry)->id('2')->locale('en')->collection($collection)->slug('child'))->save();
-        $noChildren = tap((new Entry)->id('3')->locale('en')->collection($collection)->slug('nochildren')->set('redirect', '@child'))->save();
+        $noChildren = tap((new Entry)->id('3')->locale('en')->collection($collection)->slug('nochildren')->set('redirect', $value))->save();
 
         $collection->structureContents([
             'expects_root' => false, // irrelevant. just can't pass an empty array at the moment.
@@ -684,6 +688,14 @@ public function it_gets_urls_for_first_child_redirects()
         $this->assertEquals(404, $noChildren->redirectUrl());
     }
 
+    public static function firstChildRedirectProvider()
+    {
+        return [
+            'string' => ['@child'],
+            'array' => [['url' => '@child']],
+        ];
+    }
+
     /** @test */
     public function it_gets_and_sets_supplemental_data()
     {

tests/Feature/Navigation/EditNavigationTest.php

@@ -15,13 +15,13 @@ class EditNavigationTest extends TestCase
     use PreventSavingStacheItemsToDisk;
 
     /** @test */
-    public function it_shows_the_edit_form_if_user_has_edit_permission()
+    public function it_shows_the_edit_form_if_user_has_configure_permission()
     {
         $nav = $this->createNav('foo');
         Nav::shouldReceive('all')->andReturn(collect([$nav]));
         Nav::shouldReceive('find')->andReturn($nav);
 
-        $this->setTestRoles(['test' => ['access cp', 'edit foo nav']]);
+        $this->setTestRoles(['test' => ['access cp', 'configure navs']]);
         $user = Facades\User::make()->assignRole('test')->save();
 
         $response = $this
@@ -32,7 +32,7 @@ public function it_shows_the_edit_form_if_user_has_edit_permission()
     }
 
     /** @test */
-    public function it_denies_access_if_user_doesnt_have_edit_permission()
+    public function it_denies_access_if_user_doesnt_have_configure_permission()
     {
         $nav = $this->createNav('foo');
         Nav::shouldReceive('all')->andReturn(collect([$nav]));