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

Proposed by Justin McPherson
Status: Merged
Approved by: Robert Bruce Park
Approved revision: 72
Merged at revision: 83
Proposed branch: lp://staging/~justinmcp/unity-webapps-gmail/bug-1062890-2
Merge into: lp://staging/unity-webapps-gmail
Diff against target: 47 lines (+6/-6)
4 files modified
GMail.test.js (+1/-1)
GMail.user.js (+1/-1)
debian/control (+3/-3)
manifest.json (+1/-1)
To merge this branch: bzr merge lp://staging/~justinmcp/unity-webapps-gmail/bug-1062890-2
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Alexandre Abreu (community) Needs Fixing
Review via email: mp+185975@code.staging.launchpad.net

Description of the change

Correctly set capitalization of Gmail name.

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

To post a comment you must log in.
Revision history for this message
Alexandre Abreu (abreu-alexandre) wrote :

Still failing for me ...

review: Needs Fixing
Revision history for this message
Alexandre Abreu (abreu-alexandre) wrote :

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,

Revision history for this message
Robert Bruce Park (robru) wrote :

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.

Revision history for this message
Víctor R. Ruiz (vrruiz) wrote :

Robert: Right, site-credentials must be updated.

Revision history for this message
Justin McPherson (justinmcp) wrote :

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.

Revision history for this message
Robert Bruce Park (robru) wrote :

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

Revision history for this message
Alexandre Abreu (abreu-alexandre) wrote :

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

why?

Revision history for this message
Robert Bruce Park (robru) wrote :

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?

Revision history for this message
Justin McPherson (justinmcp) wrote :

@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.

Revision history for this message
Robert Bruce Park (robru) wrote :

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.

Revision history for this message
David Barth (dbarth) wrote :

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

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Robert Bruce Park (robru) wrote :

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

Thanks!

72. By Justin McPherson

Merge from trunk.

Revision history for this message
Justin McPherson (justinmcp) wrote :

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.
>

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: