1 files changed, 29 insertions, 10 deletions

diff --git a/tests/UI/specs/UIIntegration_spec.js b/tests/UI/specs/UIIntegration_spec.js
index 252f57f49d..9e7ed5dd12 100644
--- a/tests/UI/specs/UIIntegration_spec.js
+++ b/tests/UI/specs/UIIntegration_spec.js
@@ -253,6 +253,7 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik?
     });
 
     it('should load the referrers > search engines & keywords page correctly', function (done) {
+        this.retries(3);
         expect.screenshot('referrers_search_engines_keywords').to.be.captureSelector('.pageWrap', function (page) {
             page.load("?" + urlBase + "#?" + generalParams + "&category=Referrers_Referrers&subcategory=Referrers_SubmenuSearchEngines");
         }, done);
@@ -372,6 +373,7 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik?
     });
 
     it('should load the widgetized all websites dashboard correctly', function (done) {
+        this.retries(3);
         expect.screenshot('widgetize_allwebsites').to.be.capture(function (page) {
             page.load("?" + widgetizeParams + "&" + generalParams + "&moduleToWidgetize=MultiSites&actionToWidgetize=standalone");
         }, done);
@@ -470,7 +472,11 @@ 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.load("?" + generalParams + "&module=CoreAdminHome&action=generalSettings");
-            // angular might need a little to render after page has loaded 
+            // 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);
     });
@@ -504,7 +510,7 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik?
             page.load("?" + generalParams + "&module=CorePluginsAdmin&action=plugins");
         }, done);
     });
-    
+
     it('should load the config file page correctly', function (done) {
         expect.screenshot('admin_diagnostics_configfile').to.be.captureSelector('.pageWrap', function (page) {
             page.load("?" + generalParams + "&module=Diagnostics&action=configfile");
@@ -611,6 +617,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) {
 
@@ -647,6 +659,8 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik?
 
     // visitor profile popup
     it('should load the visitor profile popup correctly', function (done) {
+        this.retries(3);
+
         expect.screenshot('visitor_profile_popup').to.be.capture(function (page) {
             page.load("?" + widgetizeParams + "&" + idSite2Params + "&moduleToWidgetize=Live&actionToWidgetize=getVisitorProfilePopup"
                     + "&enableAnimation=0");
@@ -681,43 +695,48 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik?
             page.mouseMove('table.dataTable tbody tr:first-child');
             page.mouseMove('a.actionRowEvolution:visible'); // necessary to get popover to display
             page.click('a.actionRowEvolution:visible');
+            page.wait(1000);
+
         }, done);
     });
 
     it('should load the segmented visitor log correctly when a segment is selected', function (done) {
+        this.retries(3);
 
         expect.screenshot("segmented_visitorlog").to.be.skippedOnAbort();
         
         var url = "?module=CoreHome&action=index&idSite=1&period=year&date=2012-01-13#?category=General_Visitors&subcategory=CustomVariables_CustomVariables&idSite=1&period=year&date=2012-01-13";
         expect.page(url).contains('.ui-dialog > .ui-dialog-content > div.dataTableVizVisitorLog:visible', 'segmented_visitorlog', function (page) {
+            page.wait(1000);
             page.click('.segmentationTitle');
+            page.wait(500);
             page.click('.segname:contains(From Europe)');
-
+            page.wait(500);
             page.mouseMove('table.dataTable tbody tr:first-child');
+            page.wait(500);
             page.mouseMove('a.actionSegmentVisitorLog:visible'); // necessary to get popover to display
+            page.wait(500);
             page.click('a.actionSegmentVisitorLog:visible');
+            page.wait(1000);
+
         }, done);
     });
 
     it('should not apply current segmented when opening visitor log', function (done) {
+        this.retries(3);
+
         var url = "?" + widgetizeParams + "&" + generalParams + "&moduleToWidgetize=Live&actionToWidgetize=getVisitorLog&segment=visitCount==2&enableAnimation=0";
 
         delete testEnvironment.queryParamOverride.visitorId;
         testEnvironment.save();
 
-        expect.screenshot("visitor_profile_not_segmented").to.be.capture(function (page) {
+        expect.screenshot("visitor_profile_not_segmented").to.be.similar(0.002).to.capture(function (page) {
             page.load(url);
 
             page.evaluate(function () {
                 $('.visitor-log-visitor-profile-link').first().click();
             });
 
-            page.evaluate(function () {
-                $(document).ready(function () {
-                    $('.visitor-profile-show-map').click();
-                });
-            });
-
             page.wait(1000);
         }, done);
     });