1108590 - Update key in object returned in findElement to match spec

Status: RESOLVED FIXED

(Remote Protocol :: Marionette, defect)

Description

[David Burns :automatedtester]

Currently we return

{ "ELEMENT": "<some uuid>"}

THe spec has been updated to use element-6066-11e4-a52e-4f735466cecf instead of ELEMENT.

Comment 1

[David Burns :automatedtester]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=811e4755be38

Comment 2

[David Burns :automatedtester]

Attachment: MozReview Request: bz://1108590/AutomatedTester

/r/4535 - Bug 1108590: Update key that is used to return elements from marionette to the client; r=chmanchester

Pull down this commit:

hg pull review -r 1e3e64cce28043e5fa22fa15bdbf023c1de75e9c

Comment 3

[Chris Manchester (limited bugmail, email directly)]

Comment on attachment 8571982 [details]
MozReview Request: bz://1108590/AutomatedTester

https://reviewboard.mozilla.org/r/4533/#review3777

::: testing/marionette/driver/marionette_driver/marionette.py
(Diff revision 1)
> -            wrapped = {'ELEMENT': args.id }
> +            wrapped = {'element-6066-11e4-a52e-4f735466cecf': args.id }

Any reason not to accept either key for a while so we can work with slightly older geckos? Maybe that's a lost cause at this point.

::: testing/marionette/driver/marionette_driver/marionette.py
(Diff revision 1)
> +                    return unwrapped

Breaking out of the loop might be clearer than another return.

::: testing/marionette/marionette-elements.js
(Diff revision 1)
> +          result = {'ELEMENT': elementId, 'element-6066-11e4-a52e-4f735466cecf': elementId};

Maybe make the new key for elements a property of the element manager.

::: testing/marionette/marionette-elements.js
(Diff revision 1)
> -        else if (typeof(args['ELEMENT'] === 'string') &&
> -                 args.hasOwnProperty('ELEMENT')) {
> +        else if ((typeof(args['ELEMENT'] === 'string') && args.hasOwnProperty('ELEMENT')) ||
> +                 (typeof(args['element-6066-11e4-a52e-4f735466cecf'] === 'string') &&

This was here before, but the parens after these typeofs seem misplaced, these checks will always evaluate to the string "boolean", and be truthy.

::: testing/marionette/marionette-elements.js
(Diff revision 1)
> -          result = {'ELEMENT': this.addToKnownElements(val)};
> +          var elementId = this.addToKnownElements(val);

s/var/let/

::: testing/marionette/marionette-elements.js
(Diff revision 1)
> +          var elementUniqueIdentifier = args['element-6066-11e4-a52e-4f735466cecf'] ? args['element-6066-11e4-a52e-4f735466cecf'] : args['ELEMENT'];

s/var/let/

Comment 4

[David Burns :automatedtester]

Comment on attachment 8571982 [details]
MozReview Request: bz://1108590/AutomatedTester

/r/4535 - Bug 1108590: Update key that is used to return elements from marionette to the client; r=chmanchester
/r/4809 - review fixups, this will be squashed before pushing to inbound

Pull down these commits:

hg pull review -r 024d6afec6494cd984d0d4e214b0d1f91f76ed4b

Comment 5

[Chris Manchester (limited bugmail, email directly)]

Comment on attachment 8571982 [details]
MozReview Request: bz://1108590/AutomatedTester

https://reviewboard.mozilla.org/r/4533/#review3907

Ship It!

Comment 6

[David Burns :automatedtester]

https://hg.mozilla.org/integration/mozilla-inbound/rev/2bb23cc942a1

Comment 7

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/2bb23cc942a1

Comment 9

[David Burns :automatedtester]

Attachment: MozReview Request: review fixups, this will be squashed before pushing to inbound

Comment 10

[David Burns :automatedtester]

Attachment: MozReview Request: Bug 1108590: Update key that is used to return elements from marionette to the client; r=chmanchester