From d4b8f3817cc76663932a122d03962b568db7aa72 Mon Sep 17 00:00:00 2001 From: jordyvanderhaegen Date: Mon, 2 Dec 2024 21:29:20 +0100 Subject: [PATCH 1/2] test: remove redundant url variable --- tests/LaravelLocalizationTest.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/LaravelLocalizationTest.php b/tests/LaravelLocalizationTest.php index a56ab47..8850500 100644 --- a/tests/LaravelLocalizationTest.php +++ b/tests/LaravelLocalizationTest.php @@ -9,7 +9,6 @@ final class LaravelLocalizationTest extends TestCase { protected static string $testUrl = 'http://localhost/'; - protected static string $testUrl2 = 'http://localhost'; protected $supportedLocales = []; @@ -167,7 +166,7 @@ public function testLocalizeURL(): void // Missing trailing slash in a URL $this->assertEquals( - self::$testUrl2.'/'.app('laravellocalization')->getCurrentLocale(), + self::$testUrl.app('laravellocalization')->getCurrentLocale(), app('laravellocalization')->localizeURL() ); @@ -373,7 +372,7 @@ public static function getRouteNameFromAPathDataProvider(): array public function testGetLocalizedUrlForIgnoredUrls(): void { $crawler = $this->call( 'GET', - self::$testUrl2.'/skipped', + self::$testUrl.'skipped', [], [], [], @@ -382,7 +381,7 @@ public function testGetLocalizedUrlForIgnoredUrls(): void { $this->assertResponseOk(); $this->assertEquals( - self::$testUrl2.'/skipped', + self::$testUrl.'skipped', $crawler->getContent() ); } From e58c13016233f4cf8fbddd82108ecfe3c7e75cb4 Mon Sep 17 00:00:00 2001 From: jordyvanderhaegen Date: Mon, 2 Dec 2024 21:33:41 +0100 Subject: [PATCH 2/2] test: refactor static property to a constant --- tests/LaravelLocalizationTest.php | 330 +++++++++++++++--------------- 1 file changed, 165 insertions(+), 165 deletions(-) diff --git a/tests/LaravelLocalizationTest.php b/tests/LaravelLocalizationTest.php index 8850500..6281f05 100644 --- a/tests/LaravelLocalizationTest.php +++ b/tests/LaravelLocalizationTest.php @@ -8,7 +8,7 @@ final class LaravelLocalizationTest extends TestCase { - protected static string $testUrl = 'http://localhost/'; + protected const TEST_URL = 'http://localhost/'; protected $supportedLocales = []; @@ -117,7 +117,7 @@ protected function createRequest( */ protected function getEnvironmentSetUp($app) { - app('config')->set('app.url', self::$testUrl); + app('config')->set('app.url', self::TEST_URL); app('config')->set('app.locale', $this->defaultLocale); @@ -133,7 +133,7 @@ protected function getEnvironmentSetUp($app) app('translator')->load('LaravelLocalization', 'routes', 'es'); app('translator')->load('LaravelLocalization', 'routes', 'en'); - app('laravellocalization')->setBaseUrl(self::$testUrl); + app('laravellocalization')->setBaseUrl(self::TEST_URL); $this->setRoutes(); } @@ -160,13 +160,13 @@ public function testSetLocale(): void public function testLocalizeURL(): void { $this->assertEquals( - self::$testUrl.app('laravellocalization')->getCurrentLocale(), + self::TEST_URL.app('laravellocalization')->getCurrentLocale(), app('laravellocalization')->localizeURL() ); // Missing trailing slash in a URL $this->assertEquals( - self::$testUrl.app('laravellocalization')->getCurrentLocale(), + self::TEST_URL.app('laravellocalization')->getCurrentLocale(), app('laravellocalization')->localizeURL() ); @@ -174,49 +174,49 @@ public function testLocalizeURL(): void // testing hide default locale option $this->assertNotEquals( - self::$testUrl.app('laravellocalization')->getDefaultLocale(), + self::TEST_URL.app('laravellocalization')->getDefaultLocale(), app('laravellocalization')->localizeURL() ); $this->assertEquals( - self::$testUrl, + self::TEST_URL, app('laravellocalization')->localizeURL() ); app('laravellocalization')->setLocale('es'); $this->assertEquals( - self::$testUrl.'es', + self::TEST_URL.'es', app('laravellocalization')->localizeURL() ); $this->assertEquals( - self::$testUrl.'about', - app('laravellocalization')->localizeURL(self::$testUrl.'about', 'en') + self::TEST_URL.'about', + app('laravellocalization')->localizeURL(self::TEST_URL.'about', 'en') ); $this->assertNotEquals( - self::$testUrl.'en/about', - app('laravellocalization')->localizeURL(self::$testUrl.'about', 'en') + self::TEST_URL.'en/about', + app('laravellocalization')->localizeURL(self::TEST_URL.'about', 'en') ); app('config')->set('laravellocalization.hideDefaultLocaleInURL', false); $this->assertEquals( - self::$testUrl.'en/about', - app('laravellocalization')->localizeURL(self::$testUrl.'about', 'en') + self::TEST_URL.'en/about', + app('laravellocalization')->localizeURL(self::TEST_URL.'about', 'en') ); $this->assertNotEquals( - self::$testUrl.'about', - app('laravellocalization')->localizeURL(self::$testUrl.'about', 'en') + self::TEST_URL.'about', + app('laravellocalization')->localizeURL(self::TEST_URL.'about', 'en') ); } public function testGetLocalizedURL(): void { $this->assertEquals( - self::$testUrl.app('laravellocalization')->getCurrentLocale(), + self::TEST_URL.app('laravellocalization')->getCurrentLocale(), app('laravellocalization')->getLocalizedURL() ); @@ -224,37 +224,37 @@ public function testGetLocalizedURL(): void // testing default language hidden $this->assertNotEquals( - self::$testUrl.app('laravellocalization')->getDefaultLocale(), + self::TEST_URL.app('laravellocalization')->getDefaultLocale(), app('laravellocalization')->getLocalizedURL() ); app('laravellocalization')->setLocale('es'); $this->assertNotEquals( - self::$testUrl, + self::TEST_URL, app('laravellocalization')->getLocalizedURL() ); $this->assertNotEquals( - self::$testUrl.app('laravellocalization')->getDefaultLocale(), + self::TEST_URL.app('laravellocalization')->getDefaultLocale(), app('laravellocalization')->getLocalizedURL() ); $this->assertEquals( - self::$testUrl.app('laravellocalization')->getCurrentLocale(), + self::TEST_URL.app('laravellocalization')->getCurrentLocale(), app('laravellocalization')->getLocalizedURL() ); $this->assertEquals( - self::$testUrl.'es/acerca', - app('laravellocalization')->getLocalizedURL('es', self::$testUrl.'about') + self::TEST_URL.'es/acerca', + app('laravellocalization')->getLocalizedURL('es', self::TEST_URL.'about') ); app('laravellocalization')->setLocale('en'); $crawler = $this->call( 'GET', - self::$testUrl.'about', + self::TEST_URL.'about', [], [], [], @@ -263,7 +263,7 @@ public function testGetLocalizedURL(): void $this->assertResponseOk(); $this->assertEquals( - self::$testUrl.'es/acerca', + self::TEST_URL.'es/acerca', $crawler->getContent() ); @@ -272,18 +272,18 @@ public function testGetLocalizedURL(): void app('config')->set('laravellocalization.hideDefaultLocaleInURL', true); $this->assertEquals( - self::$testUrl.'test', - app('laravellocalization')->getLocalizedURL('en', self::$testUrl.'test') + self::TEST_URL.'test', + app('laravellocalization')->getLocalizedURL('en', self::TEST_URL.'test') ); $this->assertEquals( - self::$testUrl.'test?a=1', - app('laravellocalization')->getLocalizedURL('en', self::$testUrl.'test?a=1') + self::TEST_URL.'test?a=1', + app('laravellocalization')->getLocalizedURL('en', self::TEST_URL.'test?a=1') ); $crawler = $this->call( 'GET', - app('laravellocalization')->getLocalizedURL('en', self::$testUrl.'test'), + app('laravellocalization')->getLocalizedURL('en', self::TEST_URL.'test'), [], [], [], @@ -299,13 +299,13 @@ public function testGetLocalizedURL(): void $this->refreshApplication('es'); $this->assertEquals( - self::$testUrl.'es/test', - app('laravellocalization')->getLocalizedURL('es', self::$testUrl.'test') + self::TEST_URL.'es/test', + app('laravellocalization')->getLocalizedURL('es', self::TEST_URL.'test') ); $this->assertEquals( - self::$testUrl.'es/test?a=1', - app('laravellocalization')->getLocalizedURL('es', self::$testUrl.'test?a=1') + self::TEST_URL.'es/test?a=1', + app('laravellocalization')->getLocalizedURL('es', self::TEST_URL.'test?a=1') ); } @@ -319,7 +319,7 @@ public function testGetLocalizedURLWithQueryStringAndhideDefaultLocaleInURL(): v $laravelLocalization->transRoute('LaravelLocalization::routes.about'); $this->assertEquals( - self::$testUrl . 'about?q=2', + self::TEST_URL . 'about?q=2', $laravelLocalization->getLocalizedURL() ); } @@ -332,7 +332,7 @@ public function testGetLocalizedURLWithQueryStringAndNotTranslatedRoute(): void $laravelLocalization = app(LaravelLocalization::class, ['request' => $request]); $this->assertEquals( - self::$testUrl . 'en/about?q=2', + self::TEST_URL . 'en/about?q=2', $laravelLocalization->getLocalizedURL() ); } @@ -353,26 +353,26 @@ public function testGetRouteNameFromAPath($path, $expectedRouteName): void public static function getRouteNameFromAPathDataProvider(): array { return [ - [self::$testUrl, false], - [self::$testUrl.'es', false], - [self::$testUrl.'en/about', 'LaravelLocalization::routes.about'], - [self::$testUrl.'ver/1', false], - [self::$testUrl.'view/1', 'LaravelLocalization::routes.view'], - [self::$testUrl.'view/1/project', 'LaravelLocalization::routes.view_project'], - [self::$testUrl.'view/1/project/1', 'LaravelLocalization::routes.view_project'], - [self::$testUrl.'en/view/1/project/1', 'LaravelLocalization::routes.view_project'], - [self::$testUrl.'manage/1', 'LaravelLocalization::routes.manage'], - [self::$testUrl.'manage', 'LaravelLocalization::routes.manage'], - [self::$testUrl.'manage/', 'LaravelLocalization::routes.manage'], - [self::$testUrl.'manage/0', 'LaravelLocalization::routes.manage'], - [self::$testUrl.'manage/0?ex=2&ex2=a', 'LaravelLocalization::routes.manage'], + [self::TEST_URL, false], + [self::TEST_URL.'es', false], + [self::TEST_URL.'en/about', 'LaravelLocalization::routes.about'], + [self::TEST_URL.'ver/1', false], + [self::TEST_URL.'view/1', 'LaravelLocalization::routes.view'], + [self::TEST_URL.'view/1/project', 'LaravelLocalization::routes.view_project'], + [self::TEST_URL.'view/1/project/1', 'LaravelLocalization::routes.view_project'], + [self::TEST_URL.'en/view/1/project/1', 'LaravelLocalization::routes.view_project'], + [self::TEST_URL.'manage/1', 'LaravelLocalization::routes.manage'], + [self::TEST_URL.'manage', 'LaravelLocalization::routes.manage'], + [self::TEST_URL.'manage/', 'LaravelLocalization::routes.manage'], + [self::TEST_URL.'manage/0', 'LaravelLocalization::routes.manage'], + [self::TEST_URL.'manage/0?ex=2&ex2=a', 'LaravelLocalization::routes.manage'], ]; } public function testGetLocalizedUrlForIgnoredUrls(): void { $crawler = $this->call( 'GET', - self::$testUrl.'skipped', + self::TEST_URL.'skipped', [], [], [], @@ -381,7 +381,7 @@ public function testGetLocalizedUrlForIgnoredUrls(): void { $this->assertResponseOk(); $this->assertEquals( - self::$testUrl.'skipped', + self::TEST_URL.'skipped', $crawler->getContent() ); } @@ -408,168 +408,168 @@ public static function getLocalizedURLDataProvider(): array { return [ // Do not hide default - [false, false, 'es', self::$testUrl, self::$testUrl.'es'], - [false, false, 'es', self::$testUrl.'es', self::$testUrl.'es'], - [false, false, 'es', self::$testUrl.'en/about', self::$testUrl.'es/acerca'], - [false, false, 'es', self::$testUrl.'ver/1', self::$testUrl.'es/ver/1'], - [false, false, 'es', self::$testUrl.'view/1/project', self::$testUrl.'es/ver/1/proyecto'], - [false, false, 'es', self::$testUrl.'view/1/project/1', self::$testUrl.'es/ver/1/proyecto/1'], - [false, false, 'es', self::$testUrl.'en/view/1/project/1', self::$testUrl.'es/ver/1/proyecto/1'], - [false, false, 'es', self::$testUrl.'manage/1', self::$testUrl.'es/administrar/1'], - [false, false, 'es', self::$testUrl.'manage', self::$testUrl.'es/administrar'], - [false, false, 'es', self::$testUrl.'manage/', self::$testUrl.'es/administrar'], - [false, false, 'es', self::$testUrl.'manage/0', self::$testUrl.'es/administrar/0'], - [false, false, 'es', self::$testUrl.'manage/0?ex=2&ex2=a', self::$testUrl.'es/administrar/0?ex=2&ex2=a'], + [false, false, 'es', self::TEST_URL, self::TEST_URL.'es'], + [false, false, 'es', self::TEST_URL.'es', self::TEST_URL.'es'], + [false, false, 'es', self::TEST_URL.'en/about', self::TEST_URL.'es/acerca'], + [false, false, 'es', self::TEST_URL.'ver/1', self::TEST_URL.'es/ver/1'], + [false, false, 'es', self::TEST_URL.'view/1/project', self::TEST_URL.'es/ver/1/proyecto'], + [false, false, 'es', self::TEST_URL.'view/1/project/1', self::TEST_URL.'es/ver/1/proyecto/1'], + [false, false, 'es', self::TEST_URL.'en/view/1/project/1', self::TEST_URL.'es/ver/1/proyecto/1'], + [false, false, 'es', self::TEST_URL.'manage/1', self::TEST_URL.'es/administrar/1'], + [false, false, 'es', self::TEST_URL.'manage', self::TEST_URL.'es/administrar'], + [false, false, 'es', self::TEST_URL.'manage/', self::TEST_URL.'es/administrar'], + [false, false, 'es', self::TEST_URL.'manage/0', self::TEST_URL.'es/administrar/0'], + [false, false, 'es', self::TEST_URL.'manage/0?ex=2&ex2=a', self::TEST_URL.'es/administrar/0?ex=2&ex2=a'], // Do not hide default - [false, false, 'en', self::$testUrl.'en', self::$testUrl.'en'], - [false, false, 'en', self::$testUrl.'about', self::$testUrl.'en/about'], - [false, false, 'en', self::$testUrl.'ver/1', self::$testUrl.'en/ver/1'], - [false, false, 'en', self::$testUrl.'view/1/project', self::$testUrl.'en/view/1/project'], - [false, false, 'en', self::$testUrl.'view/1/project/1', self::$testUrl.'en/view/1/project/1'], - [false, false, 'en', self::$testUrl.'en/view/1/project/1', self::$testUrl.'en/view/1/project/1'], - [false, false, 'en', self::$testUrl.'manage/1', self::$testUrl.'en/manage/1'], - [false, false, 'en', self::$testUrl.'manage', self::$testUrl.'en/manage'], - [false, false, 'en', self::$testUrl.'manage/', self::$testUrl.'en/manage'], - [false, false, 'en', self::$testUrl.'manage/0', self::$testUrl.'en/manage/0'], - [false, false, 'en', self::$testUrl.'manage/0?ex=2&ex2=a', self::$testUrl.'en/manage/0?ex=2&ex2=a'], + [false, false, 'en', self::TEST_URL.'en', self::TEST_URL.'en'], + [false, false, 'en', self::TEST_URL.'about', self::TEST_URL.'en/about'], + [false, false, 'en', self::TEST_URL.'ver/1', self::TEST_URL.'en/ver/1'], + [false, false, 'en', self::TEST_URL.'view/1/project', self::TEST_URL.'en/view/1/project'], + [false, false, 'en', self::TEST_URL.'view/1/project/1', self::TEST_URL.'en/view/1/project/1'], + [false, false, 'en', self::TEST_URL.'en/view/1/project/1', self::TEST_URL.'en/view/1/project/1'], + [false, false, 'en', self::TEST_URL.'manage/1', self::TEST_URL.'en/manage/1'], + [false, false, 'en', self::TEST_URL.'manage', self::TEST_URL.'en/manage'], + [false, false, 'en', self::TEST_URL.'manage/', self::TEST_URL.'en/manage'], + [false, false, 'en', self::TEST_URL.'manage/0', self::TEST_URL.'en/manage/0'], + [false, false, 'en', self::TEST_URL.'manage/0?ex=2&ex2=a', self::TEST_URL.'en/manage/0?ex=2&ex2=a'], // Hide default - [true, false, 'es', self::$testUrl, self::$testUrl.'es'], - [true, false, 'es', self::$testUrl.'es', self::$testUrl.'es'], - [true, false, 'es', self::$testUrl.'en/about', self::$testUrl.'es/acerca'], - [true, false, 'es', self::$testUrl.'ver/1', self::$testUrl.'es/ver/1'], - [true, false, 'es', self::$testUrl.'view/1/project', self::$testUrl.'es/ver/1/proyecto'], - [true, false, 'es', self::$testUrl.'view/1/project/1', self::$testUrl.'es/ver/1/proyecto/1'], - [true, false, 'es', self::$testUrl.'en/view/1/project/1', self::$testUrl.'es/ver/1/proyecto/1'], - [true, false, 'es', self::$testUrl.'manage/1', self::$testUrl.'es/administrar/1'], - [true, false, 'es', self::$testUrl.'manage', self::$testUrl.'es/administrar'], - [true, false, 'es', self::$testUrl.'manage/', self::$testUrl.'es/administrar'], - [true, false, 'es', self::$testUrl.'manage/0', self::$testUrl.'es/administrar/0'], - [true, false, 'es', self::$testUrl.'manage/0?ex=2&ex2=a', self::$testUrl.'es/administrar/0?ex=2&ex2=a'], + [true, false, 'es', self::TEST_URL, self::TEST_URL.'es'], + [true, false, 'es', self::TEST_URL.'es', self::TEST_URL.'es'], + [true, false, 'es', self::TEST_URL.'en/about', self::TEST_URL.'es/acerca'], + [true, false, 'es', self::TEST_URL.'ver/1', self::TEST_URL.'es/ver/1'], + [true, false, 'es', self::TEST_URL.'view/1/project', self::TEST_URL.'es/ver/1/proyecto'], + [true, false, 'es', self::TEST_URL.'view/1/project/1', self::TEST_URL.'es/ver/1/proyecto/1'], + [true, false, 'es', self::TEST_URL.'en/view/1/project/1', self::TEST_URL.'es/ver/1/proyecto/1'], + [true, false, 'es', self::TEST_URL.'manage/1', self::TEST_URL.'es/administrar/1'], + [true, false, 'es', self::TEST_URL.'manage', self::TEST_URL.'es/administrar'], + [true, false, 'es', self::TEST_URL.'manage/', self::TEST_URL.'es/administrar'], + [true, false, 'es', self::TEST_URL.'manage/0', self::TEST_URL.'es/administrar/0'], + [true, false, 'es', self::TEST_URL.'manage/0?ex=2&ex2=a', self::TEST_URL.'es/administrar/0?ex=2&ex2=a'], // Hide default - [true, false, 'en', self::$testUrl.'en', self::$testUrl.''], - [true, false, 'en', self::$testUrl.'about', self::$testUrl.'about'], - [true, false, 'en', self::$testUrl.'ver/1', self::$testUrl.'ver/1'], - [true, false, 'en', self::$testUrl.'view/1/project', self::$testUrl.'view/1/project'], - [true, false, 'en', self::$testUrl.'view/1/project/1', self::$testUrl.'view/1/project/1'], - [true, false, 'en', self::$testUrl.'en/view/1/project/1', self::$testUrl.'view/1/project/1'], - [true, false, 'en', self::$testUrl.'manage/1', self::$testUrl.'manage/1'], - [true, false, 'en', self::$testUrl.'manage', self::$testUrl.'manage'], - [true, false, 'en', self::$testUrl.'manage/', self::$testUrl.'manage'], - [true, false, 'en', self::$testUrl.'manage/0', self::$testUrl.'manage/0'], - [true, false, 'en', self::$testUrl.'manage/0?ex=2&ex2=a', self::$testUrl.'manage/0?ex=2&ex2=a'], + [true, false, 'en', self::TEST_URL.'en', self::TEST_URL.''], + [true, false, 'en', self::TEST_URL.'about', self::TEST_URL.'about'], + [true, false, 'en', self::TEST_URL.'ver/1', self::TEST_URL.'ver/1'], + [true, false, 'en', self::TEST_URL.'view/1/project', self::TEST_URL.'view/1/project'], + [true, false, 'en', self::TEST_URL.'view/1/project/1', self::TEST_URL.'view/1/project/1'], + [true, false, 'en', self::TEST_URL.'en/view/1/project/1', self::TEST_URL.'view/1/project/1'], + [true, false, 'en', self::TEST_URL.'manage/1', self::TEST_URL.'manage/1'], + [true, false, 'en', self::TEST_URL.'manage', self::TEST_URL.'manage'], + [true, false, 'en', self::TEST_URL.'manage/', self::TEST_URL.'manage'], + [true, false, 'en', self::TEST_URL.'manage/0', self::TEST_URL.'manage/0'], + [true, false, 'en', self::TEST_URL.'manage/0?ex=2&ex2=a', self::TEST_URL.'manage/0?ex=2&ex2=a'], // Do not hide default FORCE SHOWING - [false, true, 'es', self::$testUrl, self::$testUrl.'es'], - [false, true, 'es', self::$testUrl.'es', self::$testUrl.'es'], - [false, true, 'es', self::$testUrl.'en/about', self::$testUrl.'es/acerca'], - [false, true, 'es', self::$testUrl.'ver/1', self::$testUrl.'es/ver/1'], - [false, true, 'es', self::$testUrl.'view/1/project', self::$testUrl.'es/ver/1/proyecto'], - [false, true, 'es', self::$testUrl.'view/1/project/1', self::$testUrl.'es/ver/1/proyecto/1'], - [false, true, 'es', self::$testUrl.'en/view/1/project/1', self::$testUrl.'es/ver/1/proyecto/1'], - [false, true, 'es', self::$testUrl.'manage/1', self::$testUrl.'es/administrar/1'], - [false, true, 'es', self::$testUrl.'manage', self::$testUrl.'es/administrar'], - [false, true, 'es', self::$testUrl.'manage/', self::$testUrl.'es/administrar'], - [false, true, 'es', self::$testUrl.'manage/0', self::$testUrl.'es/administrar/0'], - [false, true, 'es', self::$testUrl.'manage/0?ex=2&ex2=a', self::$testUrl.'es/administrar/0?ex=2&ex2=a'], + [false, true, 'es', self::TEST_URL, self::TEST_URL.'es'], + [false, true, 'es', self::TEST_URL.'es', self::TEST_URL.'es'], + [false, true, 'es', self::TEST_URL.'en/about', self::TEST_URL.'es/acerca'], + [false, true, 'es', self::TEST_URL.'ver/1', self::TEST_URL.'es/ver/1'], + [false, true, 'es', self::TEST_URL.'view/1/project', self::TEST_URL.'es/ver/1/proyecto'], + [false, true, 'es', self::TEST_URL.'view/1/project/1', self::TEST_URL.'es/ver/1/proyecto/1'], + [false, true, 'es', self::TEST_URL.'en/view/1/project/1', self::TEST_URL.'es/ver/1/proyecto/1'], + [false, true, 'es', self::TEST_URL.'manage/1', self::TEST_URL.'es/administrar/1'], + [false, true, 'es', self::TEST_URL.'manage', self::TEST_URL.'es/administrar'], + [false, true, 'es', self::TEST_URL.'manage/', self::TEST_URL.'es/administrar'], + [false, true, 'es', self::TEST_URL.'manage/0', self::TEST_URL.'es/administrar/0'], + [false, true, 'es', self::TEST_URL.'manage/0?ex=2&ex2=a', self::TEST_URL.'es/administrar/0?ex=2&ex2=a'], // Do not hide default FORCE SHOWING - [false, true, 'en', self::$testUrl.'en', self::$testUrl.'en'], - [false, true, 'en', self::$testUrl.'about', self::$testUrl.'en/about'], - [false, true, 'en', self::$testUrl.'ver/1', self::$testUrl.'en/ver/1'], - [false, true, 'en', self::$testUrl.'view/1/project', self::$testUrl.'en/view/1/project'], - [false, true, 'en', self::$testUrl.'view/1/project/1', self::$testUrl.'en/view/1/project/1'], - [false, true, 'en', self::$testUrl.'en/view/1/project/1', self::$testUrl.'en/view/1/project/1'], - [false, true, 'en', self::$testUrl.'manage/1', self::$testUrl.'en/manage/1'], - [false, true, 'en', self::$testUrl.'manage', self::$testUrl.'en/manage'], - [false, true, 'en', self::$testUrl.'manage/', self::$testUrl.'en/manage'], - [false, true, 'en', self::$testUrl.'manage/0', self::$testUrl.'en/manage/0'], - [false, true, 'en', self::$testUrl.'manage/0?ex=2&ex2=a', self::$testUrl.'en/manage/0?ex=2&ex2=a'], + [false, true, 'en', self::TEST_URL.'en', self::TEST_URL.'en'], + [false, true, 'en', self::TEST_URL.'about', self::TEST_URL.'en/about'], + [false, true, 'en', self::TEST_URL.'ver/1', self::TEST_URL.'en/ver/1'], + [false, true, 'en', self::TEST_URL.'view/1/project', self::TEST_URL.'en/view/1/project'], + [false, true, 'en', self::TEST_URL.'view/1/project/1', self::TEST_URL.'en/view/1/project/1'], + [false, true, 'en', self::TEST_URL.'en/view/1/project/1', self::TEST_URL.'en/view/1/project/1'], + [false, true, 'en', self::TEST_URL.'manage/1', self::TEST_URL.'en/manage/1'], + [false, true, 'en', self::TEST_URL.'manage', self::TEST_URL.'en/manage'], + [false, true, 'en', self::TEST_URL.'manage/', self::TEST_URL.'en/manage'], + [false, true, 'en', self::TEST_URL.'manage/0', self::TEST_URL.'en/manage/0'], + [false, true, 'en', self::TEST_URL.'manage/0?ex=2&ex2=a', self::TEST_URL.'en/manage/0?ex=2&ex2=a'], // Hide default FORCE SHOWING - [true, true, 'es', self::$testUrl, self::$testUrl.'es'], - [true, true, 'es', self::$testUrl.'es', self::$testUrl.'es'], - [true, true, 'es', self::$testUrl.'en/about', self::$testUrl.'es/acerca'], - [true, true, 'es', self::$testUrl.'ver/1', self::$testUrl.'es/ver/1'], - [true, true, 'es', self::$testUrl.'view/1/project', self::$testUrl.'es/ver/1/proyecto'], - [true, true, 'es', self::$testUrl.'view/1/project/1', self::$testUrl.'es/ver/1/proyecto/1'], - [true, true, 'es', self::$testUrl.'en/view/1/project/1', self::$testUrl.'es/ver/1/proyecto/1'], - [true, true, 'es', self::$testUrl.'manage/1', self::$testUrl.'es/administrar/1'], - [true, true, 'es', self::$testUrl.'manage', self::$testUrl.'es/administrar'], - [true, true, 'es', self::$testUrl.'manage/', self::$testUrl.'es/administrar'], - [true, true, 'es', self::$testUrl.'manage/0', self::$testUrl.'es/administrar/0'], - [true, true, 'es', self::$testUrl.'manage/0?ex=2&ex2=a', self::$testUrl.'es/administrar/0?ex=2&ex2=a'], + [true, true, 'es', self::TEST_URL, self::TEST_URL.'es'], + [true, true, 'es', self::TEST_URL.'es', self::TEST_URL.'es'], + [true, true, 'es', self::TEST_URL.'en/about', self::TEST_URL.'es/acerca'], + [true, true, 'es', self::TEST_URL.'ver/1', self::TEST_URL.'es/ver/1'], + [true, true, 'es', self::TEST_URL.'view/1/project', self::TEST_URL.'es/ver/1/proyecto'], + [true, true, 'es', self::TEST_URL.'view/1/project/1', self::TEST_URL.'es/ver/1/proyecto/1'], + [true, true, 'es', self::TEST_URL.'en/view/1/project/1', self::TEST_URL.'es/ver/1/proyecto/1'], + [true, true, 'es', self::TEST_URL.'manage/1', self::TEST_URL.'es/administrar/1'], + [true, true, 'es', self::TEST_URL.'manage', self::TEST_URL.'es/administrar'], + [true, true, 'es', self::TEST_URL.'manage/', self::TEST_URL.'es/administrar'], + [true, true, 'es', self::TEST_URL.'manage/0', self::TEST_URL.'es/administrar/0'], + [true, true, 'es', self::TEST_URL.'manage/0?ex=2&ex2=a', self::TEST_URL.'es/administrar/0?ex=2&ex2=a'], // Hide default FORCE SHOWING - [true, true, 'en', self::$testUrl.'en', self::$testUrl.'en'], - [true, true, 'en', self::$testUrl.'about', self::$testUrl.'en/about'], - [true, true, 'en', self::$testUrl.'ver/1', self::$testUrl.'en/ver/1'], - [true, true, 'en', self::$testUrl.'view/1/project', self::$testUrl.'en/view/1/project'], - [true, true, 'en', self::$testUrl.'view/1/project/1', self::$testUrl.'en/view/1/project/1'], - [true, true, 'en', self::$testUrl.'en/view/1/project/1', self::$testUrl.'en/view/1/project/1'], - [true, true, 'en', self::$testUrl.'manage/1', self::$testUrl.'en/manage/1'], - [true, true, 'en', self::$testUrl.'manage', self::$testUrl.'en/manage'], - [true, true, 'en', self::$testUrl.'manage/', self::$testUrl.'en/manage'], - [true, true, 'en', self::$testUrl.'manage/0', self::$testUrl.'en/manage/0'], - [true, true, 'en', self::$testUrl.'manage/0?ex=2&ex2=a', self::$testUrl.'en/manage/0?ex=2&ex2=a'], + [true, true, 'en', self::TEST_URL.'en', self::TEST_URL.'en'], + [true, true, 'en', self::TEST_URL.'about', self::TEST_URL.'en/about'], + [true, true, 'en', self::TEST_URL.'ver/1', self::TEST_URL.'en/ver/1'], + [true, true, 'en', self::TEST_URL.'view/1/project', self::TEST_URL.'en/view/1/project'], + [true, true, 'en', self::TEST_URL.'view/1/project/1', self::TEST_URL.'en/view/1/project/1'], + [true, true, 'en', self::TEST_URL.'en/view/1/project/1', self::TEST_URL.'en/view/1/project/1'], + [true, true, 'en', self::TEST_URL.'manage/1', self::TEST_URL.'en/manage/1'], + [true, true, 'en', self::TEST_URL.'manage', self::TEST_URL.'en/manage'], + [true, true, 'en', self::TEST_URL.'manage/', self::TEST_URL.'en/manage'], + [true, true, 'en', self::TEST_URL.'manage/0', self::TEST_URL.'en/manage/0'], + [true, true, 'en', self::TEST_URL.'manage/0?ex=2&ex2=a', self::TEST_URL.'en/manage/0?ex=2&ex2=a'], ]; } public function testGetURLFromRouteNameTranslated(): void { $this->assertEquals( - self::$testUrl.'es/acerca', + self::TEST_URL.'es/acerca', app('laravellocalization')->getURLFromRouteNameTranslated('es', 'LaravelLocalization::routes.about') ); $this->assertEquals( - self::$testUrl.'en/about', + self::TEST_URL.'en/about', app('laravellocalization')->getURLFromRouteNameTranslated('en', 'LaravelLocalization::routes.about') ); $this->assertEquals( - self::$testUrl.'en/view/1', + self::TEST_URL.'en/view/1', app('laravellocalization')->getURLFromRouteNameTranslated('en', 'LaravelLocalization::routes.view', ['id' => 1]) ); app('config')->set('laravellocalization.hideDefaultLocaleInURL', true); $this->assertEquals( - self::$testUrl.'about', + self::TEST_URL.'about', app('laravellocalization')->getURLFromRouteNameTranslated('en', 'LaravelLocalization::routes.about') ); $this->assertEquals( - self::$testUrl.'es/acerca', + self::TEST_URL.'es/acerca', app('laravellocalization')->getURLFromRouteNameTranslated('es', 'LaravelLocalization::routes.about') ); $this->assertEquals( - self::$testUrl.'es/ver/1', + self::TEST_URL.'es/ver/1', app('laravellocalization')->getURLFromRouteNameTranslated('es', 'LaravelLocalization::routes.view', ['id' => 1]) ); $this->assertEquals( - self::$testUrl.'view/1', + self::TEST_URL.'view/1', app('laravellocalization')->getURLFromRouteNameTranslated('en', 'LaravelLocalization::routes.view', ['id' => 1]) ); $this->assertNotEquals( - self::$testUrl.'en/view/1', + self::TEST_URL.'en/view/1', app('laravellocalization')->getURLFromRouteNameTranslated('en', 'LaravelLocalization::routes.view', ['id' => 1]) ); app('config')->set('laravellocalization.hideDefaultLocaleInURL', false); $this->assertNotEquals( - self::$testUrl.'view/1', + self::TEST_URL.'view/1', app('laravellocalization')->getURLFromRouteNameTranslated('en', 'LaravelLocalization::routes.view', ['id' => 1]) ); $this->assertEquals( - self::$testUrl.'en/view/1', + self::TEST_URL.'en/view/1', app('laravellocalization')->getURLFromRouteNameTranslated('en', 'LaravelLocalization::routes.view', ['id' => 1]) ); } @@ -579,12 +579,12 @@ public function testLocalizedParameterFromTranslateUrl(): void $model = new ModelWithTranslatableRoutes(); $this->assertEquals( - self::$testUrl.'en/view/company', + self::TEST_URL.'en/view/company', app('laravellocalization')->getURLFromRouteNameTranslated('en', 'LaravelLocalization::routes.view', ['id' => $model]) ); $this->assertEquals( - self::$testUrl.'es/ver/empresa', + self::TEST_URL.'es/ver/empresa', app('laravellocalization')->getURLFromRouteNameTranslated('es', 'LaravelLocalization::routes.view', ['id' => $model]) ); } @@ -592,20 +592,20 @@ public function testLocalizedParameterFromTranslateUrl(): void public function testGetNonLocalizedURL(): void { $this->assertEquals( - self::$testUrl, - app('laravellocalization')->getNonLocalizedURL(self::$testUrl.'en') + self::TEST_URL, + app('laravellocalization')->getNonLocalizedURL(self::TEST_URL.'en') ); $this->assertEquals( - self::$testUrl, - app('laravellocalization')->getNonLocalizedURL(self::$testUrl.'es') + self::TEST_URL, + app('laravellocalization')->getNonLocalizedURL(self::TEST_URL.'es') ); $this->assertEquals( - self::$testUrl.'view/1', - app('laravellocalization')->getNonLocalizedURL(self::$testUrl.'en/view/1') + self::TEST_URL.'view/1', + app('laravellocalization')->getNonLocalizedURL(self::TEST_URL.'en/view/1') ); $this->assertEquals( - self::$testUrl.'ver/1', - app('laravellocalization')->getNonLocalizedURL(self::$testUrl.'es/ver/1') + self::TEST_URL.'ver/1', + app('laravellocalization')->getNonLocalizedURL(self::TEST_URL.'es/ver/1') ); } @@ -883,7 +883,7 @@ public function testRedirectWithHiddenDefaultLocaleInUrlAndSavedLocale() $crawler = $this->call( 'GET', - self::$testUrl, + self::TEST_URL, [], ['locale' => $savedLocale], [], @@ -891,7 +891,7 @@ public function testRedirectWithHiddenDefaultLocaleInUrlAndSavedLocale() ); $this->assertResponseStatus(302); - $this->assertRedirectedTo(self::$testUrl . $savedLocale); + $this->assertRedirectedTo(self::TEST_URL . $savedLocale); $localeCookie = $crawler->headers->getCookies()[0]; $this->assertEquals($savedLocale, $localeCookie->getValue());