merged 2.1

Author: DavertMik

src/Codeception/Module/Symfony.php

@@ -142,8 +142,8 @@ public function _initialize()
                 "modules:\n    enabled:\n" .
                 "    - Symfony:\n" .
                 "        var_path: '../../app'\n" .
-                "        app_path: '../../app'");
-
+                "        app_path: '../../app'"
+            );
         }
         require_once $cache;
         $this->kernelClass = $this->getKernelClass();
@@ -226,14 +226,22 @@ protected function getKernelClass()
     {
         $path = \Codeception\Configuration::projectDir() . $this->config['app_path'];
         if (!file_exists(\Codeception\Configuration::projectDir() . $this->config['app_path'])) {
-            throw new ModuleRequireException(__CLASS__, "Can't load Kernel from $path.\nDirectory does not exists. Use `app_path` parameter to provide valid application path");
+            throw new ModuleRequireException(
+                __CLASS__,
+                "Can't load Kernel from $path.\n"
+                . "Directory does not exists. Use `app_path` parameter to provide valid application path"
+            );
         }
 
         $finder = new Finder();
         $finder->name('*Kernel.php')->depth('0')->in($path);
         $results = iterator_to_array($finder);
         if (!count($results)) {
-            throw new ModuleRequireException(__CLASS__, "AppKernel was not found at $path. Specify directory where Kernel class for your application is located with `app_path` parameter.");
+            throw new ModuleRequireException(
+                __CLASS__,
+                "AppKernel was not found at $path. "
+                . "Specify directory where Kernel class for your application is located with `app_path` parameter."
+            );
         }
 
         $file = current($results);
@@ -331,8 +339,18 @@ public function seeCurrentRouteIs($routeName, array $params = [])
         if (!$router->getRouteCollection()->get($routeName)) {
             $this->fail(sprintf('Route with name "%s" does not exists.', $routeName));
         }
-        $url = $router->generate($routeName, $params);
-        $this->seeCurrentUrlEquals($url);
+
+        $uri = explode('?', $this->grabFromCurrentUrl())[0];
+        try {
+            $match = $router->match($uri);
+        } catch (\Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {
+            $this->fail(sprintf('The "%s" url does not match with any route', $uri));
+        }
+        $expected = array_merge(array('_route' => $routeName), $params);
+        $intersection = array_intersect_assoc($expected, $match);
+
+        $this->assertEquals($expected, $intersection);
+
     }
 
     /**
@@ -354,10 +372,11 @@ public function seeInCurrentRoute($routeName)
             $this->fail(sprintf('Route with name "%s" does not exists.', $routeName));
         }
 
+        $uri = explode('?', $this->grabFromCurrentUrl())[0];
         try {
-            $matchedRouteName = $router->match($this->grabFromCurrentUrl())['_route'];
-        } catch (\Exception\ResourceNotFoundException $e) {
-            $this->fail(sprintf('The "%s" url does not match with any route', $routeName));
+            $matchedRouteName = $router->match($uri)['_route'];
+        } catch (\Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {
+            $this->fail(sprintf('The "%s" url does not match with any route', $uri));
         }
 
         $this->assertEquals($matchedRouteName, $routeName);
@@ -447,7 +466,11 @@ protected function debugResponse($url)
         if ($profile = $this->getProfile()) {
             if ($profile->hasCollector('security')) {
                 if ($profile->getCollector('security')->isAuthenticated()) {
-                    $this->debugSection('User', $profile->getCollector('security')->getUser() . ' [' . implode(',', $profile->getCollector('security')->getRoles()) . ']');
+                    $this->debugSection(
+                        'User',
+                        $profile->getCollector('security')->getUser()
+                        . ' [' . implode(',', $profile->getCollector('security')->getRoles()) . ']'
+                    );
                 } else {
                     $this->debugSection('User', 'Anonymous');
                 }