[eStudy-svn] [eStudy-GIT] branch, staging, updated. Christoph Thelen

[<kla...@mn...>]

The branch, staging has been updated

Summary of changes:
 .../functional/AbstractEstudySeleniumTest.php      |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

...from  c47ff80a70c650d9b992748019857f7030b18550 (commit) to (5ddc8595a38095794f6aa4e7b1f6a7838b7458cf)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5ddc8595a38095794f6aa4e7b1f6a7838b7458cf
Author: Christoph Thelen <chr...@mn...>
Date:   Tue Oct 2 16:55:23 2012 +0200

    Ticket #3941: Logout does not work properly and needs retries

-----------------------------------------------------------------------

Complete Diff

diff --git a/unit-tests/functional/AbstractEstudySeleniumTest.php b/unit-tests/functional/AbstractEstudySeleniumTest.php
index 0d9e99a..79900ff 100644
--- a/unit-tests/functional/AbstractEstudySeleniumTest.php
+++ b/unit-tests/functional/AbstractEstudySeleniumTest.php
@@ -117,8 +117,13 @@ abstract class AbstractEstudySeleniumTest extends RepeatFailedSeleniumTests {
 	}
 	
 	protected function logout() {
-		$this->click("css=img[alt='Ausloggen']");
+		$logoutElement = "css=img[alt='Ausloggen']";
+		$this->click($logoutElement);
 		$this->waitForPageToLoad(30000);
+		if ($this->isElementPresent($logoutElement)) {
+			// Logout is not working correctly? Retry!
+			$this->logout();
+		}
 	}
 	
 	protected function performLoginAsUser(User $user, $password = null) {


hooks/post-receive
--
estudy