GeoDirectory / geodirectory

tests/selenium/stest-18_Check_Notifications.php

Indentation +25 added lines, -25 removed lines

@@ -1,33 +1,33 @@
 <?php
 class CheckNotifications 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 testCheckNotifications()
-    {
-        $this->logInfo('Check notifications......');
-        $this->logInfo('Skipping since its not possible......');
-    }
+	public function testCheckNotifications()
+	{
+		$this->logInfo('Check notifications......');
+		$this->logInfo('Skipping since its not possible......');
+	}
 
-    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-39_Browse_GD_Pages.php

Indentation +52 added lines, -52 removed lines

@@ -1,57 +1,57 @@
 <?php
 class BrowseGDPages 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 testBrowseGDPages()
-    {
-        //Browse all GD pages and catch errors and warnings
-        $this->logInfo('Testing home page......');
-        $this->url(self::GDTEST_BASE_URL);
-        $this->waitForPageLoadAndCheckForErrors();
-
-        $this->logInfo('Testing listing page......');
-        $this->url(self::GDTEST_BASE_URL.'places/');
-        $this->waitForPageLoadAndCheckForErrors();
-
-        $this->logInfo('Testing listing country page......');
-        $this->url(self::GDTEST_BASE_URL.'places/united-states/');
-        $this->waitForPageLoadAndCheckForErrors();
-
-        $this->logInfo('Testing add listing page......');
-        $this->url(self::GDTEST_BASE_URL.'add-listing/?listing_type=gd_place');
-        $this->waitForPageLoadAndCheckForErrors();
-
-        $this->logInfo('Testing add event page......');
-        $this->url(self::GDTEST_BASE_URL.'add-listing/?listing_type=gd_event');
-        $this->waitForPageLoadAndCheckForErrors();
-
-        $this->logInfo('Testing detail page......');
-        $this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/');
-        $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 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 testBrowseGDPages()
+	{
+		//Browse all GD pages and catch errors and warnings
+		$this->logInfo('Testing home page......');
+		$this->url(self::GDTEST_BASE_URL);
+		$this->waitForPageLoadAndCheckForErrors();
+
+		$this->logInfo('Testing listing page......');
+		$this->url(self::GDTEST_BASE_URL.'places/');
+		$this->waitForPageLoadAndCheckForErrors();
+
+		$this->logInfo('Testing listing country page......');
+		$this->url(self::GDTEST_BASE_URL.'places/united-states/');
+		$this->waitForPageLoadAndCheckForErrors();
+
+		$this->logInfo('Testing add listing page......');
+		$this->url(self::GDTEST_BASE_URL.'add-listing/?listing_type=gd_place');
+		$this->waitForPageLoadAndCheckForErrors();
+
+		$this->logInfo('Testing add event page......');
+		$this->url(self::GDTEST_BASE_URL.'add-listing/?listing_type=gd_event');
+		$this->waitForPageLoadAndCheckForErrors();
+
+		$this->logInfo('Testing detail page......');
+		$this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/');
+		$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);
+		}
+	}
 }
 ?>
\ No newline at end of file

tests/selenium/stest-24_Favourites.php

Indentation +34 added lines, -34 removed lines

@@ -1,42 +1,42 @@
 <?php
 class Favourites 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 testFavourites()
-    {
-        $this->logInfo('Testing Favorites......');
-        $this->url(self::GDTEST_BASE_URL.'places/');
-        $this->waitForPageLoadAndCheckForErrors();
-        $elements = $this->elements($this->using('css selector')->value('.geodir-addtofav-icon'));
-        if ($elements) {
-            $elements[0]->click();
-        }
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->url(self::GDTEST_BASE_URL.'author/admin/?geodir_dashbord=true&stype=gd_place&list=favourite');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Favorite Places"), "Not in Favourites page");
-    }
+	public function testFavourites()
+	{
+		$this->logInfo('Testing Favorites......');
+		$this->url(self::GDTEST_BASE_URL.'places/');
+		$this->waitForPageLoadAndCheckForErrors();
+		$elements = $this->elements($this->using('css selector')->value('.geodir-addtofav-icon'));
+		if ($elements) {
+			$elements[0]->click();
+		}
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->url(self::GDTEST_BASE_URL.'author/admin/?geodir_dashbord=true&stype=gd_place&list=favourite');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Favorite Places"), "Not in Favourites page");
+	}
 
