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

Bug 821139 - Mirror latest gaia-ui-tests to gaia, r=lightsofapollo, a=te... #6988

Merged
merged 1 commit into from Dec 13, 2012
Merged

Bug 821139 - Mirror latest gaia-ui-tests to gaia, r=lightsofapollo, a=te... #6988

merged 1 commit into from Dec 13, 2012

Conversation

jonallengriffin
Copy link

...st-only

JS files pass gjslint.

@@ -64,7 +65,8 @@ def test_call_contact(self):
self.wait_for_element_displayed(*self._outgoing_call_locator)

# Check the number displayed is the one we dialed
self.assertEqual(self.contact['tel']['value'],
# TODO if this step fails bug 817291 may have been fixed
self.assertIn(self.contact['tel']['value'],
self.marionette.find_element(*self._calling_number_locator).text)
Copy link
Contributor

Choose a reason for hiding this comment

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

weird indentation I don't want to cause you more pain by fixing this kind of nit then needing to merge that back into the other repo but I had to say something :)

@lightsofapollo
Copy link
Contributor

@jonallengriffin Looks good to me, I assume tests are OK I have not run them since the recent marionette changes.

@jonallengriffin
Copy link
Author

@lightsofapollo, we have some known failures noted with the 'xfail' attribute in the manifests. Would you prefer these not be merged in?

@lightsofapollo
Copy link
Contributor

No that is 100% fine with me merging.

lightsofapollo added a commit that referenced this pull request Dec 13, 2012
Bug 821139 - Mirror latest gaia-ui-tests to gaia, r=lightsofapollo, a=te...
@lightsofapollo lightsofapollo merged commit 7a82c2e into mozilla-b2g:master Dec 13, 2012
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
2 participants