Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordiosmosis <diosmosis@users.noreply.github.com>2018-08-07 04:33:49 +0300
committerGitHub <noreply@github.com>2018-08-07 04:33:49 +0300
commit0fb534d9f03c6477d1736b465f5c39193fb9d8cb (patch)
treeaa36706f34d4e0dcaeb9df4db2428f2c0682cf92
parent2e006803ee17a8d1a992085c6425eddaa84a25f5 (diff)
Fix ui tests (#13259)3.6.0-b3
* Put generated @theme LESS variables before everything else so theme LESS can override them. * Update screenshots.
-rw-r--r--plugins/CoreHome/CoreHome.php2
-rw-r--r--plugins/Installation/tests/UI/expected-screenshots/Installation_system_check.png4
-rw-r--r--plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_load.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png4
4 files changed, 7 insertions, 7 deletions
diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php
index 19c8c7bad8..4499ee37b8 100644
--- a/plugins/CoreHome/CoreHome.php
+++ b/plugins/CoreHome/CoreHome.php
@@ -49,7 +49,7 @@ class CoreHome extends \Piwik\Plugin
public function addStylesheets(&$mergedContent)
{
$themeStyles = ThemeStyles::get();
- $mergedContent .= "\n" . $themeStyles->toLessCode();
+ $mergedContent = $themeStyles->toLessCode() . "\n" . $mergedContent;
}
public function initAuthenticationObject()
diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_system_check.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_system_check.png
index e8774ae14a..a6b4de304a 100644
--- a/plugins/Installation/tests/UI/expected-screenshots/Installation_system_check.png
+++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_system_check.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0980173cf1265a833b9c70e326f6054910ec3711ad5197872caa6e08008c8092
-size 183144
+oid sha256:88dfee4009c5ad71932e85027a16c0efc632b3a44d4316f43817f568395eef3d
+size 186236
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_load.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_load.png
index a3d494ee66..a8ee2c8e3a 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_load.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_load.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:1c58f35cb0ad50d6f5efae9cfc8fe33aec6264a1cefc6aaf32bb479231157f14
-size 110140
+oid sha256:86305a8fafba4a9a687cb2a93b67b65b10354cf8c536e93362124c987453ae73
+size 110246
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png
index f3acceb4ff..f7487d4ece 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d2a328d61a1285fdedbd6eb0ef867d6e275b93fde4bb9fd7a2ed45d9b7b53581
-size 4529606
+oid sha256:ce9056a597c2f828eb20be659350df1418865402d3586e4054d358327276fd4f
+size 4551631