-    public function tearDown()
-    {
-        if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            //write current file number to completed.txt
-            $CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
-            $completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
-            fwrite($completed, $CurrentFileNumber);
-        }
-    }
+	public function tearDown()
+	{
+		if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			//write current file number to completed.txt
+			$CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
+			$completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
+			fwrite($completed, $CurrentFileNumber);
+		}
+	}
 }
 ?>
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
         $this->waitForPageLoadAndCheckForErrors();
         $this->url(self::GDTEST_BASE_URL.'author/admin/?geodir_dashbord=true&stype=gd_place&list=favourite');
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Favorite Places"), "Not in Favourites page");
+        $this->assertTrue($this->isTextPresent("Favorite Places"), "Not in Favourites page");
     }
 
     public function tearDown()

tests/selenium/stest-30_Google_Analytics.php

Indentation +34 added lines, -34 removed lines

@@ -1,44 +1,44 @@
 <?php
 class GoogleAnalytics 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 testGoogleAnalytics()
-    {
-        $this->logInfo('Testing google analytics......');
-        //make sure Google Analytics Authorized
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=general_settings');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byLinkText('Google Analytics')->click();
+	public function testGoogleAnalytics()
+	{
+		$this->logInfo('Testing google analytics......');
+		//make sure Google Analytics Authorized
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=general_settings');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byLinkText('Google Analytics')->click();
 
-        $value = $this->byId('geodir_ga_id')->value();
-        if (empty($value)) {
-            echo "Google Analytics not configured";
-        }
+		$value = $this->byId('geodir_ga_id')->value();
+		if (empty($value)) {
+			echo "Google Analytics not configured";
+		}
 
-        $this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/');
-        $this->waitForPageLoadAndCheckForErrors();
-    }
+		$this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/');
+		$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-35_Create_New_CPT.php

Indentation +52 added lines, -52 removed lines

@@ -1,65 +1,65 @@
 <?php
 class CreateNewCPT 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 testCreateNewCPT()
-    {
-        $this->logInfo('Testing new CPT......');
-        //make sure custom post types plugin active
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        $this->waitForPageLoadAndCheckForErrors();
+	public function testCreateNewCPT()
+	{
+		$this->logInfo('Testing new CPT......');
+		//make sure custom post types plugin active
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		$this->waitForPageLoadAndCheckForErrors();
 
-        $is_active = $this->byId("geodirectory-custom-post-types")->attribute('class');
-        if (is_int(strpos($is_active, 'inactive'))) {
-            //Activate Geodirectory Custom Post Types
-            $this->maybeActivatePlugin("geodirectory-custom-post-types", 20000);
-            //go back to plugin page
-            $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        }
+		$is_active = $this->byId("geodirectory-custom-post-types")->attribute('class');
+		if (is_int(strpos($is_active, 'inactive'))) {
+			//Activate Geodirectory Custom Post Types
+			$this->maybeActivatePlugin("geodirectory-custom-post-types", 20000);
+			//go back to plugin page
+			$this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		}
 
-        $is_active1 = $this->byId("geodirectory-custom-post-types")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "Custom Post Types plugin not active");
+		$is_active1 = $this->byId("geodirectory-custom-post-types")->attribute('class');
+		$this->assertFalse( strpos($is_active1, 'inactive'), "Custom Post Types plugin not active");
 
 
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=geodir_manage_custom_posts');
-        $this->waitForPageLoadAndCheckForErrors();
-        if ($this->isTextPresent("gd_hotel")) {
-            echo "Hotel post type already found. Please delete it first";
-            return;
-        }
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=geodir_manage_custom_posts');
+		$this->waitForPageLoadAndCheckForErrors();
+		if ($this->isTextPresent("gd_hotel")) {
+			echo "Hotel post type already found. Please delete it first";
+			return;
+		}
 
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=geodir_manage_custom_posts&action=cp_addedit');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Post Type"), "Post Type text not found");
-        $this->byId('geodir_custom_post_type')->value('hotel');
-        $this->byId('geodir_listing_slug')->value('hotels');
-        $this->byId('geodir_listing_order')->value('10');
-        $this->byId('geodir_name')->value('Hotels');
-        $this->byId('geodir_singular_name')->value('Hotel');
-        $this->byName('geodir_save_post_type')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-    }
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=geodir_manage_custom_posts&action=cp_addedit');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Post Type"), "Post Type text not found");
+		$this->byId('geodir_custom_post_type')->value('hotel');
+		$this->byId('geodir_listing_slug')->value('hotels');
+		$this->byId('geodir_listing_order')->value('10');
+		$this->byId('geodir_name')->value('Hotels');
+		$this->byId('geodir_singular_name')->value('Hotel');
+		$this->byName('geodir_save_post_type')->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 +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
         }
 
         $is_active1 = $this->byId("geodirectory-custom-post-types")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "Custom Post Types plugin not active");
