Add new UI test for scheduled reports editor (#10676)

7 files changed, 20 insertions, 7 deletions

diff --git a/core/Exception/ErrorException.php b/core/Exception/ErrorException.php
index 2de42f2898..77c7ea3287 100644
--- a/core/Exception/ErrorException.php
+++ b/core/Exception/ErrorException.php
@@ -11,7 +11,6 @@ namespace Piwik\Exception;
 /**
  * ErrorException
  *
- * @author Matthieu Napoli <matthieu@mnapoli.fr>
  */
 class ErrorException extends \ErrorException
 {
diff --git a/plugins/ScheduledReports/templates/_addReport.twig b/plugins/ScheduledReports/templates/_addReport.twig
index ac7840337a..5201911d3d 100644
--- a/plugins/ScheduledReports/templates/_addReport.twig
+++ b/plugins/ScheduledReports/templates/_addReport.twig
@@ -119,7 +119,7 @@
                 </div>
                 <div class='col s12 m6'>
                     {% endif %}
-                    <div class='reportCategory'>{{ category }}</div>
+                    <h3 class='reportCategory'>{{ category }}</h3>
                     <ul class='listReports'>
                         {% for report in reports %}
                             <li>
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png
index 6c61138418..4995fec660 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:6071466d97c235246f0aa30bfc39eca493015bf88202a2888f5514b1d136dc10
-size 646336
+oid sha256:73ce5d8f801ad0c99d52b3a9585ae9f2fdc16c59897e4b3f98e348567212d505
+size 645576
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png
index 1d6917f63a..87b82189f8 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:14133d790c23c5dec1d294e9959420d48ca16e9d2891979b0773862b7d9b362f
-size 488507
+oid sha256:7809e3398fe17d090a3416144c3ab099d754728e93efd465dbba77d55f9e712e
+size 488526
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png b/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png
new file mode 100644
index 0000000000..5445d8add4
--- /dev/null
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:777b5f322b41877e06779442aa65c29f0357261d7aaa1cb2cbe14d4756bec6d9
+size 364519
diff --git a/tests/UI/specs/MultiSites_spec.js b/tests/UI/specs/MultiSites_spec.js
index 6037a196ef..66d9945f68 100644
--- a/tests/UI/specs/MultiSites_spec.js
+++ b/tests/UI/specs/MultiSites_spec.js
@@ -41,12 +41,14 @@ describe("MultiSitesTest", function () {
     it('should load the all websites dashboard correctly', function (done) {
         expect.screenshot('all_websites').to.be.captureSelector(selector, function (page) {
             page.load("?" + generalParams + "&module=MultiSites&action=index");
+            page.wait(1000);
         }, done);
     });
 
     it('should load next page correctly', function (done) {
         expect.screenshot('all_websites_page_1').to.be.captureSelector(selector, function (page) {
             page.click('.paging .next');
+            page.wait(1000);
         }, done);
     });
 
diff --git a/tests/UI/specs/UIIntegration_spec.js b/tests/UI/specs/UIIntegration_spec.js
index 7edc7c067e..0f6d3866e2 100644
--- a/tests/UI/specs/UIIntegration_spec.js
+++ b/tests/UI/specs/UIIntegration_spec.js
@@ -469,10 +469,13 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik?
 
     it('should load the Settings > General Settings admin page correctly', function (done) {
         expect.screenshot('admin_settings_general').to.be.captureSelector('.pageWrap', function (page) {
-            page.click('.materialize-textarea');
             page.load("?" + generalParams + "&module=CoreAdminHome&action=generalSettings");
             // angular might need a little to render after page has loaded 
             page.wait(1000);
+            page.evaluate(function () {
+                $('textarea:eq(0)').trigger('focus');
+            });
+            page.wait(1000);
         }, done);
     });
 
@@ -612,6 +615,12 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik?
         }, done);
     });
 
+    it('should load the scheduled reports when Edit button is clicked', function (done) {
+        expect.screenshot('email_reports_editor').to.be.captureSelector('.pageWrap', function (page) {
+            page.click('.entityTable tr:nth-child(4) button[title=Edit]');
+        }, done);
+    });
+
     it('should load the feedback form when the feedback form link is clicked', function (done) {
         expect.screenshot('feedback_form').to.be.captureSelector('.pageWrap', function (page) {