GeoDirectory / geodirectory

tests/selenium/stest-29_New_Location.php

Indentation +47 added lines, -47 removed lines

@@ -1,59 +1,59 @@
 <?php
 class NewLocation 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 testNewLocation()
-    {
-        $this->logInfo('Testing new location......');
-        //make sure multi locations plugin active
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        $this->waitForPageLoadAndCheckForErrors();
+	public function testNewLocation()
+	{
+		$this->logInfo('Testing new location......');
+		//make sure multi locations plugin active
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		$this->waitForPageLoadAndCheckForErrors();
 
-        $is_active = $this->byId("geodirectory-location-manager")->attribute('class');
-        if (is_int(strpos($is_active, 'inactive'))) {
-            //Activate Geodirectory Location Manager
-            $this->maybeActivatePlugin("geodirectory-location-manager", 20000);
-            //go back to plugin page
-            $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        }
+		$is_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");
+		$is_active1 = $this->byId("geodirectory-location-manager")->attribute('class');
+		$this->assertFalse( strpos($is_active1, 'inactive'), "Location Manager plugin not active");
 
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=managelocation_fields&subtab=geodir_location_addedit');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->prepareSession()->currentWindow()->maximize();
-        $this->byId('gd_city')->value('Bengaluru');
-        $this->byId('gd_region')->value('Karnataka');
-        $this->waitForPageLoadAndCheckForErrors();
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=managelocation_fields&subtab=geodir_location_addedit');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->prepareSession()->currentWindow()->maximize();
+		$this->byId('gd_city')->value('Bengaluru');
+		$this->byId('gd_region')->value('Karnataka');
+		$this->waitForPageLoadAndCheckForErrors();
 //        $this->byId('gd_city')->value('texas');
-        $this->byId('gd_set_address_button')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('geodir_location_save')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
-    }
+		$this->byId('gd_set_address_button')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('geodir_location_save')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
+	}
 
-    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

@@ -7,7 +7,7 @@ 
 
         //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......');
