makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 05:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/14315] Properly get sid from cookies and simplify take_screenshot

Browse source 
PHPBB3-14315
This commit is contained in:
Marc Alexander 2016-02-17 14:11:27 +01:00
parent 7c96d0abcd
commit 7d41fe0136
2 changed files with 16 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
tests/test_framework/phpbb_ui_test_case.php
View file

@ -280,6 +280,11 @@ class phpbb_ui_test_case extends phpbb_test_case
{ {
$this->add_lang('ucp'); $this->add_lang('ucp');
if (empty($this->sid))
{
return;
}
$this->visit('ucp.php?sid=' . $this->sid . '&mode=logout'); $this->visit('ucp.php?sid=' . $this->sid . '&mode=logout');
$this->assertContains($this->lang('REGISTER'), self::$webDriver->getPageSource()); $this->assertContains($this->lang('REGISTER'), self::$webDriver->getPageSource());
unset($this->sid); unset($this->sid);
@ -301,6 +306,8 @@ class phpbb_ui_test_case extends phpbb_test_case
return; return;
} }
self::$webDriver->manage()->deleteAllCookies();
$this->visit('adm/index.php?sid=' . $this->sid); $this->visit('adm/index.php?sid=' . $this->sid);
$this->assertContains($this->lang('LOGIN_ADMIN_CONFIRM'), self::$webDriver->getPageSource()); $this->assertContains($this->lang('LOGIN_ADMIN_CONFIRM'), self::$webDriver->getPageSource());
@ -317,8 +324,12 @@ class phpbb_ui_test_case extends phpbb_test_case
if (substr($cookie['name'], -4) == '_sid') if (substr($cookie['name'], -4) == '_sid')
{ {
$this->sid = $cookie['value']; $this->sid = $cookie['value'];
break;
} }
} }
$this->assertNotEmpty($this->sid);
} }
protected function add_lang($lang_file) protected function add_lang($lang_file)
@ -428,52 +439,20 @@ class phpbb_ui_test_case extends phpbb_test_case
$this->sid = $cookie['value']; $this->sid = $cookie['value'];
} }
} }
$this->assertNotEmpty($this->sid);
} }
/** /**
* Take screenshot. Can be used for debug purposes. * Take screenshot. Can be used for debug purposes.
* *
* @param \Facebook\WebDriver\Remote\RemoteWebElement $element
* @return string Element screenshot path
* @throws Exception When screenshot can't be created * @throws Exception When screenshot can't be created
*/ */
public function takeScreenshot($element = null) { public function take_screenshot()
{
// Change the Path to your own settings // Change the Path to your own settings
$screenshot = time() . ".png"; $screenshot = time() . ".png";
// Change the driver instance
self::$webDriver->takeScreenshot($screenshot); self::$webDriver->takeScreenshot($screenshot);
if(!file_exists($screenshot)) {
throw new Exception('Could not save screenshot');
}
if( ! (bool) $element) {
return $screenshot;
}
$element_screenshot = time() . ".png"; // Change the path here as well
$element_width = $element->getSize()->getWidth();
$element_height = $element->getSize()->getHeight();
$element_src_x = $element->getLocation()->getX();
$element_src_y = $element->getLocation()->getY();
// Create image instances
$src = imagecreatefrompng($screenshot);
$dest = imagecreatetruecolor($element_width, $element_height);
// Copy
imagecopy($dest, $src, 0, 0, $element_src_x, $element_src_y, $element_width, $element_height);
imagepng($dest, $element_screenshot);
// unlink($screenshot); // unlink function might be restricted in mac os x.
if( ! file_exists($element_screenshot)) {
throw new Exception('Could not save element screenshot');
}
return $element_screenshot;
} }
} }

2
tests/ui/permission_roles_test.php
View file

@ -19,7 +19,6 @@ class ui_permission_roles_test extends phpbb_ui_test_case
public function test_permission_roles() public function test_permission_roles()
{ {
$this->logout();
$this->login(); $this->login();
$this->admin_login(); $this->admin_login();
$this->add_lang('acp/permissions'); $this->add_lang('acp/permissions');
@ -28,6 +27,7 @@ class ui_permission_roles_test extends phpbb_ui_test_case
// Select forums // Select forums
$elements = self::find_element('cssSelector', 'select#forum') $elements = self::find_element('cssSelector', 'select#forum')
->findElements(\Facebook\WebDriver\WebDriverBy::tagName('option')); ->findElements(\Facebook\WebDriver\WebDriverBy::tagName('option'));
foreach ($elements as $element) foreach ($elements as $element)
{ {
$element->click(); $element->click();