Merge lp:~justinmcp/unity-webapps-gmail/bug-1062890-2 into lp:unity-webapps-gmail

[Justin McPherson]

Correctly set capitalization of Gmail name.

Fixes: https://bugs.launchpad.net/bugs/1062890

[Alexandre Abreu (abreu-alexandre)]

Still failing for me ...

review: Needs Fixing

[Alexandre Abreu (abreu-alexandre)]

Just add a bit of context, I have:

Validation failure calling: 'undefined', error: undefined
GMail.user.js FAILED

Removing GMail.test.js...
Removing GMail.user.js...

1 FAILURES

The way webapp integration is usually being tested:

bzr branch lp:webapps-applications
cd webapps-applications/tests

(provided that you have a branch with the GMail fix)

run the test-runner.py application:

./test-runner.py -s -l <absolute-path-to-the-GMAil-branch-where-the-*.test.js-is>

You need to have a 'site-credentials' file from where the specific credentials are being
pulled from,

[Robert Bruce Park (robru)]

I think GMail.*.js needs to be renamed to Gmail.*.js, and I think the site-credentials file probably needs to be updated to reflect that change.

[Víctor R. Ruiz (vrruiz)]

Robert: Right, site-credentials must be updated.

[Justin McPherson (justinmcp)]

The failures shouldn't be related to this change. The failures were fixed with changes tied to https://bugs.launchpad.net/bugs/1227934.

This one should be good to go.

[Robert Bruce Park (robru)]

Justin, can you do 'bzr mv GMail.user.js Gmail.user.js' and 'bzr mv GMail.test.js Gmail.test.js' please?

[Alexandre Abreu (abreu-alexandre)]

> Justin, can you do 'bzr mv GMail.user.js Gmail.user.js' and 'bzr mv
> GMail.test.js Gmail.test.js' please?

why?

[Robert Bruce Park (robru)]

Because the point of this bug is putting correct capitalisation right? Why not fix it *everywhere* instead of just in one place? What's the point of fixing it if you don't fix it all the way?

[Justin McPherson (justinmcp)]

@robru; I didn't make the filename change because it would be a non-functional change, i.e. not something that effects the actual outcome of the bug fix, which is to correctly display the name.

Additionally, changing the filename is a deeper concern that what it first looks.
- The manifest will need to change
- Packaging info will need to change
- (Possibly because I don't know that much about it) All the references in the translation files will need to change
- site-credentials would need to change

The last one is "worrying" because its an OOB change, will it negatively affect test runs for some period until a manual intervention? I don't know.

If you still think I should change everything let me know and I'll add the patch.

[Robert Bruce Park (robru)]

I see, that would be a difficult fix to land this late in the cycle. Well,
land this as-is for now, but when T opens I'd like to see the files renamed
for consistency.

[David Barth (dbarth)]

Le 27/09/2013 06:42, Robert Bruce Park a écrit :
> I see, that would be a difficult fix to land this late in the cycle. Well,
> land this as-is for now, but when T opens I'd like to see the files renamed
> for consistency.
>
+1 for renaming files, *after* 13.10 ;)

David

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:71
http://jenkins.qa.ubuntu.com/job/unity-webapps-gmail-ci/11/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-gmail-trusty-amd64-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-gmail-trusty-armhf-ci/4/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-webapps-gmail-ci/11/rebuild

review: Needs Fixing (continuous-integration)

[Robert Bruce Park (robru)]

Hmmm, looks like a merge conflict in manifest.json, can you rebase on trunk, Justin?

Thanks!

[lp:~justinmcp/unity-webapps-gmail/bug-1062890-2]

72. By Justin McPherson on 2013-11-05

Merge from trunk.

[Justin McPherson (justinmcp)]

Done.

I'll open another branch now, for the filename changes.

On Tue, Nov 5, 2013 at 10:08 AM, Robert Bruce Park <
<email address hidden>> wrote:

