Updates npm dependencies for screenshot testing (#14680)

* Updates npm dependencies for screenshot testing

* updates expected screenshots

* improve some randomly failing tests

* avoid feedback popup in tests

* fix integration test

* updates screenshot

6 files changed, 21 insertions, 8 deletions

diff --git a/plugins/Feedback/Feedback.php b/plugins/Feedback/Feedback.php
index 83dd607fa8..7b897ea309 100644
--- a/plugins/Feedback/Feedback.php
+++ b/plugins/Feedback/Feedback.php
@@ -8,6 +8,7 @@
  */
 namespace Piwik\Plugins\Feedback;
 
+use Piwik\Common;
 use Piwik\Date;
 use Piwik\Option;
 use Piwik\Piwik;
@@ -82,6 +83,11 @@ class Feedback extends \Piwik\Plugin
             return false;
         }
 
+        // Hide Feedback popup in all tests except if forced
+        if ($this->isDisabledInTestMode()) {
+            return false;
+        }
+
         $login = Piwik::getCurrentUserLogin();
         $feedbackReminderKey = 'Feedback.nextFeedbackReminder.' . Piwik::getCurrentUserLogin();
         $nextReminderDate = Option::get($feedbackReminderKey);
@@ -102,4 +108,10 @@ class Feedback extends \Piwik\Plugin
         return $nextReminderDate->getTimestamp() <= $now;
     }
 
+    // needs to be protected not private for testing purpose
+    protected function isDisabledInTestMode()
+    {
+        return PIWIK_TEST_MODE && !Common::getRequestVar('forceFeedbackTest', false);
+    }
+
 }
diff --git a/plugins/Feedback/tests/Integration/FeedbackTest.php b/plugins/Feedback/tests/Integration/FeedbackTest.php
index 7878a0c9cf..02031e31f0 100644
--- a/plugins/Feedback/tests/Integration/FeedbackTest.php
+++ b/plugins/Feedback/tests/Integration/FeedbackTest.php
@@ -30,7 +30,8 @@ class FeedbackTest extends IntegrationTestCase
     {
         parent::setUp();
 
-        $this->feedback = new Feedback();
+        $this->feedback = $this->getMock(Feedback::class, ['isDisabledInTestMode']);
+        $this->feedback->method('isDisabledInTestMode')->willReturn(false);
 
         $this->userModel = new Model();
         $this->userModel->addUser(
diff --git a/plugins/Feedback/tests/UI/FeedbackPopup_spec.js b/plugins/Feedback/tests/UI/FeedbackPopup_spec.js
index 370ba4571b..d642984ed1 100644
--- a/plugins/Feedback/tests/UI/FeedbackPopup_spec.js
+++ b/plugins/Feedback/tests/UI/FeedbackPopup_spec.js
@@ -11,7 +11,7 @@ describe("FeedbackPopup", function () {
     this.timeout(0);
     this.fixture = "Piwik\\Plugins\\Feedback\\tests\\Fixtures\\FeedbackPopupFixture";
 
-    var url = "?module=CoreHome&action=index&idSite=1&period=day&date=2019-07-11";
+    var url = "?module=CoreHome&action=index&idSite=1&period=day&date=2019-07-11&forceFeedbackTest=1";
 
     before(async function() {
         await page.webpage.setViewport({
diff --git a/plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png b/plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png
index c15c68733b..e21b5ab955 100644
--- a/plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png
+++ b/plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:84a6c67996937a4bfaa35be3c6dfd352287d9d85e6efa3223406f14f7e31d6a0
-size 249243
+oid sha256:e1b09cb736a881d8f6929505af09e72d3e01f8f5cce68ecfc3c3e4c537b79c73
+size 248438
diff --git a/plugins/Feedback/tests/UI/expected-screenshots/FeedbackPopup_dashboard_no_popup.png b/plugins/Feedback/tests/UI/expected-screenshots/FeedbackPopup_dashboard_no_popup.png
index f1cb7b7fd2..1fae5d9142 100644
--- a/plugins/Feedback/tests/UI/expected-screenshots/FeedbackPopup_dashboard_no_popup.png
+++ b/plugins/Feedback/tests/UI/expected-screenshots/FeedbackPopup_dashboard_no_popup.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fe9e1f80203d318121b6f3439f6938e0fdeec1f8ef0248b04aa7e1753e61b825
-size 409042
+oid sha256:684defbee685e68fe6a44921e8f5f701053eda48ec7aadc46c51a4e7566fbd7d
+size 407466
diff --git a/plugins/Feedback/tests/UI/expected-screenshots/FeedbackPopup_feedback_popup.png b/plugins/Feedback/tests/UI/expected-screenshots/FeedbackPopup_feedback_popup.png
index 91d98b1450..d344c85afd 100644
--- a/plugins/Feedback/tests/UI/expected-screenshots/FeedbackPopup_feedback_popup.png
+++ b/plugins/Feedback/tests/UI/expected-screenshots/FeedbackPopup_feedback_popup.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef9ef9faa75e085f6ceb0e32a3c5f3e70eb3a5574b9e7dcc5fc502f22bc1ca5d
-size 28812
+oid sha256:52e4b201cfd1f5dfaed675faa499ddf8ff45b5cf29b3df1a9ab9ce6c79c4baf4
+size 28418