Просмотр исходного кода

ZF-7437 ZF-7598 change Zend_Rest_Route to route to indexAction instead of listAction

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@17812 44c647ce-9c0f-0410-b52a-842ac1e357ba
lcrouch 16 лет назад
Родитель
Сommit
c307bacbe6
2 измененных файлов с 16 добавлено и 1 удалено
  1. 1 1
      library/Zend/Rest/Route.php
  2. 15 0
      tests/Zend/Rest/RouteTest.php

+ 1 - 1
library/Zend/Rest/Route.php

@@ -143,7 +143,7 @@ class Zend_Rest_Route extends Zend_Controller_Router_Route_Module
             } elseif ($pathElementCount == 1) {
                  $params['id'] = array_shift($path);
             } elseif ($pathElementCount == 0 || $pathElementCount > 1) {
-                $specialGetTarget = 'list';
+                $specialGetTarget = 'index';
             }
 
             // Digest URI params

+ 15 - 0
tests/Zend/Rest/RouteTest.php

@@ -109,6 +109,21 @@ class Zend_Rest_RouteTest extends PHPUnit_Framework_TestCase
         $this->assertEquals('index', $values['action']);
     }
 
+    /*
+     * @group ZF-7437
+     */
+    public function test_RESTfulApp_GET_user_defaults()
+    {
+        $request = $this->_buildRequest('GET', '/user');
+        $values = $this->_invokeRouteMatch($request);
+         
+        $this->assertType('array', $values);
+        $this->assertTrue(isset($values['module']));
+        $this->assertEquals('default', $values['module']);
+        $this->assertEquals('user', $values['controller']);
+        $this->assertEquals('index', $values['action']);
+    }
+    
     public function test_RESTfulApp_GET_user_index()
     {
         $request = $this->_buildRequest('GET', '/user/index');