From 5496ca234bf5537ecf44311bcd7c50502c1982e2 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Thu, 26 Jun 2014 14:02:20 +0200
Subject: [PATCH] dont strip the s from the resource

---
 lib/private/appframework/routing/routeconfig.php | 4 ++--
 tests/lib/appframework/routing/RoutingTest.php   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/private/appframework/routing/routeconfig.php b/lib/private/appframework/routing/routeconfig.php
index 91ea7778d08..634bc888bdb 100644
--- a/lib/private/appframework/routing/routeconfig.php
+++ b/lib/private/appframework/routing/routeconfig.php
@@ -88,7 +88,7 @@ class RouteConfig {
 							->method($verb)
 							->action($handler);
 
-			// optionally register requirements for route. This is used to 
+			// optionally register requirements for route. This is used to
 			// tell the route parser how url parameters should be matched
 			if(array_key_exists('requirements', $simpleRoute)) {
 				$router->requirements($simpleRoute['requirements']);
@@ -174,7 +174,7 @@ class RouteConfig {
 	 * @return string
 	 */
 	private function buildResourceId($resource) {
-		return '{'.$this->underScoreToCamelCase(rtrim($resource, 's')).'Id}';
+		return '{' . $this->underScoreToCamelCase($resource) . 'Id}';
 	}
 
 	/**
diff --git a/tests/lib/appframework/routing/RoutingTest.php b/tests/lib/appframework/routing/RoutingTest.php
index 261ab0b26af..89cc77d684a 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', 'accountId');
 	}
 
 	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', 'adminAccountsId');
 	}
 
 	/**
-- 
2.39.5