Completed cleanup and Test api fixes.

Author: Modelizer

bootstrap/config.php

@@ -26,6 +26,11 @@
     /*
     |--------------------------------------------------------------------------
     | Web Drivers
+    | Note: filename denote when url is been complete after extracting then it
+    | find the filename given below and rename it as per operating system and
+    | and driver name. Example file would become now mac-chrome and in windows
+    | win-chrome.exe
+    | Special execution permission will be given for windows file.
     |--------------------------------------------------------------------------
     */
     'web-drivers' => [
@@ -46,7 +51,24 @@
                 'filename' => 'chromedriver',
             ],
         ],
-        'firefox' => [],
+        'firefox' => [
+            'mac' => [
+                'version'  => 'v0.20.0',
+                'url'      => 'https://github.com/mozilla/geckodriver/releases/download/v0.20.0/geckodriver-v0.20.0-macos.tar.gz',
+                'filename' => 'geckodriver'
+            ],
+
+            'win' => [
+                'version'  => 'v0.20.0',
+                'url'      => 'https://github.com/mozilla/geckodriver/releases/download/v0.20.0/geckodriver-v0.20.0-win32.zip',
+                'filename' => 'geckodriver.exe'
+            ],
+            'linux' => [
+                'version'  => 'v0.20.0',
+                'url'      => 'https://github.com/mozilla/geckodriver/releases/download/v0.20.0/geckodriver-v0.20.0-linux32.tar.gz',
+                'filename' => 'geckodriver'
+            ]
+        ],
     ],
 
     /*

composer.json

@@ -8,12 +8,16 @@
             "email": "hello@mudasir.me"
         }
     ],
+    "collaborators": [
+        {
+            "name": "John Hoopes",
+            "email": "john.hoopes@madisoncreativeweb.com"
+        }
+    ],
     "require": {
         "php": ">=7.1",
         "lmc/steward": "dev-master",
-        "guzzlehttp/guzzle": "^6.2"
-    },
-    "require-dev": {
+        "guzzlehttp/guzzle": "^6.2",
         "orchestra/testbench": "^3.3"
     },
     "autoload": {
@@ -23,7 +27,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Modelizer\\Selenium\\Tests\\" : "tests"
+            "Modelizer\\Selenium\\Tests\\" : "tests/"
         }
     },
     "extra": {

src/Console/BootSelenium.php

@@ -11,12 +11,23 @@ class BootSelenium extends Command
 {
     use WebDriverUtilsTrait;
 
+    /**
+     * DWebDriver name to be use
+     * @var array
+     */
+    protected $dWebDriver = [
+        'chrome'  => 'chrome',
+        'firefox' => 'gecko',
+        'edge'    => 'edge'
+    ];
+
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'selenium:start {driver=chrome}';
+    protected $signature = 'selenium:start {driver=chrome : (chrome|firefox) Driver version} '.
+        '{serverVersion=3.11.0 : Selenium Server Version} ';
 
     /**
      * The console command description.
@@ -30,16 +41,30 @@ class BootSelenium extends Command
      */
     public function handle()
     {
-        $cmd = implode([
-            'java',
-            $this->getWebDriver(env('DEFAULT_BROWSER', $this->argument('driver'))),
-            '-jar',
-            $this->getSeleniumServerQualifiedName(),
-        ], ' ');
+        $cmd = collect(array_merge($this->getSeleniumDefaultCommand(), $this->getArguments()))
+            ->except('driver', 'serverVersion')
+            ->implode(' ');
+
+        $this->info('Starting Selenium server v'.$this->argument('serverVersion'));
 
         echo shell_exec($cmd.' '.$this->getSeleniumOptions());
     }
 
+    /**
+     * Get the default commands which are require to boot selenium server
+     * @return array
+     */
+    public function getSeleniumDefaultCommand()
+    {
+         return [
+             'java',
+             $this->getWebDriver(env('DEFAULT_BROWSER', $this->argument('driver'))),
+             '-jar '.$this->getSeleniumServerQualifiedName(),
+             '-enablePassThrough false',
+         ];
+    }
+
+
     /**
      * Get selenium server qualified location.
      *
@@ -52,7 +77,7 @@ public function getSeleniumServerQualifiedName()
         $files = opendir($binDirectory = static::prependPackagePath('vendor/bin'));
 
         while (false !== ($file = readdir($files))) {
-            if (str_contains($file, 'selenium')) {
+            if (str_contains($file, 'selenium') && str_contains($file, $this->argument('serverVersion'))) {
                 return $binDirectory.DIRECTORY_SEPARATOR.$file;
             }
         }
@@ -69,7 +94,7 @@ public function downloadSelenium()
     {
         $this->info('Downloading Selenium server file. Please wait...');
 
-        $process = new Process(base_path('vendor/bin/steward install'));
+        $process = new Process(base_path('vendor/bin/steward install '.$this->argument('serverVersion')));
         $process->setTimeout(0);
 
         $process->run();
@@ -102,7 +127,7 @@ protected function getWebDriver($driverName)
             ]);
         }
 
-        return "-Dwebdriver.$driverName.driver={$driver}";
+        return "-Dwebdriver.{$this->dWebDriver[$driverName]}.driver={$driver}";
     }
 
     protected function getSeleniumOptions()

src/Console/Kernel.php

@@ -3,8 +3,9 @@
 namespace Modelizer\Selenium\Console;
 
 use Illuminate\Foundation\Console\ServeCommand;
+use Orchestra\Testbench\Console\Kernel as OrchestraKernel;
 
-class Kernel extends \Orchestra\Testbench\Console\Kernel
+class Kernel extends OrchestraKernel
 {
     /**
      * The Artisan commands provided by your application.
@@ -14,6 +15,6 @@ class Kernel extends \Orchestra\Testbench\Console\Kernel
     protected $commands = [
         BootSelenium::class,
         GetWebDriver::class,
-        ServeCommand::class,
+        ServeCommand::class
     ];
 }

src/Console/MakeSeleniumTestCommand.php

@@ -4,9 +4,12 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Console\GeneratorCommand;
+use Modelizer\Selenium\Traits\WebDriverUtilsTrait;
 
 class MakeSeleniumTestCommand extends GeneratorCommand
 {
+    use WebDriverUtilsTrait;
+
     /**
      * The console command name.
      *
@@ -35,7 +38,7 @@ class MakeSeleniumTestCommand extends GeneratorCommand
      */
     protected function getStub()
     {
-        return __DIR__.'/stubs/test.stub';
+        return self::prependPackagePath('stubs/test.stub');
     }
 
     /**
@@ -51,16 +54,4 @@ protected function getPath($name)
 
         return $this->laravel['path.base'].'/tests/'.str_replace('\\', '/', $name).'.php';
     }
-
-    /**
-     * Get the default namespace for the class.
-     *
-     * @param string $rootNamespace
-     *
-     * @return string
-     */
-    protected function getDefaultNamespace($rootNamespace)
-    {
-        return $rootNamespace;
-    }
 }

src/SeleniumTestCase.php

@@ -2,81 +2,96 @@
 
 namespace Modelizer\Selenium;
 
+use Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables;
+use Illuminate\Foundation\Testing\Concerns\InteractsWithAuthentication;
+use Illuminate\Foundation\Testing\Concerns\InteractsWithConsole;
+use Illuminate\Foundation\Testing\Concerns\InteractsWithContainer;
+use Illuminate\Foundation\Testing\Concerns\InteractsWithDatabase;
+use Illuminate\Foundation\Testing\Concerns\InteractsWithExceptionHandling;
+use Illuminate\Foundation\Testing\Concerns\InteractsWithSession;
+use Illuminate\Foundation\Testing\Concerns\MakesHttpRequests;
+use Illuminate\Foundation\Testing\Concerns\MocksApplicationServices;
 use Lmc\Steward\Test\AbstractTestCase;
-use Modelizer\Selenium\Services\Application as Laravel;
-use Modelizer\Selenium\Services\InteractWithPage as Interaction;
-use Modelizer\Selenium\Services\ManageWindow;
-use Modelizer\Selenium\Services\WaitForElement;
-use Modelizer\Selenium\Services\WorkWithDatabase;
+use Modelizer\Selenium\Services\InteractWithPage;
+use Orchestra\Testbench\Concerns\Testing;
+use Orchestra\Testbench\Contracts\TestCase as OrchestraTestCaseContract;
 
