GeoDirectory / geodirectory

tests/selenium/stest-15_Import_Export.php

Indentation +26 added lines, -26 removed lines

@@ -1,23 +1,23 @@ 
 <?php
 class ImportExport 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 testImportExport()
-    {
-        $this->logInfo('Import Export......');
-        $this->logInfo('Skipping Import Export since its not possible......');
+	public function testImportExport()
+	{
+		$this->logInfo('Import Export......');
+		$this->logInfo('Skipping Import Export since its not possible......');
 //        //export listing
 //        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=import_export');
 //        $this->waitForPageLoadAndCheckForErrors();
@@ -28,17 +28,17 @@ 
 //        $this->byId('gd_ie_excats_submit')->click();
 //        $this->waitForPageLoadAndCheckForErrors();
 
-        //Todo: find a way to test import
-    }
+		//Todo: find a way to test import
+	}
 
-    public function tearDown()
-    {
-        if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            //write current file number to completed.txt
-            $CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
-            $completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
-            fwrite($completed, $CurrentFileNumber);
-        }
-    }
+	public function tearDown()
+	{
+		if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			//write current file number to completed.txt
+			$CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
+			$completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
+			fwrite($completed, $CurrentFileNumber);
+		}
+	}
 }
 ?>
\ No newline at end of file

tests/selenium/stest-27_Expiry_Listing.php

Indentation +25 added lines, -25 removed lines

@@ -1,35 +1,35 @@
 <?php
 class ExpiryListing 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 testExpiryListing()
-    {
-        $this->logInfo('Testing expiry listing......');
-        $this->logInfo('Skipping Import Export since its not possible......');
+	public function testExpiryListing()
+	{
+		$this->logInfo('Testing expiry listing......');
+		$this->logInfo('Skipping Import Export since its not possible......');
 //        $this->url(self::GDTEST_BASE_URL);
 //        $this->waitForPageLoadAndCheckForErrors();
-    }
+	}
 
-    public function tearDown()
-    {
-        if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            //write current file number to completed.txt
-            $CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
-            $completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
-            fwrite($completed, $CurrentFileNumber);
-        }
-    }
+	public function tearDown()
+	{
+		if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			//write current file number to completed.txt
+			$CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
+			$completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
+			fwrite($completed, $CurrentFileNumber);
+		}
+	}
 }
 ?>
\ No newline at end of file

tests/selenium/stest-26_Event_To_Business.php

Indentation +90 added lines, -90 removed lines

@@ -1,110 +1,110 @@
 <?php
 class EventToBusiness 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 testEventToBusiness()