+        $this->assertFalse(strpos($is_active1, 'inactive'), "Custom Post Types plugin not active");
 
 
         $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=geodir_manage_custom_posts');
@@ -42,7 +42,7 @@ 
 
         $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=geodir_manage_custom_posts&action=cp_addedit');
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Post Type"), "Post Type text not found");
+        $this->assertTrue($this->isTextPresent("Post Type"), "Post Type text not found");
         $this->byId('geodir_custom_post_type')->value('hotel');
         $this->byId('geodir_listing_slug')->value('hotels');
         $this->byId('geodir_listing_order')->value('10');

tests/selenium/stest-41_Check_Shortcodes.php

Indentation +159 added lines, -159 removed lines

@@ -1,164 +1,164 @@
 <?php
 class CheckShortcodes 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 testCheckShortcodes()
-    {
-        $this->logInfo('Testing shortcodes......');
-
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('title')->value('Shortcode Test: Home Page Map');
-        $this->byId('content')->value('[gd_homepage_map width=100% height=300 scrollwheel=false]');
-        $this->byId('publish')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byLinkText('View page')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("geodir-map-home-page"), "Home page map not found");
-
-
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('title')->value('Shortcode Test: Custom Post Type Categories');
-        $this->byId('content')->value('[gd_cpt_categories show_count=1]');
-        $this->byId('publish')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byLinkText('View page')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("gd-cptcats-widget"), "Custom Post Type Categories not found");
-
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('title')->value('Shortcode Test: Listings Page Map');
-        $this->byId('content')->value('[gd_listing_map width=100% height=300 scrollwheel=false sticky=true]');
-        $this->byId('publish')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byLinkText('View page')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("geodir-map-listing-page"), "Listings Page Map not found");
-
-
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('title')->value('Shortcode Test: Listing Slider');
-        $this->byId('content')->value('[gd_listing_slider post_number=5 category=3 slideshow=true show_featured_only=true]');
-        $this->byId('publish')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byLinkText('View page')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("geodir_widget_carousel"), "Listing Slider not found");
-
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('title')->value('Shortcode Test: Login Box');
-        $this->byId('content')->value('[gd_login_box]');
-        $this->byId('publish')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byLinkText('View page')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("geodir-loginbox-list"), "Login Box not found");
-
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('title')->value('Shortcode Test: Popular Post Category');
-        $this->byId('content')->value('[gd_popular_post_category category_limit=10]');
-        $this->byId('publish')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byLinkText('View page')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("geodir-popular-cat-list"), "Popular Post Category not found");
-
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('title')->value('Shortcode Test: Popular Post View');
-        $this->byId('content')->value('[gd_popular_post_view category=3 layout=5 add_location_filter=true character_count=0 show_featured_only=true]');
-        $this->byId('publish')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byLinkText('View page')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("geodir_category_list_view"), "Popular Post View not found");
-
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('title')->value('Shortcode Test: Recent Review');
-        $this->byId('content')->value('[gd_recent_reviews count=5]');
-        $this->byId('publish')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byLinkText('View page')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("geodir_sc_recent_reviews"), "Recent Review not found");
-
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('title')->value('Shortcode Test: Related Listings');
-        $this->byId('content')->value('[gd_related_listings relate_to=tags layout=3 add_location_filter=true list_sort=featured character_count=0]');
-        $this->byId('publish')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byLinkText('View page')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("geodir_location_listing"), "Related Listings not found");
-
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('title')->value('Shortcode Test: Search');
-        $this->byId('content')->value('[gd_advanced_search]');
-        $this->byId('publish')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byLinkText('View page')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("geodir-map-home-page"), "Search not found");
-
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('title')->value('Shortcode Test: GD Listings');
-        $this->byId('content')->value('[gd_listings post_type="gd_place" category="1,3" post_number="10" list_sort="high_review"]');
-        $this->byId('publish')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byLinkText('View page')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("geodir-sc-gd-listings"), "GD Listings not found");
-
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('title')->value('Shortcode Test: GD Best of');
-        $this->byId('content')->value('[gd_bestof_widget title="widget title" post_type=gd_hotel post_limit=5 categ_limit=6 character_count=50 use_viewing_post_type=true add_location_filter=true tab_layout=bestof-tabs-as-dropdown]');
-        $this->byId('publish')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byLinkText('View page')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("geodir_bestof_widget"), "GD Best of not found");
-
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('title')->value('Shortcode Test: Add Listing Form');
-        $this->byId('content')->value('[gd_add_listing listing_type=gd_event login_msg="Please register and login to submit listings" show_login=true]');
-        $this->byId('publish')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byLinkText('View page')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("geodir-add-listing-submit"), "Add Listing Form not found");
-    }
-
-    public function tearDown()
-    {
-        if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            //write current file number to completed.txt
-            $CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
-            $completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
-            fwrite($completed, $CurrentFileNumber);
-        }
-    }
+	public function setUp()
+	{
+		parent::setUp();
+
+		//skip test if already completed.
+		if ($this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			$this->markTestSkipped('Skipping '.pathinfo(__FILE__, PATHINFO_FILENAME).' since its already completed......');
+			return;
+		} else {
+			$this->prepareSession()->currentWindow()->maximize();
+		}
+	}
+
+	public function testCheckShortcodes()
+	{
+		$this->logInfo('Testing shortcodes......');
+
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('title')->value('Shortcode Test: Home Page Map');
+		$this->byId('content')->value('[gd_homepage_map width=100% height=300 scrollwheel=false]');
+		$this->byId('publish')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byLinkText('View page')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("geodir-map-home-page"), "Home page map not found");
+
+
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('title')->value('Shortcode Test: Custom Post Type Categories');
+		$this->byId('content')->value('[gd_cpt_categories show_count=1]');
+		$this->byId('publish')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byLinkText('View page')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("gd-cptcats-widget"), "Custom Post Type Categories not found");
+
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('title')->value('Shortcode Test: Listings Page Map');
+		$this->byId('content')->value('[gd_listing_map width=100% height=300 scrollwheel=false sticky=true]');
+		$this->byId('publish')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byLinkText('View page')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("geodir-map-listing-page"), "Listings Page Map not found");
+
+
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('title')->value('Shortcode Test: Listing Slider');
+		$this->byId('content')->value('[gd_listing_slider post_number=5 category=3 slideshow=true show_featured_only=true]');
+		$this->byId('publish')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byLinkText('View page')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("geodir_widget_carousel"), "Listing Slider not found");
+
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('title')->value('Shortcode Test: Login Box');
+		$this->byId('content')->value('[gd_login_box]');
+		$this->byId('publish')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byLinkText('View page')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("geodir-loginbox-list"), "Login Box not found");
+
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('title')->value('Shortcode Test: Popular Post Category');
+		$this->byId('content')->value('[gd_popular_post_category category_limit=10]');
+		$this->byId('publish')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byLinkText('View page')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("geodir-popular-cat-list"), "Popular Post Category not found");
+
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('title')->value('Shortcode Test: Popular Post View');
+		$this->byId('content')->value('[gd_popular_post_view category=3 layout=5 add_location_filter=true character_count=0 show_featured_only=true]');
+		$this->byId('publish')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byLinkText('View page')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("geodir_category_list_view"), "Popular Post View not found");
+
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('title')->value('Shortcode Test: Recent Review');
+		$this->byId('content')->value('[gd_recent_reviews count=5]');
+		$this->byId('publish')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byLinkText('View page')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("geodir_sc_recent_reviews"), "Recent Review not found");
+
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('title')->value('Shortcode Test: Related Listings');
+		$this->byId('content')->value('[gd_related_listings relate_to=tags layout=3 add_location_filter=true list_sort=featured character_count=0]');
+		$this->byId('publish')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byLinkText('View page')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("geodir_location_listing"), "Related Listings not found");
+
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('title')->value('Shortcode Test: Search');
+		$this->byId('content')->value('[gd_advanced_search]');
+		$this->byId('publish')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byLinkText('View page')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("geodir-map-home-page"), "Search not found");
+
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('title')->value('Shortcode Test: GD Listings');
+		$this->byId('content')->value('[gd_listings post_type="gd_place" category="1,3" post_number="10" list_sort="high_review"]');
+		$this->byId('publish')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byLinkText('View page')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("geodir-sc-gd-listings"), "GD Listings not found");
+
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('title')->value('Shortcode Test: GD Best of');
+		$this->byId('content')->value('[gd_bestof_widget title="widget title" post_type=gd_hotel post_limit=5 categ_limit=6 character_count=50 use_viewing_post_type=true add_location_filter=true tab_layout=bestof-tabs-as-dropdown]');
+		$this->byId('publish')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byLinkText('View page')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("geodir_bestof_widget"), "GD Best of not found");
+
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('title')->value('Shortcode Test: Add Listing Form');
+		$this->byId('content')->value('[gd_add_listing listing_type=gd_event login_msg="Please register and login to submit listings" show_login=true]');
+		$this->byId('publish')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byLinkText('View page')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("geodir-add-listing-submit"), "Add Listing Form not found");
+	}
+
+	public function tearDown()
+	{
+		if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			//write current file number to completed.txt
+			$CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
+			$completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
+			fwrite($completed, $CurrentFileNumber);
+		}
+	}
 }
 ?>