-class SeleniumTestCase extends AbstractTestCase
+abstract class SeleniumTestCase extends AbstractTestCase implements OrchestraTestCaseContract
 {
-    use Laravel,
-        Interaction,
-        WorkWithDatabase,
-        WaitForElement,
-        ManageWindow;
+    use Testing,
+        InteractsWithAuthentication,
+        InteractsWithConsole,
+        InteractsWithContainer,
+        InteractsWithDatabase,
+        InteractsWithExceptionHandling,
+        InteractsWithSession,
+        MakesHttpRequests,
+        MocksApplicationServices,
+        InteractWithPage;
 
     /**
+     * The base URL to use while testing the application.
+     *
      * @var string
      */
-    protected $baseUrl;
+    protected $baseUrl = 'http://localhost';
 
     /**
-     * @var int
+     * Setup the test environment.
+     *
+     * @return void
      */
-    protected $width;
+    public function setUp(): void
+    {
+        $this->setUpTheTestEnvironment();
+
+        $this->baseUrl = env('APP_URL', $this->baseUrl);
+
+        parent::setUp();
+    }
 
     /**
-     * @var int
+     * Clean up the testing environment before the next test.
+     *
+     * @return void
      */
-    protected $height;
-
-    public function setUp()
+    protected function tearDown()
     {
-        $this->setUpLaravel();
-        $this->baseUrl = env('APP_URL', 'http://localhost/');
-        $this->wd->get($this->baseUrl);
-
-        $this->setBrowser(env('DEFAULT_BROWSER', 'chrome'));
+        $this->tearDownTheTestEnvironment();
     }
 
-    public function setupPage()
+    /**
+     * Boot the testing helper traits.
+     *
+     * @return array
+     */
+    protected function setUpTraits()
     {
-        if (empty($this->width)) {
-            $this->width = env('SELENIUM_WIDTH', 1024);
-        }
-
-        if (empty($this->height)) {
-            $this->height = env('SELENIUM_HEIGHT', 768);
-        }
-
-        $this->changeWindowSize($this->width, $this->height);
+        return $this->setUpTheTestEnvironmentTraits();
     }
 
     /**
-     * Force selenium to wait.
+     * Refresh the application instance.
      *
-     * @param int|float $seconds The number of seconds or partial seconds to wait
-     *
-     * @return $this
+     * @return void
      */
-    protected function wait($seconds = 1)
+    protected function refreshApplication()
     {
-        usleep($seconds * 1000000);
-
-        return $this;
+        $this->app = $this->createApplication();
     }
 
     /**
-     * Alias for wait.
+     * Define environment setup.
      *
-     * @param int $seconds
+     * @param \Illuminate\Foundation\Application $app
      *
-     * @return SeleniumTestCase
+     * @return void
      */
-    public function hold($seconds = 1)
+    protected function getEnvironmentSetUp($app)
     {
-        return $this->wait($seconds);
+        putenv('APP_ENV=testing');
+        $app->useEnvironmentPath(__DIR__.'/..');
+        $app->loadEnvironmentFrom('testing.env');
+        $app->bootstrapWith([LoadEnvironmentVariables::class]);
     }
 }

src/Services/Application.php

@@ -295,4 +295,29 @@ protected function findElement($name)
 
         throw new CannotFindElement('Cannot find element: '.$value.' isn\'t visible on the page');
     }
+
+    /**
+     * Force selenium to wait.
+     *
+     * @param int|float $seconds The number of seconds or partial seconds to wait
+     *
+     * @return $this
+     */
+    protected function wait($seconds = 1)
+    {
+        usleep($seconds * 1000000);
+
+        return $this;
+    }
+
+    /**
+     * Alias for wait.
+     *
+     * @param int $seconds
+     * @return TestCase
+     */
+    protected function hold($seconds = 1)
+    {
+        return $this->wait($seconds);
+    }
 }

src/Services/InteractWithPage.php

@@ -2,41 +2,41 @@
 
 namespace Modelizer\Selenium\Services;
 
