Merge pull request #1569 from Devolicious/fix/phpunit

[TranslatorBundle] revert fix #1562 with new solution
Kunstmaan · Aug 1, 2017 · 6fb1855 · 6fb1855
2 parents 9201534 + a24b8be
commit 6fb1855
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/Kunstmaan/TranslatorBundle/Resources/config/services.yml b/src/Kunstmaan/TranslatorBundle/Resources/config/services.yml
@@ -59,7 +59,7 @@ services:
     kunstmaan_translator.service.translator.loader:
         class: Kunstmaan\TranslatorBundle\Service\Translator\Loader
         tags:
-            - { name: 'translation.loader', alias: 'yml' }
+            - { name: 'translation.loader', alias: 'database' }
         calls:
             - [setTranslationRepository, ['@kunstmaan_translator.repository.translation']]
 

diff --git a/src/Kunstmaan/TranslatorBundle/Tests/Service/Importer/ImporterTest.php b/src/Kunstmaan/TranslatorBundle/Tests/Service/Importer/ImporterTest.php
@@ -40,7 +40,7 @@ public function testImportExistingDomainFileNonForced()
         }
 
         $translation = $this->translationRepository->findOneBy(array('keyword' => 'headers.frontpage', 'locale' => 'en'));
-        $this->assertEquals('FrontPage', $translation->getText());
+        $this->assertEquals('a not yet updated frontpage header', $translation->getText());
     }
 
     /**
@@ -53,7 +53,7 @@ public function testImportExistingDomainFileForced()
         }
 
         $translation = $this->translationRepository->findOneBy(array('keyword' => 'headers.frontpage', 'locale' => 'en'));
-        $this->assertEquals('a not yet updated frontpage header', $translation->getText());
+        $this->assertEquals('FrontPage', $translation->getText());
     }
 
     public function getNewDomainTestFinder()

diff --git a/src/Kunstmaan/TranslatorBundle/Tests/app/config/config.yml b/src/Kunstmaan/TranslatorBundle/Tests/app/config/config.yml
@@ -13,6 +13,12 @@ framework:
     session:         ~
     fragments:       ~
 
+services:
+    translation.loader.yml:
+        class: Symfony\Component\Translation\Loader\YamlFileLoader
+        tags:
+            - { name: translation.loader, alias: yml }
+
 kunstmaan_translator:
     managed_locales: ['nl','en','de']
     cache_dir: "%kernel.cache_dir%/translations"