+            $this->markTestSkipped('Skipping ' . pathinfo(__FILE__, PATHINFO_FILENAME) . ' since its already completed......');
             return;
         } else {
             $this->prepareSession()->currentWindow()->maximize();
@@ -18,7 +18,7 @@ 
     {
         $this->logInfo('Testing new location......');
         //make sure multi locations plugin active
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+        $this->maybeAdminLogin(self::GDTEST_BASE_URL . 'wp-admin/plugins.php');
         $this->waitForPageLoadAndCheckForErrors();
 
         $is_active = $this->byId("geodirectory-location-manager")->attribute('class');
@@ -26,13 +26,13 @@ 
             //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');
+            $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");
+        $this->assertFalse(strpos($is_active1, 'inactive'), "Location Manager plugin not active");
 
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=managelocation_fields&subtab=geodir_location_addedit');
+        $this->url(self::GDTEST_BASE_URL . 'wp-admin/admin.php?page=geodirectory&tab=managelocation_fields&subtab=geodir_location_addedit');
         $this->waitForPageLoadAndCheckForErrors();
         $this->prepareSession()->currentWindow()->maximize();
         $this->byId('gd_city')->value('Bengaluru');
@@ -43,7 +43,7 @@ 
         $this->waitForPageLoadAndCheckForErrors();
         $this->byId('geodir_location_save')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
+        $this->assertTrue($this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
     }
 
     public function tearDown()

tests/selenium/stest-14_Delete_Listing.php

Indentation +29 added lines, -29 removed lines

@@ -1,37 +1,37 @@
 <?php
 class DeleteListing 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 testDeleteListing()
-    {
-        $this->logInfo('Delete Listing......');
-        $this->maybeUserLogin(self::GDTEST_BASE_URL.'author/test-user/?geodir_dashbord=true&stype=gd_place', true);
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byClassName('geodir-delete')->click();
-        $this->acceptAlert();
-        $this->waitForPageLoadAndCheckForErrors();
-    }
+	public function testDeleteListing()
+	{
+		$this->logInfo('Delete Listing......');
+		$this->maybeUserLogin(self::GDTEST_BASE_URL.'author/test-user/?geodir_dashbord=true&stype=gd_place', true);
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byClassName('geodir-delete')->click();
+		$this->acceptAlert();
+		$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

@@ -7,7 +7,7 @@ 
 
         //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......');
+            $this->markTestSkipped('Skipping ' . pathinfo(__FILE__, PATHINFO_FILENAME) . ' since its already completed......');
             return;
         } else {
             $this->prepareSession()->currentWindow()->maximize();
@@ -17,7 +17,7 @@ 
     public function testDeleteListing()
     {
         $this->logInfo('Delete Listing......');
-        $this->maybeUserLogin(self::GDTEST_BASE_URL.'author/test-user/?geodir_dashbord=true&stype=gd_place', true);
+        $this->maybeUserLogin(self::GDTEST_BASE_URL . 'author/test-user/?geodir_dashbord=true&stype=gd_place', true);
         $this->waitForPageLoadAndCheckForErrors();
         $this->byClassName('geodir-delete')->click();
         $this->acceptAlert();

tests/selenium/stest-00_Initilaize.php

Indentation +236 added lines, -236 removed lines

@@ -1,67 +1,67 @@ 
 <?php
 class Initialize 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......');
-        } else {
-            $this->prepareSession()->currentWindow()->maximize();
-        }
-
-    }
-
-    public function testInitialize()
-    {
-        // Check plugins available
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+	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......');
+		} else {
+			$this->prepareSession()->currentWindow()->maximize();
+		}
+
+	}
+
+	public function testInitialize()
+	{
+		// Check plugins available
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
 //        echo $this->source();
-        $this->waitForPageLoadAndCheckForErrors();
-
-        $stop_script = false;
-
-        $plugins = array(
-            'geodirectory',
-            'geodirectory-advance-search-filters',
-            'geodirectory-affiliatewp-integration',
-            'geodirectory-ajax-duplicate-alert',
-            'geodirectory-buddypress-integration',
-            'geodirectory-claim-manager',
-            'geodirectory-custom-post-types',
-            'geodirectory-events',
-            'gd-booster',
-            'geodirectory-location-manager',
-            'geodirectory-marker-cluster',
-            'geodirectory-payment-manager',
-            'geodirectory-re-captcha',
-            'geodirectory-review-rating-manager',
-            'geodirectory-social-importer',
-            'stripe-payment-geodirectory-add-on',
-            'buddypress',
+		$this->waitForPageLoadAndCheckForErrors();
+
+		$stop_script = false;
+
+		$plugins = array(
+			'geodirectory',
+			'geodirectory-advance-search-filters',
+			'geodirectory-affiliatewp-integration',
+			'geodirectory-ajax-duplicate-alert',
+			'geodirectory-buddypress-integration',
+			'geodirectory-claim-manager',
+			'geodirectory-custom-post-types',
+			'geodirectory-events',
+			'gd-booster',
+			'geodirectory-location-manager',
+			'geodirectory-marker-cluster',
+			'geodirectory-payment-manager',
+			'geodirectory-re-captcha',
+			'geodirectory-review-rating-manager',
+			'geodirectory-social-importer',
+			'stripe-payment-geodirectory-add-on',
+			'buddypress',
 //            'wordpress-database-reset'
-        );
+		);
 
-        foreach ($plugins as $plugin) {
-            if (!$this->isElementExists($plugin)) {
-                $plugin_name = ucwords(str_replace('-', ' ', $plugin));
-                $this->logError($plugin_name.' not installed');
-                $stop_script = true;
-            }
-        }
+		foreach ($plugins as $plugin) {
+			if (!$this->isElementExists($plugin)) {
+				$plugin_name = ucwords(str_replace('-', ' ', $plugin));
+				$this->logError($plugin_name.' not installed');
+				$stop_script = true;
+			}
+		}
 
-        if($stop_script) {
-            $this->logError("Stopping the script. Please fix the errors to continue");
-            return;
-        }
+		if($stop_script) {
+			$this->logError("Stopping the script. Please fix the errors to continue");
+			return;
+		}
 
 
-        //Activate WordPress database reset
-        //$this->maybeActivatePlugin("wordpress-database-reset");
+		//Activate WordPress database reset
+		//$this->maybeActivatePlugin("wordpress-database-reset");
 
-        //reset the db
+		//reset the db
 //        $this->logInfo('Resetting WordPress database......');
 //        $this->url(self::GDTEST_BASE_URL.'wp-admin/tools.php?page=database-reset');
 //        $this->waitForPageLoadAndCheckForErrors();
@@ -75,194 +75,194 @@ 
 //        $this->acceptAlert();
 //        $this->waitForPageLoadAndCheckForErrors();
 
-        // make sure all plugins not active. We will activate it programatically.
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->hideAdminBar();
+		// make sure all plugins not active. We will activate it programatically.
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->hideAdminBar();
 
 //        if(($key = array_search('wordpress-database-reset', $plugins)) !== false) {
 //            unset($plugins[$key]);
 //        }
 
-        foreach ($plugins as $plugin) {
-            if (!is_int(strpos($this->byId($plugin)->attribute('class'), 'inactive'))) {
-                $plugin_name = ucwords(str_replace('-', ' ', $plugin));
-                $this->logError($plugin_name." is active. Please deactivate it. It will be activated programatically.");
-                $stop_script = true;
-            }
-        }
-
-
-        if($stop_script) {
-            $this->logInfo("Stopping the script. Please fix the errors to continue");
-            return;
-        }
-
-        //make sure GDF theme installed
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/themes.php');
-        $this->waitForPageLoadAndCheckForErrors();
-        if (!$this->isElementExists("GeoDirectory_framework-name")) {
-            $this->logError("GeoDirectory Framework theme not installed");
-            $stop_script = true;
-        }
-
-        if (!$this->isElementExists("gdf_test_child-name")) {
-            $this->logError("GDF child theme not installed");
-            $stop_script = true;
-        }
-
-        if($stop_script) {
-            $this->logError("Stopping the script. Please fix the errors to continue");
-            return;
-        }
-
-        //Activate GDF theme if not active
-        $this->logInfo('Checking GDF theme......');
-        $is_active = $this->byXPath("//div[contains(@class, 'theme') and contains(@class, 'active')]")->attribute('aria-describedby');
-        if (strpos($is_active, 'gdf_test_child-name')) {
-            //GDF already active
-        } else {
-            //Activate GDF
-            $this->logInfo('Activating GDF theme......');
-            $this->byXPath("//div[contains(@aria-describedby, 'gdf_test_child-action') and contains(@aria-describedby, 'gdf_test_child-name')]//div[@class='theme-actions']//a[contains(@class, 'activate')]")->click();
-            $this->waitForPageLoadAndCheckForErrors();
-            $this->assertTrue( $this->isTextPresent("New theme activated"), "'New theme activated' text not found");
-        }
-
-        //Activate Geodirectory core
-        $this->maybeActivatePlugin("geodirectory", 20000);
-
-        //set default location
-        $this->logInfo('Setting default location......');
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=default_location_settings');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('city')->value('New York');
-        $this->byId('set_address_button')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('location_save')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Your settings have been saved"), "'Your settings have been saved' text not found");
-        $this->waitForPageLoadAndCheckForErrors();
-
-        //install place dummy data
-        $this->logInfo('Installing place dummy data......');
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory');
-        $this->waitForPageLoadAndCheckForErrors();
-        //$this->byLinkText('Dummy Data')->click();
-        $this->byXPath("//dd[@id='dummy_data_settings']/a")->click();
-        $html = $this->byId('sub_dummy_data_settings')->attribute('innerHTML');
-        if (strpos($html, 'Yes Delete Please!')) {
-            //delete old place data
-            $this->byXPath("//div[@id='sub_dummy_data_settings']//a[@id='geodir_dummy_delete']")->click();
-            $this->acceptAlert();
-            $this->waitForPageLoadAndCheckForErrors();
-        }
-        $this->select($this->byXPath("//div[@id='sub_dummy_data_settings']//select[@class='selected_sample_data']"))->selectOptionByLabel('10');
-        $this->byXPath("//div[@id='sub_dummy_data_settings']//a[@id='geodir_dummy_insert']")->click();
-        $this->waitForPageLoadAndCheckForErrors(60000);
-
-        //make sure dummy data installed
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byXPath("//dd[@id='dummy_data_settings']/a")->click();
-        $html = $this->byId('sub_dummy_data_settings')->attribute('innerHTML');
-        $this->assertTrue( is_int(strpos($html, 'Yes Delete Please!')), "Places Demo data not installed correctly");
-
-
-        //Activate Geodirectory Events
-        $this->maybeActivatePlugin("geodirectory-events", 20000);
-
-        //install Events dummy data
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byXPath("//dd[@id='gdevent_dummy_data_settings']/a")->click();
-        $html = $this->byId('sub_gdevent_dummy_data_settings')->attribute('innerHTML');
-        if (strpos($html, 'Yes Delete Please!')) {
-            //delete old data
-            $this->byXPath("//div[@id='sub_gdevent_dummy_data_settings']//a[@id='geodir_dummy_delete']")->click();
-            $this->acceptAlert();
-            $this->waitForPageLoadAndCheckForErrors();
-        }
-        $this->select($this->byXPath("//div[@id='sub_gdevent_dummy_data_settings']//select[@class='selected_sample_data']"))->selectOptionByLabel('10');
-        $this->byXPath("//div[@id='sub_gdevent_dummy_data_settings']//a[@id='geodir_dummy_insert']")->click();
-        $this->waitForPageLoadAndCheckForErrors(60000);
-
-        //make sure Events dummy data installed
-        $this->logInfo('Checking events dummy data installed properly or not......');
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=general_settings&active_tab=gdevent_dummy_data_settings');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byXPath("//dd[@id='gdevent_dummy_data_settings']/a")->click();
-        $html = $this->byId('sub_gdevent_dummy_data_settings')->attribute('innerHTML');
-        $this->assertTrue( is_int(strpos($html, 'Yes Delete Please!')), "Events Demo data not installed correctly");
-
-        //set home page
-        $this->logInfo('Setting home page......');
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/options-reading.php');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byXPath("//input[@value='page']")->click();
-        $this->select($this->byId("page_on_front"))->selectOptionByLabel('GD Home page');
-        $this->byId("submit")->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Settings saved"), "'Settings saved' text not found");
-
-        //Enable registration
-        $this->logInfo('Enabling registration......');
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/options-general.php');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId("users_can_register")->click();
-        $this->byId("submit")->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Settings saved"), "'Settings saved' text not found");
-
-        //Permalinks
-        $this->logInfo('Setting permalinks......');
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/options-permalink.php');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byXPath("(//input[@name='selection'])[5]")->click();
-        $this->byId("submit")->click();
-        $this->waitForPageLoadAndCheckForErrors();
+		foreach ($plugins as $plugin) {
+			if (!is_int(strpos($this->byId($plugin)->attribute('class'), 'inactive'))) {
+				$plugin_name = ucwords(str_replace('-', ' ', $plugin));
+				$this->logError($plugin_name." is active. Please deactivate it. It will be activated programatically.");
+				$stop_script = true;
+			}
+		}
+
+
+		if($stop_script) {
+			$this->logInfo("Stopping the script. Please fix the errors to continue");
+			return;
+		}
+
+		//make sure GDF theme installed
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/themes.php');
+		$this->waitForPageLoadAndCheckForErrors();
+		if (!$this->isElementExists("GeoDirectory_framework-name")) {
+			$this->logError("GeoDirectory Framework theme not installed");
+			$stop_script = true;
+		}
+
+		if (!$this->isElementExists("gdf_test_child-name")) {
+			$this->logError("GDF child theme not installed");
+			$stop_script = true;
+		}
+
+		if($stop_script) {
+			$this->logError("Stopping the script. Please fix the errors to continue");
+			return;
+		}
+
+		//Activate GDF theme if not active
+		$this->logInfo('Checking GDF theme......');
+		$is_active = $this->byXPath("//div[contains(@class, 'theme') and contains(@class, 'active')]")->attribute('aria-describedby');
+		if (strpos($is_active, 'gdf_test_child-name')) {
+			//GDF already active
+		} else {
+			//Activate GDF
+			$this->logInfo('Activating GDF theme......');
+			$this->byXPath("//div[contains(@aria-describedby, 'gdf_test_child-action') and contains(@aria-describedby, 'gdf_test_child-name')]//div[@class='theme-actions']//a[contains(@class, 'activate')]")->click();
+			$this->waitForPageLoadAndCheckForErrors();
+			$this->assertTrue( $this->isTextPresent("New theme activated"), "'New theme activated' text not found");
+		}
+
+		//Activate Geodirectory core
+		$this->maybeActivatePlugin("geodirectory", 20000);
+
+		//set default location
+		$this->logInfo('Setting default location......');
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=default_location_settings');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('city')->value('New York');
+		$this->byId('set_address_button')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('location_save')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Your settings have been saved"), "'Your settings have been saved' text not found");
+		$this->waitForPageLoadAndCheckForErrors();
+
+		//install place dummy data
+		$this->logInfo('Installing place dummy data......');
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory');
+		$this->waitForPageLoadAndCheckForErrors();
+		//$this->byLinkText('Dummy Data')->click();
+		$this->byXPath("//dd[@id='dummy_data_settings']/a")->click();
+		$html = $this->byId('sub_dummy_data_settings')->attribute('innerHTML');
+		if (strpos($html, 'Yes Delete Please!')) {
+			//delete old place data
+			$this->byXPath("//div[@id='sub_dummy_data_settings']//a[@id='geodir_dummy_delete']")->click();
+			$this->acceptAlert();
+			$this->waitForPageLoadAndCheckForErrors();
+		}
+		$this->select($this->byXPath("//div[@id='sub_dummy_data_settings']//select[@class='selected_sample_data']"))->selectOptionByLabel('10');
+		$this->byXPath("//div[@id='sub_dummy_data_settings']//a[@id='geodir_dummy_insert']")->click();
+		$this->waitForPageLoadAndCheckForErrors(60000);
+
+		//make sure dummy data installed
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byXPath("//dd[@id='dummy_data_settings']/a")->click();
+		$html = $this->byId('sub_dummy_data_settings')->attribute('innerHTML');
+		$this->assertTrue( is_int(strpos($html, 'Yes Delete Please!')), "Places Demo data not installed correctly");
+
+
+		//Activate Geodirectory Events
+		$this->maybeActivatePlugin("geodirectory-events", 20000);
+
+		//install Events dummy data
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byXPath("//dd[@id='gdevent_dummy_data_settings']/a")->click();
+		$html = $this->byId('sub_gdevent_dummy_data_settings')->attribute('innerHTML');
+		if (strpos($html, 'Yes Delete Please!')) {
+			//delete old data
+			$this->byXPath("//div[@id='sub_gdevent_dummy_data_settings']//a[@id='geodir_dummy_delete']")->click();
+			$this->acceptAlert();
+			$this->waitForPageLoadAndCheckForErrors();
+		}
+		$this->select($this->byXPath("//div[@id='sub_gdevent_dummy_data_settings']//select[@class='selected_sample_data']"))->selectOptionByLabel('10');
+		$this->byXPath("//div[@id='sub_gdevent_dummy_data_settings']//a[@id='geodir_dummy_insert']")->click();
+		$this->waitForPageLoadAndCheckForErrors(60000);
+
+		//make sure Events dummy data installed
+		$this->logInfo('Checking events dummy data installed properly or not......');
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=general_settings&active_tab=gdevent_dummy_data_settings');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byXPath("//dd[@id='gdevent_dummy_data_settings']/a")->click();
+		$html = $this->byId('sub_gdevent_dummy_data_settings')->attribute('innerHTML');
+		$this->assertTrue( is_int(strpos($html, 'Yes Delete Please!')), "Events Demo data not installed correctly");
+
+		//set home page
+		$this->logInfo('Setting home page......');
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/options-reading.php');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byXPath("//input[@value='page']")->click();
+		$this->select($this->byId("page_on_front"))->selectOptionByLabel('GD Home page');
+		$this->byId("submit")->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Settings saved"), "'Settings saved' text not found");
+
+		//Enable registration
+		$this->logInfo('Enabling registration......');
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/options-general.php');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId("users_can_register")->click();
+		$this->byId("submit")->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Settings saved"), "'Settings saved' text not found");
+
+		//Permalinks
+		$this->logInfo('Setting permalinks......');
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/options-permalink.php');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byXPath("(//input[@name='selection'])[5]")->click();
+		$this->byId("submit")->click();
+		$this->waitForPageLoadAndCheckForErrors();
 //        echo $this->source();
-        $this->assertTrue( $this->isTextPresent("Permalink structure updated"), "'Permalink structure updated' text not found");
-
-        //create and assign menu
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/nav-menus.php');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Give your menu a name above, then click Create Menu."), "'Create Menu' text not found");
-        $this->logInfo('Creating new menu......');
-        $this->byId('menu-name')->value('Primary');
-        $this->byId('save_menu_header')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/nav-menus.php');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Add menu items from the column on the left"), "'Add menu items from the column on the left' text not found");
-        $this->logInfo('Setting menu location......');
-        $this->byId('locations-main-nav')->click();
-        $this->byId('save_menu_header')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("<strong>Primary</strong> has been updated"), "'Primary has been updated' text not found");
-
-        // Assign menu
-        $this->logInfo('Assigning menu......');
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_navigation_settings');
-        $this->ExecuteScript('jQuery("#geodir_theme_location_nav").show();');
-        $this->select($this->byId('geodir_theme_location_nav'))->selectOptionByLabel('The Main Menu');
-        $this->byName('save')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-
-        //Logout
-        $this->maybeAdminLogout();
-    }
-
-    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);
-        }
-    }
+		$this->assertTrue( $this->isTextPresent("Permalink structure updated"), "'Permalink structure updated' text not found");
+
+		//create and assign menu
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/nav-menus.php');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Give your menu a name above, then click Create Menu."), "'Create Menu' text not found");
+		$this->logInfo('Creating new menu......');
+		$this->byId('menu-name')->value('Primary');
+		$this->byId('save_menu_header')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/nav-menus.php');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Add menu items from the column on the left"), "'Add menu items from the column on the left' text not found");
+		$this->logInfo('Setting menu location......');
+		$this->byId('locations-main-nav')->click();
+		$this->byId('save_menu_header')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("<strong>Primary</strong> has been updated"), "'Primary has been updated' text not found");
+
+		// Assign menu
+		$this->logInfo('Assigning menu......');
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_navigation_settings');
+		$this->ExecuteScript('jQuery("#geodir_theme_location_nav").show();');
+		$this->select($this->byId('geodir_theme_location_nav'))->selectOptionByLabel('The Main Menu');
+		$this->byName('save')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+
+		//Logout
+		$this->maybeAdminLogout();
+	}
+
+	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 +30 added lines, -30 removed lines

