Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Bug 817039 - Merge latest gaia-ui-tests to gaia, r=lightsofapollo, a=tes... #6793

Merged
merged 1 commit into from
Dec 4, 2012
Merged

Conversation

jonallengriffin
Copy link

...t-only

This PR updates Gaia's copy of gaia-ui-tests with the latest. Most of these are Python changes, but there are a few atom changes as well.


findAndRemoveContact: function(cdata){
var options = {filterBy: ["familyName"],
filterOp: "contains",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

one var per line

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you define as:

var options = {
  myvar: x,
  ...
};

@lightsofapollo
Copy link
Contributor

@jonallengriffin r=lightsofapollo assuming small nits are fixed.

I mentioned this before but this is awesome, its great to see all these tests!

@jonallengriffin
Copy link
Author

@lightsofapollo, this addresses the code duplication issue by removing gaia_unlock.js, and updating app_integration.js to use gaia_lock_screen.js instead. Can you confirm the changes look ok to you?

@lightsofapollo
Copy link
Contributor

@jonallengriffin Thanks for killing the other unlock script! r=me. please merge (assuming tests passing) if you can't merge I will be back in a moment...

jonallengriffin pushed a commit that referenced this pull request Dec 4, 2012
Bug 817039 - Merge latest gaia-ui-tests to gaia, r=lightsofapollo, a=tes...
@jonallengriffin jonallengriffin merged commit 5d150b2 into mozilla-b2g:master Dec 4, 2012
@jonallengriffin
Copy link
Author

Tests pass, merged.

sashakruglov pushed a commit to sashakruglov/gaia-ui-tests that referenced this pull request Dec 8, 2013
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants