Skip to content

Commit

Permalink
Merge pull request #1358 from teodosia/issue-1336
Browse files Browse the repository at this point in the history
Removed un needed locator in test_marketplace_login.py
  • Loading branch information
Zac committed Sep 12, 2013
2 parents 2586350 + 212fe60 commit 644ea39
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
3 changes: 3 additions & 0 deletions gaiatest/apps/marketplace/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ def error_message_text(self):
def wait_for_notification_message_displayed(self):
self.wait_for_element_displayed(*self._notification_locator)

def wait_for_notification_message_not_displayed(self):
self.wait_for_element_not_displayed(*self._notification_locator)

@property
def notification_message(self):
return self.marionette.find_element(*self._notification_locator).text
Expand Down
10 changes: 1 addition & 9 deletions gaiatest/tests/marketplace/test_marketplace_login.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,6 @@ class TestMarketplaceLogin(GaiaTestCase):

MARKETPLACE_DEV_NAME = 'Marketplace Dev'

# Marketplace locators
_settings_button_locator = (By.CSS_SELECTOR, 'a.header-button.settings')
_sign_in_button_locator = (By.CSS_SELECTOR, 'a.button.browserid')
_signed_in_notification_locator = (By.CSS_SELECTOR, '#notification.show')
_sign_out_button_locator = (By.CSS_SELECTOR, 'a.button.logout')

_email_account_field_locator = (By.ID, 'email')

def setUp(self):
GaiaTestCase.setUp(self)
self.connect_to_network()
Expand All @@ -45,7 +37,7 @@ def test_login_marketplace(self):
self.marketplace.launch()

# wait for signed-in notification at the bottom of the screen to clear
self.wait_for_element_not_displayed(*self._signed_in_notification_locator)
self.marketplace.wait_for_notification_message_not_displayed()

# Verify that user is logged in
self.assertEqual(self.user.email, settings.email)
Expand Down

0 comments on commit 644ea39

Please sign in to comment.