diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-07-14 17:10:07 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-07-14 17:10:07 +0200 |
| commit | 9ee1c7ff7143c9d75a5f5a9f9477cc73f5d97717 (patch) | |
| tree | 18d03c605d51cc54422a8a3f9763fd3c08e8b682 /tests | |
| parent | 4b917418751a56a369580d1981933e25edbe205b (diff) | |
| parent | 2662c4c61b5f8dcb274a1a205de1c2b0d8980b1c (diff) | |
| download | nextcloud-server-9ee1c7ff7143c9d75a5f5a9f9477cc73f5d97717.tar.gz nextcloud-server-9ee1c7ff7143c9d75a5f5a9f9477cc73f5d97717.zip | |
Merge pull request #9228 from owncloud/remove-routing-singular-issues
Routing: Dont strip the s from the resource id to prevent possible weird behavior with irregular english plural nouns
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/appframework/routing/RoutingTest.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/lib/appframework/routing/RoutingTest.php b/tests/lib/appframework/routing/RoutingTest.php index 261ab0b26af..7cd07db6ce1 100644 --- a/tests/lib/appframework/routing/RoutingTest.php +++ b/tests/lib/appframework/routing/RoutingTest.php @@ -6,7 +6,7 @@ use OC\AppFramework\DependencyInjection\DIContainer; use OC\AppFramework\routing\RouteConfig; -class RouteConfigTest extends \PHPUnit_Framework_TestCase +class RoutingTest extends \PHPUnit_Framework_TestCase { public function testSimpleRoute() @@ -76,16 +76,16 @@ class RouteConfigTest extends \PHPUnit_Framework_TestCase public function testResource() { - $routes = array('resources' => array('accounts' => array('url' => '/accounts'))); + $routes = array('resources' => array('account' => array('url' => '/accounts'))); - $this->assertResource($routes, 'accounts', '/accounts', 'AccountsController', 'accountId'); + $this->assertResource($routes, 'account', '/accounts', 'AccountController', 'id'); } public function testResourceWithUnderScoreName() { $routes = array('resources' => array('admin_accounts' => array('url' => '/admin/accounts'))); - $this->assertResource($routes, 'admin_accounts', '/admin/accounts', 'AdminAccountsController', 'adminAccountId'); + $this->assertResource($routes, 'admin_accounts', '/admin/accounts', 'AdminAccountsController', 'id'); } /** |