Now using the facades for testing instead of App::make().

Author: Andy Wermke

tests/JsLocalization/CachingServiceTest.php

@@ -1,7 +1,7 @@
 <?php
 
 use Mockery as m;
-use JsLocalization\CachingService;
+use JsLocalization\Facades\CachingService;
 
 class CachingServiceTest extends TestCase
 {
@@ -12,10 +12,8 @@ public function setUp ()
     {
         parent::setUp();
 
-        $this->cachingService = new CachingService;
-        
-        Cache::forget(CachingService::CACHE_KEY);
-        Cache::forget(CachingService::CACHE_TIMESTAMP_KEY);
+        Cache::forget(JsLocalization\CachingService::CACHE_KEY);
+        Cache::forget(JsLocalization\CachingService::CACHE_TIMESTAMP_KEY);
     }
 
     public function tearDown ()
@@ -39,33 +37,33 @@ public function testGetMessagesJson ()
 
         // Now refresh the cache:
 
-        $this->cachingService->refreshMessageCache();
+        CachingService::refreshMessageCache();
 
         $this->assertMessagesJsonEquals($this->testMessages);
     }
 
     public function testGetLastRefreshTimestamp ()
     {
-        $timestamp = $this->cachingService->getLastRefreshTimestamp();
+        $timestamp = CachingService::getLastRefreshTimestamp();
         $this->assertEquals(0, $timestamp);
 
-        $this->cachingService->refreshMessageCache();
+        CachingService::refreshMessageCache();
         $refreshTime = time();
 
-        $timestamp = $this->cachingService->getLastRefreshTimestamp();
+        $timestamp = CachingService::getLastRefreshTimestamp();
         $this->assertEquals($refreshTime, $timestamp);
     }
 
     public function testRefreshMessageCacheEvent ()
     {
         Event::shouldReceive('fire')->once()->with('JsLocalization.registerMessages');
 
-        $this->cachingService->refreshMessageCache();
+        CachingService::refreshMessageCache();
     }
 
     private function assertMessagesJsonEquals (array $expectedMessages)
     {
-        $messagesJson = $this->cachingService->getMessagesJson();
+        $messagesJson = CachingService::getMessagesJson();
         $this->assertJson($messagesJson);
 
         $messages = json_decode($messagesJson, true);

tests/JsLocalization/JsLocalizationHelperTest.php

@@ -1,5 +1,7 @@
 <?php
 
+use JsLocalization\Facades\JsLocalizationHelper;
+
 class JsLocalizationHelperTest extends TestCase
 {
 
@@ -65,95 +67,86 @@ public function tearDown ()
 
     public function testResolveMessageKeyArray ()
     {
-        $helper = App::make('JsLocalizationHelper');
-
-        $this->assertEquals($this->testKeysFlat, $helper->resolveMessageKeyArray($this->testKeys));
+        $this->assertEquals($this->testKeysFlat, JsLocalizationHelper::resolveMessageKeyArray($this->testKeys));
     }
 
     public function testResolveMessageArrayToMessageKeys ()
     {
-        $helper = App::make('JsLocalizationHelper');
-
-        $this->assertEquals($this->testKeysFlat, $helper->resolveMessageArrayToMessageKeys($this->testMessages));
+        $this->assertEquals($this->testKeysFlat, JsLocalizationHelper::resolveMessageArrayToMessageKeys($this->testMessages));
     }
 
     public function testAddingRetrieving ()
     {
-        $helper = App::make('JsLocalizationHelper');
-
-        $helper->addMessagesToExport($this->additionalMessageKeys);
+        JsLocalizationHelper::addMessagesToExport($this->additionalMessageKeys);
 
         $this->assertEquals(
             $this->additionalMessageKeysFlat,
-            $helper->getAdditionalMessages()
+            JsLocalizationHelper::getAdditionalMessages()
         );
 
 
         $this->addTestMessage('another', 'Another test text.');
 
-        $helper->addMessagesToExport(array('another'));
+        JsLocalizationHelper::addMessagesToExport(array('another'));
 
         $this->assertEquals(
             array_merge($this->additionalMessageKeysFlat, array('another')),
-            $helper->getAdditionalMessages()
+            JsLocalizationHelper::getAdditionalMessages()
         );
     }
 
     public function testEventBasedAdding ()
     {
-        $helper = App::make('JsLocalizationHelper');
         $additionalMessageKeys = $this->additionalMessageKeys;
 
 
         Event::listen('JsLocalization.registerMessages', function()
-        use($helper, $additionalMessageKeys)
+        use($additionalMessageKeys)
         {
-            $helper->addMessagesToExport($additionalMessageKeys);
+            JsLocalizationHelper::addMessagesToExport($additionalMessageKeys);
         });
 
-        $this->assertEquals(array(), $helper->getAdditionalMessages());
+        $this->assertEquals(array(), JsLocalizationHelper::getAdditionalMessages());
 
-        $helper->triggerRegisterMessages();
+        JsLocalizationHelper::triggerRegisterMessages();
 
         $this->assertEquals(
             $this->additionalMessageKeysFlat,
-            $helper->getAdditionalMessages()
+            JsLocalizationHelper::getAdditionalMessages()
         );
 
 
         $this->addTestMessage('another', 'Another test text.');
 
-        Event::listen('JsLocalization.registerMessages', function() use($helper)
+        Event::listen('JsLocalization.registerMessages', function()
         {
-            $helper->addMessagesToExport(array('another'));
+            JsLocalizationHelper::addMessagesToExport(array('another'));
         });
 
-        $helper->triggerRegisterMessages();
+        JsLocalizationHelper::triggerRegisterMessages();
 
         $this->assertEquals(
             array_merge($this->additionalMessageKeysFlat, array('another')),
-            $helper->getAdditionalMessages()
+            JsLocalizationHelper::getAdditionalMessages()
         );
     }
 
     public function testAddMessageFileToExport ()
     {
-        $helper = App::make('JsLocalizationHelper');
-
         $fileContents = '<?php return ' . var_export($this->testMessages, true) . ';';
         file_put_contents($this->tmpFilePath, $fileContents);
 
         $prefix  = 'xyz::';
         $prefix .= preg_replace('/\.php$/i', '', basename($this->tmpFilePath)) . '.';
-        $helper->addMessageFileToExport($this->tmpFilePath, 'xyz::');
+        JsLocalizationHelper::addMessageFileToExport($this->tmpFilePath, 'xyz::');
 
         $testKeysFlat = $this->testKeysFlat;
         array_walk($testKeysFlat, function(&$key) use($prefix)
             {
                 $key = $prefix . $key;
             });
 
-        $this->assertEquals($testKeysFlat, $helper->getAdditionalMessages());
+        $this->assertEquals($testKeysFlat, JsLocalizationHelper::getAdditionalMessages());
     }
 
 }