GeoDirectory / geodirectory

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/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

tests/selenium/stest-01_Register.php

Indentation +52 added lines, -52 removed lines

@@ -1,66 +1,66 @@
 <?php
 class Register 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 testRegister()
-    {
-        $this->logInfo('Registering new user......');
-        $this->url(self::GDTEST_BASE_URL.'gd-login/?signup=1');
-        $this->waitForPageLoadAndCheckForErrors();
+	public function testRegister()
+	{
+		$this->logInfo('Registering new user......');
+		$this->url(self::GDTEST_BASE_URL.'gd-login/?signup=1');
+		$this->waitForPageLoadAndCheckForErrors();
 //        echo $this->source();
-        $this->assertTrue( $this->isTextPresent("Sign Up Now"), "'Sign Up Now' text found");
-        $this->byId('user_email')->value('testuser@test.com');
-        $this->byId('user_fname')->value('Test User');
-        // Submit the form
-        $this->byId('cus_registerform')->submit();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertFalse( $this->isTextPresent("New user registration disabled."), "New user registration disabled.");
-        $this->assertFalse( $this->isTextPresent("This email is already registered."), "This email is already registered.");
-        $this->assertTrue( $this->isTextPresent("Add Listing"), "Add Listing text not found");
+		$this->assertTrue( $this->isTextPresent("Sign Up Now"), "'Sign Up Now' text found");
+		$this->byId('user_email')->value('testuser@test.com');
+		$this->byId('user_fname')->value('Test User');
+		// Submit the form
+		$this->byId('cus_registerform')->submit();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertFalse( $this->isTextPresent("New user registration disabled."), "New user registration disabled.");
+		$this->assertFalse( $this->isTextPresent("This email is already registered."), "This email is already registered.");
+		$this->assertTrue( $this->isTextPresent("Add Listing"), "Add Listing text not found");
 //        echo $this->source();
-        $this->byXPath("//*[@id='gd-sidebar-wrapper']//ul[@class='geodir-loginbox-list']//a[@class='signin']")->click();
-        $this->waitForPageLoadAndCheckForErrors();
+		$this->byXPath("//*[@id='gd-sidebar-wrapper']//ul[@class='geodir-loginbox-list']//a[@class='signin']")->click();
+		$this->waitForPageLoadAndCheckForErrors();
 
-        //change password for the test user
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/users.php');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("testuser@test.com"), "Test user not found");
-        $user_id = $this->byXPath("//*[text()[contains(.,'testuser@test.com')]]/ancestor::tr")->attribute('id');
-        $user_id = str_replace('user-', '', $user_id);
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/user-edit.php?user_id='.$user_id);
+		//change password for the test user
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/users.php');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("testuser@test.com"), "Test user not found");
+		$user_id = $this->byXPath("//*[text()[contains(.,'testuser@test.com')]]/ancestor::tr")->attribute('id');
+		$user_id = str_replace('user-', '', $user_id);
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/user-edit.php?user_id='.$user_id);
 //        $this->select($this->byId("role"))->selectOptionByLabel('Administrator');
-        $this->byClassName('wp-generate-pw')->click();
-        $this->waitForPageLoadAndCheckForErrors(5000);
-        $this->byId('pass1-text')->value('1');
-        $this->waitForPageLoadAndCheckForErrors(10000);
-        $this->byClassName('pw-checkbox')->click();
-        $this->byId('submit')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("User updated"), "User updated text not found");
+		$this->byClassName('wp-generate-pw')->click();
+		$this->waitForPageLoadAndCheckForErrors(5000);
+		$this->byId('pass1-text')->value('1');
+		$this->waitForPageLoadAndCheckForErrors(10000);
+		$this->byClassName('pw-checkbox')->click();
+		$this->byId('submit')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("User updated"), "User updated 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 +6 added lines, -6 removed lines

@@ -20,15 +20,15 @@ 
         $this->url(self::GDTEST_BASE_URL.'gd-login/?signup=1');
         $this->waitForPageLoadAndCheckForErrors();
 //        echo $this->source();
-        $this->assertTrue( $this->isTextPresent("Sign Up Now"), "'Sign Up Now' text found");
+        $this->assertTrue($this->isTextPresent("Sign Up Now"), "'Sign Up Now' text found");
         $this->byId('user_email')->value('testuser@test.com');
         $this->byId('user_fname')->value('Test User');
         // Submit the form
         $this->byId('cus_registerform')->submit();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertFalse( $this->isTextPresent("New user registration disabled."), "New user registration disabled.");
-        $this->assertFalse( $this->isTextPresent("This email is already registered."), "This email is already registered.");
-        $this->assertTrue( $this->isTextPresent("Add Listing"), "Add Listing text not found");
+        $this->assertFalse($this->isTextPresent("New user registration disabled."), "New user registration disabled.");
+        $this->assertFalse($this->isTextPresent("This email is already registered."), "This email is already registered.");
+        $this->assertTrue($this->isTextPresent("Add Listing"), "Add Listing text not found");
 //        echo $this->source();
         $this->byXPath("//*[@id='gd-sidebar-wrapper']//ul[@class='geodir-loginbox-list']//a[@class='signin']")->click();
         $this->waitForPageLoadAndCheckForErrors();
@@ -36,7 +36,7 @@ 
         //change password for the test user
         $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/users.php');
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("testuser@test.com"), "Test user not found");
+        $this->assertTrue($this->isTextPresent("testuser@test.com"), "Test user not found");
         $user_id = $this->byXPath("//*[text()[contains(.,'testuser@test.com')]]/ancestor::tr")->attribute('id');
         $user_id = str_replace('user-', '', $user_id);
         $this->url(self::GDTEST_BASE_URL.'wp-admin/user-edit.php?user_id='.$user_id);
@@ -48,7 +48,7 @@ 
         $this->byClassName('pw-checkbox')->click();
         $this->byId('submit')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("User updated"), "User updated text not found");
+        $this->assertTrue($this->isTextPresent("User updated"), "User updated text not found");
 
     }
 

tests/selenium/stest-20_Geolocation.php

Indentation +57 added lines, -57 removed lines

@@ -1,62 +1,62 @@
 <?php
 class Geolocation 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 testGeolocation()
-    {
-        $this->logInfo('Test Geolocation......');
-        //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");
-
-        //test country
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'places/united-states/');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("in United States"), "Not in country page");
-
-        //test region
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'places/united-states/new-york/');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("in New York"), "Not in region page");
-
-        //test city
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("in New York"), "Not in city 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 testGeolocation()
+	{
+		$this->logInfo('Test Geolocation......');
+		//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");
+
+		//test country
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'places/united-states/');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("in United States"), "Not in country page");
+
+		//test region
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'places/united-states/new-york/');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("in New York"), "Not in region page");
+
+		//test city
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("in New York"), "Not in city 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 +4 added lines, -4 removed lines

@@ -30,22 +30,22 @@
         }
 
         $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");
 
         //test country
         $this->maybeAdminLogin(self::GDTEST_BASE_URL.'places/united-states/');
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("in United States"), "Not in country page");
+        $this->assertTrue($this->isTextPresent("in United States"), "Not in country page");
 
         //test region
         $this->maybeAdminLogin(self::GDTEST_BASE_URL.'places/united-states/new-york/');
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("in New York"), "Not in region page");
+        $this->assertTrue($this->isTextPresent("in New York"), "Not in region page");
 
         //test city
         $this->maybeAdminLogin(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/');
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("in New York"), "Not in city page");
+        $this->assertTrue($this->isTextPresent("in New York"), "Not in city page");
 
     }