Perms: Fixed some issues made when adding transactions

[bookstack] / tests / LanguageTest.php

diff --git a/tests/LanguageTest.php b/tests/LanguageTest.php
index b65227dd826838472ea4ef412f2d42b74b2c7876..28491c3af9d3b112e359dddc4ce4d0f809e3bdd2 100644 (file)
--- a/tests/LanguageTest.php
+++ b/tests/LanguageTest.php
@@ -2,6 +2,9 @@
 
 namespace Tests;
 
 
 namespace Tests;
 

+use BookStack\Activity\ActivityType;
+use BookStack\Translation\LocaleManager;
+

 class LanguageTest extends TestCase
 {
     protected array $langs;
 class LanguageTest extends TestCase
 {
     protected array $langs;


@@ -15,24 +18,27 @@ class LanguageTest extends TestCase
         $this->langs = array_diff(scandir(lang_path('')), ['..', '.']);
     }
 
         $this->langs = array_diff(scandir(lang_path('')), ['..', '.']);
     }
 

-    public function test_locales_config_key_set_properly()
+    public function test_locales_list_set_properly()

     {
     {

-        $configLocales = config('app.locales');
-        sort($configLocales);
+        $appLocales = $this->app->make(LocaleManager::class)->getAllAppLocales();
+        sort($appLocales);

         sort($this->langs);
         sort($this->langs);

-        $this->assertEquals(implode(':', $configLocales), implode(':', $this->langs), 'app.locales configuration variable does not match those found in lang files');
+        $this->assertEquals(implode(':', $this->langs), implode(':', $appLocales), 'app.locales configuration variable does not match those found in lang files');

     }
 
     // Not part of standard phpunit test runs since we sometimes expect non-added langs.
     }
 
     // Not part of standard phpunit test runs since we sometimes expect non-added langs.

-    public function do_test_locales_all_have_language_dropdown_entry()
+    public function test_locales_all_have_language_dropdown_entry()

     {
     {

+        $this->markTestSkipped('Only used when checking language inclusion');
+

         $dropdownLocales = array_keys(trans('settings.language_select', [], 'en'));
         sort($dropdownLocales);
         sort($this->langs);
         $diffs = array_diff($this->langs, $dropdownLocales);
         if (count($diffs) > 0) {
             $diffText = implode(',', $diffs);
         $dropdownLocales = array_keys(trans('settings.language_select', [], 'en'));
         sort($dropdownLocales);
         sort($this->langs);
         $diffs = array_diff($this->langs, $dropdownLocales);
         if (count($diffs) > 0) {
             $diffText = implode(',', $diffs);

-            $this->addWarning("Languages: {$diffText} found in files but not in language select dropdown.");
+            $warning = "Languages: {$diffText} found in files but not in language select dropdown.";
+            $this->fail($warning);

         }
         $this->assertTrue(true);
     }
         }
         $this->assertTrue(true);
     }


@@ -73,13 +79,13 @@ class LanguageTest extends TestCase
         }
     }
 
         }
     }
 

-    public function test_rtl_config_set_if_lang_is_rtl()
+    public function test_views_use_rtl_if_rtl_language_is_set()

     {
     {

-        $this->asEditor();
-        $this->assertFalse(config('app.rtl'), 'App RTL config should be false by default');
+        $this->asEditor()->withHtml($this->get('/'))->assertElementExists('html[dir="ltr"]');
+

         setting()->putUser($this->users->editor(), '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');
+
+        $this->withHtml($this->get('/'))->assertElementExists('html[dir="rtl"]');

     }
 
     public function test_unknown_lang_does_not_break_app()
     }
 
     public function test_unknown_lang_does_not_break_app()


@@ -90,4 +96,12 @@ class LanguageTest extends TestCase
         $loginReq->assertOk();
         $loginReq->assertSee('Log In');
     }
         $loginReq->assertOk();
         $loginReq->assertSee('Log In');
     }

+
+    public function test_all_activity_types_have_activity_text()
+    {
+        foreach (ActivityType::all() as $activityType) {
+            $langKey = 'activities.' . $activityType;
+            $this->assertNotEquals($langKey, trans($langKey, [], 'en'));
+        }
+    }

 }
 }