| Index: trunk/phase3/tests/selenium/SeleniumTestSuite.php |
| — | — | @@ -4,6 +4,7 @@ |
| 5 | 5 | private $selenium; |
| 6 | 6 | private $isSetUp = false; |
| 7 | 7 | private $loginBeforeTests = true; |
| | 8 | + private $triggerClientTestResources = true; |
| 8 | 9 | |
| 9 | 10 | // Do not add line break after test output |
| 10 | 11 | const CONTINUE_LINE = 1; |
| — | — | @@ -21,16 +22,20 @@ |
| 22 | 23 | $this->isSetUp = true; |
| 23 | 24 | $this->selenium = Selenium::getInstance(); |
| 24 | 25 | $this->selenium->start(); |
| 25 | | - $this->selenium->open( $this->selenium->getUrl() . '/index.php?setupTestSuite=' . $this->getName() ); |
| 26 | | - //wait a little longer for the db operation |
| 27 | | - $this->selenium->waitForPageToLoad( 6000 ); |
| | 26 | + if ( $this->triggerClientTestResources ) { |
| | 27 | + $this->selenium->open( $this->selenium->getUrl() . '/index.php?setupTestSuite=' . $this->getName() ); |
| | 28 | + //wait a little longer for the db operation |
| | 29 | + $this->selenium->waitForPageToLoad( 6000 ); |
| | 30 | + } |
| 28 | 31 | if ( $this->loginBeforeTests ) { |
| 29 | 32 | $this->login(); |
| 30 | 33 | } |
| 31 | 34 | } |
| 32 | 35 | |
| 33 | 36 | public function tearDown() { |
| 34 | | - $this->selenium->open( $this->selenium->getUrl() . '/index.php?clearTestSuite=' . $this->getName() ); |
| | 37 | + if ( $this->triggerClientTestResources ) { |
| | 38 | + $this->selenium->open( $this->selenium->getUrl() . '/index.php?clearTestSuite=' . $this->getName() ); |
| | 39 | + } |
| 35 | 40 | $this->selenium->stop(); |
| 36 | 41 | } |
| 37 | 42 | |
| — | — | @@ -45,4 +50,8 @@ |
| 46 | 51 | protected function setLoginBeforeTests( $loginBeforeTests = true ) { |
| 47 | 52 | $this->loginBeforeTests = $loginBeforeTests; |
| 48 | 53 | } |
| | 54 | + |
| | 55 | + protected function setTriggerClientTestResources( $triggerClientTestResources = true ) { |
| | 56 | + $this->triggerClientTestResources = $triggerClientTestResources; |
| | 57 | + } |
| 49 | 58 | } |