\ No newline at end of file

Spacing +13 added lines, -13 removed lines

@@ -26,7 +26,7 @@ 
         $this->waitForPageLoadAndCheckForErrors();
         $this->byLinkText('View page')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("geodir-map-home-page"), "Home page map not found");
+        $this->assertTrue($this->isTextPresent("geodir-map-home-page"), "Home page map not found");
 
 
         $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
@@ -37,7 +37,7 @@ 
         $this->waitForPageLoadAndCheckForErrors();
         $this->byLinkText('View page')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("gd-cptcats-widget"), "Custom Post Type Categories not found");
+        $this->assertTrue($this->isTextPresent("gd-cptcats-widget"), "Custom Post Type Categories not found");
 
         $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
         $this->waitForPageLoadAndCheckForErrors();
@@ -47,7 +47,7 @@ 
         $this->waitForPageLoadAndCheckForErrors();
         $this->byLinkText('View page')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("geodir-map-listing-page"), "Listings Page Map not found");
+        $this->assertTrue($this->isTextPresent("geodir-map-listing-page"), "Listings Page Map not found");
 
 
         $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
@@ -58,7 +58,7 @@ 
         $this->waitForPageLoadAndCheckForErrors();
         $this->byLinkText('View page')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("geodir_widget_carousel"), "Listing Slider not found");
