Merge pull request #265 from CakeDC/feature/is-authorized-helper

Refactoring UserHelper::link to use UserHelper::isAuthorized method
CakeDC · Nov 12, 2015 · 73c4225 · 73c4225
2 parents f67a687 + 2856b2c
commit 73c4225
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/View/Helper/UserHelper.php b/src/View/Helper/UserHelper.php
@@ -97,9 +97,7 @@ public function logout($message = null, $options = [])
      */
     public function link($title, $url = null, array $options = [])
     {
-        $event = new Event(UsersAuthComponent::EVENT_IS_AUTHORIZED, $this, ['url' => $url]);
-        $result = $this->_View->eventManager()->dispatch($event);
-        if ($result->result) {
+        if ($this->isAuthorized($url)) {
             $linkOptions = $options;
             unset($linkOptions['before'], $linkOptions['after']);
             return Hash::get($options, 'before') . $this->Html->link($title, $url, $linkOptions) . Hash::get($options, 'after');

diff --git a/tests/TestCase/View/Helper/UserHelperTest.php b/tests/TestCase/View/Helper/UserHelperTest.php
@@ -153,7 +153,7 @@ public function testLinkAuthorized()
      *
      * @return void
      */
-    public function testIsAuthorizedHH()
+    public function testIsAuthorized()
     {
         $view = new View();
         $eventManagerMock = $this->getMockBuilder('Cake\Event\EventManager')
@@ -167,8 +167,8 @@ public function testIsAuthorizedHH()
             ->method('dispatch')
             ->will($this->returnValue($result));
 
-        $link = $this->User->isAuthorized(['controller' => 'MyController', 'action' => 'myAction']);
-        $this->assertTrue($link);
+        $result = $this->User->isAuthorized(['controller' => 'MyController', 'action' => 'myAction']);
+        $this->assertTrue($result);
     }