842315 - [SMS][Desktop] Restore desktop testing

Status: RESOLVED FIXED

(Firefox OS Graveyard :: Gaia::SMS, defect)

Description

[Borja Salguero [:borjasalguero]]

REGRESSION. Somebody removed this feature from SMS App. Restoring it back!

Comment 1

[Borja Salguero [:borjasalguero]]

Attachment: Pull Request

Comment 2

[Fernando Campo (:fcampo)]

Comment on attachment 715162 [details]
Pull Request

Just adding back the js file, no risk

Comment 3

[Borja Salguero [:borjasalguero]]

Comment on attachment 715162 [details]
Pull Request

NOTE: Please see https://wiki.mozilla.org/Release_Management/B2G_Landing to better understand the B2G approval process and landings.

[Approval Request Comment]
Bug caused by (feature/regressing bug #): Regression when including 'defer'. Somebody remove this files.
User impact if declined: Developer Impact: It's gonna be a pain making changes in DOM without having a mockuped version of SMS working in Firefox Nightly.
Testing completed: 
Risk to taking this patch (and alternatives if risky): More than low. There is no risk for the user, it's a useful tool for developers which let us optimize the development of SMS App.
String or UUID changes made by this patch:

Comment 4

[Lukas Blakk [:lsblakk] use ?needinfo]

Comment on attachment 715162 [details]
Pull Request

Approving for v1-train uplift to restore functionality, with no user risk.

Comment 5

[John Ford [:jhford] CET/CEST Berlin Time]

Commit 993ba10c3daf8cd507b67839b1b7349f9572d1d9 does not apply to v1-train.  This means that there are merge conflicts which need to be resolved.  If there are dependencies that are not approved for branch landing, or have yet to land on master, please let me know

If a manual merge is required, a good place to start might be:
  cd gaia
  git checkout v1-train
  git cherry-pick -x -m1 993ba10c3daf8cd507b67839b1b7349f9572d1d9
  <RESOLVE MERGE CONFLICTS>

Comment 6

[Julien Wajsberg [:julienw]]

John, the cherry-pick works now.

Comment 7

[Daniel Coloma:dcoloma]

Required for uplifting SMS performance improvement (bug 844770)

Comment 8

[John Ford [:jhford] CET/CEST Berlin Time]

v1-train: 4ac6652d89e6d2f9d7a1c11095c824f85e5b19a3

There are still merge conflicts on v1.0.1.  Julien, which commit was this dependent on?

Comment 9

[Julien Wajsberg [:julienw]]

I think that's Bug 841353 where I messed up when resolving conflicts.

Comment 10

[Julien Wajsberg [:julienw]]

John, this uplifts without a conflict now, I let you go ahead on this one, thanks !

Comment 11

[John Ford [:jhford] CET/CEST Berlin Time]

v1.0.1: fe1653d99d0a7cb67f84a20078f9c242f86098e4

Comment 12

[Cody Roesch [:croesch]]

Can you please provide steps to verify this fix - as we will blackbox test from the UI?

Comment 13

[amiller]

No need to create a TC in moztrap for this issue. Feature reinstatement defect.