GeoDirectory / geodirectory

tests/selenium/base.php

Doc Comments +22 added lines

@@ -10,6 +10,9 @@ 
         $this->setBrowserUrl(self::GDTEST_BASE_URL);
     }
 
+    /**
+     * @param string $search
+     */
     function isTextPresent($search)
     {
         $source = $this->source();
@@ -62,6 +65,9 @@ 
         }
     }
 
+    /**
+     * @param string $redirect
+     */
     function maybeUserLogin($redirect, $force=false) {
         if ($force) {
             $this->url(self::GDTEST_BASE_URL.'wp-admin/');
@@ -87,6 +93,9 @@ 
         }
     }
 
+    /**
+     * @param string $redirect
+     */
     function maybeAdminLogin($redirect) {
         $this->url($redirect);
         $this->waitForPageLoadAndCheckForErrors();
@@ -121,6 +130,9 @@ 
         return $exists;
     }
 
+    /**
+     * @param string $script
+     */
     function ExecuteScript($script, $args=array()) {
         $this->execute( array(
             'script' => $script ,
@@ -133,10 +145,16 @@ 
         $this->ExecuteScript('jQuery("#wpadminbar").hide();');
     }
 
+    /**
+     * @param string $string
+     */
     function logInfo($string) {
         fwrite(STDOUT, "Info: ".$string . PHP_EOL);
     }
 
+    /**
+     * @param string $string
+     */
     function logError($string) {
         fwrite(STDOUT, "Error: ".$string . PHP_EOL);
     }
@@ -157,6 +175,10 @@ 
         return (int) $content;
     }
 
+    /**
+     * @param integer $current
+     * @param integer $completed
+     */
     function skipTest($current, $completed) {
         if ($completed == 0 || $completed == 42 || $current == $completed) {
             return false;

Indentation +191 added lines, -191 removed lines

@@ -1,199 +1,199 @@
 <?php
 class GD_Test extends PHPUnit_Extensions_Selenium2TestCase {
 
-    const GDTEST_BASE_URL = 'http://www.test.ci/selpress/';
-
-    public function setUp()
-    {
-        $this->setSeleniumServerRequestsTimeout(300);
-        $this->setBrowser('firefox');
-        $this->setBrowserUrl(self::GDTEST_BASE_URL);
-    }
-
-    function isTextPresent($search)
-    {
-        $source = $this->source();
-        if ( strpos((string)$source,$search) !== FALSE) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    function randomEmailID()
-    {
-        return md5(uniqid(rand(), true)).'@gmail.com';
-    }
-
-    function waitForPageLoadAndCheckForErrors($timeout=10000)
-    {
-        // Wait 10 seconds
-        $this->timeouts()->implicitWait($timeout);
-        $this->checkForErrors();
-        $this->checkForJsErrors();
-    }
-
-    function checkForErrors()
-    {
-        $elements = $this->elements($this->using('css selector')->value('.xdebug-error'));
-        if ($elements) {
-            $total = count($elements);
-            fwrite(STDOUT, $total.' errors found'. PHP_EOL);
-            $count = 0;
-            foreach ($elements as $i => $element) {
-                $count++;
-                if ($errors = $element->attribute('innerHTML')) {
-                    fwrite(STDOUT, "========================================================================". PHP_EOL);
-                    fwrite(STDOUT, strip_tags($errors). PHP_EOL);
-                    if ($count == $total) {
-                        fwrite(STDOUT, "========================================================================". PHP_EOL);
-                    }
-                }
-            }
-        }
-    }
-
-    function checkForJsErrors() {
-        if ($this->isElementExists('sel_js_error')) {
-            fwrite(STDOUT, 'Javascript errors found'. PHP_EOL);
-            fwrite(STDOUT, "========================================================================". PHP_EOL);
-            echo $this->byId('sel_js_error')->attribute('innerHTML');
-            fwrite(STDOUT, "========================================================================". PHP_EOL);
-        }
-    }
-
-    function maybeUserLogin($redirect, $force=false) {
-        if ($force) {
-            $this->url(self::GDTEST_BASE_URL.'wp-admin/');
-            if ($this->isTextPresent("forgetmenot")) {
-                $this->byId('user_login')->value('testuser@test.com');
-                $this->byId('user_pass')->value('1');
+	const GDTEST_BASE_URL = 'http://www.test.ci/selpress/';
+
+	public function setUp()
+	{
+		$this->setSeleniumServerRequestsTimeout(300);
+		$this->setBrowser('firefox');
+		$this->setBrowserUrl(self::GDTEST_BASE_URL);
+	}
+
+	function isTextPresent($search)
+	{
+		$source = $this->source();
+		if ( strpos((string)$source,$search) !== FALSE) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	function randomEmailID()
+	{
+		return md5(uniqid(rand(), true)).'@gmail.com';
+	}
+
+	function waitForPageLoadAndCheckForErrors($timeout=10000)
+	{
+		// Wait 10 seconds
+		$this->timeouts()->implicitWait($timeout);
+		$this->checkForErrors();
+		$this->checkForJsErrors();
+	}
+
+	function checkForErrors()
+	{
+		$elements = $this->elements($this->using('css selector')->value('.xdebug-error'));
+		if ($elements) {
+			$total = count($elements);
+			fwrite(STDOUT, $total.' errors found'. PHP_EOL);
+			$count = 0;
+			foreach ($elements as $i => $element) {
+				$count++;
+				if ($errors = $element->attribute('innerHTML')) {
+					fwrite(STDOUT, "========================================================================". PHP_EOL);
+					fwrite(STDOUT, strip_tags($errors). PHP_EOL);
+					if ($count == $total) {
+						fwrite(STDOUT, "========================================================================". PHP_EOL);
+					}
+				}
+			}
+		}
+	}
+
+	function checkForJsErrors() {
+		if ($this->isElementExists('sel_js_error')) {
+			fwrite(STDOUT, 'Javascript errors found'. PHP_EOL);
+			fwrite(STDOUT, "========================================================================". PHP_EOL);
+			echo $this->byId('sel_js_error')->attribute('innerHTML');
+			fwrite(STDOUT, "========================================================================". PHP_EOL);
+		}
+	}
+
+	function maybeUserLogin($redirect, $force=false) {
+		if ($force) {
+			$this->url(self::GDTEST_BASE_URL.'wp-admin/');
+			if ($this->isTextPresent("forgetmenot")) {
+				$this->byId('user_login')->value('testuser@test.com');
+				$this->byId('user_pass')->value('1');
 //                $this->byId('rememberme')->click();
-                // Submit the form
-                $this->byId('wp-submit')->submit();
-                $this->waitForPageLoadAndCheckForErrors();
-            }
-        }
-        $this->url($redirect);
-        $this->waitForPageLoadAndCheckForErrors();
-        if ($this->isTextPresent("Sign In")) {
-            $this->byId('user_login')->value('testuser@test.com');
-            $this->byId('user_pass')->value('1');
+				// Submit the form
+				$this->byId('wp-submit')->submit();
+				$this->waitForPageLoadAndCheckForErrors();
+			}
+		}
+		$this->url($redirect);
+		$this->waitForPageLoadAndCheckForErrors();
+		if ($this->isTextPresent("Sign In")) {
+			$this->byId('user_login')->value('testuser@test.com');
+			$this->byId('user_pass')->value('1');
 //            $this->byId('rememberme')->click();
-            // Submit the form
-            $this->byId('cus_loginform')->submit();
-            $this->waitForPageLoadAndCheckForErrors();
-            $this->url($redirect);
-        }
-    }
-
-    function maybeAdminLogin($redirect) {
-        $this->url($redirect);
-        $this->waitForPageLoadAndCheckForErrors();
-        if ($this->isTextPresent("forgetmenot")) {
-            $this->byId('user_login')->value('admin');
-            $this->byId('user_pass')->value('admin');
+			// Submit the form
+			$this->byId('cus_loginform')->submit();
+			$this->waitForPageLoadAndCheckForErrors();
+			$this->url($redirect);
+		}
+	}
+
+	function maybeAdminLogin($redirect) {
+		$this->url($redirect);
+		$this->waitForPageLoadAndCheckForErrors();
+		if ($this->isTextPresent("forgetmenot")) {
+			$this->byId('user_login')->value('admin');
+			$this->byId('user_pass')->value('admin');
 //            $this->byId('rememberme')->click();
-            // Submit the form
-            $this->byId('wp-submit')->submit();
-            $this->waitForPageLoadAndCheckForErrors();
-            $this->url($redirect);
-        }
-    }
-
-    function isElementExists($id = false, $by = 'id') {
-        if (!$id) {
-            return false;
-        }
-        $exists = true;
-        try {
-            if ($by == 'id') {
-                $this->byId($id);
-            } elseif ($by == 'xpath') {
-                $this->byXPath($id);
-            }
-
-        } catch (PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
-            if (PHPUnit_Extensions_Selenium2TestCase_WebDriverException::NoSuchElement == $e->getCode()) {
-                $exists = false;
-            }
-        }
-        return $exists;
-    }
-
-    function ExecuteScript($script, $args=array()) {
-        $this->execute( array(
-            'script' => $script ,
-            'args'=>$args
-        ) );
-    }
-
-    function hideAdminBar() {
-        //admin bar causes problem with scroll. So hide admin bar while testing.
-        $this->ExecuteScript('jQuery("#wpadminbar").hide();');
-    }
-
-    function logInfo($string) {
-        fwrite(STDOUT, "Info: ".$string . PHP_EOL);
-    }
-
-    function logError($string) {
-        fwrite(STDOUT, "Error: ".$string . PHP_EOL);
-    }
-
-    function logWarning($string) {
-        fwrite(STDOUT, "Warning: ".$string . PHP_EOL);
-    }
-
-    function getCurrentFileNumber($file) {
-        preg_match('/test-([0-9]+)_/', $file, $match);
-        return (int) $match[1];
-    }
-
-    function getCompletedFileNumber() {
-        $completed = fopen("tests/selenium/completed.txt", "r") or die("Unable to open file!");
-        $content = fgets($completed);
-        fclose($completed);
-        return (int) $content;
-    }
-
-    function skipTest($current, $completed) {
-        if ($completed == 0 || $completed == 42 || $current == $completed) {
-            return false;
-        } elseif ($current < $completed) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    function maybeLogout() {
-        $this->url(self::GDTEST_BASE_URL);
-        $this->byXPath("//*[@id='gd-sidebar-wrapper']//ul[@class='geodir-loginbox-list']//a[@class='signin']")->click();
-        $this->waitForPageLoadAndCheckForErrors();
-    }
-
-    function maybeAdminLogout() {
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        $this->ExecuteScript('jQuery("#wp-admin-bar-my-account").addClass("hover");');
-        $this->byXPath("//*[@id='wp-admin-bar-logout']//a")->click();
-        $this->waitForPageLoadAndCheckForErrors();
-    }
-
-    function maybeActivatePlugin($id=false, $timeout=10000) {
-        if (!$id) {
-            return;
-        }
-        $plugin_name = ucwords(str_replace('-', ' ', $id));
-        $this->logInfo('Activating '.$plugin_name.' plugin......');
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->hideAdminBar();
-        if (is_int(strpos($this->byId($id)->attribute('class'), 'inactive'))) {
-            $this->byXPath("//tr[@id='".$id."']//span[@class='activate']/a")->click();
-        }
-        $this->waitForPageLoadAndCheckForErrors($timeout);
-        $this->logInfo($plugin_name.' activated......');
-    }
+			// Submit the form
+			$this->byId('wp-submit')->submit();
+			$this->waitForPageLoadAndCheckForErrors();
+			$this->url($redirect);
+		}
+	}
+
+	function isElementExists($id = false, $by = 'id') {
+		if (!$id) {
+			return false;
+		}
+		$exists = true;
+		try {
+			if ($by == 'id') {
+				$this->byId($id);
+			} elseif ($by == 'xpath') {
+				$this->byXPath($id);
+			}
+
+		} catch (PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
+			if (PHPUnit_Extensions_Selenium2TestCase_WebDriverException::NoSuchElement == $e->getCode()) {
+				$exists = false;
+			}
+		}
+		return $exists;
+	}
+
+	function ExecuteScript($script, $args=array()) {
+		$this->execute( array(
+			'script' => $script ,
+			'args'=>$args
+		) );
+	}
+
+	function hideAdminBar() {
+		//admin bar causes problem with scroll. So hide admin bar while testing.
+		$this->ExecuteScript('jQuery("#wpadminbar").hide();');
+	}
+
+	function logInfo($string) {
+		fwrite(STDOUT, "Info: ".$string . PHP_EOL);
+	}
+
+	function logError($string) {
+		fwrite(STDOUT, "Error: ".$string . PHP_EOL);
+	}
+
+	function logWarning($string) {
+		fwrite(STDOUT, "Warning: ".$string . PHP_EOL);
+	}
+
+	function getCurrentFileNumber($file) {
+		preg_match('/test-([0-9]+)_/', $file, $match);
+		return (int) $match[1];
+	}
+
+	function getCompletedFileNumber() {
+		$completed = fopen("tests/selenium/completed.txt", "r") or die("Unable to open file!");
+		$content = fgets($completed);
+		fclose($completed);
+		return (int) $content;
+	}
+
+	function skipTest($current, $completed) {
+		if ($completed == 0 || $completed == 42 || $current == $completed) {
+			return false;
+		} elseif ($current < $completed) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	function maybeLogout() {
+		$this->url(self::GDTEST_BASE_URL);
+		$this->byXPath("//*[@id='gd-sidebar-wrapper']//ul[@class='geodir-loginbox-list']//a[@class='signin']")->click();
+		$this->waitForPageLoadAndCheckForErrors();
+	}
+
+	function maybeAdminLogout() {
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		$this->ExecuteScript('jQuery("#wp-admin-bar-my-account").addClass("hover");');
+		$this->byXPath("//*[@id='wp-admin-bar-logout']//a")->click();
+		$this->waitForPageLoadAndCheckForErrors();
+	}
+
+	function maybeActivatePlugin($id=false, $timeout=10000) {
+		if (!$id) {
+			return;
+		}
+		$plugin_name = ucwords(str_replace('-', ' ', $id));
+		$this->logInfo('Activating '.$plugin_name.' plugin......');
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->hideAdminBar();
+		if (is_int(strpos($this->byId($id)->attribute('class'), 'inactive'))) {
+			$this->byXPath("//tr[@id='".$id."']//span[@class='activate']/a")->click();
+		}
+		$this->waitForPageLoadAndCheckForErrors($timeout);
+		$this->logInfo($plugin_name.' activated......');
+	}
 
 }
\ No newline at end of file

Spacing +18 added lines, -18 removed lines

@@ -13,7 +13,7 @@ 
     function isTextPresent($search)
     {
         $source = $this->source();
-        if ( strpos((string)$source,$search) !== FALSE) {
+        if (strpos((string) $source, $search) !== FALSE) {
             return true;
         } else {
             return false;
@@ -25,7 +25,7 @@ 
         return md5(uniqid(rand(), true)).'@gmail.com';
     }
 
-    function waitForPageLoadAndCheckForErrors($timeout=10000)
+    function waitForPageLoadAndCheckForErrors($timeout = 10000)
     {
         // Wait 10 seconds
         $this->timeouts()->implicitWait($timeout);
@@ -38,15 +38,15 @@ 
         $elements = $this->elements($this->using('css selector')->value('.xdebug-error'));
         if ($elements) {
             $total = count($elements);
-            fwrite(STDOUT, $total.' errors found'. PHP_EOL);
+            fwrite(STDOUT, $total.' errors found'.PHP_EOL);
             $count = 0;
             foreach ($elements as $i => $element) {
                 $count++;
                 if ($errors = $element->attribute('innerHTML')) {
-                    fwrite(STDOUT, "========================================================================". PHP_EOL);
-                    fwrite(STDOUT, strip_tags($errors). PHP_EOL);
+                    fwrite(STDOUT, "========================================================================".PHP_EOL);
+                    fwrite(STDOUT, strip_tags($errors).PHP_EOL);
                     if ($count == $total) {
-                        fwrite(STDOUT, "========================================================================". PHP_EOL);
+                        fwrite(STDOUT, "========================================================================".PHP_EOL);
                     }
                 }
             }
@@ -55,14 +55,14 @@ 
 
     function checkForJsErrors() {
         if ($this->isElementExists('sel_js_error')) {
-            fwrite(STDOUT, 'Javascript errors found'. PHP_EOL);
-            fwrite(STDOUT, "========================================================================". PHP_EOL);
+            fwrite(STDOUT, 'Javascript errors found'.PHP_EOL);
+            fwrite(STDOUT, "========================================================================".PHP_EOL);
             echo $this->byId('sel_js_error')->attribute('innerHTML');
-            fwrite(STDOUT, "========================================================================". PHP_EOL);
+            fwrite(STDOUT, "========================================================================".PHP_EOL);
         }
     }
 
-    function maybeUserLogin($redirect, $force=false) {
+    function maybeUserLogin($redirect, $force = false) {
         if ($force) {
             $this->url(self::GDTEST_BASE_URL.'wp-admin/');
             if ($this->isTextPresent("forgetmenot")) {
@@ -121,11 +121,11 @@ 
         return $exists;
     }
 
-    function ExecuteScript($script, $args=array()) {
-        $this->execute( array(
-            'script' => $script ,
+    function ExecuteScript($script, $args = array()) {
+        $this->execute(array(
+            'script' => $script,
             'args'=>$args
-        ) );
+        ));
     }
 
     function hideAdminBar() {
@@ -134,15 +134,15 @@ 
     }
 
     function logInfo($string) {
-        fwrite(STDOUT, "Info: ".$string . PHP_EOL);
+        fwrite(STDOUT, "Info: ".$string.PHP_EOL);
     }
 
     function logError($string) {
-        fwrite(STDOUT, "Error: ".$string . PHP_EOL);
+        fwrite(STDOUT, "Error: ".$string.PHP_EOL);
     }
 
     function logWarning($string) {
-        fwrite(STDOUT, "Warning: ".$string . PHP_EOL);
+        fwrite(STDOUT, "Warning: ".$string.PHP_EOL);
     }
 
     function getCurrentFileNumber($file) {
@@ -180,7 +180,7 @@ 
         $this->waitForPageLoadAndCheckForErrors();
     }
 
-    function maybeActivatePlugin($id=false, $timeout=10000) {
+    function maybeActivatePlugin($id = false, $timeout = 10000) {
         if (!$id) {
             return;
         }

tests/selenium/stest-13_Send_Enquiry.php

Indentation +34 added lines, -34 removed lines

@@ -1,42 +1,42 @@
 <?php
 class SendEnquiry extends GD_Test
 {
-    public function setUp()
-    {
-        parent::setUp();
+	public function setUp()
+	{
+		parent::setUp();
 
-        //skip test if already completed.
-        if ($this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            $this->markTestSkipped('Skipping '.pathinfo(__FILE__, PATHINFO_FILENAME).' since its already completed......');
-            return;
-        } else {
-            $this->prepareSession()->currentWindow()->maximize();
-        }
-    }
+		//skip test if already completed.
+		if ($this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			$this->markTestSkipped('Skipping '.pathinfo(__FILE__, PATHINFO_FILENAME).' since its already completed......');
+			return;
+		} else {
+			$this->prepareSession()->currentWindow()->maximize();
+		}
+	}
 
-    public function testSendEnquiry()
-    {
-        $this->logInfo('Send Enquiry......');
-        $this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/test-listing/');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byClassName('b_send_inquiry')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byName('inq_name')->value('Test User');
-        $this->byName('inq_email')->value('test@test.com');
-        $this->byId('agt_mail_phone')->value('44444444444');
-        $this->byName('Send')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Enquiry sent successfully"), "Success text not found");
-    }
+	public function testSendEnquiry()
+	{
+		$this->logInfo('Send Enquiry......');
+		$this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/test-listing/');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byClassName('b_send_inquiry')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byName('inq_name')->value('Test User');
+		$this->byName('inq_email')->value('test@test.com');
+		$this->byId('agt_mail_phone')->value('44444444444');
+		$this->byName('Send')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Enquiry sent successfully"), "Success text not found");
+	}
 
-    public function tearDown()
-    {
-        if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            //write current file number to completed.txt
-            $CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
-            $completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
-            fwrite($completed, $CurrentFileNumber);
-        }
-    }
+	public function tearDown()
+	{
+		if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			//write current file number to completed.txt
+			$CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
+			$completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
+			fwrite($completed, $CurrentFileNumber);
+		}
+	}
 }
 ?>
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
         $this->byId('agt_mail_phone')->value('44444444444');
         $this->byName('Send')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Enquiry sent successfully"), "Success text not found");
+        $this->assertTrue($this->isTextPresent("Enquiry sent successfully"), "Success text not found");
     }
 
     public function tearDown()

tests/selenium/stest-17_Add_Custom_Fields.php

Indentation +65 added lines, -65 removed lines

@@ -1,74 +1,74 @@
 <?php
 class AddCustomFields extends GD_Test
 {
-    public function setUp()
-    {
-        parent::setUp();
+	public function setUp()
+	{
+		parent::setUp();
 
-        //skip test if already completed.
-        if ($this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            $this->markTestSkipped('Skipping '.pathinfo(__FILE__, PATHINFO_FILENAME).' since its already completed......');
-            return;
-        } else {
-            $this->prepareSession()->currentWindow()->maximize();
-        }
-    }
+		//skip test if already completed.
+		if ($this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			$this->markTestSkipped('Skipping '.pathinfo(__FILE__, PATHINFO_FILENAME).' since its already completed......');
+			return;
+		} else {
+			$this->prepareSession()->currentWindow()->maximize();
+		}
+	}
 
-    public function testAddCustomFields()
-    {
-        $this->logInfo('Add custom fields......');
-        $this->prepareSession()->currentWindow()->maximize();
-        //Field 1
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=gd_place_fields_settings&subtab=custom_fields&listing_type=gd_place');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('gt-text')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $link = $this->byXPath("//li[@id='licontainer_new10']/div[contains(@class,'titlenew10')]");
-        $this->moveto($link);
-        $this->doubleclick();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byXPath("//div[@id='field_frmnew10']//input[@id='admin_title']")->value('Text Field 1');
-        $this->byXPath("//div[@id='field_frmnew10']//input[@id='site_title']")->value('Text Field 1');
-        $this->byXPath("//div[@id='field_frmnew10']//input[@id='htmlvar_name']")->value('text_field_1');
-        $this->byXPath("//div[@id='field_frmnew10']//input[@id='clabels']")->value('Text Field 1');
-        $this->select($this->byXPath("//div[@id='field_frmnew10']//select[@id='is_active']"))->selectOptionByLabel('Yes');
-        $this->select($this->byXPath("//div[@id='field_frmnew10']//select[@id='show_on_listing']"))->selectOptionByLabel('Yes');
-        $this->select($this->byXPath("//div[@id='field_frmnew10']//select[@id='show_on_detail']"))->selectOptionByLabel('Yes');
-        $this->byXPath("//div[@id='field_frmnew10']//input[@id='cat_sort']")->click();
-        $this->byXPath("//div[@id='field_frmnew10']//input[@id='cat_filter']")->click();
-        $this->byXPath("//div[@id='field_frmnew10']//input[@id='save']")->click();
-        $this->waitForPageLoadAndCheckForErrors();
+	public function testAddCustomFields()
+	{
+		$this->logInfo('Add custom fields......');
+		$this->prepareSession()->currentWindow()->maximize();
+		//Field 1
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=gd_place_fields_settings&subtab=custom_fields&listing_type=gd_place');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('gt-text')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$link = $this->byXPath("//li[@id='licontainer_new10']/div[contains(@class,'titlenew10')]");
+		$this->moveto($link);
+		$this->doubleclick();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byXPath("//div[@id='field_frmnew10']//input[@id='admin_title']")->value('Text Field 1');
+		$this->byXPath("//div[@id='field_frmnew10']//input[@id='site_title']")->value('Text Field 1');
+		$this->byXPath("//div[@id='field_frmnew10']//input[@id='htmlvar_name']")->value('text_field_1');
+		$this->byXPath("//div[@id='field_frmnew10']//input[@id='clabels']")->value('Text Field 1');
+		$this->select($this->byXPath("//div[@id='field_frmnew10']//select[@id='is_active']"))->selectOptionByLabel('Yes');
+		$this->select($this->byXPath("//div[@id='field_frmnew10']//select[@id='show_on_listing']"))->selectOptionByLabel('Yes');
+		$this->select($this->byXPath("//div[@id='field_frmnew10']//select[@id='show_on_detail']"))->selectOptionByLabel('Yes');
+		$this->byXPath("//div[@id='field_frmnew10']//input[@id='cat_sort']")->click();
+		$this->byXPath("//div[@id='field_frmnew10']//input[@id='cat_filter']")->click();
+		$this->byXPath("//div[@id='field_frmnew10']//input[@id='save']")->click();
+		$this->waitForPageLoadAndCheckForErrors();
 
-        //Field 2
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=gd_place_fields_settings&subtab=custom_fields&listing_type=gd_place');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('gt-text')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $link = $this->byXPath("//li[@id='licontainer_new11']/div[contains(@class,'titlenew11')]");
-        $this->moveto($link);
-        $this->doubleclick();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byXPath("//div[@id='field_frmnew11']//input[@id='admin_title']")->value('Text Field 2');
-        $this->byXPath("//div[@id='field_frmnew11']//input[@id='site_title']")->value('Text Field 2');
-        $this->byXPath("//div[@id='field_frmnew11']//input[@id='htmlvar_name']")->value('text_field_2');
-        $this->byXPath("//div[@id='field_frmnew11']//input[@id='clabels']")->value('Text Field 2');
-        $this->select($this->byXPath("//div[@id='field_frmnew11']//select[@id='is_active']"))->selectOptionByLabel('Yes');
-        $this->select($this->byXPath("//div[@id='field_frmnew11']//select[@id='show_on_listing']"))->selectOptionByLabel('Yes');
-        $this->select($this->byXPath("//div[@id='field_frmnew11']//select[@id='show_on_detail']"))->selectOptionByLabel('Yes');
-        $this->byXPath("//div[@id='field_frmnew11']//input[@id='cat_sort']")->click();
-        $this->byXPath("//div[@id='field_frmnew11']//input[@id='cat_filter']")->click();
-        $this->byXPath("//div[@id='field_frmnew11']//input[@id='save']")->click();
-        $this->waitForPageLoadAndCheckForErrors();
-    }
+		//Field 2
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=gd_place_fields_settings&subtab=custom_fields&listing_type=gd_place');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('gt-text')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$link = $this->byXPath("//li[@id='licontainer_new11']/div[contains(@class,'titlenew11')]");
+		$this->moveto($link);
+		$this->doubleclick();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byXPath("//div[@id='field_frmnew11']//input[@id='admin_title']")->value('Text Field 2');
+		$this->byXPath("//div[@id='field_frmnew11']//input[@id='site_title']")->value('Text Field 2');
+		$this->byXPath("//div[@id='field_frmnew11']//input[@id='htmlvar_name']")->value('text_field_2');
+		$this->byXPath("//div[@id='field_frmnew11']//input[@id='clabels']")->value('Text Field 2');
+		$this->select($this->byXPath("//div[@id='field_frmnew11']//select[@id='is_active']"))->selectOptionByLabel('Yes');
+		$this->select($this->byXPath("//div[@id='field_frmnew11']//select[@id='show_on_listing']"))->selectOptionByLabel('Yes');
+		$this->select($this->byXPath("//div[@id='field_frmnew11']//select[@id='show_on_detail']"))->selectOptionByLabel('Yes');
+		$this->byXPath("//div[@id='field_frmnew11']//input[@id='cat_sort']")->click();
+		$this->byXPath("//div[@id='field_frmnew11']//input[@id='cat_filter']")->click();
+		$this->byXPath("//div[@id='field_frmnew11']//input[@id='save']")->click();
+		$this->waitForPageLoadAndCheckForErrors();
+	}
 
-    public function tearDown()
-    {
-        if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            //write current file number to completed.txt
-            $CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
-            $completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
-            fwrite($completed, $CurrentFileNumber);
-        }
-    }
+	public function tearDown()
+	{
+		if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			//write current file number to completed.txt
+			$CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
+			$completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
+			fwrite($completed, $CurrentFileNumber);
+		}
+	}
 }
 ?>
\ No newline at end of file

tests/selenium/stest-10_Add_A_Review.php

Indentation +40 added lines, -40 removed lines

@@ -1,48 +1,48 @@
 <?php
 class AddReview extends GD_Test
 {
-    public function setUp()
-    {
-        parent::setUp();
+	public function setUp()
+	{
+		parent::setUp();
 
-        //skip test if already completed.
-        if ($this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            $this->markTestSkipped('Skipping '.pathinfo(__FILE__, PATHINFO_FILENAME).' since its already completed......');
-            return;
-        } else {
-            $this->prepareSession()->currentWindow()->maximize();
-        }
-    }
+		//skip test if already completed.
+		if ($this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			$this->markTestSkipped('Skipping '.pathinfo(__FILE__, PATHINFO_FILENAME).' since its already completed......');
+			return;
+		} else {
+			$this->prepareSession()->currentWindow()->maximize();
+		}
+	}
 
-    public function testAddReview()
-    {
-        $this->logInfo('Adding a review......');
-        $this->maybeUserLogin(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/', true);
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->prepareSession()->currentWindow()->maximize();
-        $this->ExecuteScript('jQuery(".geodir-tab-head").css("overflow", "hidden");');
-        try {
-            $this->byXPath("//a[text()='Reviews']")->click();
-        } catch (PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
-            if (PHPUnit_Extensions_Selenium2TestCase_WebDriverException::ElementNotVisible == $e->getCode()) {
-                $this->ExecuteScript('jQuery("#geodir-tab-mobile-menu").click();');
-                $this->byXPath("//a[text()='Reviews']")->click();
-            }
-        }
-        $this->ExecuteScript('jQuery("#geodir_overallrating").val("4");');
-        $this->byId('comment')->value('Cool xyz');
-        $this->byId('submit')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-    }
+	public function testAddReview()
+	{
+		$this->logInfo('Adding a review......');
+		$this->maybeUserLogin(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/', true);
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->prepareSession()->currentWindow()->maximize();
+		$this->ExecuteScript('jQuery(".geodir-tab-head").css("overflow", "hidden");');
+		try {
+			$this->byXPath("//a[text()='Reviews']")->click();
+		} catch (PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
+			if (PHPUnit_Extensions_Selenium2TestCase_WebDriverException::ElementNotVisible == $e->getCode()) {
+				$this->ExecuteScript('jQuery("#geodir-tab-mobile-menu").click();');
+				$this->byXPath("//a[text()='Reviews']")->click();
+			}
+		}
+		$this->ExecuteScript('jQuery("#geodir_overallrating").val("4");');
+		$this->byId('comment')->value('Cool xyz');
+		$this->byId('submit')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+	}
 
-    public function tearDown()
-    {
-        if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            //write current file number to completed.txt
-            $CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
-            $completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
-            fwrite($completed, $CurrentFileNumber);
-        }
-    }
+	public function tearDown()
+	{
+		if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			//write current file number to completed.txt
+			$CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
+			$completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
+			fwrite($completed, $CurrentFileNumber);
+		}
+	}
 }
 ?>
\ No newline at end of file

tests/selenium/stest-28_GD_Booster.php

Indentation +45 added lines, -45 removed lines

@@ -1,50 +1,50 @@
 <?php
 class GDBooster extends GD_Test
 {
-    public function setUp()
-    {
-        parent::setUp();
-
-        //skip test if already completed.
-        if ($this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            $this->markTestSkipped('Skipping '.pathinfo(__FILE__, PATHINFO_FILENAME).' since its already completed......');
-            return;
-        } else {
-            $this->prepareSession()->currentWindow()->maximize();
-        }
-    }
-
-    public function testGDBooster()
-    {
-        $this->logInfo('Testing GD booster......');
-
-        //make sure GD Booster plugin active
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        $this->waitForPageLoadAndCheckForErrors();
-
-        $is_active = $this->byId("gd-booster")->attribute('class');
-        if (is_int(strpos($is_active, 'inactive'))) {
-            //Activate Geodirectory Booster
-            $this->maybeActivatePlugin("gd-booster", 20000);
-            //go back to plugin page
-            $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        }
-
-        $is_active1 = $this->byId("gd-booster")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "GD Booster plugin not active");
-
-
-
-    }
-
-    public function tearDown()
-    {
-        if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            //write current file number to completed.txt
-            $CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
-            $completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
-            fwrite($completed, $CurrentFileNumber);
-        }
-    }
+	public function setUp()
+	{
+		parent::setUp();
+
+		//skip test if already completed.
+		if ($this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			$this->markTestSkipped('Skipping '.pathinfo(__FILE__, PATHINFO_FILENAME).' since its already completed......');
+			return;
+		} else {
+			$this->prepareSession()->currentWindow()->maximize();
+		}
+	}
+
+	public function testGDBooster()
+	{
+		$this->logInfo('Testing GD booster......');
+
+		//make sure GD Booster plugin active
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		$this->waitForPageLoadAndCheckForErrors();
+
+		$is_active = $this->byId("gd-booster")->attribute('class');
+		if (is_int(strpos($is_active, 'inactive'))) {
+			//Activate Geodirectory Booster
+			$this->maybeActivatePlugin("gd-booster", 20000);
+			//go back to plugin page
+			$this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		}
+
+		$is_active1 = $this->byId("gd-booster")->attribute('class');
+		$this->assertFalse( strpos($is_active1, 'inactive'), "GD Booster plugin not active");
+
+
+
+	}
+
+	public function tearDown()
+	{
+		if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			//write current file number to completed.txt
+			$CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
+			$completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
+			fwrite($completed, $CurrentFileNumber);
+		}
+	}
 }
 ?>
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
         }
 
         $is_active1 = $this->byId("gd-booster")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "GD Booster plugin not active");
+        $this->assertFalse(strpos($is_active1, 'inactive'), "GD Booster plugin not active");
 
 
 

tests/selenium/stest-06_Search_With_Keyword.php

Indentation +29 added lines, -29 removed lines

@@ -1,39 +1,39 @@
 <?php
 class SearchWithKeyword extends GD_Test
 {
-    public function setUp()
-    {
-        parent::setUp();
+	public function setUp()
+	{
+		parent::setUp();
 
-        //skip test if already completed.
-        if ($this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            $this->markTestSkipped('Skipping '.pathinfo(__FILE__, PATHINFO_FILENAME).' since its already completed......');
-            return;
-        } else {
-            $this->prepareSession()->currentWindow()->maximize();
-        }
-    }
+		//skip test if already completed.
+		if ($this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			$this->markTestSkipped('Skipping '.pathinfo(__FILE__, PATHINFO_FILENAME).' since its already completed......');
+			return;
+		} else {
+			$this->prepareSession()->currentWindow()->maximize();
+		}
+	}
 
-    public function testSearchWithKeyword()
-    {
-        $this->logInfo('Searching with keyword......');
-        $this->url(self::GDTEST_BASE_URL);
-        $this->waitForPageLoadAndCheckForErrors();
+	public function testSearchWithKeyword()
+	{
+		$this->logInfo('Searching with keyword......');
+		$this->url(self::GDTEST_BASE_URL);
+		$this->waitForPageLoadAndCheckForErrors();
 //        $this->byClassName('search_text')->value('Test');
 //        $this->byClassName('geodir_submit_search')->click();
-        $this->url(self::GDTEST_BASE_URL.'?geodir_search=1&stype=gd_place&s=test&snear=&sgeo_lat=&sgeo_lon=');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Search Places For"), "Not in search results page");
-    }
+		$this->url(self::GDTEST_BASE_URL.'?geodir_search=1&stype=gd_place&s=test&snear=&sgeo_lat=&sgeo_lon=');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Search Places For"), "Not in search results page");
+	}
 
-    public function tearDown()
-    {
-        if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            //write current file number to completed.txt
-            $CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
-            $completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
-            fwrite($completed, $CurrentFileNumber);
-        }
-    }
+	public function tearDown()
+	{
+		if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			//write current file number to completed.txt
+			$CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
+			$completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
+			fwrite($completed, $CurrentFileNumber);
+		}
+	}
 }
 ?>
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 //        $this->byClassName('geodir_submit_search')->click();
         $this->url(self::GDTEST_BASE_URL.'?geodir_search=1&stype=gd_place&s=test&snear=&sgeo_lat=&sgeo_lon=');
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Search Places For"), "Not in search results page");
+        $this->assertTrue($this->isTextPresent("Search Places For"), "Not in search results page");
     }
 
     public function tearDown()

tests/selenium/stest-07_Search_With_Near.php

Indentation +29 added lines, -29 removed lines

@@ -1,39 +1,39 @@
 <?php
 class SearchWithNear extends GD_Test
 {
-    public function setUp()
-    {
-        parent::setUp();
+	public function setUp()
+	{
+		parent::setUp();
 
-        //skip test if already completed.
-        if ($this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            $this->markTestSkipped('Skipping '.pathinfo(__FILE__, PATHINFO_FILENAME).' since its already completed......');
-            return;
-        } else {
-            $this->prepareSession()->currentWindow()->maximize();
-        }
-    }
+		//skip test if already completed.
+		if ($this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			$this->markTestSkipped('Skipping '.pathinfo(__FILE__, PATHINFO_FILENAME).' since its already completed......');
+			return;
+		} else {
+			$this->prepareSession()->currentWindow()->maximize();
+		}
+	}
 
-    public function testSearchWithNear()
-    {
-        $this->logInfo('Searching with near......');
-        $this->url(self::GDTEST_BASE_URL);
-        $this->waitForPageLoadAndCheckForErrors();
+	public function testSearchWithNear()
+	{
+		$this->logInfo('Searching with near......');
+		$this->url(self::GDTEST_BASE_URL);
+		$this->waitForPageLoadAndCheckForErrors();
 //        $this->byClassName('snear')->value('New York');
 //        $this->byClassName('geodir_submit_search')->click();
-        $this->url(self::GDTEST_BASE_URL.'?geodir_search=1&stype=gd_place&s=+&snear=New+York&sgeo_lat=40.7127837&sgeo_lon=-74.00594130000002');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Search Places"), "Not in search results page");
-    }
+		$this->url(self::GDTEST_BASE_URL.'?geodir_search=1&stype=gd_place&s=+&snear=New+York&sgeo_lat=40.7127837&sgeo_lon=-74.00594130000002');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Search Places"), "Not in search results page");
+	}
 
-    public function tearDown()
-    {
-        if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            //write current file number to completed.txt
-            $CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
-            $completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
-            fwrite($completed, $CurrentFileNumber);
-        }
-    }
+	public function tearDown()
+	{
+		if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			//write current file number to completed.txt
+			$CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
+			$completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
+			fwrite($completed, $CurrentFileNumber);
+		}
+	}
 }
 ?>
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 //        $this->byClassName('geodir_submit_search')->click();
         $this->url(self::GDTEST_BASE_URL.'?geodir_search=1&stype=gd_place&s=+&snear=New+York&sgeo_lat=40.7127837&sgeo_lon=-74.00594130000002');
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Search Places"), "Not in search results page");
+        $this->assertTrue($this->isTextPresent("Search Places"), "Not in search results page");
     }
 
     public function tearDown()

tests/selenium/stest-19_Switch_Locations.php

Indentation +166 added lines, -166 removed lines

@@ -1,171 +1,171 @@
 <?php
 class SwitchLocations extends GD_Test
 {
-    public function setUp()
-    {
-        parent::setUp();
-
-        //skip test if already completed.
-        if ($this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            $this->markTestSkipped('Skipping '.pathinfo(__FILE__, PATHINFO_FILENAME).' since its already completed......');
-            return;
-        } else {
-            $this->prepareSession()->currentWindow()->maximize();
-        }
-    }
-
-    public function testSwitchLocations()
-    {
-        $this->logInfo('Switch locations......');
-        //make sure multi locations plugin active
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        $this->waitForPageLoadAndCheckForErrors();
-
-        $is_active = $this->byId("geodirectory-location-manager")->attribute('class');
-        if (is_int(strpos($is_active, 'inactive'))) {
-            //Activate Geodirectory Location Manager
-            $this->maybeActivatePlugin("geodirectory-location-manager", 20000);
-            //go back to plugin page
-            $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        }
-
-        $is_active1 = $this->byId("geodirectory-location-manager")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "Location Manager plugin not active");
-
-
-        //Make sure Show location switcher in menu checked.
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=managelocation_fields&subtab=geodir_location_setting');
-        $this->waitForPageLoadAndCheckForErrors();
-        $is_checked = $this->byId('geodir_show_changelocation_nave')->attribute('checked');
-        if (!$is_checked) {
-            $this->byId('geodir_show_changelocation_nave')->click();
-            $this->byClassName('button-primary')->click();
-            $this->waitForPageLoadAndCheckForErrors();
-        }
-
-        //Set Navigation Locations
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=design_settings');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byLinkText('Navigation')->click();
-        $this->ExecuteScript('jQuery("#geodir_theme_location_nav").show();');
-        $this->select($this->byId('geodir_theme_location_nav'))->selectOptionByLabel('The Main Menu');
-        $this->byName('save')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-
-        //Add new location
-        //make sure multi locations plugin active
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        $this->waitForPageLoadAndCheckForErrors();
-
-        $is_active = $this->byId("geodirectory-location-manager")->attribute('class');
-        if (is_int(strpos($is_active, 'inactive'))) {
-            //Activate Geodirectory Location Manager
-            $this->maybeActivatePlugin("geodirectory-location-manager", 20000);
-            //go back to plugin page
-            $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        }
-
-        $is_active1 = $this->byId("geodirectory-location-manager")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "Location Manager plugin not active");
-
-        // Add few locations
-        // Las vegas
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=managelocation_fields&subtab=geodir_location_addedit');
-        $this->prepareSession()->currentWindow()->maximize();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('gd_city')->value('Las Vegas');
-        $this->byId('gd_region')->value('Nevada');
-        $this->byId('gd_set_address_button')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('geodir_location_save')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
-
-        //London
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=managelocation_fields&subtab=geodir_location_addedit');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('gd_city')->value('London');
-        $this->byId('gd_region')->value('Greater London');
-        $this->byId('gd_set_address_button')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('geodir_location_save')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
-
-        //Glasgow
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=managelocation_fields&subtab=geodir_location_addedit');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('gd_city')->value('Glasgow');
-        $this->byId('gd_region')->value('Glasgow City');
-        $this->byId('gd_set_address_button')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('geodir_location_save')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
-
-        //Mexico City
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=managelocation_fields&subtab=geodir_location_addedit');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('gd_city')->value('Mexico City');
-        $this->byId('gd_region')->value('Federal District');
-        $this->byId('gd_set_address_button')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('geodir_location_save')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
-
-        //sydney
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=managelocation_fields&subtab=geodir_location_addedit');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('gd_city')->value('sydney');
-        $this->byId('gd_region')->value('New South Wales');
-        $this->byId('gd_set_address_button')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('geodir_location_save')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
-
-        //tokyo
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=managelocation_fields&subtab=geodir_location_addedit');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('gd_city')->value('tokyo');
-        $this->byId('gd_region')->value('Tokyo');
-        $this->byId('gd_set_address_button')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('geodir_location_save')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
-
-        //Chennai
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=managelocation_fields&subtab=geodir_location_addedit');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('gd_city')->value('Chennai');
-        $this->byId('gd_region')->value('Tamil Nadu');
-        $this->byId('gd_set_address_button')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('geodir_location_save')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
-
-
-        //front end switch locations
-        $this->url(self::GDTEST_BASE_URL.'location/united-states/nevada/las-vegas/');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Las Vegas"), "'Las Vegas' text not found");
-
-        $this->url(self::GDTEST_BASE_URL.'location/united-states/new-york/new-york/');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("New York"), "'New York' text not found");
-    }
-
-    public function tearDown()
-    {
-        if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            //write current file number to completed.txt
-            $CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
-            $completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
-            fwrite($completed, $CurrentFileNumber);
-        }
-    }
+	public function setUp()
+	{
+		parent::setUp();
+
+		//skip test if already completed.
+		if ($this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			$this->markTestSkipped('Skipping '.pathinfo(__FILE__, PATHINFO_FILENAME).' since its already completed......');
+			return;
+		} else {
+			$this->prepareSession()->currentWindow()->maximize();
+		}
+	}
+
+	public function testSwitchLocations()
+	{
+		$this->logInfo('Switch locations......');
+		//make sure multi locations plugin active
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		$this->waitForPageLoadAndCheckForErrors();
+
+		$is_active = $this->byId("geodirectory-location-manager")->attribute('class');
+		if (is_int(strpos($is_active, 'inactive'))) {
+			//Activate Geodirectory Location Manager
+			$this->maybeActivatePlugin("geodirectory-location-manager", 20000);
+			//go back to plugin page
+			$this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		}
+
+		$is_active1 = $this->byId("geodirectory-location-manager")->attribute('class');
+		$this->assertFalse( strpos($is_active1, 'inactive'), "Location Manager plugin not active");
+
+
+		//Make sure Show location switcher in menu checked.
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=managelocation_fields&subtab=geodir_location_setting');
+		$this->waitForPageLoadAndCheckForErrors();
+		$is_checked = $this->byId('geodir_show_changelocation_nave')->attribute('checked');
+		if (!$is_checked) {
+			$this->byId('geodir_show_changelocation_nave')->click();
+			$this->byClassName('button-primary')->click();
+			$this->waitForPageLoadAndCheckForErrors();
+		}
+
+		//Set Navigation Locations
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=design_settings');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byLinkText('Navigation')->click();
+		$this->ExecuteScript('jQuery("#geodir_theme_location_nav").show();');
+		$this->select($this->byId('geodir_theme_location_nav'))->selectOptionByLabel('The Main Menu');
+		$this->byName('save')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+
+		//Add new location
+		//make sure multi locations plugin active
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		$this->waitForPageLoadAndCheckForErrors();
+
+		$is_active = $this->byId("geodirectory-location-manager")->attribute('class');
+		if (is_int(strpos($is_active, 'inactive'))) {
+			//Activate Geodirectory Location Manager
+			$this->maybeActivatePlugin("geodirectory-location-manager", 20000);
+			//go back to plugin page
+			$this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		}
+
+		$is_active1 = $this->byId("geodirectory-location-manager")->attribute('class');
+		$this->assertFalse( strpos($is_active1, 'inactive'), "Location Manager plugin not active");
+
+		// Add few locations
+		// Las vegas
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=managelocation_fields&subtab=geodir_location_addedit');
+		$this->prepareSession()->currentWindow()->maximize();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('gd_city')->value('Las Vegas');
+		$this->byId('gd_region')->value('Nevada');
+		$this->byId('gd_set_address_button')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('geodir_location_save')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
+
+		//London
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=managelocation_fields&subtab=geodir_location_addedit');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('gd_city')->value('London');
+		$this->byId('gd_region')->value('Greater London');
+		$this->byId('gd_set_address_button')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('geodir_location_save')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
+
+		//Glasgow
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=managelocation_fields&subtab=geodir_location_addedit');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('gd_city')->value('Glasgow');
+		$this->byId('gd_region')->value('Glasgow City');
+		$this->byId('gd_set_address_button')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('geodir_location_save')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
+
+		//Mexico City
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=managelocation_fields&subtab=geodir_location_addedit');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('gd_city')->value('Mexico City');
+		$this->byId('gd_region')->value('Federal District');
+		$this->byId('gd_set_address_button')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('geodir_location_save')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
+
+		//sydney
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=managelocation_fields&subtab=geodir_location_addedit');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('gd_city')->value('sydney');
+		$this->byId('gd_region')->value('New South Wales');
+		$this->byId('gd_set_address_button')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('geodir_location_save')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
+
+		//tokyo
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=managelocation_fields&subtab=geodir_location_addedit');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('gd_city')->value('tokyo');
+		$this->byId('gd_region')->value('Tokyo');
+		$this->byId('gd_set_address_button')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('geodir_location_save')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
+
+		//Chennai
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=managelocation_fields&subtab=geodir_location_addedit');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('gd_city')->value('Chennai');
+		$this->byId('gd_region')->value('Tamil Nadu');
+		$this->byId('gd_set_address_button')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('geodir_location_save')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
+
+
+		//front end switch locations
+		$this->url(self::GDTEST_BASE_URL.'location/united-states/nevada/las-vegas/');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Las Vegas"), "'Las Vegas' text not found");
+
+		$this->url(self::GDTEST_BASE_URL.'location/united-states/new-york/new-york/');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("New York"), "'New York' text not found");
+	}
+
+	public function tearDown()
+	{
+		if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			//write current file number to completed.txt
+			$CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
+			$completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
+			fwrite($completed, $CurrentFileNumber);
+		}
+	}
 }
 ?>