+        $this->assertTrue($this->isTextPresent("geodir_widget_carousel"), "Listing Slider not found");
 
         $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
         $this->waitForPageLoadAndCheckForErrors();
@@ -68,7 +68,7 @@ 
         $this->waitForPageLoadAndCheckForErrors();
         $this->byLinkText('View page')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("geodir-loginbox-list"), "Login Box not found");
+        $this->assertTrue($this->isTextPresent("geodir-loginbox-list"), "Login Box not found");
 
         $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
         $this->waitForPageLoadAndCheckForErrors();
@@ -78,7 +78,7 @@ 
         $this->waitForPageLoadAndCheckForErrors();
         $this->byLinkText('View page')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("geodir-popular-cat-list"), "Popular Post Category not found");
+        $this->assertTrue($this->isTextPresent("geodir-popular-cat-list"), "Popular Post Category not found");
 
         $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
         $this->waitForPageLoadAndCheckForErrors();
@@ -88,7 +88,7 @@ 
         $this->waitForPageLoadAndCheckForErrors();
         $this->byLinkText('View page')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("geodir_category_list_view"), "Popular Post View not found");
+        $this->assertTrue($this->isTextPresent("geodir_category_list_view"), "Popular Post View not found");
 
         $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
         $this->waitForPageLoadAndCheckForErrors();
@@ -98,7 +98,7 @@ 
         $this->waitForPageLoadAndCheckForErrors();
         $this->byLinkText('View page')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("geodir_sc_recent_reviews"), "Recent Review not found");
+        $this->assertTrue($this->isTextPresent("geodir_sc_recent_reviews"), "Recent Review not found");
 
         $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
         $this->waitForPageLoadAndCheckForErrors();
@@ -108,7 +108,7 @@ 
         $this->waitForPageLoadAndCheckForErrors();
         $this->byLinkText('View page')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("geodir_location_listing"), "Related Listings not found");
+        $this->assertTrue($this->isTextPresent("geodir_location_listing"), "Related Listings not found");
 
         $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
         $this->waitForPageLoadAndCheckForErrors();
@@ -118,7 +118,7 @@ 
         $this->waitForPageLoadAndCheckForErrors();
         $this->byLinkText('View page')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("geodir-map-home-page"), "Search not found");
+        $this->assertTrue($this->isTextPresent("geodir-map-home-page"), "Search not found");
 
         $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
         $this->waitForPageLoadAndCheckForErrors();
@@ -128,7 +128,7 @@ 
         $this->waitForPageLoadAndCheckForErrors();
         $this->byLinkText('View page')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("geodir-sc-gd-listings"), "GD Listings not found");
