Altered ldap_connect usage, cleaned up LDAP classes

[bookstack] / tests / LanguageTest.php

diff --git a/tests/LanguageTest.php b/tests/LanguageTest.php
index a9070248e5f86ab4fc333d0110e72d6a42ecf2a4..b65227dd826838472ea4ef412f2d42b74b2c7876 100644 (file)
--- a/tests/LanguageTest.php
+++ b/tests/LanguageTest.php
@@ -4,15 +4,15 @@ namespace Tests;
 
 class LanguageTest extends TestCase
 {
-    protected $langs;
+    protected array $langs;
 
     /**
      * LanguageTest constructor.
      */
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
-        $this->langs = array_diff(scandir(resource_path('lang')), ['..', '.']);
+        $this->langs = array_diff(scandir(lang_path('')), ['..', '.']);
     }
 
     public function test_locales_config_key_set_properly()
@@ -58,7 +58,7 @@ class LanguageTest extends TestCase
 
     public function test_all_lang_files_loadable()
     {
-        $files = array_diff(scandir(resource_path('lang/en')), ['..', '.']);
+        $files = array_diff(scandir(lang_path('en')), ['..', '.']);
         foreach ($this->langs as $lang) {
             foreach ($files as $file) {
                 $loadError = false;
@@ -77,8 +77,17 @@ class LanguageTest extends TestCase
     {
         $this->asEditor();
         $this->assertFalse(config('app.rtl'), 'App RTL config should be false by default');
-        setting()->putUser($this->getEditor(), 'language', 'ar');
+        setting()->putUser($this->users->editor(), 'language', 'ar');
         $this->get('/');
         $this->assertTrue(config('app.rtl'), 'App RTL config should have been set to true by middleware');
     }
+
+    public function test_unknown_lang_does_not_break_app()
+    {
+        config()->set('app.locale', 'zz');
+
+        $loginReq = $this->get('/login', ['Accept-Language' => 'zz']);
+        $loginReq->assertOk();
+        $loginReq->assertSee('Log In');
+    }
 }