\ No newline at end of file

Spacing +11 added lines, -11 removed lines

@@ -30,7 +30,7 @@ 
         }
 
         $is_active1 = $this->byId("geodirectory-location-manager")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "Location Manager plugin not active");
+        $this->assertFalse(strpos($is_active1, 'inactive'), "Location Manager plugin not active");
 
 
         //Make sure Show location switcher in menu checked.
@@ -66,7 +66,7 @@ 
         }
 
         $is_active1 = $this->byId("geodirectory-location-manager")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "Location Manager plugin not active");
+        $this->assertFalse(strpos($is_active1, 'inactive'), "Location Manager plugin not active");
 
         // Add few locations
         // Las vegas
@@ -79,7 +79,7 @@ 
         $this->waitForPageLoadAndCheckForErrors();
         $this->byId('geodir_location_save')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
+        $this->assertTrue($this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
 
         //London
         $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=managelocation_fields&subtab=geodir_location_addedit');
@@ -90,7 +90,7 @@ 
         $this->waitForPageLoadAndCheckForErrors();
         $this->byId('geodir_location_save')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
+        $this->assertTrue($this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
 
         //Glasgow
         $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=managelocation_fields&subtab=geodir_location_addedit');
@@ -101,7 +101,7 @@ 
         $this->waitForPageLoadAndCheckForErrors();
         $this->byId('geodir_location_save')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
+        $this->assertTrue($this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
 
         //Mexico City
         $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=managelocation_fields&subtab=geodir_location_addedit');
@@ -112,7 +112,7 @@ 
         $this->waitForPageLoadAndCheckForErrors();
         $this->byId('geodir_location_save')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
+        $this->assertTrue($this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
 
         //sydney
         $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=managelocation_fields&subtab=geodir_location_addedit');
@@ -123,7 +123,7 @@ 
         $this->waitForPageLoadAndCheckForErrors();
         $this->byId('geodir_location_save')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
+        $this->assertTrue($this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
 
         //tokyo
         $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=managelocation_fields&subtab=geodir_location_addedit');
@@ -134,7 +134,7 @@ 
         $this->waitForPageLoadAndCheckForErrors();
         $this->byId('geodir_location_save')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
+        $this->assertTrue($this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
 
         //Chennai
         $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=managelocation_fields&subtab=geodir_location_addedit');
@@ -145,17 +145,17 @@ 
         $this->waitForPageLoadAndCheckForErrors();
         $this->byId('geodir_location_save')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
+        $this->assertTrue($this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
 
 
         //front end switch locations
         $this->url(self::GDTEST_BASE_URL.'location/united-states/nevada/las-vegas/');
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Las Vegas"), "'Las Vegas' text not found");
+        $this->assertTrue($this->isTextPresent("Las Vegas"), "'Las Vegas' text not found");
 
         $this->url(self::GDTEST_BASE_URL.'location/united-states/new-york/new-york/');
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("New York"), "'New York' text not found");
+        $this->assertTrue($this->isTextPresent("New York"), "'New York' text not found");
     }
 
     public function tearDown()

tests/selenium/stest-40_Check_Login_Box.php

Indentation +34 added lines, -34 removed lines

@@ -1,42 +1,42 @@
 <?php
 class CheckLoginBox extends GD_Test
 {
-    public function setUp()
-    {
-        parent::setUp();
+	public function setUp()
+	{
+		parent::setUp();
 
-        //skip test if already completed.
-        if ($this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            $this->markTestSkipped('Skipping '.pathinfo(__FILE__, PATHINFO_FILENAME).' since its already completed......');
-            return;
-        } else {
-            $this->prepareSession()->currentWindow()->maximize();
-        }
-    }
+		//skip test if already completed.
+		if ($this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			$this->markTestSkipped('Skipping '.pathinfo(__FILE__, PATHINFO_FILENAME).' since its already completed......');
+			return;
+		} else {
+			$this->prepareSession()->currentWindow()->maximize();
+		}
+	}
 
-    public function testCheckLoginBox()
-    {
-        $this->logInfo('Testing login box......');
-        $this->url(self::GDTEST_BASE_URL);
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("gdf_welcome_login_wrap"), "Login welcome widget not found");
-        $this->byName('log')->value('testuser@test.com');
-        $this->byName('pwd')->value('1');
-        // Submit the form
-        $this->byClassName('b_signin')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertFalse( $this->isTextPresent("Invalid Username/Password."), "Invalid Username/Password.");
-        $this->assertTrue( $this->isTextPresent("Welcome,"), "Welcome text not found");
-    }
+	public function testCheckLoginBox()
+	{
+		$this->logInfo('Testing login box......');
+		$this->url(self::GDTEST_BASE_URL);
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("gdf_welcome_login_wrap"), "Login welcome widget not found");
+		$this->byName('log')->value('testuser@test.com');
+		$this->byName('pwd')->value('1');
+		// Submit the form
+		$this->byClassName('b_signin')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertFalse( $this->isTextPresent("Invalid Username/Password."), "Invalid Username/Password.");
+		$this->assertTrue( $this->isTextPresent("Welcome,"), "Welcome text not found");
+	}
 
-    public function tearDown()
-    {
-        if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            //write current file number to completed.txt
-            $CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
-            $completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
-            fwrite($completed, $CurrentFileNumber);
-        }
-    }
+	public function tearDown()
+	{
+		if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			//write current file number to completed.txt
+			$CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
+			$completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
+			fwrite($completed, $CurrentFileNumber);
+		}
+	}
 }
 ?>
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -19,14 +19,14 @@
         $this->logInfo('Testing login box......');
         $this->url(self::GDTEST_BASE_URL);
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("gdf_welcome_login_wrap"), "Login welcome widget not found");
+        $this->assertTrue($this->isTextPresent("gdf_welcome_login_wrap"), "Login welcome widget not found");
         $this->byName('log')->value('testuser@test.com');
         $this->byName('pwd')->value('1');
         // Submit the form
         $this->byClassName('b_signin')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertFalse( $this->isTextPresent("Invalid Username/Password."), "Invalid Username/Password.");
-        $this->assertTrue( $this->isTextPresent("Welcome,"), "Welcome text not found");
+        $this->assertFalse($this->isTextPresent("Invalid Username/Password."), "Invalid Username/Password.");
+        $this->assertTrue($this->isTextPresent("Welcome,"), "Welcome text not found");
     }
 
     public function tearDown()