GeoDirectory / geodirectory

tests/selenium/stest-23_Check_PinPoint.php

Indentation +29 added lines, -29 removed lines

@@ -1,37 +1,37 @@
 <?php
 class CheckPinpoint 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 testCheckPinpoint()
-    {
-        $this->logInfo('Checking pin point......');
-        $this->url(self::GDTEST_BASE_URL.'places/');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->ExecuteScript('jQuery("a.geodir-pinpoint-link").trigger("mouseover");');
-        $this->waitForPageLoadAndCheckForErrors(5000);
-        $this->ExecuteScript('jQuery("a.geodir-pinpoint-link").trigger("mouseout");');
-    }
+	public function testCheckPinpoint()
+	{
+		$this->logInfo('Checking pin point......');
+		$this->url(self::GDTEST_BASE_URL.'places/');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->ExecuteScript('jQuery("a.geodir-pinpoint-link").trigger("mouseover");');
+		$this->waitForPageLoadAndCheckForErrors(5000);
+		$this->ExecuteScript('jQuery("a.geodir-pinpoint-link").trigger("mouseout");');
+	}
 
-    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-32_Social_Importer.php

Indentation +108 added lines, -108 removed lines

@@ -1,113 +1,113 @@
 <?php
 class SocialImporter 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 testSocialImporter()