+        $this->assertTrue($this->isTextPresent("geodir-sc-gd-listings"), "GD Listings not found");
 
         $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
         $this->waitForPageLoadAndCheckForErrors();
@@ -138,7 +138,7 @@ 
         $this->waitForPageLoadAndCheckForErrors();
         $this->byLinkText('View page')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("geodir_bestof_widget"), "GD Best of not found");
+        $this->assertTrue($this->isTextPresent("geodir_bestof_widget"), "GD Best of not found");
 
         $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/post-new.php?post_type=page');
         $this->waitForPageLoadAndCheckForErrors();
@@ -148,7 +148,7 @@ 
         $this->waitForPageLoadAndCheckForErrors();
         $this->byLinkText('View page')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("geodir-add-listing-submit"), "Add Listing Form not found");
+        $this->assertTrue($this->isTextPresent("geodir-add-listing-submit"), "Add Listing Form not found");
     }
 
     public function tearDown()

tests/selenium/stest-11_Sort_A_Review.php

Indentation +47 added lines, -47 removed lines

@@ -1,58 +1,58 @@
 <?php
 class SortReview 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 testSortReview()
-    {
-        $this->logInfo('sorting reviews......');
-        //make sure advance search filters plugin active
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        $this->waitForPageLoadAndCheckForErrors();
+	public function testSortReview()
+	{
+		$this->logInfo('sorting reviews......');
+		//make sure advance search filters plugin active
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		$this->waitForPageLoadAndCheckForErrors();
 
-        $is_active = $this->byId("geodirectory-review-rating-manager")->attribute('class');
-        if (is_int(strpos($is_active, 'inactive'))) {
-            //Activate Geodirectory Review Rating Manager
-            $this->maybeActivatePlugin("geodirectory-review-rating-manager", 20000);
-            //go back to plugin page
-            $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        }
+		$is_active = $this->byId("geodirectory-review-rating-manager")->attribute('class');
+		if (is_int(strpos($is_active, 'inactive'))) {
+			//Activate Geodirectory Review Rating Manager
+			$this->maybeActivatePlugin("geodirectory-review-rating-manager", 20000);
+			//go back to plugin page
+			$this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		}
 
-        $is_active1 = $this->byId("geodirectory-review-rating-manager")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "Review Rating Manager plugin not active");
+		$is_active1 = $this->byId("geodirectory-review-rating-manager")->attribute('class');
+		$this->assertFalse( strpos($is_active1, 'inactive'), "Review Rating Manager plugin not active");
 
-        //Make sure Enable comment list sorting checked.
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=multirating_fields&subtab=geodir_multirating_options');
-        $this->waitForPageLoadAndCheckForErrors();
-        $is_checked = $this->byId('geodir_reviewrating_enable_sorting')->attribute('checked');
-        if (!$is_checked) {
-            $this->byId('geodir_reviewrating_enable_sorting')->click();
-            $this->byName('save')->click();
-            $this->waitForPageLoadAndCheckForErrors();
-        }
-        $this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/test-listing/?comment_sorting=high_rating');
-        $this->waitForPageLoadAndCheckForErrors();
-    }
+		//Make sure Enable comment list sorting checked.
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=multirating_fields&subtab=geodir_multirating_options');
+		$this->waitForPageLoadAndCheckForErrors();
+		$is_checked = $this->byId('geodir_reviewrating_enable_sorting')->attribute('checked');
+		if (!$is_checked) {
+			$this->byId('geodir_reviewrating_enable_sorting')->click();
+			$this->byName('save')->click();
+			$this->waitForPageLoadAndCheckForErrors();
+		}
+		$this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/test-listing/?comment_sorting=high_rating');
+		$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

@@ -30,7 +30,7 @@
         }
 
         $is_active1 = $this->byId("geodirectory-review-rating-manager")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "Review Rating Manager plugin not active");
+        $this->assertFalse(strpos($is_active1, 'inactive'), "Review Rating Manager plugin not active");
 
         //Make sure Enable comment list sorting checked.
         $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=multirating_fields&subtab=geodir_multirating_options');

tests/selenium/stest-03_Add_Listing.php

Indentation +62 added lines, -62 removed lines

@@ -1,70 +1,70 @@
 <?php
 class AddListing 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 testAddListing()