> Hmmm, looks like a merge conflict in manifest.json, can you rebase on
> trunk, Justin?
>
> Thanks!
> --
>
> https://code.launchpad.net/~justinmcp/unity-webapps-gmail/bug-1062890-2/+merge/185975
> You are the owner of lp:~justinmcp/unity-webapps-gmail/bug-1062890-2.
>

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'GMail.test.js'
--- GMail.test.js	2013-04-30 20:40:19 +0000
+++ GMail.test.js	2013-11-05 01:19:33 +0000
@@ -26,7 +26,7 @@
 
     validateCallLog: function (log, out) {
         assertEquals('Unity.init', log[0].func, 'Unity.init');
-        assertEquals('GMail', log[0].args[0].name, 'GMail');
+        assertEquals('Gmail', log[0].args[0].name, 'Gmail');
         assertEquals('Unity.Launcher.addAction', log[2].func, 'Unity.Launcher.addAction');
         assertEquals('Unity.MessagingIndicator.addAction', log[1].func, 'Unity.MessagingIndicator.addAction');
         assertEquals('Unity.MessagingIndicator.clearIndicators', log[3].func, 'Unity.MessagingIndicator.clearIndicators');

=== modified file 'GMail.user.js'
--- GMail.user.js	2013-10-24 18:12:33 +0000
+++ GMail.user.js	2013-11-05 01:19:33 +0000
@@ -164,7 +164,7 @@
 
         var login = gmaillogin.indexOf("@") !== -1 ? gmaillogin : gappslogin.indexOf("@") !== -1 ? gappslogin : "";
 
-        Unity.init({ name: "GMail",
+        Unity.init({ name: "Gmail",
                      login: login,
                      iconUrl: "icon://unity-webapps-gmail",
                      homepage: 'https://mail.google.com',

=== modified file 'debian/control'
--- debian/control	2013-09-13 21:20:41 +0000
+++ debian/control	2013-11-05 01:19:33 +0000
@@ -17,7 +17,7 @@
          xdg-utils,
          ${misc:Depends},
 XB-Ubuntu-Webapps-Includes: https://mail.google.com/*
-XB-Ubuntu-Webapps-Name: GMail
+XB-Ubuntu-Webapps-Name: Gmail
 XB-Ubuntu-Webapps-Domain: mail.google.com
-Description: Unity Webapp for GMail
- GMail Webapp for Unity
+Description: Unity Webapp for Gmail
+ Gmail Webapp for Unity

=== modified file 'manifest.json'
--- manifest.json	2013-10-24 17:04:43 +0000
+++ manifest.json	2013-11-05 01:19:33 +0000
@@ -1,1 +1,1 @@
-{"includes":["https://mail.google.com/*", "https://accounts.google.*/*", "https://www.google.com/a/*"],"requires":["utils.js","google-common.js"],"name":"GMail","scripts":["GMail.user.js"],"maintainer":"Webapps Team <[e-mail]>","license":"GPL-3","manifest-version":"1.0","integration-version":"2.4.8","package-name":"GMail","description":"Unity Webapp for GMail","icons":{"128":"128/unity-webapps-gmail.png","48":"48/unity-webapps-gmail.png","52":"52/unity-webapps-gmail.png","64":"64/unity-webapps-gmail.png"},"domain":"mail.google.com","homepage":"https://mail.google.com"}
+{"includes":["https://mail.google.com/*", "https://accounts.google.*/*", "https://www.google.com/a/*"],"requires":["utils.js","google-common.js"],"name":"Gmail","scripts":["GMail.user.js"],"maintainer":"Webapps Team <[e-mail]>","license":"GPL-3","manifest-version":"1.0","integration-version":"2.4.8","package-name":"Gmail","description":"Unity Webapp for Gmail","icons":{"128":"128/unity-webapps-gmail.png","48":"48/unity-webapps-gmail.png","52":"52/unity-webapps-gmail.png","64":"64/unity-webapps-gmail.png"},"domain":"mail.google.com","homepage":"https://mail.google.com"}