@@ -7,7 +7,7 @@ 
 
         //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......');
+            $this->markTestSkipped('Skipping ' . pathinfo(__FILE__, PATHINFO_FILENAME) . ' since its already completed......');
         } else {
             $this->prepareSession()->currentWindow()->maximize();
         }
@@ -17,7 +17,7 @@ 
     public function testInitialize()
     {
         // Check plugins available
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+        $this->maybeAdminLogin(self::GDTEST_BASE_URL . 'wp-admin/plugins.php');
 //        echo $this->source();
         $this->waitForPageLoadAndCheckForErrors();
 
@@ -47,12 +47,12 @@ 
         foreach ($plugins as $plugin) {
             if (!$this->isElementExists($plugin)) {
                 $plugin_name = ucwords(str_replace('-', ' ', $plugin));
-                $this->logError($plugin_name.' not installed');
+                $this->logError($plugin_name . ' not installed');
                 $stop_script = true;
             }
         }
 
-        if($stop_script) {
+        if ($stop_script) {
             $this->logError("Stopping the script. Please fix the errors to continue");
             return;
         }
@@ -76,7 +76,7 @@ 
 //        $this->waitForPageLoadAndCheckForErrors();
 
         // make sure all plugins not active. We will activate it programatically.
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+        $this->url(self::GDTEST_BASE_URL . 'wp-admin/plugins.php');
         $this->waitForPageLoadAndCheckForErrors();
         $this->hideAdminBar();
 
@@ -87,19 +87,19 @@ 
         foreach ($plugins as $plugin) {
             if (!is_int(strpos($this->byId($plugin)->attribute('class'), 'inactive'))) {
                 $plugin_name = ucwords(str_replace('-', ' ', $plugin));
-                $this->logError($plugin_name." is active. Please deactivate it. It will be activated programatically.");
+                $this->logError($plugin_name . " is active. Please deactivate it. It will be activated programatically.");
                 $stop_script = true;
             }
         }
 
 
-        if($stop_script) {
+        if ($stop_script) {
             $this->logInfo("Stopping the script. Please fix the errors to continue");
             return;
         }
 
         //make sure GDF theme installed
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/themes.php');
+        $this->url(self::GDTEST_BASE_URL . 'wp-admin/themes.php');
         $this->waitForPageLoadAndCheckForErrors();
         if (!$this->isElementExists("GeoDirectory_framework-name")) {
             $this->logError("GeoDirectory Framework theme not installed");
@@ -111,7 +111,7 @@ 
             $stop_script = true;
         }
 
-        if($stop_script) {
+        if ($stop_script) {
             $this->logError("Stopping the script. Please fix the errors to continue");
             return;
         }
@@ -126,7 +126,7 @@ 
             $this->logInfo('Activating GDF theme......');
             $this->byXPath("//div[contains(@aria-describedby, 'gdf_test_child-action') and contains(@aria-describedby, 'gdf_test_child-name')]//div[@class='theme-actions']//a[contains(@class, 'activate')]")->click();
             $this->waitForPageLoadAndCheckForErrors();
-            $this->assertTrue( $this->isTextPresent("New theme activated"), "'New theme activated' text not found");
+            $this->assertTrue($this->isTextPresent("New theme activated"), "'New theme activated' text not found");
         }
 
         //Activate Geodirectory core
@@ -134,19 +134,19 @@ 
 
         //set default location
         $this->logInfo('Setting default location......');
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=default_location_settings');
+        $this->url(self::GDTEST_BASE_URL . 'wp-admin/admin.php?page=geodirectory&tab=default_location_settings');
         $this->waitForPageLoadAndCheckForErrors();
         $this->byId('city')->value('New York');
         $this->byId('set_address_button')->click();
         $this->waitForPageLoadAndCheckForErrors();
         $this->byId('location_save')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Your settings have been saved"), "'Your settings have been saved' text not found");
+        $this->assertTrue($this->isTextPresent("Your settings have been saved"), "'Your settings have been saved' text not found");
         $this->waitForPageLoadAndCheckForErrors();
 
         //install place dummy data
         $this->logInfo('Installing place dummy data......');
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory');
+        $this->url(self::GDTEST_BASE_URL . 'wp-admin/admin.php?page=geodirectory');
         $this->waitForPageLoadAndCheckForErrors();
         //$this->byLinkText('Dummy Data')->click();
         $this->byXPath("//dd[@id='dummy_data_settings']/a")->click();
@@ -162,18 +162,18 @@ 
         $this->waitForPageLoadAndCheckForErrors(60000);
 
         //make sure dummy data installed
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory');
+        $this->url(self::GDTEST_BASE_URL . 'wp-admin/admin.php?page=geodirectory');
         $this->waitForPageLoadAndCheckForErrors();
         $this->byXPath("//dd[@id='dummy_data_settings']/a")->click();
         $html = $this->byId('sub_dummy_data_settings')->attribute('innerHTML');
-        $this->assertTrue( is_int(strpos($html, 'Yes Delete Please!')), "Places Demo data not installed correctly");
+        $this->assertTrue(is_int(strpos($html, 'Yes Delete Please!')), "Places Demo data not installed correctly");
 
 
         //Activate Geodirectory Events
         $this->maybeActivatePlugin("geodirectory-events", 20000);
 
         //install Events dummy data
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory');
+        $this->url(self::GDTEST_BASE_URL . 'wp-admin/admin.php?page=geodirectory');
         $this->waitForPageLoadAndCheckForErrors();
         $this->byXPath("//dd[@id='gdevent_dummy_data_settings']/a")->click();
         $html = $this->byId('sub_gdevent_dummy_data_settings')->attribute('innerHTML');
@@ -189,62 +189,62 @@ 
 
         //make sure Events dummy data installed
         $this->logInfo('Checking events dummy data installed properly or not......');
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=general_settings&active_tab=gdevent_dummy_data_settings');
+        $this->url(self::GDTEST_BASE_URL . 'wp-admin/admin.php?page=geodirectory&tab=general_settings&active_tab=gdevent_dummy_data_settings');
         $this->waitForPageLoadAndCheckForErrors();
         $this->byXPath("//dd[@id='gdevent_dummy_data_settings']/a")->click();
         $html = $this->byId('sub_gdevent_dummy_data_settings')->attribute('innerHTML');
-        $this->assertTrue( is_int(strpos($html, 'Yes Delete Please!')), "Events Demo data not installed correctly");
+        $this->assertTrue(is_int(strpos($html, 'Yes Delete Please!')), "Events Demo data not installed correctly");
 
         //set home page
         $this->logInfo('Setting home page......');
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/options-reading.php');
+        $this->url(self::GDTEST_BASE_URL . 'wp-admin/options-reading.php');
         $this->waitForPageLoadAndCheckForErrors();
         $this->byXPath("//input[@value='page']")->click();
         $this->select($this->byId("page_on_front"))->selectOptionByLabel('GD Home page');
         $this->byId("submit")->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Settings saved"), "'Settings saved' text not found");
+        $this->assertTrue($this->isTextPresent("Settings saved"), "'Settings saved' text not found");
 
         //Enable registration
         $this->logInfo('Enabling registration......');
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/options-general.php');
+        $this->url(self::GDTEST_BASE_URL . 'wp-admin/options-general.php');
         $this->waitForPageLoadAndCheckForErrors();
         $this->byId("users_can_register")->click();
         $this->byId("submit")->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Settings saved"), "'Settings saved' text not found");
+        $this->assertTrue($this->isTextPresent("Settings saved"), "'Settings saved' text not found");
 
         //Permalinks
         $this->logInfo('Setting permalinks......');
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/options-permalink.php');
+        $this->url(self::GDTEST_BASE_URL . 'wp-admin/options-permalink.php');
         $this->waitForPageLoadAndCheckForErrors();
         $this->byXPath("(//input[@name='selection'])[5]")->click();
         $this->byId("submit")->click();
         $this->waitForPageLoadAndCheckForErrors();
 //        echo $this->source();
-        $this->assertTrue( $this->isTextPresent("Permalink structure updated"), "'Permalink structure updated' text not found");
+        $this->assertTrue($this->isTextPresent("Permalink structure updated"), "'Permalink structure updated' text not found");
 
         //create and assign menu
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/nav-menus.php');
+        $this->maybeAdminLogin(self::GDTEST_BASE_URL . 'wp-admin/nav-menus.php');
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Give your menu a name above, then click Create Menu."), "'Create Menu' text not found");
+        $this->assertTrue($this->isTextPresent("Give your menu a name above, then click Create Menu."), "'Create Menu' text not found");
         $this->logInfo('Creating new menu......');
         $this->byId('menu-name')->value('Primary');
         $this->byId('save_menu_header')->click();
         $this->waitForPageLoadAndCheckForErrors();
 
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/nav-menus.php');
+        $this->url(self::GDTEST_BASE_URL . 'wp-admin/nav-menus.php');
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Add menu items from the column on the left"), "'Add menu items from the column on the left' text not found");
+        $this->assertTrue($this->isTextPresent("Add menu items from the column on the left"), "'Add menu items from the column on the left' text not found");
         $this->logInfo('Setting menu location......');
         $this->byId('locations-main-nav')->click();
         $this->byId('save_menu_header')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("<strong>Primary</strong> has been updated"), "'Primary has been updated' text not found");
+        $this->assertTrue($this->isTextPresent("<strong>Primary</strong> has been updated"), "'Primary has been updated' text not found");
 
         // Assign menu
         $this->logInfo('Assigning menu......');
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_navigation_settings');
+        $this->url(self::GDTEST_BASE_URL . 'wp-admin/admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_navigation_settings');
         $this->ExecuteScript('jQuery("#geodir_theme_location_nav").show();');
         $this->select($this->byId('geodir_theme_location_nav'))->selectOptionByLabel('The Main Menu');
         $this->byName('save')->click();

tests/selenium/stest-33_Stripe.php

Indentation +57 added lines, -57 removed lines

@@ -1,79 +1,79 @@
 <?php
 class Stripe 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 testStripe()
-    {
-        $this->logInfo('Testing stripe......');
-        //make sure Stripe payment plugin active
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        $this->waitForPageLoadAndCheckForErrors();
+	public function testStripe()
+	{
+		$this->logInfo('Testing stripe......');
+		//make sure Stripe payment plugin active
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		$this->waitForPageLoadAndCheckForErrors();
 
-        $is_active = $this->byId("stripe-payment-geodirectory-add-on")->attribute('class');
-        if (is_int(strpos($is_active, 'inactive'))) {
-            //Activate Geodirectory stripe payment geodirectory add on
-            $this->maybeActivatePlugin("stripe-payment-geodirectory-add-on", 20000);
-            //go back to plugin page
-            $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        }
+		$is_active = $this->byId("stripe-payment-geodirectory-add-on")->attribute('class');
+		if (is_int(strpos($is_active, 'inactive'))) {
+			//Activate Geodirectory stripe payment geodirectory add on
+			$this->maybeActivatePlugin("stripe-payment-geodirectory-add-on", 20000);
+			//go back to plugin page
+			$this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		}
 
-        $is_active1 = $this->byId("stripe-payment-geodirectory-add-on")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "stripe payment geodirectory add on plugin not active");
+		$is_active1 = $this->byId("stripe-payment-geodirectory-add-on")->attribute('class');
+		$this->assertFalse( strpos($is_active1, 'inactive'), "stripe payment geodirectory add on plugin not active");
 
 
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=paymentmanager_fields&subtab=geodir_payment_options');
-        $this->waitForPageLoadAndCheckForErrors();
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=paymentmanager_fields&subtab=geodir_payment_options');
+		$this->waitForPageLoadAndCheckForErrors();
 
-        $this->url(self::GDTEST_BASE_URL.'author/admin/?geodir_dashbord=true&stype=gd_place');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byClassName('geodir-upgrade')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byXPath("(//div[@class='geodir_package']/input[@type='radio'])[2]")->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        if ($this->isTextPresent("Business Owner/Associate")) {
+		$this->url(self::GDTEST_BASE_URL.'author/admin/?geodir_dashbord=true&stype=gd_place');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byClassName('geodir-upgrade')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byXPath("(//div[@class='geodir_package']/input[@type='radio'])[2]")->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		if ($this->isTextPresent("Business Owner/Associate")) {
 //            $elements = $this->elements($this->using('name')->value('claimed'));
 //            $elements[0]->click();
 //            $this->byXPath("//input[contains(@name,'claimed') and contains(@value,'0')]")->click();
-            $this->ExecuteScript('jQuery("#geodir_claimed_row input:radio:first").prop("checked", true).trigger("click");');
-        }
-        $this->byId('geodir_accept_term_condition')->click();
-        $this->byXPath("//div[@id='geodir-add-listing-submit']//input[@type='submit']")->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byXPath("//input[@name='Submit and Pay']")->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->ExecuteScript('jQuery("#gd_pmethod_stripe").prop("checked", true).trigger("click");');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('gd_checkout_paynow')->click();
+			$this->ExecuteScript('jQuery("#geodir_claimed_row input:radio:first").prop("checked", true).trigger("click");');
+		}
+		$this->byId('geodir_accept_term_condition')->click();
+		$this->byXPath("//div[@id='geodir-add-listing-submit']//input[@type='submit']")->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byXPath("//input[@name='Submit and Pay']")->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->ExecuteScript('jQuery("#gd_pmethod_stripe").prop("checked", true).trigger("click");');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('gd_checkout_paynow')->click();
 //        $this->waitForPageLoadAndCheckForErrors();
 //        $this->byId('email')->value('test@test.com');
 //        $this->byId('card_number')->value('4242424242424242');
 //        $this->byId('cc-exp')->value('12 / 20');
 //        $this->byId('cc-csc')->value('333');
 //        $this->byId('submitButton')->click();
-        $this->logInfo('Skipping stripe payment since cross-site scripting not possible......');
-        $this->waitForPageLoadAndCheckForErrors();
-    }
+		$this->logInfo('Skipping stripe payment since cross-site scripting not possible......');
+		$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 +6 added lines, -6 removed lines

@@ -7,7 +7,7 @@ 
 
         //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......');
+            $this->markTestSkipped('Skipping ' . pathinfo(__FILE__, PATHINFO_FILENAME) . ' since its already completed......');
             return;
         } else {
             $this->prepareSession()->currentWindow()->maximize();
@@ -18,7 +18,7 @@ 
     {
         $this->logInfo('Testing stripe......');
         //make sure Stripe payment plugin active
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+        $this->maybeAdminLogin(self::GDTEST_BASE_URL . 'wp-admin/plugins.php');
         $this->waitForPageLoadAndCheckForErrors();
 
         $is_active = $this->byId("stripe-payment-geodirectory-add-on")->attribute('class');
@@ -26,17 +26,17 @@ 
             //Activate Geodirectory stripe payment geodirectory add on
             $this->maybeActivatePlugin("stripe-payment-geodirectory-add-on", 20000);
             //go back to plugin page
-            $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+            $this->url(self::GDTEST_BASE_URL . 'wp-admin/plugins.php');
         }
 
         $is_active1 = $this->byId("stripe-payment-geodirectory-add-on")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "stripe payment geodirectory add on plugin not active");
+        $this->assertFalse(strpos($is_active1, 'inactive'), "stripe payment geodirectory add on plugin not active");
 
 
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=paymentmanager_fields&subtab=geodir_payment_options');
+        $this->url(self::GDTEST_BASE_URL . 'wp-admin/admin.php?page=geodirectory&tab=paymentmanager_fields&subtab=geodir_payment_options');
         $this->waitForPageLoadAndCheckForErrors();
 
-        $this->url(self::GDTEST_BASE_URL.'author/admin/?geodir_dashbord=true&stype=gd_place');
+        $this->url(self::GDTEST_BASE_URL . 'author/admin/?geodir_dashbord=true&stype=gd_place');
         $this->waitForPageLoadAndCheckForErrors();
         $this->byClassName('geodir-upgrade')->click();
         $this->waitForPageLoadAndCheckForErrors();

tests/selenium/stest-02_Login.php

Indentation +34 added lines, -34 removed lines

@@ -1,45 +1,45 @@
 <?php
 class LoginUser 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 testLogin()
-    {
-        $this->logInfo('Logging in new user......');
-        $this->url(self::GDTEST_BASE_URL.'gd-login/?signup=1');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Sign In"), "No text found");
-        $this->byId('user_login')->value('testuser@test.com');
-        $this->byId('user_pass')->value('1');
+	public function testLogin()
+	{
+		$this->logInfo('Logging in new user......');
+		$this->url(self::GDTEST_BASE_URL.'gd-login/?signup=1');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Sign In"), "No text found");
+		$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->assertFalse( $this->isTextPresent("Invalid Username/Password."), "Invalid Username/Password.");
-        $this->assertTrue( $this->isTextPresent("Add Listing"), "Add Listing text not found");
+		// Submit the form
+		$this->byId('cus_loginform')->submit();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertFalse( $this->isTextPresent("Invalid Username/Password."), "Invalid Username/Password.");
+		$this->assertTrue( $this->isTextPresent("Add Listing"), "Add Listing 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 +5 added lines, -5 removed lines

@@ -7,7 +7,7 @@ 
 
         //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......');
+            $this->markTestSkipped('Skipping ' . pathinfo(__FILE__, PATHINFO_FILENAME) . ' since its already completed......');
             return;
         } else {
             $this->prepareSession()->currentWindow()->maximize();
@@ -17,17 +17,17 @@ 
     public function testLogin()
     {
         $this->logInfo('Logging in new user......');
-        $this->url(self::GDTEST_BASE_URL.'gd-login/?signup=1');
+        $this->url(self::GDTEST_BASE_URL . 'gd-login/?signup=1');
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Sign In"), "No text found");
+        $this->assertTrue($this->isTextPresent("Sign In"), "No text found");
         $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->assertFalse( $this->isTextPresent("Invalid Username/Password."), "Invalid Username/Password.");
-        $this->assertTrue( $this->isTextPresent("Add Listing"), "Add Listing text not found");
+        $this->assertFalse($this->isTextPresent("Invalid Username/Password."), "Invalid Username/Password.");
+        $this->assertTrue($this->isTextPresent("Add Listing"), "Add Listing text not found");
 
     }
 

tests/selenium/stest-31_ReCaptcha.php

Indentation +189 added lines, -189 removed lines

@@ -1,194 +1,194 @@
 <?php
 class ReCaptcha 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 testReCaptcha()
-    {
-        $this->logInfo('Testing recaptcha......');
-        //make sure ReCaptcha plugin active
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        $this->waitForPageLoadAndCheckForErrors();
-
-        $is_active = $this->byId("geodirectory-re-captcha")->attribute('class');
-        if (is_int(strpos($is_active, 'inactive'))) {
-            //Activate Geodirectory ReCaptcha
-            $this->maybeActivatePlugin("geodirectory-re-captcha", 20000);
-            //go back to plugin page
-            $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        }
-
-        $is_active1 = $this->byId("geodirectory-re-captcha")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "ReCaptcha plugin not active");
-
-        //make sure BuddyPress core plugin active
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        $this->waitForPageLoadAndCheckForErrors();
-
-        $is_active = $this->byId("buddypress")->attribute('class');
-        if (is_int(strpos($is_active, 'inactive'))) {
-            //Activate Geodirectory buddypress
-            $this->maybeActivatePlugin("buddypress", 20000);
-            //go back to plugin page
-            $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        }
-
-        $is_active1 = $this->byId("buddypress")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "buddypress plugin not active");
-
-        //make sure BuddyPress Integration plugin active
-        $is_active = $this->byId("geodirectory-buddypress-integration")->attribute('class');
-        if (is_int(strpos($is_active, 'inactive'))) {
-            //Activate Geodirectory buddypress integration
-            $this->maybeActivatePlugin("geodirectory-buddypress-integration", 20000);
-            //go back to plugin page
-            $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        }
-
-        $is_active1 = $this->byId("geodirectory-buddypress-integration")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "geodirectory buddypress integration plugin not active");
-
-
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=geodir_recaptcha&subtab=gdcaptcha_settings');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->prepareSession()->currentWindow()->maximize();
-
-        $stop_script = false;
-
-        $public_key  = getenv( 'GOOGLE_RECAPTCHA_KEY' );
-        $private_key  = getenv( 'GOOGLE_RECAPTCHA_SECRET' );
-
-        if (!$public_key) {
-            $this->logError("ENV variable GOOGLE_RECAPTCHA_KEY not available");
-            $stop_script = true;
-        }
-
-        if (!$private_key) {
-            $this->logError("ENV variable GOOGLE_RECAPTCHA_KEY not available");
-            $stop_script = true;
-        }
-
-        if($stop_script) {
-            $this->logInfo("Stopping the script. Please fix the errors to continue");
-            return;
-        }
-
-        $value = $this->byId('geodir_recaptcha_site_key')->value();
-        if (empty($value)) {
-            $this->byId('geodir_recaptcha_site_key')->value($public_key);
-        }
-
-        $value = $this->byId('geodir_recaptcha_secret_key')->value();
-        if (empty($value)) {
-            $this->byId('geodir_recaptcha_secret_key')->value($private_key);
-        }
-
-
-        $to_save = false;
-
-        $options = array(
-            'geodir_recaptcha_registration',
-            'geodir_recaptcha_add_listing',
-            'geodir_recaptcha_claim_listing',
-            'geodir_recaptcha_comments',
-            'geodir_recaptcha_send_to_friend',
-            'geodir_recaptcha_send_enquery',
-            'geodir_recaptcha_buddypress'
-        );
-
-        foreach ($options as $option) {
-            $is_checked = $this->byId($option)->attribute('checked');
-            if (!$is_checked) {
-                $this->byId($option)->click();
-                $to_save = true;
-            }
-        }
-
-        if ($to_save) {
-            $this->byName('save')->click();
-            $this->waitForPageLoadAndCheckForErrors();
-        }
-
-        $this->maybeLogout();
-        //Signup
-        $this->url(self::GDTEST_BASE_URL.'gd-login/?signup=1');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Sign Up Now"), "Not in signup page");
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
-        $this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in signup page");
-
-        //Add 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"), "Not in Add Listing page");
-        $this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
-        $this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in Add Listing page");
-
-        //claim
-        $this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('gd-claim-button')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
-        $this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in claim form");
-
-        //reviews
-        $this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byLinkText('Reviews')->click();
-        $this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
-        $this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in reviews form");
-
-        //send enquiry
-        $this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byClassName('b_send_inquiry')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
-        $this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in Send Enquiry form");
-
-        //send to friend
-        $this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byClassName('b_sendtofriend')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
-        $this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in Send To Friend form");
-
-        //buddypress
-        //Todo: assert buddypress 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 testReCaptcha()
+	{
+		$this->logInfo('Testing recaptcha......');
+		//make sure ReCaptcha plugin active
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		$this->waitForPageLoadAndCheckForErrors();
+
+		$is_active = $this->byId("geodirectory-re-captcha")->attribute('class');
+		if (is_int(strpos($is_active, 'inactive'))) {
+			//Activate Geodirectory ReCaptcha
+			$this->maybeActivatePlugin("geodirectory-re-captcha", 20000);
+			//go back to plugin page
+			$this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		}
+
+		$is_active1 = $this->byId("geodirectory-re-captcha")->attribute('class');
+		$this->assertFalse( strpos($is_active1, 'inactive'), "ReCaptcha plugin not active");
+
+		//make sure BuddyPress core plugin active
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		$this->waitForPageLoadAndCheckForErrors();
+
+		$is_active = $this->byId("buddypress")->attribute('class');
+		if (is_int(strpos($is_active, 'inactive'))) {
+			//Activate Geodirectory buddypress
+			$this->maybeActivatePlugin("buddypress", 20000);
+			//go back to plugin page
+			$this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		}
+
+		$is_active1 = $this->byId("buddypress")->attribute('class');
+		$this->assertFalse( strpos($is_active1, 'inactive'), "buddypress plugin not active");
+
+		//make sure BuddyPress Integration plugin active
+		$is_active = $this->byId("geodirectory-buddypress-integration")->attribute('class');
+		if (is_int(strpos($is_active, 'inactive'))) {
+			//Activate Geodirectory buddypress integration
+			$this->maybeActivatePlugin("geodirectory-buddypress-integration", 20000);
+			//go back to plugin page
+			$this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		}
+
+		$is_active1 = $this->byId("geodirectory-buddypress-integration")->attribute('class');
+		$this->assertFalse( strpos($is_active1, 'inactive'), "geodirectory buddypress integration plugin not active");
+
+
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=geodir_recaptcha&subtab=gdcaptcha_settings');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->prepareSession()->currentWindow()->maximize();
+
+		$stop_script = false;
+
+		$public_key  = getenv( 'GOOGLE_RECAPTCHA_KEY' );
+		$private_key  = getenv( 'GOOGLE_RECAPTCHA_SECRET' );
+
+		if (!$public_key) {
+			$this->logError("ENV variable GOOGLE_RECAPTCHA_KEY not available");
+			$stop_script = true;
+		}
+
+		if (!$private_key) {
+			$this->logError("ENV variable GOOGLE_RECAPTCHA_KEY not available");
+			$stop_script = true;
+		}
+
+		if($stop_script) {
+			$this->logInfo("Stopping the script. Please fix the errors to continue");
+			return;
+		}
+
+		$value = $this->byId('geodir_recaptcha_site_key')->value();
+		if (empty($value)) {
+			$this->byId('geodir_recaptcha_site_key')->value($public_key);
+		}
+
+		$value = $this->byId('geodir_recaptcha_secret_key')->value();
+		if (empty($value)) {
+			$this->byId('geodir_recaptcha_secret_key')->value($private_key);
+		}
+
+
+		$to_save = false;
+
+		$options = array(
+			'geodir_recaptcha_registration',
+			'geodir_recaptcha_add_listing',
+			'geodir_recaptcha_claim_listing',
+			'geodir_recaptcha_comments',
+			'geodir_recaptcha_send_to_friend',
+			'geodir_recaptcha_send_enquery',
+			'geodir_recaptcha_buddypress'
+		);
+
+		foreach ($options as $option) {
+			$is_checked = $this->byId($option)->attribute('checked');
+			if (!$is_checked) {
+				$this->byId($option)->click();
+				$to_save = true;
+			}
+		}
+
+		if ($to_save) {
+			$this->byName('save')->click();
+			$this->waitForPageLoadAndCheckForErrors();
+		}
+
+		$this->maybeLogout();
+		//Signup
+		$this->url(self::GDTEST_BASE_URL.'gd-login/?signup=1');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Sign Up Now"), "Not in signup page");
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
+		$this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in signup page");
+
+		//Add 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"), "Not in Add Listing page");
+		$this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
+		$this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in Add Listing page");
+
+		//claim
+		$this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('gd-claim-button')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
+		$this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in claim form");
+
+		//reviews
+		$this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byLinkText('Reviews')->click();
+		$this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
+		$this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in reviews form");
+
+		//send enquiry
+		$this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byClassName('b_send_inquiry')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
+		$this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in Send Enquiry form");
+
+		//send to friend
+		$this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byClassName('b_sendtofriend')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
+		$this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in Send To Friend form");
+
+		//buddypress
+		//Todo: assert buddypress 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 +28 added lines, -28 removed lines

@@ -7,7 +7,7 @@ 
 
         //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......');
+            $this->markTestSkipped('Skipping ' . pathinfo(__FILE__, PATHINFO_FILENAME) . ' since its already completed......');
             return;
         } else {
             $this->prepareSession()->currentWindow()->maximize();
@@ -18,7 +18,7 @@ 
     {
         $this->logInfo('Testing recaptcha......');
         //make sure ReCaptcha plugin active
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+        $this->maybeAdminLogin(self::GDTEST_BASE_URL . 'wp-admin/plugins.php');
         $this->waitForPageLoadAndCheckForErrors();
 
         $is_active = $this->byId("geodirectory-re-captcha")->attribute('class');
@@ -26,14 +26,14 @@ 
             //Activate Geodirectory ReCaptcha
             $this->maybeActivatePlugin("geodirectory-re-captcha", 20000);
             //go back to plugin page
-            $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+            $this->url(self::GDTEST_BASE_URL . 'wp-admin/plugins.php');
         }
 
         $is_active1 = $this->byId("geodirectory-re-captcha")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "ReCaptcha plugin not active");
+        $this->assertFalse(strpos($is_active1, 'inactive'), "ReCaptcha plugin not active");
 
         //make sure BuddyPress core plugin active
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+        $this->maybeAdminLogin(self::GDTEST_BASE_URL . 'wp-admin/plugins.php');
         $this->waitForPageLoadAndCheckForErrors();
 
         $is_active = $this->byId("buddypress")->attribute('class');
@@ -41,11 +41,11 @@ 
             //Activate Geodirectory buddypress
             $this->maybeActivatePlugin("buddypress", 20000);
             //go back to plugin page
-            $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+            $this->url(self::GDTEST_BASE_URL . 'wp-admin/plugins.php');
         }
 
         $is_active1 = $this->byId("buddypress")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "buddypress plugin not active");
