Merge branch 'release/v1.1'

Author: javigomez

README.md

@@ -51,13 +51,24 @@ You are asked to remove WebDriver module and change it by the JoomlaBrowser modu
 ```yaml
     config:
         JoomlaBrowser:
-            url: 'http://joomla.box/repos/redmember2/tests/joomla-cms3/'     # the url that points to the joomla installation at /tests/system/joomla-cms
+            url: 'http://localhost/joomla-cms/'     # the url that points to the joomla installation at /tests/system/joomla-cms
             browser: 'firefox'
             window_size: 1024x768
             capabilities:
               unexpectedAlertBehaviour: 'accept'
             username: 'admin'
             password: 'admin'
+            database host: 'localhost'             # place where the Application is Hosted #server Address
+            database user: 'root'                  # MySQL Server user ID, usually root
+            database password: '1234'                  # MySQL Server password, usually empty or root
+            database name: 'dbname'            # DB Name, at the Server
+            database type: 'mysqli'                # type in lowercase one of the options: MySQL\MySQLi\PDO
+            database prefix: 'jos_'                # DB Prefix for tables
+            install sample data: 'Yes'              # Do you want to Download the Sample Data Along with Joomla Installation, then keep it Yes
+            sample data: 'Default English (GB) Sample Data'    # Default Sample Data
+            admin email: '[email protected]'      # email Id of the Admin
+            language: 'English (United Kingdom)'   # Language in which you want the Application to be Installed
+            joomla folder: '/home/.../path to Joomla Folder' # Path to Joomla installation where we execute the tests
         AcceptanceHelper:
             ...
 ```

src/JoomlaBrowser.php

@@ -35,9 +35,10 @@ public function doAdministratorLogin()
     {
         $I = $this;
         $I->amOnPage('/administrator/index.php');
-        $I->fillField('username', $this->config['username']);
-        $I->fillField('Password', $this->config['password']);
-        $I->click('Log in');
+        $I->fillField('#mod-login-username', $this->config['username']);
+        $I->fillField('#mod-login-password', $this->config['password']);
+        // @todo: update login button in joomla login screen to make this xPath more friendly
+        $I->click("//form[@id='form-login']/fieldset/div[3]/div/div/button");
         $I->waitForText('Control Panel', 10, 'H1');
     }
 
@@ -54,38 +55,61 @@ public function installJoomla()
         //$I->expect('no configuration.php is in the Joomla CMS folder');
         //$I->dontSeeFileFound('configuration.php', $this->config['Joomla folder')];
         $I->amOnPage('/installation/index.php');
+        $this->debug('I open Joomla Installation Configuration Page and fill the fields');
 
         // I Wait for the text Main Configuration, meaning that the page is loaded
+        $this->debug('I wait for Main Configuration');
         $I->waitForText('Main Configuration', 10, 'h3');
 
+        $this->debug('I click Language Selector');
         $I->click("//div[@id='jform_language_chzn']/a"); // Language Selector
+        $this-debug('I select en-GB');
         $I->click("//li[text()='English (United Kingdom)']"); // English (United Kingdom)
         sleep(1);
+        $this-debug('I fill Site Name');
         $I->fillField('Site Name', 'Joomla CMS test');
+        $this-debug('I fill Site Description');
         $I->fillField('Description', 'Site for testing Joomla CMS');
 
         // I get the configuration from acceptance.suite.yml (see: tests/_support/acceptancehelper.php)
+        $this-debug('I fill Admin Email');
         $I->fillField('Admin Email', $this->config['admin email']);
+        $this-debug('I fill Admin Username');
         $I->fillField('Admin Username', $this->config['username']);
+        $this-debug('I fill Admin Password');
         $I->fillField('Admin Password', $this->config['password']);
+        $this-debug('I fill Admin Password Confirmation');
         $I->fillField('Confirm Admin Password', $this->config['password']);
+        $this-debug('I click Site Offline: no');
         $I->click("//fieldset[@id='jform_site_offline']/label[2]"); // ['No Site Offline']
+        $this-debug('I click Next');
         $I->click('Next');
-        // I Fill the form for creating the Joomla site Database'
+
+        $this->debug('I Fill the form for creating the Joomla site Database');
         $I->waitForText('Database Configuration', 10, 'h3');
 
+        $this-debug('I select MySQLi');
         $I->selectOption('#jform_db_type', $this->config['database type']);
+        $this-debug('I fill Database Host');
         $I->fillField('Host Name', $this->config['database host']);
+        $this-debug('I fill Database User');
         $I->fillField('Username', $this->config['database user']);
+        $this-debug('I fill Database Password');
         $I->fillField('Password', $this->config['database password']);
+        $this-debug('I fill Database Name');
         $I->fillField('Database Name', $this->config['database name']);
+        $this-debug('I fill Database Prefix');
         $I->fillField('Table Prefix', $this->config['database prefix']);
+        $this-debug('I click Remove Old Database ');
         $I->click("//label[@for='jform_db_old1']"); // Remove Old Database button
         $I->click('Next');
+        $this-debug('I click Next');
+        $I->click('Next');
 
-        // I Fill the form for creating the Joomla site database
+        $this->debug('I install joomla with or without sample data');
         $I->waitForText('Finalisation', 10, 'h3');
 
+        $this-debug('I install Sample Data');
         if ($this->config['install sample data']) :
             $I->selectOption('#jform_sample_file', $this->config['sample data']);
         else :
@@ -95,6 +119,7 @@ public function installJoomla()
 
         // Wait while Joomla gets installed
         $I->waitForText('Congratulations! Joomla! is now installed.', 30, 'h3');
+        $this->debug('Joomla is now installed');
     }
 
     /**
@@ -117,7 +142,9 @@ public function setErrorReportingtoDevelopment()
     }
 
     /**
-     * Sets in Adminitrator->Global Configuration the Error reporting to Development
+     * Installs a Extension in Joomla that is located in a folder inside the server
+     *
+     * @param $path
      *
      * @note: doAdminLogin() before
      */
@@ -131,4 +158,24 @@ public function installExtensionFromDirectory($path)
         $I->click("//input[contains(@onclick,'Joomla.submitbutton3()')]"); // Install button
         $I->waitForText('was successful', 10, '#system-message-container');
     }
+
+    /**
+     * Function to check for PHP Notices or Warnings
+     *
+     * @param string $page Optional, if not given checks will be done in the current page
+     *
+     * @note: doAdminLogin() before
+     */
+    public function checkForPhpNoticesOrWarnings($page = null)
+    {
+        $I = $this;
+
+        if($page)
+        {
+            $I->amOnPage($page);
+        }
+
+        $I->dontSeeInPageSource('Notice:');
+        $I->dontSeeInPageSource('Warning:');
+    }
 }