Skip intermediate login page with single provider

[bookstack] / tests / PublicActionTest.php

diff --git a/tests/PublicActionTest.php b/tests/PublicActionTest.php
index 7caefd0ac45a5a1b9b9a5b21a3f89605fe4e3754..499c0c9f9710ab0bbd4c6f7401743c325dc2c6be 100644 (file)
--- a/tests/PublicActionTest.php
+++ b/tests/PublicActionTest.php
@@ -1,6 +1,7 @@
-<?php namespace Tests;
+<?php
+
+namespace Tests;

 
 

-use Auth;

 use BookStack\Auth\Permissions\PermissionService;
 use BookStack\Auth\Permissions\RolePermission;
 use BookStack\Auth\Role;
 use BookStack\Auth\Permissions\PermissionService;
 use BookStack\Auth\Permissions\RolePermission;
 use BookStack\Auth\Role;


@@ -8,10 +9,11 @@ use BookStack\Auth\User;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;

+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\View;

 
 class PublicActionTest extends TestCase
 {
 
 class PublicActionTest extends TestCase
 {

-

     public function test_app_not_public()
     {
         $this->setSettings(['app-public' => 'false']);
     public function test_app_not_public()
     {
         $this->setSettings(['app-public' => 'false']);


@@ -26,7 +28,7 @@ class PublicActionTest extends TestCase
     public function test_login_link_visible()
     {
         $this->setSettings(['app-public' => 'true']);
     public function test_login_link_visible()
     {
         $this->setSettings(['app-public' => 'true']);

-        $this->get('/')->assertElementExists('a[href="'.url('/login').'"]');
+        $this->get('/')->assertElementExists('a[href="' . url('/login') . '"]');

     }
 
     public function test_register_link_visible_when_enabled()
     }
 
     public function test_register_link_visible_when_enabled()


@@ -93,32 +95,34 @@ class PublicActionTest extends TestCase
         $chapter = Chapter::query()->first();
         $resp = $this->get($chapter->getUrl());
         $resp->assertSee('New Page');
         $chapter = Chapter::query()->first();
         $resp = $this->get($chapter->getUrl());
         $resp->assertSee('New Page');

-        $resp->assertElementExists('a[href="'.$chapter->getUrl('/create-page').'"]');
+        $resp->assertElementExists('a[href="' . $chapter->getUrl('/create-page') . '"]');

 
         $resp = $this->get($chapter->getUrl('/create-page'));
         $resp->assertSee('Continue');
         $resp->assertSee('Page Name');
 
         $resp = $this->get($chapter->getUrl('/create-page'));
         $resp->assertSee('Continue');
         $resp->assertSee('Page Name');

-        $resp->assertElementExists('form[action="'.$chapter->getUrl('/create-guest-page').'"]');
+        $resp->assertElementExists('form[action="' . $chapter->getUrl('/create-guest-page') . '"]');

 
         $resp = $this->post($chapter->getUrl('/create-guest-page'), ['name' => 'My guest page']);
         $resp->assertRedirect($chapter->book->getUrl('/page/my-guest-page/edit'));
 
         $user = User::getDefault();
         $this->assertDatabaseHas('pages', [
 
         $resp = $this->post($chapter->getUrl('/create-guest-page'), ['name' => 'My guest page']);
         $resp->assertRedirect($chapter->book->getUrl('/page/my-guest-page/edit'));
 
         $user = User::getDefault();
         $this->assertDatabaseHas('pages', [

-            'name' => 'My guest page',
+            'name'       => 'My guest page',

             'chapter_id' => $chapter->id,
             'created_by' => $user->id,
             'chapter_id' => $chapter->id,
             'created_by' => $user->id,

-            'updated_by' => $user->id
+            'updated_by' => $user->id,

         ]);
     }
 
     public function test_content_not_listed_on_404_for_public_users()
     {
         $page = Page::query()->first();
         ]);
     }
 
     public function test_content_not_listed_on_404_for_public_users()
     {
         $page = Page::query()->first();

+        $page->fill(['name' => 'my testing random unique page name'])->save();

         $this->asAdmin()->get($page->getUrl()); // Fake visit to show on recents
         $resp = $this->get('/cats/dogs/hippos');
         $resp->assertStatus(404);
         $resp->assertSee($page->name);
         $this->asAdmin()->get($page->getUrl()); // Fake visit to show on recents
         $resp = $this->get('/cats/dogs/hippos');
         $resp->assertStatus(404);
         $resp->assertSee($page->name);

+        View::share('pageTitle', '');

 
         Auth::logout();
         $resp = $this->get('/cats/dogs/hippos');
 
         Auth::logout();
         $resp = $this->get('/cats/dogs/hippos');


@@ -134,7 +138,7 @@ class PublicActionTest extends TestCase
 
         $resp = $this->get('/robots.txt');
         $resp->assertSee("User-agent: *\nDisallow:");
 
         $resp = $this->get('/robots.txt');
         $resp->assertSee("User-agent: *\nDisallow:");

-        $resp->assertDontSee("Disallow: /");
+        $resp->assertDontSee('Disallow: /');

     }
 
     public function test_robots_effected_by_setting()
     }
 
     public function test_robots_effected_by_setting()


@@ -145,7 +149,7 @@ class PublicActionTest extends TestCase
 
         $resp = $this->get('/robots.txt');
         $resp->assertSee("User-agent: *\nDisallow:");
 
         $resp = $this->get('/robots.txt');
         $resp->assertSee("User-agent: *\nDisallow:");

-        $resp->assertDontSee("Disallow: /");
+        $resp->assertDontSee('Disallow: /');

 
         // Check config overrides app-public setting
         config()->set('app.allow_robots', false);
 
         // Check config overrides app-public setting
         config()->set('app.allow_robots', false);


@@ -181,4 +185,4 @@ class PublicActionTest extends TestCase
         $resp->assertRedirect($book->getUrl());
         $this->followRedirects($resp)->assertSee($book->name);
     }
         $resp->assertRedirect($book->getUrl());
         $this->followRedirects($resp)->assertSee($book->name);
     }

-}
\ No newline at end of file
+}