diff options
author | mattab <matthieu.aubry@gmail.com> | 2013-11-22 11:23:19 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2013-11-22 11:23:19 +0400 |
commit | 6c753c5d8358009e07146d4bc77e49ef082f6dce (patch) | |
tree | ee3db73c40f474a3f16e933ef2edd17a5b33be97 | |
parent | add4e4af16f9e1c3f8c580c8f97201f7f59fbd01 (diff) |
Adding new screenshot test case: Themes admin page2.0-b9
-rw-r--r-- | core/Theme.php | 2 | ||||
-rwxr-xr-x | tests/PHPUnit/IntegrationTestCase.php | 4 | ||||
-rw-r--r-- | tests/PHPUnit/UITest.php | 7 |
3 files changed, 10 insertions, 3 deletions
diff --git a/core/Theme.php b/core/Theme.php index 76fdd57303..3ae44431de 100644 --- a/core/Theme.php +++ b/core/Theme.php @@ -59,7 +59,7 @@ class Theme '~(src|href)=[\'"]([^\'"]+)[\'"]~', // rewrite images in CSS files, i.e. url(plugins/Morpheus/overrides/themes/default/images/help.png); - '~(url\()[\'"]([^\)]?[themes|plugins]+[^\)]+[.jpg|png|gif|svg]?)[\'"][\)]~', + '~(url\()[\'"]([^\)]?[plugins]+[^\)]+[.jpg|png|gif|svg]?)[\'"][\)]~', // rewrites images in JS files '~(=)[\s]?[\'"]([^\'"]+[.jpg|.png|.gif|svg]?)[\'"]~', diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php index 09bb84192f..d54db6e778 100755 --- a/tests/PHPUnit/IntegrationTestCase.php +++ b/tests/PHPUnit/IntegrationTestCase.php @@ -187,7 +187,9 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase Piwik::setUserIsSuperUser(); Cache::deleteTrackerCache(); - if ($installPlugins === null) $installPlugins = $createEmptyDatabase; + if ($installPlugins === null) { + $installPlugins = $createEmptyDatabase; + } static::installAndLoadPlugins( $installPlugins); diff --git a/tests/PHPUnit/UITest.php b/tests/PHPUnit/UITest.php index ad2206b7bb..26988c5a43 100644 --- a/tests/PHPUnit/UITest.php +++ b/tests/PHPUnit/UITest.php @@ -113,7 +113,7 @@ abstract class UITest extends IntegrationTestCase parent::tearDownAfterClass(); } - + public function setUp() { parent::setUp(); @@ -262,6 +262,11 @@ Screenshot diff: $diffPath\n"; } } + self::createProxySymlinks(); + } + + private static function createProxySymlinks() + { foreach (self::$recursiveProxyLinkNames as $linkName) { $linkPath = PIWIK_INCLUDE_PATH . '/tests/PHPUnit/proxy/' . $linkName; if (!file_exists($linkPath)) { |