979666 - [marionette-js-client] The documentation for the text function is not correct.

Status: RESOLVED FIXED

(Testing Graveyard :: JSMarionette, defect)

Description

[Evan Tseng [:evanxd]]

It should say that return the text of the element,
like `@return {String} the text of the element.`
Please refer to https://github.com/mozilla-b2g/marionette-js-client/blob/master/lib/marionette/element.js#L180.

Comment 1

[chiene]

Attachment: ps element.js

https://github.com/mozilla-b2g/marionette-js-client/pull/85

Comment 2

[(Inactive after June) George Duan [:gduan] [:喬智]]

Comment on attachment 8389849 [details]
ps element.js

I have put my comment on github, please check and modify it. And then set the review flag to me.
Thanks.

Comment 3

[chiene]

Comment on attachment 8389849 [details]
ps element.js

https://github.com/mozilla-b2g/marionette-js-client/pull/89

Comment 4

[(Inactive after June) George Duan [:gduan] [:喬智]]

Hi Chiene,

I noticed that your travis failed, although I believe it's not related to your modification.

But, we usually merge the code to master after all the test result pass.
Could you try to update your master to latest and cherry-pick your commit and push again?
So that, we can
1. make sure we have latest code base, 
2. make the  travis rerun again

Comment 5

[chiene]

Attachment: ps element.js

I modified it and the Travis is ok

Thank you for check more time and tell me how to solve

Hope I can success

Comment 6

[(Inactive after June) George Duan [:gduan] [:喬智]]

Hi Chiene,
sorry, I forgot to mention, please update your commit message as the bug title .
you can use |git --amend -m 'Bug 979666 - [marionette-js-client] The documentation for the text function is not correct'| and push with --force again, we need to know what bug has modified the line you committed in the future.

Comment 7

[chiene]

Attachment: ps element.js

I used git clone the marionette-js-client ,modified the element.js and push the file but I'm not sure it correctly  
Could you help me to check through the steps which of the following.
I used terminal:

  git add element.js
  git commit -m Bug 979666-[marionette-js-client] The documentation for ...省略
  git remote 'my marionette-js-client's http location' client
  git push --force client
  (git ask me to enter the username): chiene
  (git ask me to enter the password):
  and then,show this=>

  To https://github.com/Chiene/marionette-js-client.git
  + a681cf8...fb21b10 master -> master (forced update)

  and show this picture
https://www.dropbox.com/s/rp5cbiy0ddvfuw4/%E8%9E%A2%E5%B9%95%E6%93%B7%E5%9C%96%E5%AD%98%E7%82%BA%202014-03-15%2000%3A15%3A08.png.

Is this result correct?

Comment 8

[chiene]

(In reply to chiene from comment #7)
> Created attachment 8391284 [details]
> ps element.js
> 
> I used git clone the marionette-js-client ,modified the element.js and push
> the file but I'm not sure it correctly  
> Could you help me to check through the steps which of the following.
> I used terminal:
> 
>   git add element.js
>   git commit -m Bug 979666-[marionette-js-client] The documentation for ...
>   git remote 'my marionette-js-client's http location' client
>   git push --force client
>   (git ask me to enter the username): chiene
>   (git ask me to enter the password):
>   and then,show this=>
> 
>   To https://github.com/Chiene/marionette-js-client.git
>   + a681cf8...fb21b10 master -> master (forced update)
> 
>   and show this picture
> https://www.dropbox.com/s/rp5cbiy0ddvfuw4/
> %E8%9E%A2%E5%B9%95%E6%93%B7%E5%9C%96%E5%AD%98%E7%82%BA%202014-03-
> 15%2000%3A15%3A08.png.
> 
> Is this result correct?

Comment 9

[(Inactive after June) George Duan [:gduan] [:喬智]]

I just checked your github...

1. it seems you work on master branch of your repository? I suggest you to have another branch for bugs "next time".
2. Compared with latest b2g master, you have new three commits. (ref: https://github.com/Chiene/marionette-js-client/compare/mozilla-b2g:master...master)

3. Please try to follow below steps.
   
   a. type |git log|, you should have "Bug 979666 - [marionette-js-client] The documentation for the text fu..", "test" and "Update element.js" 
   b. type |git rebase -i HEAD~4|
   c. replace |pick| with |squash| for "test" and "Update element.js", and then save and exit
   d. please check the result by |git log|, it should have one commit now
   e. type |git push client --force|
   f. go back to github page and create a pull request to b2g master, and then paste the link in attachment, the link should be like "https://github.com/mozilla-b2g/gaia/pull/11111"

I remember Ricky will go to school, please ask him if you have further question.

Comment 10

[chiene]

Attachment: ps element.js

sorry, please check it again , thank you

Comment 11

[(Inactive after June) George Duan [:gduan] [:喬智]]

Comment on attachment 8392232 [details] [review]
ps element.js

Nice work! r=gduan.

Hi Evan, we'd need your feedback on this patch.

Comment 12

[Evan Tseng [:evanxd]]

Comment on attachment 8392232 [details] [review]
ps element.js

Hi chiene,

A little nit, please see that in 
https://github.com/mozilla-b2g/marionette-js-client/pull/103/files#r10688211.
f+, if the nit is fixed.

Thanks.

Comment 13

[Evan Tseng [:evanxd]]

Please make sure we fix the Comment 12, then we could merge the patch.
Thanks.

Comment 14

[chiene]

Attachment: ps element.js

sorry,I modified it , please check agian , thank you !!!

Comment 15

[chiene]

Comment on attachment 8392687 [details]
ps element.js

https://github.com/mozilla-b2g/marionette-js-client/pull/104

Comment 16

[(Inactive after June) George Duan [:gduan] [:喬智]]

Comment on attachment 8392687 [details]
ps element.js

looks fine!

Comment 17

[Evan Tseng [:evanxd]]

Hi chiene,

r+, nice shot!

Comment 18

[Evan Tseng [:evanxd]]

master: https://github.com/mozilla-b2g/marionette-js-client/commit/bd4ac0f9e79dd1faa4406120e8c9d48178e601e7