-    {
-        //make sure event manager plugin active
-        $this->logInfo('Testing events......');
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        $this->waitForPageLoadAndCheckForErrors();
+	public function testEventToBusiness()
+	{
+		//make sure event manager plugin active
+		$this->logInfo('Testing events......');
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		$this->waitForPageLoadAndCheckForErrors();
 
-        $is_active = $this->byId("geodirectory-events")->attribute('class');
-        if (is_int(strpos($is_active, 'inactive'))) {
-            //Activate Geodirectory Events
-            $this->maybeActivatePlugin("geodirectory-events", 20000);
-            //go back to plugin page
-            $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        }
+		$is_active = $this->byId("geodirectory-events")->attribute('class');
+		if (is_int(strpos($is_active, 'inactive'))) {
+			//Activate Geodirectory Events
+			$this->maybeActivatePlugin("geodirectory-events", 20000);
+			//go back to plugin page
+			$this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		}
 
-        $is_active1 = $this->byId("geodirectory-events")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "Events plugin not active");
+		$is_active1 = $this->byId("geodirectory-events")->attribute('class');
+		$this->assertFalse( strpos($is_active1, 'inactive'), "Events plugin not active");
 
 
-        // Event post type -> Allow post type to add from frontend
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=design_settings');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byLinkText('Navigation')->click();
-        $this->ExecuteScript('jQuery("#geodir_allow_posttype_frontend").show();');
-        $this->select($this->byId('geodir_allow_posttype_frontend'))->selectOptionByLabel('Event');
-        $this->byName('save')->click();
-        $this->waitForPageLoadAndCheckForErrors();
+		// Event post type -> Allow post type to add from frontend
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=design_settings');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byLinkText('Navigation')->click();
+		$this->ExecuteScript('jQuery("#geodir_allow_posttype_frontend").show();');
+		$this->select($this->byId('geodir_allow_posttype_frontend'))->selectOptionByLabel('Event');
+		$this->byName('save')->click();
+		$this->waitForPageLoadAndCheckForErrors();
 
-        $this->url(self::GDTEST_BASE_URL.'add-listing/?listing_type=gd_event');
-        $this->waitForPageLoadAndCheckForErrors();
-        if ($this->isTextPresent("Sign In")) {
-            $this->byId('user_login')->value('test@test.com');
-            $this->byId('user_pass')->value('12345');
-            $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_event');
-        }
-        $this->assertTrue( $this->isTextPresent("Add Event"), "Add Event text not found");
-        //event info
-        $this->byId('is_recurring_n')->click();
-        $this->byId('event_start')->value('2016-01-01');
-        $this->byId('event_end')->value('2016-01-31');
-        $this->byId('all_day')->click();
+		$this->url(self::GDTEST_BASE_URL.'add-listing/?listing_type=gd_event');
+		$this->waitForPageLoadAndCheckForErrors();
+		if ($this->isTextPresent("Sign In")) {
+			$this->byId('user_login')->value('test@test.com');
+			$this->byId('user_pass')->value('12345');
+			$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_event');
+		}
+		$this->assertTrue( $this->isTextPresent("Add Event"), "Add Event text not found");
+		//event info
+		$this->byId('is_recurring_n')->click();
+		$this->byId('event_start')->value('2016-01-01');
+		$this->byId('event_end')->value('2016-01-31');
+		$this->byId('all_day')->click();
 
 
-        if ($this->isTextPresent("Business Owner/Associate")) {
+		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->ExecuteScript('jQuery("#geodir_claimed_row input:radio:first").prop("checked", true).trigger("click");');
+		}
 
-        $this->byId('post_title')->value('Test Event');
-        $this->byId('post_desc')->value('Test Desc');
-        $this->byId('post_tags')->value('tag1,tag2');
-        $this->ExecuteScript('jQuery("select#gd_eventcategory").show();');
-        $this->select($this->byXPath("//select[@id='gd_eventcategory']"))->selectOptionByLabel('Events');
-        $this->waitForPageLoadAndCheckForErrors(2000);
-        $this->byId('post_address')->value('wall street');
-        $this->byId('post_address')->value('10006');
-        $this->byId('post_set_address_button')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('geodir_timing')->value('10.00 am to 6 pm every day');
-        $this->byId('geodir_contact')->value('444444444444');
-        $this->byId('geodir_email')->value('test@test.com');
-        $this->byId('geodir_website')->value('http://test.com');
-        $this->byId('geodir_twitter')->value('http://twitter.com/test');
-        $this->byId('geodir_facebook')->value('http://facebook.com/test');
-        $this->byId('geodir_special_offers')->value('Test Offer');
-        $this->byId('geodir_accept_term_condition')->click();
-        // Submit the form
-        $this->byXPath("//div[@id='geodir-add-listing-submit']//input[@type='submit']")->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("This is a preview of your listing"), "Not in preview page.");
-        // Submit the form
-        $this->byClassName('geodir_publish_button')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Thank you, your information has been successfully received"), "Not in success page");
+		$this->byId('post_title')->value('Test Event');
+		$this->byId('post_desc')->value('Test Desc');
+		$this->byId('post_tags')->value('tag1,tag2');
+		$this->ExecuteScript('jQuery("select#gd_eventcategory").show();');
+		$this->select($this->byXPath("//select[@id='gd_eventcategory']"))->selectOptionByLabel('Events');
+		$this->waitForPageLoadAndCheckForErrors(2000);
+		$this->byId('post_address')->value('wall street');
+		$this->byId('post_address')->value('10006');
+		$this->byId('post_set_address_button')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('geodir_timing')->value('10.00 am to 6 pm every day');
+		$this->byId('geodir_contact')->value('444444444444');
+		$this->byId('geodir_email')->value('test@test.com');
+		$this->byId('geodir_website')->value('http://test.com');
+		$this->byId('geodir_twitter')->value('http://twitter.com/test');
+		$this->byId('geodir_facebook')->value('http://facebook.com/test');
+		$this->byId('geodir_special_offers')->value('Test Offer');
+		$this->byId('geodir_accept_term_condition')->click();
+		// Submit the form
+		$this->byXPath("//div[@id='geodir-add-listing-submit']//input[@type='submit']")->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("This is a preview of your listing"), "Not in preview page.");
+		// Submit the form
+		$this->byClassName('geodir_publish_button')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Thank you, your information has been successfully received"), "Not in success page");
 