+        $this->assertFalse(strpos($is_active1, 'inactive'), "buddypress plugin not active");
 
         //make sure BuddyPress Integration plugin active
         $is_active = $this->byId("geodirectory-buddypress-integration")->attribute('class');
@@ -53,21 +53,21 @@ 
             //Activate Geodirectory buddypress integration
             $this->maybeActivatePlugin("geodirectory-buddypress-integration", 20000);
             //go back to plugin page
-            $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+            $this->url(self::GDTEST_BASE_URL . 'wp-admin/plugins.php');
         }
 
         $is_active1 = $this->byId("geodirectory-buddypress-integration")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "geodirectory buddypress integration plugin not active");
+        $this->assertFalse(strpos($is_active1, 'inactive'), "geodirectory buddypress integration plugin not active");
 
 
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=geodir_recaptcha&subtab=gdcaptcha_settings');
+        $this->url(self::GDTEST_BASE_URL . 'wp-admin/admin.php?page=geodirectory&tab=geodir_recaptcha&subtab=gdcaptcha_settings');
         $this->waitForPageLoadAndCheckForErrors();
         $this->prepareSession()->currentWindow()->maximize();
 
         $stop_script = false;
 
-        $public_key  = getenv( 'GOOGLE_RECAPTCHA_KEY' );
-        $private_key  = getenv( 'GOOGLE_RECAPTCHA_SECRET' );
+        $public_key  = getenv('GOOGLE_RECAPTCHA_KEY');
+        $private_key = getenv('GOOGLE_RECAPTCHA_SECRET');
 
         if (!$public_key) {
             $this->logError("ENV variable GOOGLE_RECAPTCHA_KEY not available");
@@ -79,7 +79,7 @@ 
             $stop_script = true;
         }
 
