Fixes for the new workflows in j4

Author: wilsonge

src/ElementIsVisibleTrait.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * @package    JoomlaBrowser
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Browser;
+
+use Facebook\WebDriver\Remote\RemoteWebDriver;
+use Facebook\WebDriver\Remote\RemoteWebElement;
+use Facebook\WebDriver\WebDriverBy;
+
+/**
+ * Trait ElementIsVisibleTrait Based on the blog post below
+ *
+ * @see  https://maslosoft.com/blog/2018/04/04/codeception-acceptance-check-if-element-is-visible/
+ */
+trait ElementIsVisibleTrait {
+
+	/**
+	 * Checks if an element is visible on the page
+	 *
+	 * @param   string  $element  The element to check if it's visible
+	 *
+	 * @return  bool
+	 */
+	public function haveVisible($element)
+	{
+		/** @var \Codeception\Actor $I */
+		$I = $this;
+		$value = false;
+		$I->executeInSelenium(function(RemoteWebDriver $webDriver)use($element, &$value)
+		{
+			try
+			{
+				$element = $webDriver->findElement(WebDriverBy::cssSelector($element));
+				$value = $element instanceof RemoteWebElement;
+			}
+			catch (\Exception $e)
+			{
+				// Swallow exception silently
+			}
+		});
+		return $value;
+	}
+}

src/JoomlaBrowser.php

@@ -20,6 +20,8 @@
  */
 class JoomlaBrowser extends WebDriver
 {
+	use ElementIsVisibleTrait;
+
 	/**
 	 * The module required fields, to be set in the suite .yml configuration file.
 	 *
@@ -287,16 +289,18 @@ public function installJoomlaRemovingInstallationFolder()
 	{
 		$this->installJoomla();
 
-		// TODO: This will not show in stable mode. Tests need to handle this accordingly
-		$this->debug('Removing Installation Folder');
-		$this->click(['id' => 'removeInstallationFolder']);
+		if (!$this->haveVisible('#removeInstallationFolder'))
+		{
+			$this->debug('Removing Installation Folder');
+			$this->click(['id' => 'removeInstallationFolder']);
 
-		// Accept the confirmation alert
-		$this->seeInPopup('Are you sure you want to delete?');
-		$this->acceptPopup();
+			// Accept the confirmation alert
+			$this->seeInPopup('Are you sure you want to delete?');
+			$this->acceptPopup();
 
-		// Wait until the installation folder is gone and the "customize installation" box has been removed
-		$this->waitForElementNotVisible(['id' => 'installAddFeatures']);
+			// Wait until the installation folder is gone and the "customize installation" box has been removed
+			$this->waitForElementNotVisible(['id' => 'installAddFeatures']);
+		}
 
 		$this->debug('Joomla is now installed');
 		$this->click(['button' => "Complete & Open Admin"]);
@@ -343,11 +347,15 @@ public function installJoomlaMultilingualSite($languages = array())
 		$this->click(['link' => 'Next']);
 
 		$this->waitForText('Congratulations! Joomla! is now installed.', $this->config['timeout'], ['xpath' => '//h2']);
-		$this->debug('Removing Installation Folder');
-		$this->click(['xpath' => "//input[@value='Remove \"installation\" folder']"]);
 
-		// @todo https://github.com/joomla-projects/joomla-browser/issues/45
-		$this->wait(2);
+		if (!$this->haveVisible('#removeInstallationFolder'))
+		{
+			$this->debug('Removing Installation Folder');
+			$this->click(['xpath' => "//input[@value='Remove \"installation\" folder']"]);
+
+			// Wait until the installation folder is gone and the "customize installation" box has been removed
+			$this->waitForElementNotVisible(['id' => 'installAddFeatures']);
+		}
 
 		$this->debug('Joomla is now installed');
 		$this->see('Congratulations! Joomla! is now installed.', ['xpath' => '//h2']);