+use Facebook\WebDriver\Remote\RemoteWebDriver;
+use Facebook\WebDriver\WebDriverPoint;
+
 trait ManageWindow
 {
+    /**
+     * @var RemoteWebDriver
+     */
+    public $wd;
+
     /**
      * Change the current window's width and height.
      *
      * @param int $width
      * @param int $height
-     *
      * @return $this
      */
-    public function changeWindowSize($width = 1024, $height = 768)
+    public function changeWindowSize(int $width = 1024, int $height = 768)
     {
-        if (!empty($width) && !empty($height) &&
-            is_int(intval($width)) && is_int(intval($height))) {
-            $this->prepareSession()->currentWindow()->size([
-                'width'  => intval($width),
-                'height' => intval($height),
-            ]);
-        }
+        $this->wd->manage()->window()->setPosition(new WebDriverPoint($width, $height));
 
         return $this;
     }
 
     /**
      * Set the current window's width.
      *
-     * @param int $width
-     *
-     * @return $this
+     * @param $width
+     * @return \Facebook\WebDriver\WebDriverWindow
      */
     public function setWidth($width)
     {
-        $this->width = $width;
-
-        return $this->changeWindowSize($this->width, $this->height);
+        return $this->wd->manage()
+            ->window()
+            ->setPosition(new WebDriverPoint($width, self::BROWSER_HEIGHT));
     }
 
     /**
@@ -48,8 +48,6 @@ public function setWidth($width)
      */
     public function setHeight($height)
     {
-        $this->height = $height;
-
-        return $this->changeWindowSize($this->width, $this->height);
+        return $this->changeWindowSize(self::BROWSER_WIDTH, $height);
     }
 }

src/Services/ManageWindow.php

@@ -2,9 +2,9 @@
 
 namespace Modelizer\Selenium\Tests\Feature\Console;
 
-use Modelizer\Selenium\Tests\TestCase;
+use Modelizer\Selenium\SeleniumTestCase;
 
-class GetSeleniumServerTest extends TestCase
+class GetSeleniumServerTest extends SeleniumTestCase
 {
     /** @test */
     public function it_should_download_selenium_web_server()

tests/TestCase.php

@@ -2,28 +2,28 @@
 
 namespace Modelizer\Selenium\Tests\Feature;
 
-use Modelizer\Selenium\Tests\TestCase;
+use Modelizer\Selenium\SeleniumTestCase;
 
-class FormTest extends TestCase
+class FormTest extends SeleniumTestCase
 {
     /** @test */
     function it_should_fill_input_fields()
     {
         $this->visit()
             ->click('Form')
             ->see('Form Test')
-            ->type('John', 'firstName')
-            ->type('Hoopes', 'lastName')
-            ->typeById('john.hoopes@madisoncreativeweb.com', 'inputEmail');
+            ->type('Mohammed', 'firstName')
+            ->type('Mudassir', 'lastName')
+            ->typeById('hello@mudasir.me', 'inputEmail');
     }
 
     /** @test */
     function it_should_type_information()
     {
         $formInfo = [
-            'firstName'  => 'John',
-            'lastName'   => 'Hoopes',
-            'inputEmail' => 'john.hoopes@madisoncreativeweb.com',
+            'firstName'  => 'Mohammed',
+            'lastName'   => 'Mudassir',
+            'inputEmail' => 'hello@mudasir.me',
         ];
 
         $this->visit()
@@ -61,9 +61,9 @@ function it_should_type_by_css_selector()
     function it_should_type_information_and_press_a_button()
     {
         $formInfo = [
-            'firstName'  => 'John',
-            'lastName'   => 'Hoopes',
-            'inputEmail-name' => 'john.hoopes@madisoncreativeweb.com',
+            'firstName'  => 'Mohammed',
+            'lastName'   => 'Mudassir',
+            'inputEmail-name' => 'hello@mudasir.me',
         ];
 
         $this->visit()
@@ -78,9 +78,9 @@ function it_should_type_information_and_press_a_button()
     function it_should_submit_form()
     {
         $formInfo = [
-            'firstName'  => 'John',
-            'lastName'   => 'Hoopes',
-            'inputEmail-name' => 'john.hoopes@madisoncreativeweb.com',
+            'firstName'  => 'Mohammed',
+            'lastName'   => 'Mudassir',
+            'inputEmail-name' => 'hello@mudasir.me',
         ];
 
         $this->visit()

tests/feature/Console/GetSeleniumServerTest.php

@@ -1,8 +1,10 @@
 <?php
 
-namespace Modelizer\Selenium\Tests;
+namespace Modelizer\Selenium\Tests\Feature;
 
-class InteractionTest extends TestCase
+use Modelizer\Selenium\SeleniumTestCase;
+
+class InteractionTest extends SeleniumTestCase
 {
     /** @test */
     function it_should_visit_page()