From 3f36a93ce6dd2c68456bb7c3290973ba891aef32 Mon Sep 17 00:00:00 2001
From: Bozhidar Slaveykov <bobi@microweber.com>
Date: Mon, 14 Feb 2022 15:29:10 +0200
Subject: [PATCH] update

---
 tests/Browser/AbppInstallTest.php             |  2 +-
 tests/Browser/Components/AdminMakeInstall.php | 58 +++++++++----------
 2 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/tests/Browser/AbppInstallTest.php b/tests/Browser/AbppInstallTest.php
index 36170615349..6ede7e5398e 100644
--- a/tests/Browser/AbppInstallTest.php
+++ b/tests/Browser/AbppInstallTest.php
@@ -18,7 +18,7 @@ public function testViewDashboard()
     {
         $siteUrl = $this->siteUrl;
 
-        $this->browse(function (Browser $browser) use($siteUrl) {
+        $this->browse(function (Browser $browser) use ($siteUrl) {
 
             $browser->within(new AdminLogin(), function ($browser) {
                 $browser->fillForm();
diff --git a/tests/Browser/Components/AdminMakeInstall.php b/tests/Browser/Components/AdminMakeInstall.php
index 76be78bfb5d..5ea17898ec1 100644
--- a/tests/Browser/Components/AdminMakeInstall.php
+++ b/tests/Browser/Components/AdminMakeInstall.php
@@ -5,6 +5,7 @@
 use Facebook\WebDriver\WebDriverBy;
 use Laravel\Dusk\Browser;
 use Laravel\Dusk\Component as BaseComponent;
+use PHPUnit\Framework\Assert as PHPUnit;
 
 class AdminMakeInstall extends BaseComponent
 {
@@ -43,45 +44,42 @@ public function makeInstallation(Browser $browser)
     {
         $siteUrl = site_url();
 
-        $this->browse(function (Browser $browser) use($siteUrl) {
+        if (mw_is_installed()) {
+            PHPUnit::assertTrue(true);
+            return true;
+        }
 
-            if (mw_is_installed()) {
-                $this->assertTrue(true);
-                return true;
-            }
+        /* $deleteDbFiles = [];
+         $deleteDbFiles[] = dirname(dirname(__DIR__)) . DS . 'config/microweber.php';
+         $deleteDbFiles[] = dirname(dirname(__DIR__)) . DS . 'storage/127_0_0_1.sqlite';
+         foreach ($deleteDbFiles as $file) {
+             if (is_file($file)) {
+                 unlink($file);
+             }
+         }*/
 
-            /* $deleteDbFiles = [];
-             $deleteDbFiles[] = dirname(dirname(__DIR__)) . DS . 'config/microweber.php';
-             $deleteDbFiles[] = dirname(dirname(__DIR__)) . DS . 'storage/127_0_0_1.sqlite';
-             foreach ($deleteDbFiles as $file) {
-                 if (is_file($file)) {
-                     unlink($file);
-                 }
-             }*/
+        $browser->visit($siteUrl)->assertSee('install');
 
-            $browser->visit($siteUrl)->assertSee('install');
-
-            $browser->within(new ChekForJavascriptErrors(), function ($browser) {
-                $browser->validate();
-            });
+        $browser->within(new ChekForJavascriptErrors(), function ($browser) {
+            $browser->validate();
+        });
 
 
-            // Fill the install fields
-            $browser->type('admin_username', '1');
-            $browser->type('admin_password', '1');
-            $browser->type('admin_password2', '1');
-            $browser->type('admin_email', 'bobi@microweber.com');
+        // Fill the install fields
+        $browser->type('admin_username', '1');
+        $browser->type('admin_password', '1');
+        $browser->type('admin_password2', '1');
+        $browser->type('admin_email', 'bobi@microweber.com');
 
-            $browser->pause(300);
-            $browser->select('#default_template', 'new-world');
+        $browser->pause(300);
+        $browser->select('#default_template', 'new-world');
 
-            $browser->pause(100);
-            $browser->click('@install-button');
+        $browser->pause(100);
+        $browser->click('@install-button');
 
-            $browser->pause(20000);
+        $browser->pause(20000);
 
-            clearcache();
+        clearcache();
 
-        });
     }
 }