Altered ldap_connect usage, cleaned up LDAP classes

[bookstack] / tests / LanguageTest.php

diff --git a/tests/LanguageTest.php b/tests/LanguageTest.php
index 27de5f875b552074820afb730e4f89dcfee03c26..b65227dd826838472ea4ef412f2d42b74b2c7876 100644 (file)
--- a/tests/LanguageTest.php
+++ b/tests/LanguageTest.php
@@ -12,7 +12,7 @@ class LanguageTest extends TestCase
     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,20 +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_pluralisation_for_non_standard_locales()
+    public function test_unknown_lang_does_not_break_app()
     {
-        $text = trans_choice('entities.x_pages', 1, [], 'de_informal');
-        $this->assertEquals('1 Seite', $text);
+        config()->set('app.locale', 'zz');
 
-        $text = trans_choice('entities.x_pages', 2, [], 'de_informal');
-        $this->assertEquals('2 Seiten', $text);
-
-        $text = trans_choice('entities.x_pages', 0, [], 'de_informal');
-        $this->assertEquals('0 Seiten', $text);
+        $loginReq = $this->get('/login', ['Accept-Language' => 'zz']);
+        $loginReq->assertOk();
+        $loginReq->assertSee('Log In');
     }
 }