Merge lp:~vrruiz/unity-webapps-yahoomail/fix-1188594 into lp:unity-webapps-yahoomail

[Víctor R. Ruiz]

Fixes test.

Fixes test.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:46
http://jenkins.qa.ubuntu.com/job/unity-webapps-yahoomail-ci/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-yahoomail-saucy-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-yahoomail-saucy-armhf-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-webapps-yahoomail-ci/2/rebuild

review: Needs Fixing (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-webapps-yahoomail-autolanding/3/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-yahoomail-saucy-amd64-autolanding/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-yahoomail-saucy-armhf-autolanding/2/console

review: Needs Fixing (continuous-integration)

[Robert Bruce Park (robru)]

Victor, jenkins seems to be indicating a merge conflict here. Can you try merging trunk into this branch and then pushing it again? hopefully that'll make it work.

review: Approve

=== modified file 'YahooMail.test.js'
--- YahooMail.test.js	2013-04-30 20:42:40 +0000
+++ YahooMail.test.js	2013-06-07 13:48:40 +0000
@@ -27,7 +27,7 @@
     validateCallLog: function (log, out) {
         assertEquals('Unity.init', log[0].func, 'Unity.init');
         assertEquals('Yahoo Mail', log[0].args[0].name, 'Yahoo Mail');
-        assertEquals('Unity.MessagingIndicator.clearIndicators', log[1].func, 'Unity.MessagingIndicator.clearIndicators');
+        assertEquals('Unity.Launcher.addAction', log[1].func, 'Unity.Launcher.addAction');
 
         var found = false, i;
         for (i = 0; i < out.length; i++) {