-    }
+	}
 
-    public function tearDown()
-    {
-        if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            //write current file number to completed.txt
-            $CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
-            $completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
-            fwrite($completed, $CurrentFileNumber);
-        }
-    }
+	public function tearDown()
+	{
+		if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			//write current file number to completed.txt
+			$CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
+			$completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
+			fwrite($completed, $CurrentFileNumber);
+		}
+	}
 }
 ?>
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -30,7 +30,7 @@ 
         }
 
         $is_active1 = $this->byId("geodirectory-events")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "Events plugin not active");
+        $this->assertFalse(strpos($is_active1, 'inactive'), "Events plugin not active");
 
 
         // Event post type -> Allow post type to add from frontend
@@ -53,7 +53,7 @@ 
             $this->waitForPageLoadAndCheckForErrors();
             $this->url(self::GDTEST_BASE_URL.'add-listing/?listing_type=gd_event');
         }
-        $this->assertTrue( $this->isTextPresent("Add Event"), "Add Event text not found");
+        $this->assertTrue($this->isTextPresent("Add Event"), "Add Event text not found");
         //event info
         $this->byId('is_recurring_n')->click();
         $this->byId('event_start')->value('2016-01-01');
@@ -89,11 +89,11 @@ 
         // Submit the form
         $this->byXPath("//div[@id='geodir-add-listing-submit']//input[@type='submit']")->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("This is a preview of your listing"), "Not in preview page.");
+        $this->assertTrue($this->isTextPresent("This is a preview of your listing"), "Not in preview page.");
         // Submit the form
         $this->byClassName('geodir_publish_button')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Thank you, your information has been successfully received"), "Not in success page");
+        $this->assertTrue($this->isTextPresent("Thank you, your information has been successfully received"), "Not in success page");
 
     }
 

tests/selenium/stest-34_BuddyPress.php

Indentation +144 added lines, -144 removed lines

@@ -1,149 +1,149 @@
 <?php
 class BuddyPress 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 testBuddyPress()
