Merge pull request #1067 from jorns/unit_fix

Unit fix

Resources/views/Form/form_admin_fields.html.twig

@@ -29,7 +29,7 @@ file that was distributed with this source code.
         <label{% for attrname,attrvalue in attr %} {{attrname}}="{{attrvalue}}"{% endfor %}>
             {{ widget|raw }}
             <span>
-                {% if not sonata_admin.admin%}
+                {% if not sonata_admin.admin %}
                     {{- label|trans({}, translation_domain) -}}
                 {% else %}
                     {{- label|trans({}, sonata_admin.admin.translationDomain) -}}
@@ -41,8 +41,8 @@ file that was distributed with this source code.
             {% if not sonata_admin.admin%}
                 {{- label|trans({}, translation_domain) -}}
             {% else %}
-                {{- label|trans({}, sonata_admin.admin.translationDomain) -}}
-            {% endif%}
+                {{ sonata_admin.admin.trans(label) }}
+            {% endif %}
             {{ required ? '*' : '' }}
         </label>
     {% endif %}

Tests/Admin/PoolTest.php

@@ -49,10 +49,13 @@ class PoolTest extends \PHPUnit_Framework_TestCase
         $admin_group2 = $this->getMock('Sonata\AdminBundle\Admin\AdminInterface');
         $admin_group2->expects($this->once())->method('showIn')->will($this->returnValue(false));
 
+        $admin_group3 = $this->getMock('Sonata\AdminBundle\Admin\AdminInterface');
+        $admin_group3->expects($this->once())->method('showIn')->will($this->returnValue(false));
+
         $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
 
         $container->expects($this->any())->method('get')->will($this->onConsecutiveCalls(
-            $admin_group1, $admin_group2
+            $admin_group1, $admin_group2, $admin_group3
         ));
 
         $pool = new Pool($container, 'Sonata Admin', '/path/to/pic.png');
@@ -62,10 +65,10 @@ class PoolTest extends \PHPUnit_Framework_TestCase
                 'items' => array('itemKey' => 'sonata.user.admin.group1')
             ),
             'adminGroup2' => array(
-                'items' => array('itemKey' => 'sonata.user.admin.group1')
+                'items' => array('itemKey' => 'sonata.user.admin.group2')
             ),
             'adminGroup3' => array(
-                'items' => array('itemKey' => 'sonata.user.admin.group2')
+                'items' => array('itemKey' => 'sonata.user.admin.group3')
             ),
         ));
 
@@ -130,8 +133,8 @@ class PoolTest extends \PHPUnit_Framework_TestCase
 
     public function testGetAdminServiceIds()
     {
-        $this->pool->setAdminServiceIds(array('sonata.user.admin.group1', 'sonata.user.admin.group2'));
-        $this->assertEquals(array('sonata.user.admin.group1', 'sonata.user.admin.group2'), $this->pool->getAdminServiceIds());
+        $this->pool->setAdminServiceIds(array('sonata.user.admin.group1', 'sonata.user.admin.group2', 'sonata.user.admin.group3'));
+        $this->assertEquals(array('sonata.user.admin.group1', 'sonata.user.admin.group2', 'sonata.user.admin.group3'), $this->pool->getAdminServiceIds());
     }
 
     public function testGetContainer()