-    {
-        $this->logInfo('Add GD Place listing......');
-        $this->url(self::GDTEST_BASE_URL.'add-listing/?listing_type=gd_place');
-        $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(self::GDTEST_BASE_URL.'add-listing/?listing_type=gd_place');
-        }
-        $this->assertTrue( $this->isTextPresent("Add Place"), "Add Place text not found");
-        $this->byId('post_title')->value('Test Listing');
-        $this->byId('post_desc')->value('Test Desc');
-        $this->byId('post_tags')->value('tag1,tag2');
-        $this->ExecuteScript('jQuery("select#gd_placecategory").show();');
-        $this->select($this->byXPath("//select[@id='gd_placecategory']"))->selectOptionByLabel('Attractions');
-        $this->waitForPageLoadAndCheckForErrors(2000);
-        $this->byId('post_address')->value('wall street');
-        $this->byId('post_address')->value('10006');
-        $this->byId('post_set_address_button')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('geodir_timing')->value('10.00 am to 6 pm every day');
-        $this->byId('geodir_contact')->value('444444444444');
-        $this->byId('geodir_email')->value('test@test.com');
-        $this->byId('geodir_website')->value('http://test.com');
-        $this->byId('geodir_twitter')->value('http://twitter.com/test');
-        $this->byId('geodir_facebook')->value('http://facebook.com/test');
-        $this->byId('geodir_special_offers')->value('Test Offer');
-        $this->byId('geodir_accept_term_condition')->click();
-        // Submit the form
-        $this->byXPath("//div[@id='geodir-add-listing-submit']//input[@type='submit']")->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("This is a preview of your listing"), "Not in preview page.");
-        // Submit the form
-        $this->byClassName('geodir_publish_button')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Thank you, your information has been successfully received"), "Not in success page");
-    }
+	public function testAddListing()
+	{
+		$this->logInfo('Add GD Place listing......');
+		$this->url(self::GDTEST_BASE_URL.'add-listing/?listing_type=gd_place');
+		$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(self::GDTEST_BASE_URL.'add-listing/?listing_type=gd_place');
+		}
+		$this->assertTrue( $this->isTextPresent("Add Place"), "Add Place text not found");
+		$this->byId('post_title')->value('Test Listing');
+		$this->byId('post_desc')->value('Test Desc');
+		$this->byId('post_tags')->value('tag1,tag2');
+		$this->ExecuteScript('jQuery("select#gd_placecategory").show();');
+		$this->select($this->byXPath("//select[@id='gd_placecategory']"))->selectOptionByLabel('Attractions');
+		$this->waitForPageLoadAndCheckForErrors(2000);
+		$this->byId('post_address')->value('wall street');
+		$this->byId('post_address')->value('10006');
+		$this->byId('post_set_address_button')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('geodir_timing')->value('10.00 am to 6 pm every day');
+		$this->byId('geodir_contact')->value('444444444444');
+		$this->byId('geodir_email')->value('test@test.com');
+		$this->byId('geodir_website')->value('http://test.com');
+		$this->byId('geodir_twitter')->value('http://twitter.com/test');
+		$this->byId('geodir_facebook')->value('http://facebook.com/test');
+		$this->byId('geodir_special_offers')->value('Test Offer');
+		$this->byId('geodir_accept_term_condition')->click();
+		// Submit the form
+		$this->byXPath("//div[@id='geodir-add-listing-submit']//input[@type='submit']")->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("This is a preview of your listing"), "Not in preview page.");
+		// Submit the form
+		$this->byClassName('geodir_publish_button')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Thank you, your information has been successfully received"), "Not in success page");
+	}
 
-    public function tearDown()
-    {
-        if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            //write current file number to completed.txt
-            $CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
-            $completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
-            fwrite($completed, $CurrentFileNumber);
-        }
-    }
+	public function tearDown()
+	{
+		if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			//write current file number to completed.txt
+			$CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
+			$completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
+			fwrite($completed, $CurrentFileNumber);
+		}
+	}
 }
 ?>
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
             $this->waitForPageLoadAndCheckForErrors();
             $this->url(self::GDTEST_BASE_URL.'add-listing/?listing_type=gd_place');
         }
-        $this->assertTrue( $this->isTextPresent("Add Place"), "Add Place text not found");
+        $this->assertTrue($this->isTextPresent("Add Place"), "Add Place text not found");
         $this->byId('post_title')->value('Test Listing');
         $this->byId('post_desc')->value('Test Desc');
         $this->byId('post_tags')->value('tag1,tag2');
@@ -50,11 +50,11 @@ 
         // Submit the form
         $this->byXPath("//div[@id='geodir-add-listing-submit']//input[@type='submit']")->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("This is a preview of your listing"), "Not in preview page.");