-        if($stop_script) {
+        if ($stop_script) {
             $this->logInfo("Stopping the script. Please fix the errors to continue");
             return;
         }
@@ -122,15 +122,15 @@ 
 
         $this->maybeLogout();
         //Signup
-        $this->url(self::GDTEST_BASE_URL.'gd-login/?signup=1');
+        $this->url(self::GDTEST_BASE_URL . 'gd-login/?signup=1');
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Sign Up Now"), "Not in signup page");
+        $this->assertTrue($this->isTextPresent("Sign Up Now"), "Not in signup page");
         $this->waitForPageLoadAndCheckForErrors();
         $this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
-        $this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in signup page");
+        $this->assertTrue($this->isTextPresent("I'm not a robot"), "Recaptcha field not found in signup page");
 
         //Add Listing
-        $this->url(self::GDTEST_BASE_URL.'add-listing/?listing_type=gd_place');
+        $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');
@@ -139,42 +139,42 @@ 
             // Submit the form
             $this->byId('cus_loginform')->submit();
             $this->waitForPageLoadAndCheckForErrors();
-            $this->url(self::GDTEST_BASE_URL.'add-listing/?listing_type=gd_place');
+            $this->url(self::GDTEST_BASE_URL . 'add-listing/?listing_type=gd_place');
         }
