1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00

Merge branch '3.3.x'

This commit is contained in:
mrgoldy
2020-05-02 22:49:54 +02:00
34 changed files with 9386 additions and 2694 deletions

View File

@@ -31,13 +31,13 @@ class phpbb_functional_forum_style_test extends phpbb_functional_test_case
public function test_default_forum_style()
{
$crawler = self::request('GET', 'viewtopic.php?t=1&f=2');
$this->assertContains('styles/prosilver/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href'));
$this->assertContains('styles/prosilver/', $crawler->filter('head > link[rel=stylesheet]')->eq(2)->attr('href'));
$crawler = self::request('GET', 'viewtopic.php?t=1');
$this->assertContains('styles/prosilver/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href'));
$this->assertContains('styles/prosilver/', $crawler->filter('head > link[rel=stylesheet]')->eq(2)->attr('href'));
$crawler = self::request('GET', 'viewtopic.php?t=1&view=next');
$this->assertContains('styles/prosilver/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href'));
$this->assertContains('styles/prosilver/', $crawler->filter('head > link[rel=stylesheet]')->eq(2)->attr('href'));
}
public function test_custom_forum_style()
@@ -47,13 +47,13 @@ class phpbb_functional_forum_style_test extends phpbb_functional_test_case
$db->sql_query('UPDATE ' . FORUMS_TABLE . ' SET forum_style = 2 WHERE forum_id = 2');
$crawler = self::request('GET', 'viewtopic.php?t=1&f=2');
$this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href'));
$this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(2)->attr('href'));
$crawler = self::request('GET', 'viewtopic.php?t=1');
$this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href'));
$this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(2)->attr('href'));
$crawler = self::request('GET', 'viewtopic.php?t=1&view=next');
$this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href'));
$this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(2)->attr('href'));
$db->sql_query('UPDATE ' . FORUMS_TABLE . ' SET forum_style = 0 WHERE forum_id = 2');
$this->delete_style(2, 'test_style');