-    {
-        $this->logInfo('Testing buddypress......');
-        //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");
-
-
-        //Make sure "Use BuddyPress registration form" checked.
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=geodir_buddypress&subtab=gdbuddypress_settings');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->prepareSession()->currentWindow()->maximize();
-
-        $to_save = false;
-
-        $options = array(
-            'geodir_buddypress_bp_register',
-            'geodir_buddypress_link_listing',
-            'geodir_buddypress_link_favorite',
-            'geodir_buddypress_link_author',
-            'geodir_buddypress_show_feature_image'
-        );
-
-        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->url(self::GDTEST_BASE_URL.'gd-login/');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Sign In"), "No text found");
-        $this->assertFalse( $this->isTextPresent("Sign Up Now"), "Sign up now text found in buddypress login");
-
-        $this->byClassName('goedir-newuser-link')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Create an Account"), "Create an Account text not found");
-
-        //register
-        $this->byId('signup_username')->value('testuser123');
-        $this->byId('signup_email')->value('testuser123@test.com');
-        $this->byId('signup_password')->value('test12345');
-        $this->byId('signup_password_confirm')->value('test12345');
-        $this->byId('field_1')->value('Test User');
-        $this->byId('signup_submit')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Check Your Email To Activate Your Account"), "BuddyPress Signup not successful");
-
-
-        //check listings page for errors
-        $this->url(self::GDTEST_BASE_URL.'members/admin/listings/');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Places"), "Not in listings page");
-
-        //check favorites page for errors
-        $this->url(self::GDTEST_BASE_URL.'members/admin/favorites/');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Places"), "Not in favorites page");
-
-        //check reviews page for errors
-        $this->url(self::GDTEST_BASE_URL.'members/admin/reviews/');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Places"), "Not in reviews page");
-
-        //test all buddypress pages and catch errors and warnings
-        $this->url(self::GDTEST_BASE_URL.'members/');
-        $this->waitForPageLoadAndCheckForErrors();
-
-        $this->url(self::GDTEST_BASE_URL.'members/admin/');
-        $this->waitForPageLoadAndCheckForErrors();
-
-        $this->url(self::GDTEST_BASE_URL.'members/admin/profile/');
-        $this->waitForPageLoadAndCheckForErrors();
-
-        $this->url(self::GDTEST_BASE_URL.'members/admin/notifications/');
-        $this->waitForPageLoadAndCheckForErrors();
-
-        $this->url(self::GDTEST_BASE_URL.'members/admin/messages/');
-        $this->waitForPageLoadAndCheckForErrors();
-
-        $this->url(self::GDTEST_BASE_URL.'members/admin/friends/');
-        $this->waitForPageLoadAndCheckForErrors();
-
-        $this->url(self::GDTEST_BASE_URL.'members/admin/groups/');
-        $this->waitForPageLoadAndCheckForErrors();
-
-        $this->url(self::GDTEST_BASE_URL.'members/admin/listings/');
-        $this->waitForPageLoadAndCheckForErrors();
-
-    }
-
-    public function tearDown()
-    {
-        if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            //write current file number to completed.txt
-            $CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
-            $completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
-            fwrite($completed, $CurrentFileNumber);
-        }
-    }
+	public function setUp()
+	{
+		parent::setUp();
+
+		//skip test if already completed.
+		if ($this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			$this->markTestSkipped('Skipping '.pathinfo(__FILE__, PATHINFO_FILENAME).' since its already completed......');
+			return;
+		} else {
+			$this->prepareSession()->currentWindow()->maximize();
+		}
+	}
+
+	public function testBuddyPress()
+	{
+		$this->logInfo('Testing buddypress......');
+		//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");
+
+
+		//Make sure "Use BuddyPress registration form" checked.
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=geodir_buddypress&subtab=gdbuddypress_settings');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->prepareSession()->currentWindow()->maximize();
+
+		$to_save = false;
+
+		$options = array(
+			'geodir_buddypress_bp_register',
+			'geodir_buddypress_link_listing',
+			'geodir_buddypress_link_favorite',
+			'geodir_buddypress_link_author',
+			'geodir_buddypress_show_feature_image'
+		);
+
+		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->url(self::GDTEST_BASE_URL.'gd-login/');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Sign In"), "No text found");
+		$this->assertFalse( $this->isTextPresent("Sign Up Now"), "Sign up now text found in buddypress login");
+
+		$this->byClassName('goedir-newuser-link')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Create an Account"), "Create an Account text not found");
+
+		//register
+		$this->byId('signup_username')->value('testuser123');
+		$this->byId('signup_email')->value('testuser123@test.com');
+		$this->byId('signup_password')->value('test12345');
+		$this->byId('signup_password_confirm')->value('test12345');
+		$this->byId('field_1')->value('Test User');
+		$this->byId('signup_submit')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Check Your Email To Activate Your Account"), "BuddyPress Signup not successful");
+
+
+		//check listings page for errors
+		$this->url(self::GDTEST_BASE_URL.'members/admin/listings/');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Places"), "Not in listings page");
+
+		//check favorites page for errors
+		$this->url(self::GDTEST_BASE_URL.'members/admin/favorites/');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Places"), "Not in favorites page");
+
+		//check reviews page for errors
+		$this->url(self::GDTEST_BASE_URL.'members/admin/reviews/');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Places"), "Not in reviews page");
+
+		//test all buddypress pages and catch errors and warnings
+		$this->url(self::GDTEST_BASE_URL.'members/');
+		$this->waitForPageLoadAndCheckForErrors();
+
+		$this->url(self::GDTEST_BASE_URL.'members/admin/');
+		$this->waitForPageLoadAndCheckForErrors();
+
+		$this->url(self::GDTEST_BASE_URL.'members/admin/profile/');
+		$this->waitForPageLoadAndCheckForErrors();
+
+		$this->url(self::GDTEST_BASE_URL.'members/admin/notifications/');
+		$this->waitForPageLoadAndCheckForErrors();
+
+		$this->url(self::GDTEST_BASE_URL.'members/admin/messages/');
+		$this->waitForPageLoadAndCheckForErrors();
+
+		$this->url(self::GDTEST_BASE_URL.'members/admin/friends/');
+		$this->waitForPageLoadAndCheckForErrors();
+
+		$this->url(self::GDTEST_BASE_URL.'members/admin/groups/');
+		$this->waitForPageLoadAndCheckForErrors();
+
+		$this->url(self::GDTEST_BASE_URL.'members/admin/listings/');
+		$this->waitForPageLoadAndCheckForErrors();
+
+	}
+
+	public function tearDown()
+	{
+		if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			//write current file number to completed.txt
+			$CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
+			$completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
+			fwrite($completed, $CurrentFileNumber);
+		}
+	}
 }
 ?>