-    {
-        $this->logInfo('Testing social importer......');
-        //make sure Social Importer plugin active
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        $this->waitForPageLoadAndCheckForErrors();
-
-        $is_active = $this->byId("geodirectory-social-importer")->attribute('class');
-        if (is_int(strpos($is_active, 'inactive'))) {
-            //Activate Geodirectory Social Importer
-            $this->maybeActivatePlugin("geodirectory-social-importer", 20000);
-            //go back to plugin page
-            $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        }
-
-        $is_active1 = $this->byId("geodirectory-social-importer")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "Social Importer plugin not active");
-
-        $stop_script = false;
-
-        $fb_app_id  = getenv( 'FACEBOOK_APP_ID' );
-        $fb_app_secret  = getenv( 'FACEBOOK_APP_SECRET' );
-        $yelp_key  = getenv( 'YELP_KEY' );
-        $yelp_key_secret  = getenv( 'YELP_KEY_SECRET' );
-        $yelp_token  = getenv( 'YELP_TOKEN' );
-        $yelp_token_secret  = getenv( 'YELP_TOKEN_SECRET' );
-
-        if (!$fb_app_id) {
-            $this->logError("ENV variable FACEBOOK_APP_ID not available");
-            $stop_script = true;
-        }
-
-        if (!$fb_app_secret) {
-            $this->logError("ENV variable FACEBOOK_APP_SECRET not available");
-            $stop_script = true;
-        }
-
-        if (!$yelp_key) {
-            $this->logError("ENV variable YELP_KEY not available");
-            $stop_script = true;
-        }
-
-        if (!$yelp_key_secret) {
-            $this->logError("ENV variable YELP_KEY_SECRET not available");
-            $stop_script = true;
-        }
-
-        if (!$yelp_token) {
-            $this->logError("ENV variable YELP_TOKEN not available");
-            $stop_script = true;
-        }
-
-        if (!$yelp_token_secret) {
-            $this->logError("ENV variable YELP_TOKEN_SECRET not available");
-            $stop_script = true;
-        }
-
-        if($stop_script) {
-            $this->logInfo("Stopping the script. Please fix the errors to continue");
-            return;
-        }
-
-        // facebook
-        $this->url(self::GDTEST_BASE_URL.'admin.php?page=geodirectory&tab=facebook_integration&subtab=geodir_gdfi_options');
-        $this->byId('gdfi_app_id')->value($fb_app_id);
-        $this->byId('gdfi_app_secret')->value($fb_app_secret);
-        $this->byName('gdfi_facebook_integration_options_save')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-
-        //yelp
-        $this->url(self::GDTEST_BASE_URL.'admin.php?page=geodirectory&tab=facebook_integration&subtab=manage_gdfi_options_yelp');
-        $this->byId('gdfi_yelp_key')->value($yelp_key);
-        $this->byId('gdfi_yelp_key_secret')->value($yelp_key_secret);
-        $this->byId('gdfi_yelp_token')->value($yelp_token);
-        $this->byId('gdfi_yelp_token_secret')->value($yelp_token_secret);
-        $this->byName('gdfi_yelp_integration_options_save')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-
-        // import listing
-        $this->url(self::GDTEST_BASE_URL.'add-listing/?listing_type=gd_place');
-        $this->byId('gdfi_import_url')->value('http://www.yelp.com/biz/mcdonalds-mountain-view-3');
-        $this->byId('gd_facebook_import')->click();
-
-
-    }
-
-    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 testSocialImporter()
+	{
+		$this->logInfo('Testing social importer......');
+		//make sure Social Importer plugin active
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		$this->waitForPageLoadAndCheckForErrors();
+
+		$is_active = $this->byId("geodirectory-social-importer")->attribute('class');
+		if (is_int(strpos($is_active, 'inactive'))) {
+			//Activate Geodirectory Social Importer
+			$this->maybeActivatePlugin("geodirectory-social-importer", 20000);
+			//go back to plugin page
+			$this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		}
+
+		$is_active1 = $this->byId("geodirectory-social-importer")->attribute('class');
+		$this->assertFalse( strpos($is_active1, 'inactive'), "Social Importer plugin not active");
+
+		$stop_script = false;
+
+		$fb_app_id  = getenv( 'FACEBOOK_APP_ID' );
+		$fb_app_secret  = getenv( 'FACEBOOK_APP_SECRET' );
+		$yelp_key  = getenv( 'YELP_KEY' );
+		$yelp_key_secret  = getenv( 'YELP_KEY_SECRET' );
+		$yelp_token  = getenv( 'YELP_TOKEN' );
+		$yelp_token_secret  = getenv( 'YELP_TOKEN_SECRET' );
+
+		if (!$fb_app_id) {
+			$this->logError("ENV variable FACEBOOK_APP_ID not available");
+			$stop_script = true;
+		}
+
+		if (!$fb_app_secret) {
+			$this->logError("ENV variable FACEBOOK_APP_SECRET not available");
+			$stop_script = true;
+		}
+
+		if (!$yelp_key) {
+			$this->logError("ENV variable YELP_KEY not available");
+			$stop_script = true;
+		}
+
+		if (!$yelp_key_secret) {
+			$this->logError("ENV variable YELP_KEY_SECRET not available");
+			$stop_script = true;
+		}
+
+		if (!$yelp_token) {
+			$this->logError("ENV variable YELP_TOKEN not available");
+			$stop_script = true;
+		}
+
+		if (!$yelp_token_secret) {
+			$this->logError("ENV variable YELP_TOKEN_SECRET not available");
+			$stop_script = true;
+		}
+
+		if($stop_script) {
+			$this->logInfo("Stopping the script. Please fix the errors to continue");
+			return;
+		}
+
+		// facebook
+		$this->url(self::GDTEST_BASE_URL.'admin.php?page=geodirectory&tab=facebook_integration&subtab=geodir_gdfi_options');
+		$this->byId('gdfi_app_id')->value($fb_app_id);
+		$this->byId('gdfi_app_secret')->value($fb_app_secret);
+		$this->byName('gdfi_facebook_integration_options_save')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+
+		//yelp
+		$this->url(self::GDTEST_BASE_URL.'admin.php?page=geodirectory&tab=facebook_integration&subtab=manage_gdfi_options_yelp');
+		$this->byId('gdfi_yelp_key')->value($yelp_key);
+		$this->byId('gdfi_yelp_key_secret')->value($yelp_key_secret);
+		$this->byId('gdfi_yelp_token')->value($yelp_token);
+		$this->byId('gdfi_yelp_token_secret')->value($yelp_token_secret);
+		$this->byName('gdfi_yelp_integration_options_save')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+
+		// import listing
+		$this->url(self::GDTEST_BASE_URL.'add-listing/?listing_type=gd_place');
+		$this->byId('gdfi_import_url')->value('http://www.yelp.com/biz/mcdonalds-mountain-view-3');
+		$this->byId('gd_facebook_import')->click();
+
+
+	}
+
+	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 +8 added lines, -8 removed lines