-        $this->assertTrue( $this->isTextPresent("Add Place"), "Not in Add Listing page");
+        $this->assertTrue($this->isTextPresent("Add Place"), "Not in Add Listing page");
         $this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
-        $this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in Add Listing page");
+        $this->assertTrue($this->isTextPresent("I'm not a robot"), "Recaptcha field not found in Add Listing page");
 
         //claim
-        $this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/');
+        $this->url(self::GDTEST_BASE_URL . 'places/united-states/new-york/new-york/attractions/franklin-square/');
         $this->waitForPageLoadAndCheckForErrors();
         $this->byId('gd-claim-button')->click();
         $this->waitForPageLoadAndCheckForErrors();
         $this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
-        $this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in claim form");
+        $this->assertTrue($this->isTextPresent("I'm not a robot"), "Recaptcha field not found in claim form");
 
         //reviews
-        $this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/');
+        $this->url(self::GDTEST_BASE_URL . 'places/united-states/new-york/new-york/attractions/franklin-square/');
         $this->waitForPageLoadAndCheckForErrors();
         $this->byLinkText('Reviews')->click();
         $this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
-        $this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in reviews form");
+        $this->assertTrue($this->isTextPresent("I'm not a robot"), "Recaptcha field not found in reviews form");
 
         //send enquiry
-        $this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/');
+        $this->url(self::GDTEST_BASE_URL . 'places/united-states/new-york/new-york/attractions/franklin-square/');
         $this->waitForPageLoadAndCheckForErrors();
         $this->byClassName('b_send_inquiry')->click();
         $this->waitForPageLoadAndCheckForErrors();
         $this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
-        $this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in Send Enquiry form");
+        $this->assertTrue($this->isTextPresent("I'm not a robot"), "Recaptcha field not found in Send Enquiry form");
 
         //send to friend
-        $this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/');
+        $this->url(self::GDTEST_BASE_URL . 'places/united-states/new-york/new-york/attractions/franklin-square/');
         $this->waitForPageLoadAndCheckForErrors();
         $this->byClassName('b_sendtofriend')->click();
         $this->waitForPageLoadAndCheckForErrors();
         $this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
-        $this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in Send To Friend form");
+        $this->assertTrue($this->isTextPresent("I'm not a robot"), "Recaptcha field not found in Send To Friend form");
 
         //buddypress
         //Todo: assert buddypress page

tests/selenium/stest-04_Edit_Listing.php

Indentation +54 added lines, -54 removed lines

@@ -1,63 +1,63 @@
 <?php
 class EditListing 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 testEditListing()
