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
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/UI/expected-screenshots/BarGraph_load.png4
-rw-r--r--tests/UI/expected-screenshots/BarGraph_metric_picker_shown.png4
-rw-r--r--tests/UI/expected-screenshots/BarGraph_other_metric.png4
-rw-r--r--tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce.png4
-rw-r--r--tests/UI/expected-screenshots/GoalsTable_goals_table_full.png4
-rw-r--r--tests/UI/expected-screenshots/GoalsTable_goals_table_single.png4
-rw-r--r--tests/UI/expected-screenshots/GoalsTable_initial.png4
-rw-r--r--tests/UI/expected-screenshots/Installation_system_check.png4
-rw-r--r--tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png4
-rw-r--r--tests/UI/expected-screenshots/Overlay_loaded.png4
-rw-r--r--tests/UI/expected-screenshots/Overlay_loaded_with_segment.png4
-rw-r--r--tests/UI/expected-screenshots/Overlay_page_change.png4
-rw-r--r--tests/UI/expected-screenshots/Overlay_page_link_clicks.png4
-rw-r--r--tests/UI/expected-screenshots/Overlay_period_change.png4
-rw-r--r--tests/UI/expected-screenshots/Overlay_transitions.png4
-rw-r--r--tests/UI/expected-screenshots/PieGraph_load.png4
-rw-r--r--tests/UI/expected-screenshots/PieGraph_metric_picker_shown.png4
-rw-r--r--tests/UI/expected-screenshots/PieGraph_other_metric.png4
-rw-r--r--tests/UI/expected-screenshots/PieGraph_pie_segment_tooltip.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_admin_themes.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_feedback_form.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png4
-rw-r--r--tests/UI/expected-screenshots/ViewDataTableTest_0_initial.png4
-rw-r--r--tests/UI/expected-screenshots/ViewDataTableTest_10_change_limit.png4
-rw-r--r--tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png4
-rw-r--r--tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png4
-rw-r--r--tests/UI/expected-screenshots/ViewDataTableTest_13_make_hierarchical.png4
-rw-r--r--tests/UI/expected-screenshots/ViewDataTableTest_14_visits_percent.png4
-rw-r--r--tests/UI/expected-screenshots/ViewDataTableTest_15_search.png4
-rw-r--r--tests/UI/expected-screenshots/ViewDataTableTest_1_all_columns.png4
-rw-r--r--tests/UI/expected-screenshots/ViewDataTableTest_2_column_sorted_desc.png4
-rw-r--r--tests/UI/expected-screenshots/ViewDataTableTest_3_column_sorted_asc.png4
-rw-r--r--tests/UI/expected-screenshots/ViewDataTableTest_5_goals.png4
-rw-r--r--tests/UI/expected-screenshots/ViewDataTableTest_6_bar_graph.png4
-rw-r--r--tests/UI/expected-screenshots/ViewDataTableTest_7_pie_graph.png4
-rw-r--r--tests/UI/expected-screenshots/ViewDataTableTest_8_tag_cloud.png4
-rw-r--r--tests/UI/expected-screenshots/ViewDataTableTest_9_normal_table.png4
-rw-r--r--tests/UI/expected-screenshots/ViewDataTableTest_export_options.png4
-rw-r--r--tests/UI/expected-screenshots/ViewDataTableTest_limit_selector_open.png4
-rw-r--r--tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png4
-rw-r--r--tests/UI/specs/Dashboard_spec.js1
-rw-r--r--tests/lib/screenshot-testing/support/page-renderer.js65
46 files changed, 150 insertions, 92 deletions
diff --git a/tests/UI/expected-screenshots/BarGraph_load.png b/tests/UI/expected-screenshots/BarGraph_load.png
index 9ce17c35fe..1a3b1997bc 100644
--- a/tests/UI/expected-screenshots/BarGraph_load.png
+++ b/tests/UI/expected-screenshots/BarGraph_load.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a3616d61a7ea6e9ff3fd6dd5b3ebc3c1a7262dc905efe5a2e3a1cb37d6415bf8
-size 14355
+oid sha256:52149c088a9d4952984527d2fcb69629eb19917ab7ea06828567e7b4de176626
+size 33400
diff --git a/tests/UI/expected-screenshots/BarGraph_metric_picker_shown.png b/tests/UI/expected-screenshots/BarGraph_metric_picker_shown.png
index aa0cace36b..3b1b59724e 100644
--- a/tests/UI/expected-screenshots/BarGraph_metric_picker_shown.png
+++ b/tests/UI/expected-screenshots/BarGraph_metric_picker_shown.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7a285d7f289198295a281b722a8fca500a720375b925e76c068fbe1459cdf932
-size 26905
+oid sha256:f1b9cc2db50c14995a966b63eb516b4f1e9bd9faa571cc43457d175a84396886
+size 46745
diff --git a/tests/UI/expected-screenshots/BarGraph_other_metric.png b/tests/UI/expected-screenshots/BarGraph_other_metric.png
index 798e00cb55..2a4696fc9b 100644
--- a/tests/UI/expected-screenshots/BarGraph_other_metric.png
+++ b/tests/UI/expected-screenshots/BarGraph_other_metric.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:bd3e453454d4ca353a41f11d6a1e8f85c26f784dd474f05bdf7b66c53d8931bd
-size 15829
+oid sha256:f3031f2dde305a4ea64ff03a72dda62c4f2d66d6f92f69c2a2c9d1a7f357829b
+size 34472
diff --git a/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce.png b/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce.png
index 6ae5762e30..113ea5134e 100644
--- a/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce.png
+++ b/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:03ef44db1e4a79a625aa9b4fe3bbebc1f882c5268f90f08af4fd0b9d3795613b
-size 37733
+oid sha256:b0815d3e4a94ab8771d07d8f90d94168f889e88996f16799de28961e0e294a80
+size 57172
diff --git a/tests/UI/expected-screenshots/GoalsTable_goals_table_full.png b/tests/UI/expected-screenshots/GoalsTable_goals_table_full.png
index f95fb27c72..3c50aa1394 100644
--- a/tests/UI/expected-screenshots/GoalsTable_goals_table_full.png
+++ b/tests/UI/expected-screenshots/GoalsTable_goals_table_full.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:05ab66ef93ba61f5c2a76caf72da7a68a4e0ffe33dc994fe9c788cfa8128a9ed
-size 68784
+oid sha256:76dc796f59932a62912ac54f0e391a226e9760e4bd99aa676fad455c286d17fc
+size 85638
diff --git a/tests/UI/expected-screenshots/GoalsTable_goals_table_single.png b/tests/UI/expected-screenshots/GoalsTable_goals_table_single.png
index 21965d9bb6..4cd3fa8ff3 100644
--- a/tests/UI/expected-screenshots/GoalsTable_goals_table_single.png
+++ b/tests/UI/expected-screenshots/GoalsTable_goals_table_single.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:84da3d27ec8edbcd191edf023c7eff72b4af71f452092eea7876cce11ee49b31
-size 43366
+oid sha256:92d1342bd3d11111b3cd6bc14ce9af212711cf1484be5957a9b6de1fe3c1e703
+size 63126
diff --git a/tests/UI/expected-screenshots/GoalsTable_initial.png b/tests/UI/expected-screenshots/GoalsTable_initial.png
index 3e3272f1e6..0768317efb 100644
--- a/tests/UI/expected-screenshots/GoalsTable_initial.png
+++ b/tests/UI/expected-screenshots/GoalsTable_initial.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8736f9d6b4986e0e886e4bc1a547c7796217f8dd5361fc0e38a9c1bee4fe4498
-size 41983
+oid sha256:188caa6ddaf1e61ca1880977ce2feacbbb7309f1a52086613de11512e75202a9
+size 61769
diff --git a/tests/UI/expected-screenshots/Installation_system_check.png b/tests/UI/expected-screenshots/Installation_system_check.png
index 0d0af0024b..2b068301b1 100644
--- a/tests/UI/expected-screenshots/Installation_system_check.png
+++ b/tests/UI/expected-screenshots/Installation_system_check.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:4466e331e9dcdefbd09f68ed8e649c96c867627267a434d79c8cb3bc8ec4b0da
-size 168847
+oid sha256:22f5ded27d63055d808e02751a8aa203118e6f58a421d5f16ddf7499f85eadc9
+size 169750
diff --git a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png
index fa3726eeba..e71e879402 100644
--- a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png
+++ b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f5374f56887499ba2aca22f50d02096d7e0fcd6252a90563408ed2512fef077e
-size 424564
+oid sha256:a86785bdde4c70ca7dea71035926d5b0232742f1a18f6d0d44c21d74642d00e1
+size 427663
diff --git a/tests/UI/expected-screenshots/Overlay_loaded.png b/tests/UI/expected-screenshots/Overlay_loaded.png
index f4db30282f..714d4c9708 100644
--- a/tests/UI/expected-screenshots/Overlay_loaded.png
+++ b/tests/UI/expected-screenshots/Overlay_loaded.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:17a4c698ad76447989cba6f79f4467bd10f91ade67571909cb552fc802eb4359
-size 90444
+oid sha256:06e6f83a9bf5b90fa04c9d834c3d18e30682819745a7c9eae2de13a55238d6ee
+size 90662
diff --git a/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png b/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png
index 03f54336fc..86aa47a554 100644
--- a/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png
+++ b/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2a3a1baf8b525a006b266974852fffbd74fd6f70f156e19a1472b489e085913b
-size 89026
+oid sha256:43b57ce669b979f74af229b11ae937030cd35309ad3f45d0718beaf69974ee0e
+size 89140
diff --git a/tests/UI/expected-screenshots/Overlay_page_change.png b/tests/UI/expected-screenshots/Overlay_page_change.png
index e69bf4b7ba..8599c29f2d 100644
--- a/tests/UI/expected-screenshots/Overlay_page_change.png
+++ b/tests/UI/expected-screenshots/Overlay_page_change.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0aacca889a473900d5e79717a7c584462918761fd505630d374efe93f94900fb
-size 199077
+oid sha256:116c07c68ed377f1d9ee8f3235280037d3a29f016246ecb71c4fd35240d4d577
+size 199127
diff --git a/tests/UI/expected-screenshots/Overlay_page_link_clicks.png b/tests/UI/expected-screenshots/Overlay_page_link_clicks.png
index b5f571d737..8c5ae90776 100644
--- a/tests/UI/expected-screenshots/Overlay_page_link_clicks.png
+++ b/tests/UI/expected-screenshots/Overlay_page_link_clicks.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:63753eefe1437f94c4578f444fb4cbb0062c337fc47605889ed9ede2be521d5a
-size 97259
+oid sha256:8b7d7301d2b5e260db0241d0fcb0234e5d5b0215079a6f08971d424fadf938b5
+size 97493
diff --git a/tests/UI/expected-screenshots/Overlay_period_change.png b/tests/UI/expected-screenshots/Overlay_period_change.png
index 3d4461f835..f1921bf3d2 100644
--- a/tests/UI/expected-screenshots/Overlay_period_change.png
+++ b/tests/UI/expected-screenshots/Overlay_period_change.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0bdc09ac43acaa7d97f10072e4751e02ad579f79dae51a9d86835d4c15e1c91d
-size 201359
+oid sha256:f592419ff29b16e74b49a98e743882986458021b29d6682eb3b9acbed07d8b4a
+size 201409
diff --git a/tests/UI/expected-screenshots/Overlay_transitions.png b/tests/UI/expected-screenshots/Overlay_transitions.png
index b905aa18b2..e53c5c9f41 100644
--- a/tests/UI/expected-screenshots/Overlay_transitions.png
+++ b/tests/UI/expected-screenshots/Overlay_transitions.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:3841fe4b0ff02129ccf16d1b5a6c5bd7486ba4f36ce5e0b59cbd290a2b3ee264
-size 120161
+oid sha256:b512d8e268ffcec1c8c005f09eb6e8210547c3a1f876bf8312315e7cdc975598
+size 120232
diff --git a/tests/UI/expected-screenshots/PieGraph_load.png b/tests/UI/expected-screenshots/PieGraph_load.png
index a5c5430e53..b438b8b520 100644
--- a/tests/UI/expected-screenshots/PieGraph_load.png
+++ b/tests/UI/expected-screenshots/PieGraph_load.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:dd3ca2311e5466f30b434f140dcfcee23bcebe0106269560fb6af1c11f34e3f9
-size 29894
+oid sha256:a07659206f0a9786165f9c2073d32718bfc36409cbe70c54fcd357a758509b6f
+size 49255
diff --git a/tests/UI/expected-screenshots/PieGraph_metric_picker_shown.png b/tests/UI/expected-screenshots/PieGraph_metric_picker_shown.png
index 7f0ffb4a1f..f83211fd23 100644
--- a/tests/UI/expected-screenshots/PieGraph_metric_picker_shown.png
+++ b/tests/UI/expected-screenshots/PieGraph_metric_picker_shown.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:85cd1d643e1c0b006ffebe4efad378d7345e568a792af701002961b6d9c00de7
-size 43780
+oid sha256:5b3ffb582693f7e9511ca36c77392ec581dbcb272edcc874a42178c1f1498230
+size 63682
diff --git a/tests/UI/expected-screenshots/PieGraph_other_metric.png b/tests/UI/expected-screenshots/PieGraph_other_metric.png
index dbc3c9724c..993d128b8d 100644
--- a/tests/UI/expected-screenshots/PieGraph_other_metric.png
+++ b/tests/UI/expected-screenshots/PieGraph_other_metric.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f9a012c5d0369d1bdd4b3fbfc85155f3e522d522d7d0f298eb8dd6f2446e7782
-size 35148
+oid sha256:493c491078867117fc0fe80e6069bb68f8b8ce060a1226387373a08a77c04ec6
+size 54142
diff --git a/tests/UI/expected-screenshots/PieGraph_pie_segment_tooltip.png b/tests/UI/expected-screenshots/PieGraph_pie_segment_tooltip.png
index f3d5af32aa..3fd53f1837 100644
--- a/tests/UI/expected-screenshots/PieGraph_pie_segment_tooltip.png
+++ b/tests/UI/expected-screenshots/PieGraph_pie_segment_tooltip.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:dc1ae497258e4e2a2f16400e6724a2bd9691b5b17417376850d2c38394de9e89
-size 32641
+oid sha256:6184b18de3cc01d68f10c87ab6162da147de78ac1e07d08ad482228fc7374cc1
+size 51461
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
index b4569d0fe7..b98f8ecb03 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a90487bbaaae92569b8ddc2c3fa0ffd19b973ae7cd771efdea6b11199efdd7b5
-size 3532421
+oid sha256:ce5fe2a7e10433eccc7ff65ecc8282e9f261309697be4cf8378eb0384c5c3f8a
+size 3559171
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png
index 83ce827159..726fca1877 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:1dfe72aff4ea603f1c3ddfd0cdcfcd3e03d1230713e077054512e3fe2b682ac9
-size 955453
+oid sha256:0cacebc0fa6fa2aec9920c16311d1ea10a0770d787967f0f411d2b3b172c4ed2
+size 956270
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png
index 83a4b8ac44..c13ddb72b9 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:9955076f8a3a3e6efbfb1c171154a76ed9381052205263063356269fdd6eff59
-size 653419
+oid sha256:a0de3aa3ad3d81ac2c29249bc1cf1e9acdd3470eba73fd32a494822ba7a9af15
+size 653375
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_themes.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_themes.png
index 59120fe451..510782eb50 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_themes.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_themes.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f8713d9dca666ac6f2532cc3dee5a4b30bd5e8f3a6fa3181d6b9005c87e2c9b2
-size 80901
+oid sha256:e11b309dbd848688234faa2e2e1e82403035596332128d871b47ec43248cb8bc
+size 81460
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png b/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png
index 14bf63a1cf..7644c8b396 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:72e051179a4110d717256901c2c7bfa96da877407500348b968e20019b58cf73
-size 193463
+oid sha256:f6c7b1e43460effdcf48f24aa60696f78591214aa16d193b4bd319e5cd46f4ac
+size 193363
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_feedback_form.png b/tests/UI/expected-screenshots/UIIntegrationTest_feedback_form.png
index da8b82d38a..484a5a5e0d 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_feedback_form.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_feedback_form.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:581633963d6ad2e35e0259c593fac39072e96c9924a485f446b48e3654f366ce
-size 217914
+oid sha256:c443db5ec52e9f09e58365f410b5ff8a79639fbc18a98b5ac81fa4a9e522aa72
+size 227746
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png
index e7f02027c3..80b7468a87 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:66c69b9c0dda3f16b3085b947714776ef607351ba50814cd33d68c755ca1a74d
-size 71814
+oid sha256:46ae4e1a6f608ebdd704c81597571d7641b21bb3e7262f5b266e07a990763e56
+size 97011
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_0_initial.png b/tests/UI/expected-screenshots/ViewDataTableTest_0_initial.png
index 00028031a4..69783be1d3 100644
--- a/tests/UI/expected-screenshots/ViewDataTableTest_0_initial.png
+++ b/tests/UI/expected-screenshots/ViewDataTableTest_0_initial.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8db471e5cd81cad572a7a68397ef8f42831dffa75a531c026fcb196b6e9c11a6
-size 24087
+oid sha256:0f3354a263829ab4416b032a8fc9446c202e97f4681843f4d2d8eeee7c77a0ee
+size 43884
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_10_change_limit.png b/tests/UI/expected-screenshots/ViewDataTableTest_10_change_limit.png
index a37e480237..732f9d70c5 100644
--- a/tests/UI/expected-screenshots/ViewDataTableTest_10_change_limit.png
+++ b/tests/UI/expected-screenshots/ViewDataTableTest_10_change_limit.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:96b114016b088e681dbe80500350fd40e82a6b598a25c45b44929eb9624f9a7f
-size 39069
+oid sha256:42b300cef1e8077ca3671725c9a75b1d99724964a9fcfdc759a3632c95543f70
+size 58606
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png b/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png
index 1a9dda3f85..8711e209ad 100644
--- a/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png
+++ b/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:b233e118fa6459b94faf6e31690f677181b2e5d830bbae56a8cb7329524cfb56
-size 46518
+oid sha256:e205ef29771a9bd531351d66ee207f7e301893e4d9b214d1be49ced93669b622
+size 65037
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png b/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png
index 3e0d937536..87a4cf6185 100644
--- a/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png
+++ b/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d62b387394e730e1b93285b55bcac93d2c5003d3fd6142ab4d56723e269572a0
-size 51239
+oid sha256:9e9e2064a5d68ec792c9f86751e049c6473e1d6b1396fa60079d734305e12a62
+size 70625
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_13_make_hierarchical.png b/tests/UI/expected-screenshots/ViewDataTableTest_13_make_hierarchical.png
index a37e480237..732f9d70c5 100644
--- a/tests/UI/expected-screenshots/ViewDataTableTest_13_make_hierarchical.png
+++ b/tests/UI/expected-screenshots/ViewDataTableTest_13_make_hierarchical.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:96b114016b088e681dbe80500350fd40e82a6b598a25c45b44929eb9624f9a7f
-size 39069
+oid sha256:42b300cef1e8077ca3671725c9a75b1d99724964a9fcfdc759a3632c95543f70
+size 58606
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_14_visits_percent.png b/tests/UI/expected-screenshots/ViewDataTableTest_14_visits_percent.png
index 59e571c6a2..f771037e7f 100644
--- a/tests/UI/expected-screenshots/ViewDataTableTest_14_visits_percent.png
+++ b/tests/UI/expected-screenshots/ViewDataTableTest_14_visits_percent.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7583864f6dd731a581465da38ab41461af9660289422e0e14b81693b835ba527
-size 47228
+oid sha256:9e41322bb963d263d8f639a68829cb2fc057a789c4bf79b3e9ef2c9f8a563446
+size 65746
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_15_search.png b/tests/UI/expected-screenshots/ViewDataTableTest_15_search.png
index 8c80f08e2a..76aeed777d 100644
--- a/tests/UI/expected-screenshots/ViewDataTableTest_15_search.png
+++ b/tests/UI/expected-screenshots/ViewDataTableTest_15_search.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:044235cdfc011161d1bdf7c3910757f52960c68c56980ab3c108c017faf0134c
-size 24615
+oid sha256:f34fc02d43dc4d3948e6b6ae2136e179c07192830153e4772091031884d9f8be
+size 44465
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_1_all_columns.png b/tests/UI/expected-screenshots/ViewDataTableTest_1_all_columns.png
index 348f6c312c..3d40d2af4b 100644
--- a/tests/UI/expected-screenshots/ViewDataTableTest_1_all_columns.png
+++ b/tests/UI/expected-screenshots/ViewDataTableTest_1_all_columns.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:174fe9bcdc2e6185e1332fed6dbc07363aeee34b60a652d767677fd29ba13c9b
-size 35266
+oid sha256:1952ae645f02cc833d65829160c9771c88e745b139e14b17ec390b9d5ff7c0ff
+size 54712
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_2_column_sorted_desc.png b/tests/UI/expected-screenshots/ViewDataTableTest_2_column_sorted_desc.png
index 4990e2f569..45654391f1 100644
--- a/tests/UI/expected-screenshots/ViewDataTableTest_2_column_sorted_desc.png
+++ b/tests/UI/expected-screenshots/ViewDataTableTest_2_column_sorted_desc.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:51e62ba90948a30110ef888c07ff067f3ab46ae1d76d94394c163c057f7a79dc
-size 40671
+oid sha256:0e8c05f2123579a1c9c12bba944add72d2e979bdd303d2ee263541fbc0c40bea
+size 60404
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_3_column_sorted_asc.png b/tests/UI/expected-screenshots/ViewDataTableTest_3_column_sorted_asc.png
index 30dd55873a..42a30b88a7 100644
--- a/tests/UI/expected-screenshots/ViewDataTableTest_3_column_sorted_asc.png
+++ b/tests/UI/expected-screenshots/ViewDataTableTest_3_column_sorted_asc.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:9c6f180eec5c2b6d095a62bc8205069464303613231fa3f9c2f057e2ebe878dd
-size 31529
+oid sha256:a3fa50152edd5722f1128f6c96904037b72df700c6d2ba0e2678325b5d025922
+size 50338
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_5_goals.png b/tests/UI/expected-screenshots/ViewDataTableTest_5_goals.png
index 3e3272f1e6..0768317efb 100644
--- a/tests/UI/expected-screenshots/ViewDataTableTest_5_goals.png
+++ b/tests/UI/expected-screenshots/ViewDataTableTest_5_goals.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8736f9d6b4986e0e886e4bc1a547c7796217f8dd5361fc0e38a9c1bee4fe4498
-size 41983
+oid sha256:188caa6ddaf1e61ca1880977ce2feacbbb7309f1a52086613de11512e75202a9
+size 61769
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_6_bar_graph.png b/tests/UI/expected-screenshots/ViewDataTableTest_6_bar_graph.png
index a03dc7a2f3..386fc90fb8 100644
--- a/tests/UI/expected-screenshots/ViewDataTableTest_6_bar_graph.png
+++ b/tests/UI/expected-screenshots/ViewDataTableTest_6_bar_graph.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:3cfa4005b1362a88ecc5fded0f104eec184bc01539f919289e157f6d96baf1eb
-size 14532
+oid sha256:b1f97b0d56b90733eee36c906a09c5174618b451252c5026a06d16279444b7e5
+size 33555
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_7_pie_graph.png b/tests/UI/expected-screenshots/ViewDataTableTest_7_pie_graph.png
index d3fb24244f..6f9bb15b31 100644
--- a/tests/UI/expected-screenshots/ViewDataTableTest_7_pie_graph.png
+++ b/tests/UI/expected-screenshots/ViewDataTableTest_7_pie_graph.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0f521257fa92b01f43c551bafe696e4c018fda6b23a09b697aa16a8703a3d369
-size 30067
+oid sha256:c10f7ecd2b97eef6e1599f28824bdf92a08f2a6b5827af9e3993f94004e27ea2
+size 49443
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_8_tag_cloud.png b/tests/UI/expected-screenshots/ViewDataTableTest_8_tag_cloud.png
index 6b1398e365..b8a201dce5 100644
--- a/tests/UI/expected-screenshots/ViewDataTableTest_8_tag_cloud.png
+++ b/tests/UI/expected-screenshots/ViewDataTableTest_8_tag_cloud.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:ed009444977b7cb6ba3f64852734962b9fa1d2c70d453931e94743118ecdfd67
-size 61738
+oid sha256:89c7280f92d5ab387a2009a8b0a554a42662a549484a3ac7615f666cc86ba015
+size 81681
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_9_normal_table.png b/tests/UI/expected-screenshots/ViewDataTableTest_9_normal_table.png
index e93bdd236e..6f8a71aa00 100644
--- a/tests/UI/expected-screenshots/ViewDataTableTest_9_normal_table.png
+++ b/tests/UI/expected-screenshots/ViewDataTableTest_9_normal_table.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a08c7a4e3bcd9867d0d9a396d2abab4aa1cac4fbbe3b46e9b1776c9ba837f8e8
-size 53573
+oid sha256:c991abf54e77046f5917ba61e654e83b7d6ee45651a4d2e349c404e91be40320
+size 74217
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_export_options.png b/tests/UI/expected-screenshots/ViewDataTableTest_export_options.png
index 2886545717..c6ecd1347c 100644
--- a/tests/UI/expected-screenshots/ViewDataTableTest_export_options.png
+++ b/tests/UI/expected-screenshots/ViewDataTableTest_export_options.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:cc6fc62acd600b8c57a070b1199891566e3a7c59d1be4fde799955efffe747ab
-size 32701
+oid sha256:5d30ba93cc82334c46fc4f5e3efd44ee15be70bddbcad0c2cbcc3ce57f2f67db
+size 49043
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_limit_selector_open.png b/tests/UI/expected-screenshots/ViewDataTableTest_limit_selector_open.png
index 2f640b5975..d82c46231a 100644
--- a/tests/UI/expected-screenshots/ViewDataTableTest_limit_selector_open.png
+++ b/tests/UI/expected-screenshots/ViewDataTableTest_limit_selector_open.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:1a6d455b1e3ff73eeb9543a91839a086bc13740cdd60f4e0f2c47966fde4f301
-size 58074
+oid sha256:a125e6d7278f066dfe13c1bc61a55a12626f0831a0b09388484cfd8d45ab856b
+size 78563
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png b/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png
index 8e8f5cf26f..81a7ba915f 100644
--- a/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png
+++ b/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:ac571db707145f557518a2a1c70461cc072d086a0ac3d5d7f2795124d1667901
-size 50019
+oid sha256:1fddef92dd6c82ab2b30d9dfe5b390021d26f96fd6820838a6ab79a860dbd6ca
+size 70794
diff --git a/tests/UI/specs/Dashboard_spec.js b/tests/UI/specs/Dashboard_spec.js
index f647bdab68..e585bc719f 100644
--- a/tests/UI/specs/Dashboard_spec.js
+++ b/tests/UI/specs/Dashboard_spec.js
@@ -182,6 +182,7 @@ describe("Dashboard", function () {
});
it("should reset dashboard when reset dashboard process completed", function (done) {
+ this.retries(3);
expect.screenshot("reset").to.be.capture(function (page) {
page.click('.dashboard-manager .title');
page.click('li[data-action=resetDashboard]');
diff --git a/tests/lib/screenshot-testing/support/page-renderer.js b/tests/lib/screenshot-testing/support/page-renderer.js
index ab756e211a..1eb7b81214 100644
--- a/tests/lib/screenshot-testing/support/page-renderer.js
+++ b/tests/lib/screenshot-testing/support/page-renderer.js
@@ -19,6 +19,7 @@ var PageRenderer = function (baseUrl) {
this.aborted = false;
this.baseUrl = baseUrl;
this.currentFrame = null;
+ this.frameOffset = null;
this.defaultWaitTime = 1000;
this._isLoading = false;
@@ -98,6 +99,14 @@ PageRenderer.prototype.mouseup = function (selector, waitTime) {
this.queuedEvents.push([this._mouseup, waitTime, selector]);
};
+PageRenderer.prototype.selectFrame = function (frameNameOrPosition, waitTime) {
+ this.queuedEvents.push([this._selectFrame, waitTime, frameNameOrPosition]);
+};
+
+PageRenderer.prototype.selectMainFrame = function (waitTime) {
+ this.queuedEvents.push([this._selectMainFrame, waitTime]);
+};
+
PageRenderer.prototype.reload = function (waitTime) {
this.queuedEvents.push([this._reload, waitTime]);
};
@@ -227,6 +236,41 @@ PageRenderer.prototype._mouseup = function (selector, callback) {
callback();
};
+PageRenderer.prototype._selectFrame = function (frameNameOrPosition, callback) {
+ if (!this.frameOffset) {
+ // case when selecting a frame within a frame is currently not supported
+ // and we'd need to make sure to not use jQuery in that case as it is likely not available in that frame
+ // within the frame :)
+ this.frameOffset = this.webpage.evaluate(function (frameName) {
+ if ('undefined' === typeof window.jQuery) {
+ return null;
+ }
+ // todo eventually we should also try to find frame by position
+ var frame = window.jQuery('iframe[name=' + frameName + ']');
+
+ if (!frame.size()) {
+ frame = window.jQuery('iframe[id=' + frameName + ']');
+ }
+ if (frame.size()) {
+ return frame.offset();
+ }
+
+ return null;
+ }, frameNameOrPosition);
+ }
+
+ this.webpage.switchToFrame(frameNameOrPosition);
+ this.wait(100);
+ callback();
+};
+
+PageRenderer.prototype._selectMainFrame = function (callback) {
+ this.frameOffset = null;
+ this.webpage.switchToMainFrame();
+ this.wait(100);
+ callback();
+};
+
PageRenderer.prototype._reload = function (callback) {
this.webpage.reload();
@@ -317,7 +361,9 @@ PageRenderer.prototype._getPosition = function (selector) {
return selector;
}
- var pos = this.webpage.evaluate(function (selector) {
+ var self = this;
+
+ var pos = this.webpage.evaluate(function (selector, frameOffset) {
var element = window.jQuery(selector),
offset = element.offset();
@@ -331,11 +377,20 @@ PageRenderer.prototype._getPosition = function (selector) {
return null;
}
+ if (frameOffset) {
+ if (frameOffset.top) {
+ offset.top += frameOffset.top;
+ }
+ if (frameOffset.left) {
+ offset.left += frameOffset.left;
+ }
+ }
+
return {
x: offset.left + element.width() / 2,
y: offset.top + element.height() / 2
};
- }, selector);
+ }, selector, self.frameOffset);
return pos;
};
@@ -382,8 +437,10 @@ PageRenderer.prototype.capture = function (outputPath, callback, selector) {
}
var result = page.evaluate(function(selector) {
- var docWidth = $(document).width(),
- docHeight = $(document).height();
+ window.jQuery('html').addClass('uiTest');
+
+ var docWidth = window.jQuery(document).width(),
+ docHeight = window.jQuery(document).height();
function isInvalidBoundingRect (rect) {
return !rect.width || !rect.height