@@ -30,16 +30,16 @@ 
         }
 
         $is_active1 = $this->byId("geodirectory-social-importer")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "Social Importer plugin not active");
+        $this->assertFalse(strpos($is_active1, 'inactive'), "Social Importer plugin not active");
 
         $stop_script = false;
 
-        $fb_app_id  = getenv( 'FACEBOOK_APP_ID' );
-        $fb_app_secret  = getenv( 'FACEBOOK_APP_SECRET' );
-        $yelp_key  = getenv( 'YELP_KEY' );
-        $yelp_key_secret  = getenv( 'YELP_KEY_SECRET' );
-        $yelp_token  = getenv( 'YELP_TOKEN' );
-        $yelp_token_secret  = getenv( 'YELP_TOKEN_SECRET' );
+        $fb_app_id = getenv('FACEBOOK_APP_ID');
+        $fb_app_secret = getenv('FACEBOOK_APP_SECRET');
+        $yelp_key = getenv('YELP_KEY');
+        $yelp_key_secret = getenv('YELP_KEY_SECRET');
+        $yelp_token = getenv('YELP_TOKEN');
+        $yelp_token_secret = getenv('YELP_TOKEN_SECRET');
 
         if (!$fb_app_id) {
             $this->logError("ENV variable FACEBOOK_APP_ID not available");
@@ -71,7 +71,7 @@ 
             $stop_script = true;
         }
 
