jan/miniflux-legacy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tests: Fix PHP strict standards warnings

Browse Source
This commit is contained in:
Mathias Kresin 2015-01-04 22:25:28 +01:00
parent 71275eac2c
commit bb51368f3a
6 changed files with 243 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/keyboardShortcutsTest.php
View File

@ -10,7 +10,7 @@ class keyboardShortcutTest extends minifluxTestCase
public function setUpPage() public function setUpPage()
{ {
$url = $this->getURLPageFirstFeed(); $url = $this->getURLPageFirstFeed();
parent::setUpPage($url); $this->doLoginIfRequired($url);
$this->basePageHeading = $this->getBasePageHeading(); $this->basePageHeading = $this->getBasePageHeading();
$this->expectedPageUrl = $url; $this->expectedPageUrl = $url;

4
tests/integration/minifluxTestCase.php
View File

@ -31,10 +31,8 @@ abstract class minifluxTestCase extends PHPUnit_Extensions_Selenium2TestCase
$this->setBrowserUrl(PHPUNIT_TESTSUITE_EXTENSION_SELENIUM_BASEURL); $this->setBrowserUrl(PHPUNIT_TESTSUITE_EXTENSION_SELENIUM_BASEURL);
} }
public function setUpPage($url) public function doLoginIfRequired($url)
{ {
parent::setUpPage();
// (re)load the requested page // (re)load the requested page
$this->url($url); $this->url($url);

2
tests/integration/pageBookmarksTest.php
View File

@ -10,7 +10,7 @@ class pageBookmarksTest extends minifluxTestCase
public function setUpPage() public function setUpPage()
{ {
$url = $this->getURLPageBookmarks(); $url = $this->getURLPageBookmarks();
parent::setUpPage($url); $this->doLoginIfRequired($url);
$this->basePageHeading = $this->getBasePageHeading(); $this->basePageHeading = $this->getBasePageHeading();
$this->expectedPageUrl = $url; $this->expectedPageUrl = $url;

2
tests/integration/pageFirstFeedTest.php
View File

@ -10,7 +10,7 @@ class pageFirstFeedTest extends minifluxTestCase
public function setUpPage() public function setUpPage()
{ {
$url = $this->getURLPageFirstFeed(); $url = $this->getURLPageFirstFeed();
parent::setUpPage($url); $this->doLoginIfRequired($url);
$this->basePageHeading = $this->getBasePageHeading(); $this->basePageHeading = $this->getBasePageHeading();
$this->expectedPageUrl = $url; $this->expectedPageUrl = $url;

2
tests/integration/pageHistoryTest.php
View File

@ -10,7 +10,7 @@ class pageHistoryTest extends minifluxTestCase
public function setUpPage() public function setUpPage()
{ {
$url = $this->getURLPageHistory(); $url = $this->getURLPageHistory();
parent::setUpPage($url); $this->doLoginIfRequired($url);;
$this->basePageHeading = $this->getBasePageHeading(); $this->basePageHeading = $this->getBasePageHeading();
$this->expectedPageUrl = $url; $this->expectedPageUrl = $url;

2
tests/integration/pageUnreadTest.php
View File

@ -10,7 +10,7 @@ class pageUnreadTest extends minifluxTestCase
public function setUpPage() public function setUpPage()
{ {
$url = $this->getURLPageUnread(); $url = $this->getURLPageUnread();
parent::setUpPage($url); $this->doLoginIfRequired($url);
$this->expectedPageUrl = $url; $this->expectedPageUrl = $url;
} }