Merge pull request #8 from interactive-solutions/allow-aliases-in-ids

Allow the use of aliases in all steps that use createUri
interactive-solutions · Jan 3, 2017 · 9dd8bc6 · 9dd8bc6
2 parents 3c34788 + e4510f7
commit 9dd8bc6
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/Context/ApiContext.php b/src/Context/ApiContext.php
@@ -95,6 +95,10 @@ private function convertValueToAlias($value)
         return $this->replaceValueWithAlias($value);
     }
 
+    /**
+     * @param $value
+     * @return string|mixed
+     */
     private function replaceValueWithAlias($value)
     {
         if (!(strpos($value, '%') === 0) && !(strpos(strrev($value), '%') === 0)) {
@@ -731,9 +735,10 @@ private function sendRpcAction($uri, $method, array $body = [])
      */
     private function createUri($type, $typeId = null, $subType = null, $subTypeId = null)
     {
-        $uri = '/';
-
-        $route = $this->entityFixtureContext->getEntityRoute($type);
+        $uri       = '/';
+        $route     = $this->entityFixtureContext->getEntityRoute($type);
+        $typeId    = $this->replaceValueWithAlias($typeId);
+        $subTypeId = $this->replaceValueWithAlias($subTypeId);
 
         if (!$route) {
             $route = PluralisationUtil::pluralize($type);