makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5397 from VSEphpbb/ticket/15824

Browse source 
[ticket/15824] Fix and update UI framework
This commit is contained in:
Marc Alexander 2018-10-13 17:06:10 -07:00
commit 7e003bf687
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 49 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
tests/test_framework/phpbb_ui_test_case.php
View file

@ -192,6 +192,13 @@ class phpbb_ui_test_case extends phpbb_test_case
} }
} }
$install_config_file = $phpbb_root_path . 'store/install_config.php';
if (file_exists($install_config_file))
{
unlink($install_config_file);
}
$container_builder = new \phpbb\di\container_builder($phpbb_root_path, $phpEx); $container_builder = new \phpbb\di\container_builder($phpbb_root_path, $phpEx);
$container = $container_builder $container = $container_builder
->with_environment('installer') ->with_environment('installer')
@ -205,11 +212,14 @@ class phpbb_ui_test_case extends phpbb_test_case
], ],
'cache.driver.class' => 'phpbb\cache\driver\file' 'cache.driver.class' => 'phpbb\cache\driver\file'
]) ])
->with_config(new \phpbb\config_php_file($phpbb_root_path, $phpEx))
->without_compiled_container() ->without_compiled_container()
->get_container(); ->get_container();
$container->register('installer.install_finish.notify_user')->setSynthetic(true); $container->register('installer.install_finish.notify_user')->setSynthetic(true);
$container->set('installer.install_finish.notify_user', new phpbb_mock_null_installer_task()); $container->set('installer.install_finish.notify_user', new phpbb_mock_null_installer_task());
$container->register('installer.install_finish.install_extensions')->setSynthetic(true);
$container->set('installer.install_finish.install_extensions', new phpbb_mock_null_installer_task());
$container->compile(); $container->compile();
$language = $container->get('language'); $language = $container->get('language');
@ -338,6 +348,12 @@ class phpbb_ui_test_case extends phpbb_test_case
{ {
if (!$this->cache) if (!$this->cache)
{ {
global $phpbb_container, $phpbb_root_path;
$phpbb_container = new phpbb_mock_container_builder();
$phpbb_container->setParameter('core.environment', PHPBB_ENVIRONMENT);
$phpbb_container->setParameter('core.cache_dir', $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/');
$this->cache = new \phpbb\cache\driver\file; $this->cache = new \phpbb\cache\driver\file;
} }
@ -590,4 +606,37 @@ class phpbb_ui_test_case extends phpbb_test_case
$this->getDriver()->takeScreenshot($screenshot); $this->getDriver()->takeScreenshot($screenshot);
} }
/**
* Wait for AJAX. Should be called after an AJAX action is made.
*
* @param string $framework javascript frameworks jquery|prototype|dojo
* @throws \Facebook\WebDriver\Exception\NoSuchElementException
* @throws \Facebook\WebDriver\Exception\TimeOutException
*/
public function waitForAjax($framework = 'jquery')
{
switch ($framework)
{
case 'jquery':
$code = 'return jQuery.active;';
break;
case 'prototype':
$code = 'return Ajax.activeRequestCount;';
break;
case 'dojo':
$code = 'return dojo.io.XMLHTTPTransport.inFlight.length;';
break;
default:
throw new \RuntimeException('Unsupported framework');
break;
}
// wait for at most 30s, retry every 2000ms (2s)
$driver = $this->getDriver();
$driver->wait(30, 2000)->until(
function () use ($driver, $code) {
return !$driver->executeScript($code);
}
);
}
} }