+        $this->assertTrue($this->isTextPresent("This is a preview of your listing"), "Not in preview page.");
         // Submit the form
         $this->byClassName('geodir_publish_button')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Thank you, your information has been successfully received"), "Not in success page");
+        $this->assertTrue($this->isTextPresent("Thank you, your information has been successfully received"), "Not in success page");
     }
 
     public function tearDown()

tests/selenium/stest-36_Locationless_CPT.php

Indentation +55 added lines, -55 removed lines

@@ -1,69 +1,69 @@
 <?php
 class LocationlessCPT 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 testLocationlessCPT()
-    {
-        $this->logInfo('Testing locationless CPT......');
-        //make sure custom post types plugin active
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        $this->waitForPageLoadAndCheckForErrors();
+	public function testLocationlessCPT()
+	{
+		$this->logInfo('Testing locationless CPT......');
+		//make sure custom post types plugin active
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		$this->waitForPageLoadAndCheckForErrors();
 
-        $is_active = $this->byId("geodirectory-custom-post-types")->attribute('class');
-        if (is_int(strpos($is_active, 'inactive'))) {
-            //Activate Geodirectory Custom Post Types
-            $this->maybeActivatePlugin("geodirectory-custom-post-types", 20000);
-            //go back to plugin page
-            $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        }
+		$is_active = $this->byId("geodirectory-custom-post-types")->attribute('class');
+		if (is_int(strpos($is_active, 'inactive'))) {
+			//Activate Geodirectory Custom Post Types
+			$this->maybeActivatePlugin("geodirectory-custom-post-types", 20000);
+			//go back to plugin page
+			$this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		}
 
-        $is_active1 = $this->byId("geodirectory-custom-post-types")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "Custom Post Types plugin not active");
+		$is_active1 = $this->byId("geodirectory-custom-post-types")->attribute('class');
+		$this->assertFalse( strpos($is_active1, 'inactive'), "Custom Post Types plugin not active");
 
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=geodir_manage_custom_posts');
-        $this->waitForPageLoadAndCheckForErrors();
-        if ($this->isTextPresent("gd_product")) {
-            echo "Product post type already found. Please delete it to test a locationless CPT";
-            return;
-        }
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=geodir_manage_custom_posts');
+		$this->waitForPageLoadAndCheckForErrors();
+		if ($this->isTextPresent("gd_product")) {
+			echo "Product post type already found. Please delete it to test a locationless CPT";
+			return;
+		}
 
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=geodir_manage_custom_posts&action=cp_addedit');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Post Type"), "Post Type text not found");
-        $this->byId('geodir_custom_post_type')->value('product');
-        $this->byId('geodir_listing_slug')->value('products');
-        $this->byId('geodir_listing_order')->value('10');
-        $this->byId('geodir_name')->value('Products');
-        $this->byId('geodir_singular_name')->value('Product');
-        $this->byName('geodir_save_post_type')->click();
-        $this->waitForPageLoadAndCheckForErrors();
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=geodir_manage_custom_posts&action=cp_addedit');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Post Type"), "Post Type text not found");
+		$this->byId('geodir_custom_post_type')->value('product');
+		$this->byId('geodir_listing_slug')->value('products');
+		$this->byId('geodir_listing_order')->value('10');
+		$this->byId('geodir_name')->value('Products');
+		$this->byId('geodir_singular_name')->value('Product');
+		$this->byName('geodir_save_post_type')->click();
+		$this->waitForPageLoadAndCheckForErrors();
 
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=general_settings');
-        $this->waitForPageLoadAndCheckForErrors();
-        //Todo:find a way to click chosen dropdown
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=general_settings');
+		$this->waitForPageLoadAndCheckForErrors();
+		//Todo:find a way to click chosen dropdown
 
-    }
+	}
 
-    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 +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
         }
 
         $is_active1 = $this->byId("geodirectory-custom-post-types")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "Custom Post Types plugin not active");
+        $this->assertFalse(strpos($is_active1, 'inactive'), "Custom Post Types plugin not active");
 
         $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=geodir_manage_custom_posts');
         $this->waitForPageLoadAndCheckForErrors();
@@ -41,7 +41,7 @@ 
 
         $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=geodir_manage_custom_posts&action=cp_addedit');
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Post Type"), "Post Type text not found");
+        $this->assertTrue($this->isTextPresent("Post Type"), "Post Type text not found");
         $this->byId('geodir_custom_post_type')->value('product');
         $this->byId('geodir_listing_slug')->value('products');
         $this->byId('geodir_listing_order')->value('10');