diff options
| author | diosmosis <diosmosis@users.noreply.github.com> | 2018-12-08 09:16:59 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-08 09:16:59 +0300 |
| commit | df062ae092d6b44f319582d7d567db1ec42cc29e (patch) | |
| tree | 6a916eccb4c3137e3b9bf3de7d7e682b66a70a73 | |
| parent | 53c4d95a4b60ee099400db8c36ac64a68ffa37a3 (diff) | |
Fixing build (#13808)
* Rename long files.
* fix test name
* Try to fix several test failures.
* Rename expected files.
* --amend
* Try to fix tests.
* Fix more system tests.
* Fix more tests.
* Add debug log.
* Update CustomAlerts submodule for test fix.
* Fix some more screenshots.
* Fixing more tests.
* Update more expected test files & screenshots.
* Last couple fixes.
* update tagmanager submodule
* update submodule
* update submodule
69 files changed, 99 insertions, 84 deletions
diff --git a/core/Tracker/Request.php b/core/Tracker/Request.php index 5e56e2185c..aa97fb7d23 100644 --- a/core/Tracker/Request.php +++ b/core/Tracker/Request.php @@ -146,6 +146,7 @@ class Request try { $idSite = $this->getIdSite(); } catch (Exception $e) { + Common::printDebug("failed to authenticate: invalid idSite"); $this->isAuthenticated = false; return; } diff --git a/plugins/Actions/tests/UI/ActionsDataTable_spec.js b/plugins/Actions/tests/UI/ActionsDataTable_spec.js index 7ee45bfbc5..d34b8cedf8 100644 --- a/plugins/Actions/tests/UI/ActionsDataTable_spec.js +++ b/plugins/Actions/tests/UI/ActionsDataTable_spec.js @@ -56,6 +56,7 @@ describe("ActionsDataTable", function () { expect.screenshot('unflattened').to.be.capture(function (page) { page.click('.dropdownConfigureIcon span'); page.click('.dataTableFlatten'); + page.mouseMove({x: -10, y: -10}); // mae sure no row is highlighted }, done); }); diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_configuration_options.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_configuration_options.png index 497726e6b8..7745906a8a 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_configuration_options.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_configuration_options.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bae1b4edc7f563dd705f714fe404414aa7b6f710776329eb58c6d84fe6c0ec13 -size 7599 +oid sha256:9668b1e96c37c82db0cb018f74ea798313d55560d27acbe75a12df9b9bbc96af +size 12881 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png index 8ec0a1df7e..0723231dc0 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d31be2a26098f15242dee40c7d557264d2e3c2957c640482128b0f0577752993 -size 484208 +oid sha256:931cf07c23e2a960f01838c2848ac497cbd1bb8e93d6934ca927ee78359ead42 +size 484339 diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig index af71747c59..d0f7490564 100644 --- a/plugins/CoreAdminHome/templates/generalSettings.twig +++ b/plugins/CoreAdminHome/templates/generalSettings.twig @@ -217,7 +217,7 @@ {% if isDataPurgeSettingsEnabled %} <div piwik-content-block content-title="{{ 'PrivacyManager_DeleteDataSettings'|translate|e('html_attr') }}"> - <p>{{ 'PrivacyManager_DeleteDataDescription'|translate }} {{ 'PrivacyManager_DeleteDataDescription2'|translate }}</p> + <p>{{ 'PrivacyManager_DeleteDataDescription'|translate }}</p> <p> <a href='{{ linkTo({'module':"PrivacyManager", 'action':"privacySettings"}) }}#deleteLogsAnchor'> {{ 'PrivacyManager_ClickHereSettings'|translate("'" ~ 'PrivacyManager_DeleteDataSettings'|translate ~ "'") }} diff --git a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig index d84885725b..257150c54e 100644 --- a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig +++ b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig @@ -67,7 +67,7 @@ ng-change="jsTrackingCode.updateTrackingCode()" disabled="jsTrackingCode.isLoading" introduction="{{ 'General_Options'|translate|e('html_attr') }}" - title="{{ 'CoreAdminHome_JSTracking_MergeSubdomains'|translate|e('html_attr') }} <span class='current-site-name'></span>" + title="{{ ('CoreAdminHome_JSTracking_MergeSubdomains'|translate ~ " <span class='current-site-name'></span>")|e('html_attr') }}" value="" inline-help="#jsTrackAllSubdomainsInlineHelp"> </div> @@ -93,7 +93,7 @@ ng-model="jsTrackingCode.trackAllAliases" ng-change="jsTrackingCode.updateTrackingCode()" disabled="jsTrackingCode.isLoading" - title="{{ 'CoreAdminHome_JSTracking_MergeAliases'|translate|e('html_attr') }} <span class='current-site-name'></span>" + title="{{ ('CoreAdminHome_JSTracking_MergeAliases'|translate ~ " <span class='current-site-name'></span>")|e('html_attr') }}" value="" inline-help="#jsTrackAllAliasesInlineHelp"> </div> diff --git a/plugins/CoreAdminHome/tests/UI/TrackingFailures_spec.js b/plugins/CoreAdminHome/tests/UI/TrackingFailures_spec.js index f98f1c0646..b0e68d7d16 100644 --- a/plugins/CoreAdminHome/tests/UI/TrackingFailures_spec.js +++ b/plugins/CoreAdminHome/tests/UI/TrackingFailures_spec.js @@ -8,6 +8,8 @@ describe("TrackingFailures", function () { this.timeout(0); + this.fixture = 'Piwik\\Tests\\Fixtures\\InvalidVisits'; + var manageUrl = '?module=CoreAdminHome&action=trackingFailures&idSite=1&period=day&date=today'; var widgetUrl = '?module=Widgetize&action=iframe&moduleToWidgetize=CoreAdminHome&actionToWidgetize=getTrackingFailures&idSite=1&period=day&date=today&widget=1'; diff --git a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures.png b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures.png index 3920b896ea..4d09ab7a58 100644 --- a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures.png +++ b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:164fc892e74d90ff316f76cc424dbb00e8af9f8ff5c487deaca4df67fb3b058d -size 75105 +oid sha256:69533861027563f90823d3028b395282cce23b0eb945910450580296bc4364cf +size 73944 diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts -Subproject aa9448262af28c4dd48d7eade15cd00c9f9da04 +Subproject 49e01c658061c3848bd63478087bf127b5fb74a diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions -Subproject 57e7a63a330602bbc879ce1a218a21b225ffa2e +Subproject 24efe9f7ffecc6358ae8ba4be488292cf661655 diff --git a/plugins/DBStats/tests/UI/expected-screenshots/DBStats_admin_page.png b/plugins/DBStats/tests/UI/expected-screenshots/DBStats_admin_page.png index 75e51821fc..e98f6db10a 100644 --- a/plugins/DBStats/tests/UI/expected-screenshots/DBStats_admin_page.png +++ b/plugins/DBStats/tests/UI/expected-screenshots/DBStats_admin_page.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd77bd0450f47700c1ebb05bc5d063515d817ec853495cd208e55c4a2477447c -size 227644 +oid sha256:d7364ea09c23f1ca0387e9983c18cf402b2046fbbad46019d8197ac1074fffde +size 233735 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png index a6b86d651d..914bd4c78a 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7d9e6e1415904dd15b54c4f4a5fd8bbe78f168a62a80e085ef7dafb8e11ee24 -size 438044 +oid sha256:5cc558d5fa6634dfcc05a52c9ff10f640e4d631396df9749dbe7fb782f71f07e +size 439728 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png index 3bd7cb1fd0..a303a6bbc9 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efed52b579b86fb4cf4953e80a34753d15d48bf75d254297b2b18dfbabb17174 -size 643147 +oid sha256:ca08e4db2dc2def8e61bcc50ad70e668ea9811b78549e2272364261c7b57057a +size 634426 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png index c3c04c11fb..764cdbd44e 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:393f5bb1399c554e243042f8d9b42da371e384b6b422c6565756a474228c5dcd -size 642650 +oid sha256:d7898080e63af2fd804577812e62d1f0ceeb2af128ede5bb0b00b4012c58ae30 +size 633792 diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html index 452a5e4515..452a5e4515 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_overEachInPeriod__ScheduledReports.generateReport_week.original.html b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_overEach__ScheduledReports.generateReport_week.original.html index dd617a4dd5..dd617a4dd5 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_overEachInPeriod__ScheduledReports.generateReport_week.original.html +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_overEach__ScheduledReports.generateReport_week.original.html diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_prevCustomN__ScheduledReports.generateReport_week.original.html b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_prevCustomN__ScheduledReports.generateReport_week.original.html index 909beaa0b3..909beaa0b3 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_prevCustomN__ScheduledReports.generateReport_week.original.html +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_prevCustomN__ScheduledReports.generateReport_week.original.html diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_and_graph__ScheduledReports.generateReport_week.original.html index f3d705b9c2..f3d705b9c2 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_and_graph__ScheduledReports.generateReport_week.original.html diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_only__ScheduledReports.generateReport_week.original.html index b7cc46dc3e..b7cc46dc3e 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_only__ScheduledReports.generateReport_week.original.html diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_csv__ScheduledReports.generateReport_week.original.csv index 19eec7be60..19eec7be60 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_csv__ScheduledReports.generateReport_week.original.csv diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf Binary files differindex bc0e02c299..bc0e02c299 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt index 645d7467c3..645d7467c3 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt index f36a23fa6e..f36a23fa6e 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt diff --git a/plugins/Installation/FormSuperUser.php b/plugins/Installation/FormSuperUser.php index 6cbe91e4cc..46d9e2edab 100644 --- a/plugins/Installation/FormSuperUser.php +++ b/plugins/Installation/FormSuperUser.php @@ -46,7 +46,7 @@ class FormSuperUser extends QuickForm2 $passwordBis = $this->addElement('password', 'password_bis') ->setLabel(Piwik::translate('Installation_PasswordRepeat')); $passwordBis->addRule('required', Piwik::translate('General_Required', Piwik::translate('Installation_PasswordRepeat'))); - $passwordBis->addRule('eq', Piwik::translate('Installation_PasswordDoNotMatch'), $password); + $passwordBis->addRule('eq', Piwik::translate('Installation_PasswordDoNotMatch'), ['operand' => $password]); $email = $this->addElement('text', 'email') ->setLabel(Piwik::translate('Installation_Email')); diff --git a/plugins/Login/FormResetPassword.php b/plugins/Login/FormResetPassword.php index 30eabcb963..f9b251cba9 100644 --- a/plugins/Login/FormResetPassword.php +++ b/plugins/Login/FormResetPassword.php @@ -31,7 +31,7 @@ class FormResetPassword extends QuickForm2 $passwordBis = $this->addElement('password', 'form_password_bis'); $passwordBis->addRule('required', Piwik::translate('General_Required', Piwik::translate('Login_PasswordRepeat'))); - $passwordBis->addRule('eq', Piwik::translate('Login_PasswordsDoNotMatch'), $password); + $passwordBis->addRule('eq', Piwik::translate('Login_PasswordsDoNotMatch'), ['operand' => $password]); $this->addElement('hidden', 'form_nonce'); diff --git a/plugins/MarketingCampaignsReporting b/plugins/MarketingCampaignsReporting -Subproject 7083e2995a681e1b5c7d8109ccb26b7e483eae0 +Subproject 1bb48586ddda10528c1db9193239262cf1082ab diff --git a/plugins/Overlay/API.php b/plugins/Overlay/API.php index 0d9ae9cdcb..25b10e33ec 100644 --- a/plugins/Overlay/API.php +++ b/plugins/Overlay/API.php @@ -73,7 +73,7 @@ class API extends \Piwik\Plugin\API $limitBeforeGrouping = Config::getInstance()->General['overlay_following_pages_limit']; $transitionsReport = APITransitions::getInstance()->getTransitionsForAction( $url, $type = 'url', $idSite, $period, $date, $segment, $limitBeforeGrouping, - $part = 'followingActions', $returnNormalizedUrls = true); + $part = 'followingActions'); } catch (Exception $e) { return $resultDataTable; } diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_privacy_settings_default.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_privacy_settings_default.png index a3dc2c7efb..10b30b5a75 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_privacy_settings_default.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_privacy_settings_default.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:349addb202be9776613544c8fed2893a19d77afc40b0bd33b5a71aceb9fb5cfe -size 462531 +oid sha256:c91954d29a502d87d18af67f1bf57ddbb59c3cf9bc3e555ef97e0a67fda4d0b5 +size 465006 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_users_opt_out_default.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_users_opt_out_default.png index 38cbad6871..a31aa9c4c2 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_users_opt_out_default.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_users_opt_out_default.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4d28644d4b15201c76ea3fb9637c7face09fcd7786c0ce57121f7fea068274d -size 138512 +oid sha256:2b69e764fb0626abf8367ccdb56b277c1bd34421dae07b918d98abba65e33b2c +size 168637 diff --git a/plugins/TagManager b/plugins/TagManager -Subproject 30c8a1158bd3a9edabe2bcb3e6a49f9b2b50153 +Subproject 2fd9ec848c9e33f7aa1cfcecddf590bb0442188 diff --git a/plugins/TwoFactorAuth/templates/_setupTwoFactorAuth.twig b/plugins/TwoFactorAuth/templates/_setupTwoFactorAuth.twig index d0e279d23e..df16baef23 100644 --- a/plugins/TwoFactorAuth/templates/_setupTwoFactorAuth.twig +++ b/plugins/TwoFactorAuth/templates/_setupTwoFactorAuth.twig @@ -24,7 +24,7 @@ <p>{{ 'TwoFactorAuth_SetupAuthenticatorOnDeviceStep1'|translate }} <a rel="noreferrer noopener" href="https://github.com/andOTP/andOTP#downloads">andOTP</a>, <a rel="noreferrer noopener" href="https://authy.com/guides/github/">Authy</a>, <a rel="noreferrer noopener" href="https://support.1password.com/one-time-passwords/">1Password</a>, <a rel="noreferrer noopener" href="https://helpdesk.lastpass.com/multifactor-authentication-options/lastpass-authenticator/">LastPass Authenticator</a>, {{ 'General_Or'|translate }} <a rel="noreferrer noopener" href="https://support.google.com/accounts/answer/1066447">Google Authenticator</a>. </p> <p>{{ 'TwoFactorAuth_SetupAuthenticatorOnDeviceStep2'|translate('<a href="javascript:void(0)" onclick="piwikHelper.modalConfirm(\'#setupTwoFAsecretConfirm\')">', '</a>')|raw }}<br/> - <img src="{{ authImage|raw }}"> + <img id="qrcode" src="{{ authImage|raw }}"> <br /> <button ng-show="setup2fa.step == 2" ng-click="setup2fa.nextStep()" class="btn goToStep3">{{ 'General_Next'|translate }}</button> </p> diff --git a/plugins/TwoFactorAuth/tests/UI/TwoFactorAuth_spec.js b/plugins/TwoFactorAuth/tests/UI/TwoFactorAuth_spec.js index b3a76c3987..259c9ba713 100644 --- a/plugins/TwoFactorAuth/tests/UI/TwoFactorAuth_spec.js +++ b/plugins/TwoFactorAuth/tests/UI/TwoFactorAuth_spec.js @@ -30,7 +30,7 @@ describe("TwoFactorAuth", function () { if (typeof doAuth === 'undefined') { doAuth = true; } - var logMeUrl = '?module=Login&action=logme&login=' + username + '&password=240161a241087c28d92d8d7ff3b6186b' + var logMeUrl = '?module=Login&action=logme&login=' + username + '&password=240161a241087c28d92d8d7ff3b6186b'; if (doAuth) { logMeUrl += '&authCode=123456'; // we make sure in test config this code always works } @@ -50,6 +50,7 @@ describe("TwoFactorAuth", function () { before(function () { testEnvironment.pluginsToLoad = ['TwoFactorAuth']; + testEnvironment.queryParamOverride = { date: '2018-03-04' }; testEnvironment.save(); }); @@ -92,7 +93,7 @@ describe("TwoFactorAuth", function () { it('a user with 2fa can open the widgetized view by token without needing to verify', function (done) { captureScreen(done, 'widgetized_no_verify', function (page) { - page.load('?module=Widgetize&action=iframe&moduleToWidgetize=Actions&actionToWidgetize=getPageUrls&token_auth=c4ca4238a0b923820dcc509a6f75849b&' + generalParams); + page.load('?module=Widgetize&action=iframe&moduleToWidgetize=Actions&actionToWidgetize=getPageUrls&date=2018-03-04&token_auth=c4ca4238a0b923820dcc509a6f75849b&' + generalParams); }); }); @@ -174,6 +175,9 @@ describe("TwoFactorAuth", function () { captureScreen(done, 'twofa_setup_step2', function (page) { page.click('.setupTwoFactorAuthentication .backupRecoveryCode:first'); page.click('.setupTwoFactorAuthentication .goToStep2'); + page.evaluate(function () { + $('#qrcode').hide(); + }); }); }); diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa_reset_confirm.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa_reset_confirm.png index f5a25ae9a1..79e12910fc 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa_reset_confirm.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa_reset_confirm.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab3a215b8f7038be361dbf648b9a5efbdcadc5dc7bdd0d565b74a0e9f47c0b3b -size 6127 +oid sha256:d906bbd7824a69df5e8ce9aa604a2c3417634ce28ab2e341657a8abc2b81efbc +size 6125 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_verified.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_verified.png index 4e1b429108..18288b26be 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_verified.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_verified.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57ee17dcaf6be387f1df3bf318208e1b849d9228c6290f64beb03624fe814376 -size 139517 +oid sha256:8e2f223eca26aec2084e6908f3994e356e2c64b932b23e05f103ee24e5f0bcd6 +size 139507 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step2.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step2.png index 15dd7c7e43..542e76f94a 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step2.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:157b46a7bed191c5d2585366c60d6a01e69f847748fbcb760e4a35ea5627ab3d -size 136989 +oid sha256:aa0c4bb2fc87e7cae1a94050e7db7227a2563a18deda4631e7652705ccfa7fb2 +size 137012 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step3.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step3.png index 143ce340a8..667a311b2a 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step3.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40729fc0b0676c77ba7da2b4ba70884e223a446ed23e6a863e1457a047f643f5 -size 176206 +oid sha256:b78696df8055d60c904b7e286c3e48139d1e029b80cd77a1055d4c2c825a9596 +size 176231 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step4.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step4.png index 4e1b429108..18288b26be 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step4.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57ee17dcaf6be387f1df3bf318208e1b849d9228c6290f64beb03624fe814376 -size 139517 +oid sha256:8e2f223eca26aec2084e6908f3994e356e2c64b932b23e05f103ee24e5f0bcd6 +size 139507 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step2.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step2.png index 72b7383319..6140fb3007 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step2.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e880b4f4fc98cb8fc5a6538f2ff5b2ecdd464a2662ed3ff946087a2f7a15dd3c -size 95996 +oid sha256:ade3b15b8921bcbbe83b703d1434183458f0e4ad192d003adb087c0c19b8745b +size 93245 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step3.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step3.png index e1e5cac715..82b5252fab 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step3.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c2b1e53058987335b513a461e81eb43c23d89e8f07b4f899f62c4091a10ff10 -size 124487 +oid sha256:0522e7ddd0d587bbb1733f41c6e236bd8ae360abe323e1a10e70dd3d6efb0342 +size 121373 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_basic_asks_confirmation.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_basic_asks_confirmation.png index d4c84a5976..d4f1373951 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_basic_asks_confirmation.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_basic_asks_confirmation.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc3f0fcd3ac18b88a19fb3afef08bd8d31f3dd6aef1a1aea2231bb2663a78d9e -size 22237 +oid sha256:58417ca355aed42e9eb80ea205ff689274737c384f43bc3759bc92e848a57b0e +size 22241 diff --git a/tests/PHPUnit/Fixtures/SqlDump.php b/tests/PHPUnit/Fixtures/SqlDump.php index 8069c4b67e..64042eb8cf 100644 --- a/tests/PHPUnit/Fixtures/SqlDump.php +++ b/tests/PHPUnit/Fixtures/SqlDump.php @@ -69,6 +69,8 @@ class SqlDump extends Fixture throw new Exception("Failed to load sql dump: " . implode("\n", $output)); } + Db::destroyDatabaseObject(); // recreate db connection so any cached table metadata in the connection is reset + // make sure archiving will be called Rules::setBrowserTriggerArchiving(true); diff --git a/tests/PHPUnit/Framework/TestCase/SystemTestCase.php b/tests/PHPUnit/Framework/TestCase/SystemTestCase.php index c270310257..e1a61df564 100644 --- a/tests/PHPUnit/Framework/TestCase/SystemTestCase.php +++ b/tests/PHPUnit/Framework/TestCase/SystemTestCase.php @@ -155,7 +155,7 @@ abstract class SystemTestCase extends PHPUnit_Framework_TestCase array( 'ScheduledReports.generateReport', array( - 'testSuffix' => '_scheduled_report_in_html_tables_only', + 'testSuffix' => '_schedrep_html_tables_only', 'date' => $dateTime, 'periods' => array($period), 'format' => 'original', @@ -175,7 +175,7 @@ abstract class SystemTestCase extends PHPUnit_Framework_TestCase array( 'ScheduledReports.generateReport', array( - 'testSuffix' => '_scheduled_report_in_csv', + 'testSuffix' => '_schedrep_in_csv', 'date' => $dateTime, 'periods' => array($period), 'format' => 'original', @@ -197,7 +197,7 @@ abstract class SystemTestCase extends PHPUnit_Framework_TestCase array( 'ScheduledReports.generateReport', array( - 'testSuffix' => '_scheduled_report_in_pdf_tables_only', + 'testSuffix' => '_schedrep_in_pdf_tables_only', 'date' => $dateTime, 'periods' => array($period), 'format' => 'original', @@ -218,7 +218,7 @@ abstract class SystemTestCase extends PHPUnit_Framework_TestCase array( 'ScheduledReports.generateReport', array( - 'testSuffix' => '_scheduled_report_via_sms_one_site', + 'testSuffix' => '_schedrep_via_sms_one_site', 'date' => $dateTime, 'periods' => array($period), 'format' => 'original', @@ -237,7 +237,7 @@ abstract class SystemTestCase extends PHPUnit_Framework_TestCase array( 'ScheduledReports.generateReport', array( - 'testSuffix' => '_scheduled_report_via_sms_all_sites', + 'testSuffix' => '_schedrep_via_sms_all_sites', 'date' => $dateTime, 'periods' => array($period), 'format' => 'original', @@ -257,7 +257,7 @@ abstract class SystemTestCase extends PHPUnit_Framework_TestCase array( 'ScheduledReports.generateReport', array( - 'testSuffix' => '_scheduled_report_in_html_tables_and_graph', + 'testSuffix' => '_schedrep_html_tables_and_graph', 'date' => $dateTime, 'periods' => array($period), 'format' => 'original', @@ -277,7 +277,7 @@ abstract class SystemTestCase extends PHPUnit_Framework_TestCase array( 'ScheduledReports.generateReport', array( - 'testSuffix' => '_scheduled_report_in_html_row_evolution_graph', + 'testSuffix' => '_schedrep_html_row_evolution_graph', 'date' => $dateTime, 'periods' => array($period), 'format' => 'original', @@ -296,7 +296,7 @@ abstract class SystemTestCase extends PHPUnit_Framework_TestCase array( 'ScheduledReports.generateReport', array( - 'testSuffix' => '_scheduled_report_in_html_row_evolution_prevCustomN', + 'testSuffix' => '_schedrep_html_row_evolution_prevCustomN', 'date' => $dateTime, 'periods' => array($period), 'format' => 'original', @@ -315,7 +315,7 @@ abstract class SystemTestCase extends PHPUnit_Framework_TestCase array( 'ScheduledReports.generateReport', array( - 'testSuffix' => '_scheduled_report_in_html_row_evolution_overEachInPeriod', + 'testSuffix' => '_schedrep_html_row_evolution_overEach', 'date' => $dateTime, 'periods' => array($period), 'format' => 'original', diff --git a/tests/PHPUnit/Framework/TestingEnvironmentManipulator.php b/tests/PHPUnit/Framework/TestingEnvironmentManipulator.php index e7c8ee7d77..feceee00e0 100644 --- a/tests/PHPUnit/Framework/TestingEnvironmentManipulator.php +++ b/tests/PHPUnit/Framework/TestingEnvironmentManipulator.php @@ -83,6 +83,8 @@ class TestingEnvironmentManipulator implements EnvironmentManipulator foreach ($this->vars->queryParamOverride as $key => $value) { $_GET[$key] = $value; } + + $_SERVER['QUERY_STRING'] = http_build_query($_GET); } if ($this->vars->globalsOverride) { diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html index 8fcfaf85b0..8fcfaf85b0 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_overEachInPeriod__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_overEach__ScheduledReports.generateReport_month.original.html index 541b5399d9..541b5399d9 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_overEachInPeriod__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_overEach__ScheduledReports.generateReport_month.original.html diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_prevCustomN__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_prevCustomN__ScheduledReports.generateReport_month.original.html index 080694758a..080694758a 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_prevCustomN__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_prevCustomN__ScheduledReports.generateReport_month.original.html diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_and_graph__ScheduledReports.generateReport_month.original.html index 66c24c6719..66c24c6719 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_and_graph__ScheduledReports.generateReport_month.original.html diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_only__ScheduledReports.generateReport_month.original.html index c3fbefb0a8..c3fbefb0a8 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_only__ScheduledReports.generateReport_month.original.html diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_in_csv__ScheduledReports.generateReport_month.original.csv index 2c357a1233..2c357a1233 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_in_csv__ScheduledReports.generateReport_month.original.csv diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf Binary files differindex 39f4dd090f..39f4dd090f 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_month.original.sms.txt b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_via_sms_all_sites__ScheduledReports.generateReport_month.original.sms.txt index 3255f3784e..3255f3784e 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_month.original.sms.txt +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_via_sms_all_sites__ScheduledReports.generateReport_month.original.sms.txt diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_month.original.sms.txt b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_via_sms_one_site__ScheduledReports.generateReport_month.original.sms.txt index 99c4547298..99c4547298 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_month.original.sms.txt +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_via_sms_one_site__ScheduledReports.generateReport_month.original.sms.txt diff --git a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png index fb2cef1273..f702b3c476 100644 --- a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png +++ b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a4392adc20482d1aaa6e5f6c54621b7986f7a09db817e9a668626e46234df32 -size 321537 +oid sha256:76eacf84272b3f21f032d71f6d9c362f16d4555521bfa776fce4a02f7fac0c70 +size 325057 diff --git a/tests/UI/expected-screenshots/GoalsTable_goals_table_abandoned_carts.png b/tests/UI/expected-screenshots/GoalsTable_goals_table_abandoned_carts.png index 501e21bec0..da9c3ded48 100644 --- a/tests/UI/expected-screenshots/GoalsTable_goals_table_abandoned_carts.png +++ b/tests/UI/expected-screenshots/GoalsTable_goals_table_abandoned_carts.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a9eb0b3f415c945af0ab4724385d1869e4581c3bda7cd156e1ae4dc5692ec06 -size 39199 +oid sha256:587f258e4c53b324b67cf14f7313854151124aa756a23ae5d4f28425a49ffcf2 +size 39433 diff --git a/tests/UI/expected-screenshots/Theme_home.png b/tests/UI/expected-screenshots/Theme_home.png index 43b3c74214..ce59b2f2c1 100644 --- a/tests/UI/expected-screenshots/Theme_home.png +++ b/tests/UI/expected-screenshots/Theme_home.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dbd1c70d53852513051986618c84ad238fcb72f390d11df4d6f46beeea735a99 -size 648280 +oid sha256:b0e7927f8542b760d23166fa7f31e083634cbf718e04b9aedcffe2e2fba76975 +size 637432 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png index 38d8be92cf..30dbfc6bcb 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b68c1038e1b971f1fc3a20f0a099070aed8aa06e7975f6dd57f7e508ff41ae0 -size 135316 +oid sha256:6f581ef2639670db9ed114e6a3caf48828c1cacd951f9d4b2ed6fc5a71f145d3 +size 146226 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png index 06315c1e0d..016aaf4527 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f29b3b308c2cc58c52e53c74b2e382c829c427e6eeeb0349d683f08206e172c9 -size 389096 +oid sha256:0569c53e1801f40edb789530dd8bbca25ae3a4f93998e11d1a5a3158e1c3dd5e +size 395399 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png index 056fa0cf17..3e3d2023a1 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:ebd3d2cc498bf2f710fbe629f0302bdc64670dfb50556aea99c0dcdaea10be03 -size 966478 +oid sha256:4f044aa59cec672b06b3ef2d0c22242140b9e78072f66abec430b459f0b7cfb1 +size 959339 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png index 8f9913d8e0..8a0ebf4d16 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:fc3c326add9d34a8f4f11f65a275b5af485542c6e4627447f123b54bccf70870 -size 5011417 +oid sha256:986c927e45c3101caeb384ae7bbcaec94f5a4e10b139dda2b7a96cb52ff8dfae +size 5032891 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png index 4097c1bcfa..7e7ceebf76 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7c3c9aceecf73530ab9401447c71b8a5f695c442ba22ecee69ee34ab83231fb -size 591784 +oid sha256:04978b1b1fc3ded37d9f1c67ae9dc0f84f5859533cd3736567cd00189fddd2f7 +size 582155 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png index 547ba75371..a1a182763f 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90ee0e072293768cb4b2fa0266e9d94f59d3d32b130d10d2d75bb6dbec396d95 -size 1597892 +oid sha256:f84cd9c91525abcc494e6739926d3245d381f3d9e7d8b9c252fb70a89c51331e +size 1592120 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png index ba7df8488e..4a5db34553 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33550a953fd5168d2d04f185539062da2995dbad8e622c785b4bf28ae987c665 -size 647044 +oid sha256:32799020646194a048391f05ebedd884ba4d84a896ca64539e01ef7f434a49dd +size 636768 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_products.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_products.png index b14170bc19..441edfb026 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_products.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_products.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:625b8e4091be172c8c78748cff1678cac924babd1e7e5525a537c1ceb831097c -size 48445 +oid sha256:5cbc9b055e0fd9a7a4b4e9988f4c47af751c1519f217a501cabf7c1a4408f7a5 +size 48649 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_sales.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_sales.png index 9331620494..4514167d26 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_sales.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_sales.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12bee15c3477663d3fe31a4bcb1cf0cd4179ea7e12a8ab08139ef22b0f72b6f5 -size 88903 +oid sha256:8f68d1249f682d7e871994086177ebd4a887843180ba13d8219fdc80783ed1c9 +size 85875 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png b/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png index 145fd3090f..9c02538f72 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf24e23f4f3748ae082da7f386e0c0bcbd526fd40a8886b9629f631eead56ff0 -size 167066 +oid sha256:7f0bd84d9dc2c50097c053318c03d0e2724d2579ea3a366da3223c8032ee5094 +size 167453 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png b/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png index 0de08bcb2d..7f3385d419 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:6c78cfd16c758911ced0ab428d41b435383e1a03b2a9206c126e16ef7662df96 -size 66668 +oid sha256:7e5e34a9e291df062d6a046a6aa1dc7be9f65c6cb57f307e4af3ecd9727de5ed +size 66508 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png b/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png index f61ee9bc61..ebf3dff684 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e729275c7870adb74cddda26eeeaa0d3d3b6de99a1973a4a1abce0d605ee5857 -size 39004 +oid sha256:3d4b44309d3fc2642d42175ef88cec53b5e43923e3cf49924c5fa446653cee1e +size 39603 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_totals_row.png b/tests/UI/expected-screenshots/ViewDataTableTest_totals_row.png index 6d95fae280..ecca353ef7 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_totals_row.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_totals_row.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d0ec7a07c484886af0f4e783cb4c2eeb7ac6cd908d09895008ef70c1e239b1e -size 45754 +oid sha256:a5d44aff828bc9f6de654a0974c7aef3d88f321f0e4437be7306398b19b88183 +size 45669 diff --git a/tests/UI/specs/ViewDataTable_spec.js b/tests/UI/specs/ViewDataTable_spec.js index e1f7a32e2c..9ee13e655f 100644 --- a/tests/UI/specs/ViewDataTable_spec.js +++ b/tests/UI/specs/ViewDataTable_spec.js @@ -98,6 +98,7 @@ describe("ViewDataTableTest", function () { // TODO: should remove Test suffix f expect.screenshot('11_flattened').to.be.capture(function (page) { page.click('.dropdownConfigureIcon'); page.click('.dataTableFlatten'); + page.mouseMove({x: -10, y: -10}); // mae sure no row is highlighted }, done); }); @@ -105,6 +106,7 @@ describe("ViewDataTableTest", function () { // TODO: should remove Test suffix f expect.screenshot('12_aggregate_shown').to.be.capture(function (page) { page.click('.dropdownConfigureIcon'); page.click('.dataTableIncludeAggregateRows'); + page.mouseMove({x: -10, y: -10}); // mae sure no row is highlighted }, done); }); @@ -112,6 +114,7 @@ describe("ViewDataTableTest", function () { // TODO: should remove Test suffix f expect.screenshot('13_make_hierarchical').to.be.capture(function (page) { page.click('.dropdownConfigureIcon'); page.click('.dataTableFlatten'); + page.mouseMove({x: -10, y: -10}); // mae sure no row is highlighted }, done); }); |
