From 122692f1e6c5b074e15c8f4ed23055313db28903 Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Mon, 3 Mar 2014 17:49:06 +0100
Subject: [PATCH] Fix latest merge

---
 .../Configuration/Fixtures/configuration-setup.yml   |  4 ++++
 .../Core/Configuration/Fixtures/configuration.yml    |  4 ++++
 .../Model/Manipulator/UserManipulatorTest.php        | 12 +++++++++---
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-setup.yml b/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-setup.yml
index 104c4837e4..e1ea10930e 100644
--- a/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-setup.yml
+++ b/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-setup.yml
@@ -182,4 +182,8 @@ xsendfile:
     enabled: false
     type: nginx
     mapping: []
+h264-pseudo-streaming:
+    enabled: false
+    type: nginx
+    mapping: []
 plugins: []
diff --git a/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration.yml b/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration.yml
index 104c4837e4..e1ea10930e 100644
--- a/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration.yml
+++ b/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration.yml
@@ -182,4 +182,8 @@ xsendfile:
     enabled: false
     type: nginx
     mapping: []
+h264-pseudo-streaming:
+    enabled: false
+    type: nginx
+    mapping: []
 plugins: []
diff --git a/tests/Alchemy/Tests/Phrasea/Model/Manipulator/UserManipulatorTest.php b/tests/Alchemy/Tests/Phrasea/Model/Manipulator/UserManipulatorTest.php
index 3a76544134..5b12ef952b 100644
--- a/tests/Alchemy/Tests/Phrasea/Model/Manipulator/UserManipulatorTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Model/Manipulator/UserManipulatorTest.php
@@ -56,10 +56,16 @@ class UserManipulatorTest extends \PhraseanetTestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $geoname->expects($this->once())
+        $geoname->expects($this->any())
             ->method('get')
-            ->with($this->equalTo('country'))
-            ->will($this->returnValue(['code' => 'fr']));
+            ->will($this->returnCallback(function ($prop) {
+                switch ($prop) {
+                    case 'country':
+                        return ['code' => 'fr'];
+                    case 'name':
+                        return 'Orléans';
+                }
+            }));
 
         $geonamesConnector = $this->getMockBuilder('Alchemy\Geonames\Connector')
             ->disableOriginalConstructor()