Fix methods that don't work properly (#14)

TavoNiievez · web-flow · commit e17344e438dd · 2020-12-29T14:45:56.000-05:00
diff --git a/src/Codeception/Module/Laravel.php b/src/Codeception/Module/Laravel.php
@@ -31,6 +31,7 @@
 use Illuminate\Foundation\Application;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Route;
+use Illuminate\Routing\Router;
 use Illuminate\Support\Collection;
 use Illuminate\Support\ViewErrorBag;
 use ReflectionClass;
@@ -462,14 +463,16 @@ public function callArtisan(string $command, $parameters = [], OutputInterface $
      * ```
      *
      * @param string $routeName
-     * @param array $params
+     * @param mixed $params
      */
-    public function amOnRoute(string $routeName, array $params = []): void
+    public function amOnRoute(string $routeName, $params = []): void
     {
         $route = $this->getRouteByName($routeName);
 
         $absolute = !is_null($route->domain());
-        $url = $this->app['url']->route($routeName, $params, $absolute);
+        /** @var UrlGenerator $urlGenerator */
+        $urlGenerator = $this->app['url'];
+        $url = $urlGenerator->route($routeName, $params, $absolute);
         $this->amOnPage($url);
     }
 
@@ -562,7 +565,10 @@ public function seeCurrentActionIs(string $action): void
      */
     protected function getRouteByName(string $routeName)
     {
-        if (!$route = $this->app['routes']->getByName($routeName)) {
+        /** @var Router $router */
+        $router = $this->app['router'];
+        $routes = $router->getRoutes();
+        if (!$route = $routes->getByName($routeName)) {
             $this->fail("Route with name '$routeName' does not exist");
         }
 
@@ -1126,17 +1132,16 @@ protected function getQueryBuilderFromTable(string $table)
     }
 
     /**
-     * Use Laravel's model factory to create a model.
-     * Can only be used with Laravel 5.1 and later.
+     * Use Laravel model factory to create a model.
      *
      * ``` php
      * <?php
-     * $I->have('App\User');
-     * $I->have('App\User', ['name' => 'John Doe']);
-     * $I->have('App\User', [], 'admin');
+     * $I->have('App\Models\User');
+     * $I->have('App\Models\User', ['name' => 'John Doe']);
+     * $I->have('App\Models\User', [], 'admin');
      * ```
      *
-     * @see http://laravel.com/docs/5.1/testing#model-factories
+     * @see https://laravel.com/docs/6.x/database-testing#using-factories
      * @param string $model
      * @param array $attributes
      * @param string $name
@@ -1146,31 +1151,30 @@ protected function getQueryBuilderFromTable(string $table)
     public function have(string $model, array $attributes = [], string $name = 'default')
     {
         try {
-            $result = $this->modelFactory($model, $name)->create($attributes);
+            $model = $this->modelFactory($model, $name)->create($attributes);
 
-            // Since Laravel 5.4 the model factory returns a collection instead of a single object
-            if ($result instanceof Collection) {
-                $result = $result[0];
+            // In Laravel 6 the model factory returns a collection instead of a single object
+            if ($model instanceof Collection) {
+                $model = $model[0];
             }
 
-            return $result;
+            return $model;
         } catch (Exception $e) {
-            $this->fail("Could not create model: \n\n" . get_class($e) . "\n\n" . $e->getMessage());
+            $this->fail('Could not create model: \n\n' . get_class($e) . '\n\n' . $e->getMessage());
         }
     }
 
     /**
-     * Use Laravel's model factory to create multiple models.
-     * Can only be used with Laravel 5.1 and later.
+     * Use Laravel model factory to create multiple models.
      *
      * ``` php
      * <?php
-     * $I->haveMultiple('App\User', 10);
-     * $I->haveMultiple('App\User', 10, ['name' => 'John Doe']);
-     * $I->haveMultiple('App\User', 10, [], 'admin');
+     * $I->haveMultiple('App\Models\User', 10);
+     * $I->haveMultiple('App\Models\User', 10, ['name' => 'John Doe']);
+     * $I->haveMultiple('App\Models\User', 10, [], 'admin');
      * ```
      *
-     * @see http://laravel.com/docs/5.1/testing#model-factories
+     * @see https://laravel.com/docs/6.x/database-testing#using-factories
      * @param string $model
      * @param int $times
      * @param array $attributes
@@ -1188,17 +1192,16 @@ public function haveMultiple(string $model, int $times, array $attributes = [],
     }
 
     /**
-     * Use Laravel's model factory to make a model instance.
-     * Can only be used with Laravel 5.1 and later.
+     * Use Laravel model factory to make a model instance.
      *
      * ``` php
      * <?php
-     * $I->make('App\User');
-     * $I->make('App\User', ['name' => 'John Doe']);
-     * $I->make('App\User', [], 'admin');
+     * $I->make('App\Models\User');
+     * $I->make('App\Models\User', ['name' => 'John Doe']);
+     * $I->make('App\Models\User', [], 'admin');
      * ```
      *
-     * @see http://laravel.com/docs/5.1/testing#model-factories
+     * @see https://laravel.com/docs/6.x/database-testing#using-factories
      * @param string $model
      * @param array $attributes
      * @param string $name
@@ -1215,17 +1218,16 @@ public function make(string $model, array $attributes = [], string $name = 'defa
     }
 
     /**
-     * Use Laravel's model factory to make multiple model instances.
-     * Can only be used with Laravel 5.1 and later.
+     * Use Laravel model factory to make multiple model instances.
      *
      * ``` php
      * <?php
-     * $I->makeMultiple('App\User', 10);
-     * $I->makeMultiple('App\User', 10, ['name' => 'John Doe']);
-     * $I->makeMultiple('App\User', 10, [], 'admin');
+     * $I->makeMultiple('App\Models\User', 10);
+     * $I->makeMultiple('App\Models\User', 10, ['name' => 'John Doe']);
+     * $I->makeMultiple('App\Models\User', 10, [], 'admin');
      * ```
      *
-     * @see http://laravel.com/docs/5.1/testing#model-factories
+     * @see https://laravel.com/docs/6.x/database-testing#using-factories
      * @param string $model
      * @param int $times
      * @param array $attributes
@@ -1246,23 +1248,15 @@ public function makeMultiple(string $model, int $times, array $attributes = [],
      * @param string $model
      * @param string $name
      * @param int $times
-     * @return FactoryBuilder
-     * @throws ModuleException
+     * @return FactoryBuilder|\Illuminate\Database\Eloquent\Factories\Factory
      */
-    protected function modelFactory(string $model, string $name, $times = 1): FactoryBuilder
+    protected function modelFactory(string $model, string $name, $times = 1)
     {
-        if (! function_exists('factory')) {
-            throw new ModuleException($this, 'The factory() method does not exist. ' .
-                'This functionality relies on Laravel model factories, which were introduced in Laravel 5.1.');
-        }
-
         if (version_compare(Application::VERSION, '7.0.0', '<')) {
-            $factory = factory($model, $name, $times);
-        } else {
-            $factory = factory($model, $times);
+            return factory($model, $name, $times);
         }
 
-        return $factory;
+        return $model::factory()->count($times);
     }
 
     /**
