Skip to content

Commit 18a9a66

Browse files
committed
Use App and Config facades in tests
1 parent f235b4c commit 18a9a66

File tree

3 files changed

+18
-13
lines changed

3 files changed

+18
-13
lines changed

tests/Unit/Macros/LocalizedRoutesMacroTest.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22

33
namespace CodeZero\LocalizedRoutes\Tests\Unit\Macros;
44

5+
use App;
56
use CodeZero\LocalizedRoutes\Tests\TestCase;
7+
use Config;
68
use Route;
79

810
class LocalizedRoutesMacroTest extends TestCase
911
{
1012
protected function setAvailableLocales($locales)
1113
{
12-
config()->set('localized-routes.supported-locales', $locales);
14+
Config::set('localized-routes.supported-locales', $locales);
1315
}
1416

1517
/** @test */
@@ -43,12 +45,12 @@ public function it_temporarily_changes_the_app_locale_when_registering_the_route
4345
{
4446
$this->setAvailableLocales(['nl']);
4547

46-
$this->assertEquals('en', app()->getLocale());
48+
$this->assertEquals('en', App::getLocale());
4749

4850
Route::localized(function () {
49-
$this->assertEquals('nl', app()->getLocale());
51+
$this->assertEquals('nl', App::getLocale());
5052
});
5153

52-
$this->assertEquals('en', app()->getLocale());
54+
$this->assertEquals('en', App::getLocale());
5355
}
5456
}

tests/Unit/Macros/UriTranslationMacroTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace CodeZero\LocalizedRoutes\Tests\Unit\Macros;
44

5+
use App;
56
use CodeZero\LocalizedRoutes\Tests\TestCase;
67
use Lang;
78

@@ -30,10 +31,10 @@ public function it_translates_every_segment_in_a_uri_to_the_current_locale()
3031
]
3132
]);
3233

33-
app()->setLocale('en');
34+
App::setLocale('en');
3435
$this->assertEquals('my/new/page', Lang::uri('my/new/page'));
3536

36-
app()->setLocale('nl');
37+
App::setLocale('nl');
3738
$this->assertEquals('mijn/nieuwe/pagina', Lang::uri('my/new/page'));
3839
}
3940

tests/Unit/UrlGeneratorTest.php

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
namespace CodeZero\LocalizedRoutes\Tests\Unit;
44

5+
use App;
56
use CodeZero\LocalizedRoutes\Tests\Stubs\Model;
67
use CodeZero\LocalizedRoutes\Tests\TestCase;
78
use CodeZero\LocalizedRoutes\UrlGenerator;
9+
use Config;
810
use InvalidArgumentException;
911
use Route;
1012

@@ -14,9 +16,9 @@ protected function setUp()
1416
{
1517
parent::setUp();
1618

17-
config()->set('localized-routes.supported-locales', ['en', 'nl']);
19+
Config::set('localized-routes.supported-locales', ['en', 'nl']);
1820

19-
app()->setLocale('en');
21+
App::setLocale('en');
2022
}
2123

2224
protected function registerRoute($url, $name)
@@ -49,7 +51,7 @@ public function it_gets_the_url_of_a_route_in_the_current_locale_if_the_given_ro
4951
{
5052
$this->registerRoute('en/route', 'en.route.name');
5153

52-
$this->assertEquals('en', app()->getLocale());
54+
$this->assertEquals('en', App::getLocale());
5355
$this->assertEquals(url('en/route'), route('route.name'));
5456
}
5557

@@ -58,7 +60,7 @@ public function it_throws_if_no_valid_route_can_be_found()
5860
{
5961
$this->registerRoute('nl/route', 'nl.route.name');
6062

61-
$this->assertEquals('en', app()->getLocale());
63+
$this->assertEquals('en', App::getLocale());
6264
$this->expectException(InvalidArgumentException::class);
6365

6466
route('route.name');
@@ -70,7 +72,7 @@ public function it_gets_the_url_of_a_route_in_the_given_locale()
7072
$this->registerRoute('en/route', 'en.route.name');
7173
$this->registerRoute('nl/route', 'nl.route.name');
7274

73-
$this->assertEquals('en', app()->getLocale());
75+
$this->assertEquals('en', App::getLocale());
7476
$this->assertEquals(url('nl/route'), route('route.name', [], true, 'nl'));
7577
$this->assertEquals(url('nl/route'), route('en.route.name', [], true, 'nl'));
7678
$this->assertEquals(url('nl/route'), route('nl.route.name', [], true, 'nl'));
@@ -90,7 +92,7 @@ public function it_throws_if_no_valid_route_can_be_found_for_the_given_locale()
9092
{
9193
$this->registerRoute('en/route', 'en.route.name');
9294

93-
$this->assertEquals('en', app()->getLocale());
95+
$this->assertEquals('en', App::getLocale());
9496
$this->expectException(InvalidArgumentException::class);
9597

9698
route('en.route.name', [], true, 'nl');
@@ -102,7 +104,7 @@ public function it_temporarily_changes_the_app_locale_when_generating_a_route_ur
102104
$this->registerRoute('en/route/{slug}', 'en.route.name');
103105
$this->registerRoute('nl/route/{slug}', 'nl.route.name');
104106

105-
app()->setLocale('en');
107+
App::setLocale('en');
106108

107109
$this->assertEquals(url('en/route/en-slug'), route('route.name', [new Model]));
108110
$this->assertEquals(url('en/route/en-slug'), route('route.name', [new Model], true, 'en'));

0 commit comments

Comments
 (0)