-        if($stop_script) {
+        if ($stop_script) {
             $this->logInfo("Stopping the script. Please fix the errors to continue");
             return;
         }

tests/selenium/stest-42_Test_Dummy_Data.php

Indentation +55 added lines, -55 removed lines

@@ -1,60 +1,60 @@
 <?php
 class TestDummyData 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 testTestDummyData()
-    {
-        $this->logInfo('Testing dummy data......');
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=general_settings');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byLinkText('Dummy Data')->click();
-
-        $html = $this->byId('sub_dummy_data_settings')->attribute('innerHTML');
-        if (is_int(strpos($html, 'Yes Delete Please!'))) {
-            //delete event data
-        }
-
-
-        //make sure event manager plugin active
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        $this->waitForPageLoadAndCheckForErrors();
-        $is_active = $this->byId("geodirectory-events")->attribute('class');
-        $this->assertFalse( strpos($is_active, 'inactive'), "event manager plugin not active");
-        if (strpos($is_active, 'inactive')) {
-            return;
-        }
-
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=general_settings');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byLinkText('Event Dummy Data')->click();
-
-        $html = $this->byId('sub_gdevent_dummy_data_settings')->attribute('innerHTML');
-        if (is_int(strpos($html, 'Yes Delete Please!'))) {
-            //delete event data
-        }
-
-    }
-
-    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 testTestDummyData()
+	{
+		$this->logInfo('Testing dummy data......');
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=general_settings');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byLinkText('Dummy Data')->click();
+
+		$html = $this->byId('sub_dummy_data_settings')->attribute('innerHTML');
+		if (is_int(strpos($html, 'Yes Delete Please!'))) {
+			//delete event data
+		}
+
+
+		//make sure event manager plugin active
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		$this->waitForPageLoadAndCheckForErrors();
+		$is_active = $this->byId("geodirectory-events")->attribute('class');
+		$this->assertFalse( strpos($is_active, 'inactive'), "event manager plugin not active");
+		if (strpos($is_active, 'inactive')) {
+			return;
+		}
+
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=general_settings');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byLinkText('Event Dummy Data')->click();
+
+		$html = $this->byId('sub_gdevent_dummy_data_settings')->attribute('innerHTML');
+		if (is_int(strpos($html, 'Yes Delete Please!'))) {
+			//delete event data
+		}
+
+	}
+
+	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 @@
         $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
         $this->waitForPageLoadAndCheckForErrors();
         $is_active = $this->byId("geodirectory-events")->attribute('class');
-        $this->assertFalse( strpos($is_active, 'inactive'), "event manager plugin not active");
+        $this->assertFalse(strpos($is_active, 'inactive'), "event manager plugin not active");
         if (strpos($is_active, 'inactive')) {
             return;
         }

tests/selenium/base.php

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-09_Sort_Listing.php

Indentation +63 added lines, -63 removed lines

@@ -1,40 +1,40 @@ 
 <?php
 class SortListing 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 testSortListing()
-    {
-        $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();
+	public function testSortListing()
+	{
+		$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_new9']/div[contains(@class,'titlenew9')]");
-        $this->moveto($link);
-        $this->doubleclick();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byXPath("//div[@id='field_frmnew9']//input[@id='admin_title']")->value('Price');
-        $this->byXPath("//div[@id='field_frmnew9']//input[@id='site_title']")->value('Price');
-        $this->byXPath("//div[@id='field_frmnew9']//input[@id='htmlvar_name']")->value('price');
-        $this->byXPath("//div[@id='field_frmnew9']//input[@id='clabels']")->value('Price');
-        $this->select($this->byXPath("//div[@id='field_frmnew9']//select[@id='is_active']"))->selectOptionByLabel('Yes');
-        $this->select($this->byXPath("//div[@id='field_frmnew9']//select[@id='show_on_listing']"))->selectOptionByLabel('Yes');
-        $this->select($this->byXPath("//div[@id='field_frmnew9']//select[@id='show_on_detail']"))->selectOptionByLabel('Yes');
-        $this->byXPath("//div[@id='field_frmnew9']//input[@id='cat_sort']")->click();
-        $this->byXPath("//div[@id='field_frmnew9']//input[@id='cat_filter']")->click();
-        $this->byXPath("//div[@id='field_frmnew9']//input[@id='save']")->click();
+		$link = $this->byXPath("//li[@id='licontainer_new9']/div[contains(@class,'titlenew9')]");
+		$this->moveto($link);
+		$this->doubleclick();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byXPath("//div[@id='field_frmnew9']//input[@id='admin_title']")->value('Price');
+		$this->byXPath("//div[@id='field_frmnew9']//input[@id='site_title']")->value('Price');
+		$this->byXPath("//div[@id='field_frmnew9']//input[@id='htmlvar_name']")->value('price');
+		$this->byXPath("//div[@id='field_frmnew9']//input[@id='clabels']")->value('Price');
+		$this->select($this->byXPath("//div[@id='field_frmnew9']//select[@id='is_active']"))->selectOptionByLabel('Yes');
+		$this->select($this->byXPath("//div[@id='field_frmnew9']//select[@id='show_on_listing']"))->selectOptionByLabel('Yes');
+		$this->select($this->byXPath("//div[@id='field_frmnew9']//select[@id='show_on_detail']"))->selectOptionByLabel('Yes');
+		$this->byXPath("//div[@id='field_frmnew9']//input[@id='cat_sort']")->click();
+		$this->byXPath("//div[@id='field_frmnew9']//input[@id='cat_filter']")->click();
+		$this->byXPath("//div[@id='field_frmnew9']//input[@id='save']")->click();
 //        $this->byId('admin_title')->value('Price');
 //        $this->byId('site_title')->value('Price');
 //        $this->byId('htmlvar_name')->value('price');
@@ -45,10 +45,10 @@ 
 //        $this->byId('cat_sort')->click();
 //        $this->byId('cat_filter')->click();
 //        $this->byId('save')->click();
-        $this->waitForPageLoadAndCheckForErrors();
+		$this->waitForPageLoadAndCheckForErrors();
 
-        $this->logInfo('Testing list sorting......');
-        //Make sure sorting options available
+		$this->logInfo('Testing list sorting......');
+		//Make sure sorting options available
 //        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=gd_place_fields_settings&subtab=sorting_options&listing_type=gd_place');
 //        $this->waitForPageLoadAndCheckForErrors();
 //        $this->byId('gt-text-_-geodir_price')->click();
@@ -63,37 +63,37 @@ 
 //        $this->byXPath("//div[@id='field_frmnew-1']//input[@id='save']")->click();
 //        $this->waitForPageLoadAndCheckForErrors();
 
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=gd_place_fields_settings&subtab=sorting_options&listing_type=gd_place');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('gt-float-_-overall_rating')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $link = $this->byXPath("//li[@id='licontainer_new-1']/div");
-        $this->moveto($link);
-        $this->doubleclick();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byXPath("//li[@id='licontainer_new-1']//input[@id='asc_title']")->value('Rating ASC');
-        $this->byXPath("//li[@id='licontainer_new-1']//input[@id='asc']")->click();
-        $this->byXPath("//li[@id='licontainer_new-1']//input[contains(@name,'is_default') and contains(@value,'overall_rating_asc')]")->click();
-        $this->byXPath("//li[@id='licontainer_new-1']//input[@id='desc']")->click();
-        $this->byXPath("//li[@id='licontainer_new-1']//input[@id='desc_title']")->value('Rating DESC');
-        $this->byXPath("//li[@id='licontainer_new-1']//input[@id='save']")->click();
-        $this->waitForPageLoadAndCheckForErrors();
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=gd_place_fields_settings&subtab=sorting_options&listing_type=gd_place');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('gt-float-_-overall_rating')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$link = $this->byXPath("//li[@id='licontainer_new-1']/div");
+		$this->moveto($link);
+		$this->doubleclick();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byXPath("//li[@id='licontainer_new-1']//input[@id='asc_title']")->value('Rating ASC');
+		$this->byXPath("//li[@id='licontainer_new-1']//input[@id='asc']")->click();
+		$this->byXPath("//li[@id='licontainer_new-1']//input[contains(@name,'is_default') and contains(@value,'overall_rating_asc')]")->click();
+		$this->byXPath("//li[@id='licontainer_new-1']//input[@id='desc']")->click();
+		$this->byXPath("//li[@id='licontainer_new-1']//input[@id='desc_title']")->value('Rating DESC');
+		$this->byXPath("//li[@id='licontainer_new-1']//input[@id='save']")->click();
+		$this->waitForPageLoadAndCheckForErrors();
 
 
-        $this->url(self::GDTEST_BASE_URL.'places/');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->select($this->byId('sort_by'))->selectOptionByLabel('Rating DESC');
-        $this->waitForPageLoadAndCheckForErrors();
-    }
+		$this->url(self::GDTEST_BASE_URL.'places/');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->select($this->byId('sort_by'))->selectOptionByLabel('Rating DESC');
+		$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-21_Search_Near_Me.php

Indentation +25 added lines, -25 removed lines

@@ -1,23 +1,23 @@ 
 <?php
 class SearchNearMe 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 testSearchNearMe()
-    {
-        $this->logInfo('Test search near me......');
-        $this->logInfo('Skipping since user need to share the location manually......');
+	public function testSearchNearMe()
+	{
+		$this->logInfo('Test search near me......');
+		$this->logInfo('Skipping since user need to share the location manually......');
 //        $this->logInfo('Test search near me......');
 //        //make sure event manager plugin active
 //        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
@@ -44,16 +44,16 @@ 
 //        $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

tests/selenium/stest-16_Add_New_Price.php

Indentation +33 added lines, -33 removed lines

@@ -1,41 +1,41 @@
 <?php
 class AddNewPrice 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 testAddNewPrice()
-    {
-        $this->logInfo('Add a new price......');
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=paymentmanager_fields&subtab=geodir_payment_manager&gd_pagetype=addeditprice');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Add Price"), "Add Price text not found");
-        $this->byId('title')->value('Premium Plus');
-        $this->byId('days')->value('0');
-        $this->byName('gd_amount')->value('5');
-        $this->select($this->byName('gd_status'))->selectOptionByValue(1);
-        $this->byName('submit')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-    }
+	public function testAddNewPrice()
+	{
+		$this->logInfo('Add a new price......');
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=paymentmanager_fields&subtab=geodir_payment_manager&gd_pagetype=addeditprice');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Add Price"), "Add Price text not found");
+		$this->byId('title')->value('Premium Plus');
+		$this->byId('days')->value('0');
+		$this->byName('gd_amount')->value('5');
+		$this->select($this->byName('gd_status'))->selectOptionByValue(1);
+		$this->byName('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

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
         $this->logInfo('Add a new price......');
         $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=paymentmanager_fields&subtab=geodir_payment_manager&gd_pagetype=addeditprice');
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Add Price"), "Add Price text not found");
+        $this->assertTrue($this->isTextPresent("Add Price"), "Add Price text not found");
         $this->byId('title')->value('Premium Plus');
         $this->byId('days')->value('0');
         $this->byName('gd_amount')->value('5');

tests/selenium/stest-25_Author_Page.php

Indentation +29 added lines, -29 removed lines

@@ -1,38 +1,38 @@
 <?php
 class AuthorPage 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 testAuthorPage()
-    {
-        //test loggedin
-        $this->logInfo('Testing author page......');
-        $this->url(self::GDTEST_BASE_URL.'author/admin/?geodir_dashbord=true&stype=gd_place');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Places by"), "Not in Author page");
+	public function testAuthorPage()
+	{
+		//test loggedin
+		$this->logInfo('Testing author page......');
+		$this->url(self::GDTEST_BASE_URL.'author/admin/?geodir_dashbord=true&stype=gd_place');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Places by"), "Not in Author page");
 
-        //Todo: test when not logged in
-    }
+		//Todo: test when not logged in
+	}
 
-    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

@@ -20,7 +20,7 @@
         $this->logInfo('Testing author page......');
         $this->url(self::GDTEST_BASE_URL.'author/admin/?geodir_dashbord=true&stype=gd_place');
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Places by"), "Not in Author page");
+        $this->assertTrue($this->isTextPresent("Places by"), "Not in Author page");
 
         //Todo: test when not logged in
     }

tests/selenium/stest-37_Marker_Cluster.php

Indentation +52 added lines, -52 removed lines

@@ -1,57 +1,57 @@
 <?php
 class MarkerCluster 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 testMarkerCluster()
-    {
-        $this->logInfo('Testing marker cluster......');
-        //make sure marker cluster plugin active
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        $this->waitForPageLoadAndCheckForErrors();
-
-        $is_active = $this->byId("geodirectory-marker-cluster")->attribute('class');
-        if (is_int(strpos($is_active, 'inactive'))) {
-            //Activate Geodirectory Marker Cluster
-            $this->maybeActivatePlugin("geodirectory-marker-cluster", 20000);
-            //go back to plugin page
-            $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        }
-
-        $is_active1 = $this->byId("geodirectory-marker-cluster")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "Marker Cluster plugin not active");
-
-
-        //make sure marker cluster enabled in home map
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_marker_cluster_settings');
-        $this->byName('save')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'location/');
-        if (!$this->isElementExists('//div[text()=2]', 'xpath')) {
-            $this->logError('Marker cluster not found in home 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 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 testMarkerCluster()
+	{
+		$this->logInfo('Testing marker cluster......');
+		//make sure marker cluster plugin active
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		$this->waitForPageLoadAndCheckForErrors();
+
+		$is_active = $this->byId("geodirectory-marker-cluster")->attribute('class');
+		if (is_int(strpos($is_active, 'inactive'))) {
+			//Activate Geodirectory Marker Cluster
+			$this->maybeActivatePlugin("geodirectory-marker-cluster", 20000);
+			//go back to plugin page
+			$this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		}
+
+		$is_active1 = $this->byId("geodirectory-marker-cluster")->attribute('class');
+		$this->assertFalse( strpos($is_active1, 'inactive'), "Marker Cluster plugin not active");
+
+
+		//make sure marker cluster enabled in home map
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_marker_cluster_settings');
+		$this->byName('save')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'location/');
+		if (!$this->isElementExists('//div[text()=2]', 'xpath')) {
+			$this->logError('Marker cluster not found in home 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);
+		}
+	}
 }
 ?>
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
         }
 
         $is_active1 = $this->byId("geodirectory-marker-cluster")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "Marker Cluster plugin not active");
+        $this->assertFalse(strpos($is_active1, 'inactive'), "Marker Cluster plugin not active");
 
 
         //make sure marker cluster enabled in home map