-    {
-        $this->logInfo('Editing GD Place listing as user......');
-        $this->maybeUserLogin(self::GDTEST_BASE_URL.'author/test-user/?geodir_dashbord=true&stype=gd_place', true);
-        $this->assertTrue( $this->isTextPresent("Places by"), "'Places by' text not found");
-        $this->byClassName('geodir-edit')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Edit Place"), "Edit Place text not found");
-        $this->byId('post_desc')->value('Test Desc modified');
-        $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");
-        $this->maybeLogout();
-    }
+	public function testEditListing()
+	{
+		$this->logInfo('Editing GD Place listing as user......');
+		$this->maybeUserLogin(self::GDTEST_BASE_URL.'author/test-user/?geodir_dashbord=true&stype=gd_place', true);
+		$this->assertTrue( $this->isTextPresent("Places by"), "'Places by' text not found");
+		$this->byClassName('geodir-edit')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Edit Place"), "Edit Place text not found");
+		$this->byId('post_desc')->value('Test Desc modified');
+		$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");
+		$this->maybeLogout();
+	}
 
-    public function testEditAdminListing()
-    {
-        $this->logInfo('Editing GD Place listing as admin......');
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/edit.php?post_type=gd_place');
-        $this->assertTrue( $this->isTextPresent("post-type-gd_place"), "Not in Places post type");
-        $this->byLinkText("Test Listing")->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Edit Place"), "Edit Place text not found");
-        $this->byId('title')->value('Test Listing modified');
-        // Submit the form
-        $this->byId('publish')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Place updated."), "updated text not found.");
-    }
+	public function testEditAdminListing()
+	{
+		$this->logInfo('Editing GD Place listing as admin......');
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/edit.php?post_type=gd_place');
+		$this->assertTrue( $this->isTextPresent("post-type-gd_place"), "Not in Places post type");
+		$this->byLinkText("Test Listing")->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Edit Place"), "Edit Place text not found");
+		$this->byId('title')->value('Test Listing modified');
+		// Submit the form
+		$this->byId('publish')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Place updated."), "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 +10 added lines, -10 removed lines

@@ -7,7 +7,7 @@ 
 
         //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......');
+            $this->markTestSkipped('Skipping ' . pathinfo(__FILE__, PATHINFO_FILENAME) . ' since its already completed......');
             return;
         } else {
             $this->prepareSession()->currentWindow()->maximize();
@@ -17,37 +17,37 @@ 
     public function testEditListing()
     {
         $this->logInfo('Editing GD Place listing as user......');
-        $this->maybeUserLogin(self::GDTEST_BASE_URL.'author/test-user/?geodir_dashbord=true&stype=gd_place', true);
-        $this->assertTrue( $this->isTextPresent("Places by"), "'Places by' text not found");
+        $this->maybeUserLogin(self::GDTEST_BASE_URL . 'author/test-user/?geodir_dashbord=true&stype=gd_place', true);
+        $this->assertTrue($this->isTextPresent("Places by"), "'Places by' text not found");
         $this->byClassName('geodir-edit')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Edit Place"), "Edit Place text not found");
+        $this->assertTrue($this->isTextPresent("Edit Place"), "Edit Place text not found");
         $this->byId('post_desc')->value('Test Desc modified');
         $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.");
+        $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");
         $this->maybeLogout();
     }
 
     public function testEditAdminListing()
     {
         $this->logInfo('Editing GD Place listing as admin......');
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/edit.php?post_type=gd_place');
-        $this->assertTrue( $this->isTextPresent("post-type-gd_place"), "Not in Places post type");
+        $this->maybeAdminLogin(self::GDTEST_BASE_URL . 'wp-admin/edit.php?post_type=gd_place');
+        $this->assertTrue($this->isTextPresent("post-type-gd_place"), "Not in Places post type");
         $this->byLinkText("Test Listing")->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Edit Place"), "Edit Place text not found");
+        $this->assertTrue($this->isTextPresent("Edit Place"), "Edit Place text not found");
         $this->byId('title')->value('Test Listing modified');
         // Submit the form
         $this->byId('publish')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Place updated."), "updated text not found.");
+        $this->assertTrue($this->isTextPresent("Place updated."), "updated text not found.");
     }
 
     public function tearDown()

tests/bootstrap.php

Spacing +16 added lines, -16 removed lines

@@ -3,32 +3,32 @@ 
 $_SERVER['SERVER_NAME'] = '';
 $PHP_SELF = $GLOBALS['PHP_SELF'] = $_SERVER['PHP_SELF'] = '/index.php';
 
-define( 'GD_USE_PHP_SESSIONS', false );
-define( 'GD_TESTING_MODE', true );
+define('GD_USE_PHP_SESSIONS', false);
+define('GD_TESTING_MODE', true);
 
-$_tests_dir = getenv( 'WP_TESTS_DIR' );
+$_tests_dir = getenv('WP_TESTS_DIR');
 
-$is_selenium_test = getenv( 'IS_SELENIUM_TEST' );
+$is_selenium_test = getenv('IS_SELENIUM_TEST');
 
-if ( ! $is_selenium_test ) {
+if (!$is_selenium_test) {
 	$is_selenium_test = false;
 } else {
 	$is_selenium_test = true;
 }
 
-if ( ! $_tests_dir ) {
-	$_tests_dir = dirname( __FILE__ )  . '/lib/wordpress-tests-lib';
+if (!$_tests_dir) {
+	$_tests_dir = dirname(__FILE__) . '/lib/wordpress-tests-lib';
 }
 
 require_once $_tests_dir . '/includes/functions.php';
 require $_tests_dir . '/includes/bootstrap.php';
 
-if ( $is_selenium_test ) {
-	require dirname( __FILE__ ) . '/selenium/base.php';
+if ($is_selenium_test) {
+	require dirname(__FILE__) . '/selenium/base.php';
 }
 
-if ( ! $is_selenium_test ) {
-	require dirname( __FILE__ ) . '/../geodirectory.php';
+if (!$is_selenium_test) {
+	require dirname(__FILE__) . '/../geodirectory.php';
 	tests_add_filter('place_dummy_image_url', 'place_dummy_image_url');
 	tests_add_filter('place_dummy_cat_image_url', 'place_dummy_cat_image_url');
 
@@ -112,7 +112,7 @@ 
 //	unset($_REQUEST['_wpnonce']);
 
 	$i = 2;
-	while($i <= $max) {
+	while ($i <= $max) {
 		global $dummy_post_index, $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2;
 
 		$dummy_post_index = $i;
@@ -121,7 +121,7 @@ 
 		$city_bound_lat2 = 40.91525559999999;
 		$city_bound_lng2 = -73.7002721;
 
-		include dirname( __FILE__ ) . '/../geodirectory-admin/place_dummy_post.php';
+		include dirname(__FILE__) . '/../geodirectory-admin/place_dummy_post.php';
 		$i++;
 	}
 }
@@ -137,7 +137,7 @@ 
 }
 
 function place_dummy_image_url($url) {
-	$gd_dummy_base_url = getenv( 'GD_DUMMY_BASE_URL' );
+	$gd_dummy_base_url = getenv('GD_DUMMY_BASE_URL');
 	if ($gd_dummy_base_url) {
 		return $gd_dummy_base_url;
 	} else {
@@ -146,9 +146,9 @@ 
 }
 
 function place_dummy_cat_image_url($url) {
-	$gd_dummy_base_url = getenv( 'GD_DUMMY_BASE_URL' );
+	$gd_dummy_base_url = getenv('GD_DUMMY_BASE_URL');
 	if ($gd_dummy_base_url) {
-		return $gd_dummy_base_url."/cat_icon";
+		return $gd_dummy_base_url . "/cat_icon";
 	} else {
 		return $url;
 	}

tests/test-Check_Shortcodes.php

Spacing +16 added lines, -16 removed lines

@@ -11,25 +11,25 @@ 
     public function testHomeMapShortcode()
     {
         $output = do_shortcode('[gd_homepage_map width=100% height=300 scrollwheel=false]');
-        $this->assertContains( 'geodir-map-home-page', $output );
+        $this->assertContains('geodir-map-home-page', $output);
     }
 
     public function testListingMapShortcode()
     {
         $output = do_shortcode('[gd_listing_map width=100% height=300 scrollwheel=false sticky=true]');
-        $this->assertContains( 'geodir-map-listing-page', $output );
+        $this->assertContains('geodir-map-listing-page', $output);
     }
 
     public function testListingSliderShortcode()
     {
         $output = do_shortcode('[gd_listing_slider post_number=5 category=3 slideshow=true show_featured_only=true]');
-        $this->assertContains( 'geodir_widget_carousel', $output );
+        $this->assertContains('geodir_widget_carousel', $output);
     }
 
     public function testLoginBoxShortcode()
     {
         $output = do_shortcode('[gd_login_box]');
-        $this->assertContains( 'geodir-loginbox-list', $output );
+        $this->assertContains('geodir-loginbox-list', $output);
     }
 
     public function texstPopPostCatShortcode()
@@ -37,13 +37,13 @@ 
         global $geodir_post_type;
         $geodir_post_type = 'gd_place';
         $output = do_shortcode('[gd_popular_post_category category_limit=30]');
-        $this->assertContains( 'geodir-popular-cat-list', $output );
+        $this->assertContains('geodir-popular-cat-list', $output);
     }
 
     public function testPopPostViewShortcode()
     {
         $output = do_shortcode('[gd_popular_post_view category=3 layout=5 add_location_filter=true character_count=0 show_featured_only=true]');
-        $this->assertContains( 'geodir_category_list_view', $output );
+        $this->assertContains('geodir_category_list_view', $output);
     }
 
     public function testRecentReviewsShortcode()
@@ -54,9 +54,9 @@ 
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $post_id = get_the_ID();
         endwhile;
 
@@ -85,7 +85,7 @@ 
         geodir_save_rating($comment_id);
 
         $output = do_shortcode('[gd_recent_reviews count=5]');
-        $this->assertContains( 'geodir_sc_recent_reviews', $output );
+        $this->assertContains('geodir_sc_recent_reviews', $output);
     }
 
     public function texstRelatedListingsShortcode()
@@ -96,15 +96,15 @@ 
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $post_id = get_the_ID();
             global $post;
-            $post =  geodir_get_post_info($post_id);
+            $post = geodir_get_post_info($post_id);
             setup_postdata($post);
             $output = do_shortcode('[gd_related_listings relate_to=category layout=3 add_location_filter=0 list_sort=featured character_count=0]');
-            $this->assertContains( 'geodir_location_listing', $output );
+            $this->assertContains('geodir_location_listing', $output);
         endwhile;
 
         $this->assertTrue(is_int($post_id));
@@ -114,20 +114,20 @@ 
     public function texstListingsShortcode()
     {
         $output = do_shortcode('[gd_listings post_type="gd_place" category="1,3" post_number="10" list_sort="high_review"]');
-        $this->assertContains( 'geodir-sc-gd-listings', $output );
+        $this->assertContains('geodir-sc-gd-listings', $output);
     }
 
     public function texstBestOfWidgetShortcode()
     {
         $output = do_shortcode('[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->assertContains( 'geodir_bestof_widget', $output );
+        $this->assertContains('geodir_bestof_widget', $output);
     }
 
     public function testAddListingShortcode()
     {
         $_REQUEST['listing_type'] = 'gd_place';
         $output = do_shortcode('[gd_add_listing listing_type=gd_place login_msg="Please register and login to submit listings" show_login=true]');
-        $this->assertContains( 'geodir-add-listing-submit', $output );
+        $this->assertContains('geodir-add-listing-submit', $output);
     }
 
     public function tearDown()

Indentation +133 added lines, -133 removed lines

@@ -1,138 +1,138 @@
 <?php
 class CheckShortcodes extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        wp_set_current_user(1);
-
-    }
-
-    public function testHomeMapShortcode()
-    {
-        $output = do_shortcode('[gd_homepage_map width=100% height=300 scrollwheel=false]');
-        $this->assertContains( 'geodir-map-home-page', $output );
-    }
-
-    public function testListingMapShortcode()
-    {
-        $output = do_shortcode('[gd_listing_map width=100% height=300 scrollwheel=false sticky=true]');
-        $this->assertContains( 'geodir-map-listing-page', $output );
-    }
-
-    public function testListingSliderShortcode()
-    {
-        $output = do_shortcode('[gd_listing_slider post_number=5 category=3 slideshow=true show_featured_only=true]');
-        $this->assertContains( 'geodir_widget_carousel', $output );
-    }
-
-    public function testLoginBoxShortcode()
-    {
-        $output = do_shortcode('[gd_login_box]');
-        $this->assertContains( 'geodir-loginbox-list', $output );
-    }
-
-    public function texstPopPostCatShortcode()
-    {
-        global $geodir_post_type;
-        $geodir_post_type = 'gd_place';
-        $output = do_shortcode('[gd_popular_post_category category_limit=30]');
-        $this->assertContains( 'geodir-popular-cat-list', $output );
-    }
-
-    public function testPopPostViewShortcode()
-    {
-        $output = do_shortcode('[gd_popular_post_view category=3 layout=5 add_location_filter=true character_count=0 show_featured_only=true]');
-        $this->assertContains( 'geodir_category_list_view', $output );
-    }
-
-    public function testRecentReviewsShortcode()
-    {
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
-
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $post_id = get_the_ID();
-        endwhile;
-
-        $this->assertTrue(is_int($post_id));
-
-        $time = current_time('mysql');
-
-        $data = array(
-            'comment_post_ID' => $post_id,
-            'comment_author' => 'admin',
-            'comment_author_email' => 'admin@admin.com',
-            'comment_author_url' => 'http://wpgeodirectory.com',
-            'comment_content' => 'content here testtcc',
-            'comment_type' => '',
-            'comment_parent' => 0,
-            'user_id' => 1,
-            'comment_author_IP' => '127.0.0.1',
-            'comment_agent' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.10) Gecko/2009042316 Firefox/3.0.10 (.NET CLR 3.5.30729)',
-            'comment_date' => $time,
-            'comment_approved' => 1,
-        );
-
-        $comment_id = wp_insert_comment($data);
-
-        $_REQUEST['geodir_overallrating'] = 5.0;
-        geodir_save_rating($comment_id);
-
-        $output = do_shortcode('[gd_recent_reviews count=5]');
-        $this->assertContains( 'geodir_sc_recent_reviews', $output );
-    }
-
-    public function texstRelatedListingsShortcode()
-    {
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
-
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $post_id = get_the_ID();
-            global $post;
-            $post =  geodir_get_post_info($post_id);
-            setup_postdata($post);
-            $output = do_shortcode('[gd_related_listings relate_to=category layout=3 add_location_filter=0 list_sort=featured character_count=0]');
-            $this->assertContains( 'geodir_location_listing', $output );
-        endwhile;
-
-        $this->assertTrue(is_int($post_id));
-
-    }
-
-    public function texstListingsShortcode()
-    {
-        $output = do_shortcode('[gd_listings post_type="gd_place" category="1,3" post_number="10" list_sort="high_review"]');
-        $this->assertContains( 'geodir-sc-gd-listings', $output );
-    }
-
-    public function texstBestOfWidgetShortcode()
-    {
-        $output = do_shortcode('[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->assertContains( 'geodir_bestof_widget', $output );
-    }
-
-    public function testAddListingShortcode()
-    {
-        $_REQUEST['listing_type'] = 'gd_place';
-        $output = do_shortcode('[gd_add_listing listing_type=gd_place login_msg="Please register and login to submit listings" show_login=true]');
-        $this->assertContains( 'geodir-add-listing-submit', $output );
-    }
-
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function setUp()
+	{
+		parent::setUp();
+		wp_set_current_user(1);
+
+	}
+
+	public function testHomeMapShortcode()
+	{
+		$output = do_shortcode('[gd_homepage_map width=100% height=300 scrollwheel=false]');
+		$this->assertContains( 'geodir-map-home-page', $output );
+	}
+
+	public function testListingMapShortcode()
+	{
+		$output = do_shortcode('[gd_listing_map width=100% height=300 scrollwheel=false sticky=true]');
+		$this->assertContains( 'geodir-map-listing-page', $output );
+	}
+
+	public function testListingSliderShortcode()
+	{
+		$output = do_shortcode('[gd_listing_slider post_number=5 category=3 slideshow=true show_featured_only=true]');
+		$this->assertContains( 'geodir_widget_carousel', $output );
+	}
+
+	public function testLoginBoxShortcode()
+	{
+		$output = do_shortcode('[gd_login_box]');
+		$this->assertContains( 'geodir-loginbox-list', $output );
+	}
+
+	public function texstPopPostCatShortcode()
+	{
+		global $geodir_post_type;
+		$geodir_post_type = 'gd_place';
+		$output = do_shortcode('[gd_popular_post_category category_limit=30]');
+		$this->assertContains( 'geodir-popular-cat-list', $output );
+	}
+
+	public function testPopPostViewShortcode()
+	{
+		$output = do_shortcode('[gd_popular_post_view category=3 layout=5 add_location_filter=true character_count=0 show_featured_only=true]');
+		$this->assertContains( 'geodir_category_list_view', $output );
+	}
+
+	public function testRecentReviewsShortcode()
+	{
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
+
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$post_id = get_the_ID();
+		endwhile;
+
+		$this->assertTrue(is_int($post_id));
+
+		$time = current_time('mysql');
+
+		$data = array(
+			'comment_post_ID' => $post_id,
+			'comment_author' => 'admin',
+			'comment_author_email' => 'admin@admin.com',
+			'comment_author_url' => 'http://wpgeodirectory.com',
+			'comment_content' => 'content here testtcc',
+			'comment_type' => '',
+			'comment_parent' => 0,
+			'user_id' => 1,
+			'comment_author_IP' => '127.0.0.1',
+			'comment_agent' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.10) Gecko/2009042316 Firefox/3.0.10 (.NET CLR 3.5.30729)',
+			'comment_date' => $time,
+			'comment_approved' => 1,
+		);
+
+		$comment_id = wp_insert_comment($data);
+
+		$_REQUEST['geodir_overallrating'] = 5.0;
+		geodir_save_rating($comment_id);
+
+		$output = do_shortcode('[gd_recent_reviews count=5]');
+		$this->assertContains( 'geodir_sc_recent_reviews', $output );
+	}
+
+	public function texstRelatedListingsShortcode()
+	{
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
+
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$post_id = get_the_ID();
+			global $post;
+			$post =  geodir_get_post_info($post_id);
+			setup_postdata($post);
+			$output = do_shortcode('[gd_related_listings relate_to=category layout=3 add_location_filter=0 list_sort=featured character_count=0]');
+			$this->assertContains( 'geodir_location_listing', $output );
+		endwhile;
+
+		$this->assertTrue(is_int($post_id));
+
+	}
+
+	public function texstListingsShortcode()
+	{
+		$output = do_shortcode('[gd_listings post_type="gd_place" category="1,3" post_number="10" list_sort="high_review"]');
+		$this->assertContains( 'geodir-sc-gd-listings', $output );
+	}
+
+	public function texstBestOfWidgetShortcode()
+	{
+		$output = do_shortcode('[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->assertContains( 'geodir_bestof_widget', $output );
+	}
+
+	public function testAddListingShortcode()
+	{
+		$_REQUEST['listing_type'] = 'gd_place';
+		$output = do_shortcode('[gd_add_listing listing_type=gd_place login_msg="Please register and login to submit listings" show_login=true]');
+		$this->assertContains( 'geodir-add-listing-submit', $output );
+	}
+
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file