\ No newline at end of file

Spacing +9 added lines, -9 removed lines

@@ -30,7 +30,7 @@ 
         }
 
         $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');
@@ -42,7 +42,7 @@ 
         }
 
         $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");
 
 
         //Make sure "Use BuddyPress registration form" checked.
@@ -76,12 +76,12 @@ 
 
         $this->url(self::GDTEST_BASE_URL.'gd-login/');
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Sign In"), "No text found");
-        $this->assertFalse( $this->isTextPresent("Sign Up Now"), "Sign up now text found in buddypress login");
+        $this->assertTrue($this->isTextPresent("Sign In"), "No text found");
+        $this->assertFalse($this->isTextPresent("Sign Up Now"), "Sign up now text found in buddypress login");
 
         $this->byClassName('goedir-newuser-link')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Create an Account"), "Create an Account text not found");
+        $this->assertTrue($this->isTextPresent("Create an Account"), "Create an Account text not found");
 
         //register
         $this->byId('signup_username')->value('testuser123');
@@ -91,23 +91,23 @@ 
         $this->byId('field_1')->value('Test User');
         $this->byId('signup_submit')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Check Your Email To Activate Your Account"), "BuddyPress Signup not successful");
+        $this->assertTrue($this->isTextPresent("Check Your Email To Activate Your Account"), "BuddyPress Signup not successful");
 
 
         //check listings page for errors
         $this->url(self::GDTEST_BASE_URL.'members/admin/listings/');
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Places"), "Not in listings page");
+        $this->assertTrue($this->isTextPresent("Places"), "Not in listings page");
 
         //check favorites page for errors
         $this->url(self::GDTEST_BASE_URL.'members/admin/favorites/');
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Places"), "Not in favorites page");
+        $this->assertTrue($this->isTextPresent("Places"), "Not in favorites page");
 
         //check reviews page for errors
         $this->url(self::GDTEST_BASE_URL.'members/admin/reviews/');
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Places"), "Not in reviews page");
+        $this->assertTrue($this->isTextPresent("Places"), "Not in reviews page");
 
         //test all buddypress pages and catch errors and warnings
         $this->url(self::GDTEST_BASE_URL.'members/');

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 +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
         }
 
         $is_active1 = $this->byId("geodirectory-location-manager")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "Location Manager plugin not active");
+        $this->assertFalse(strpos($is_active1, 'inactive'), "Location Manager plugin not active");
 
         $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=managelocation_fields&subtab=geodir_location_addedit');
         $this->waitForPageLoadAndCheckForErrors();
@@ -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

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 +13 added lines, -13 removed lines

@@ -52,7 +52,7 @@ 
             }
         }
 
-        if($stop_script) {
+        if ($stop_script) {
             $this->logError("Stopping the script. Please fix the errors to continue");
             return;
         }
@@ -93,7 +93,7 @@ 
         }
 
 
-        if($stop_script) {
+        if ($stop_script) {
             $this->logInfo("Stopping the script. Please fix the errors to continue");
             return;
         }
@@ -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
@@ -141,7 +141,7 @@ 
         $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
@@ -166,7 +166,7 @@ 
         $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
@@ -193,7 +193,7 @@ 
         $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......');
@@ -203,7 +203,7 @@ 
         $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......');
@@ -212,7 +212,7 @@ 
         $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......');
@@ -222,12 +222,12 @@ 
         $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->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();
@@ -235,12 +235,12 @@ 
 
         $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......');

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 +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
         }
 
         $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');

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 +3 added lines, -3 removed lines

@@ -19,15 +19,15 @@
         $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->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");
 
     }