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

Commit

Permalink
Revert "Bug 1086563 - Write test to verify offline behaviour of the R…
Browse files Browse the repository at this point in the history
…ocketBar"

This reverts commit 94bc14f.
  • Loading branch information
Zac committed Oct 31, 2014
1 parent 811cbdf commit cf90923
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 79 deletions.
Expand Up @@ -15,28 +15,11 @@ class SearchPanel(Base):
_search_results_locator = (By.CSS_SELECTOR, 'gaia-grid .icon')
_search_suggestion_ok_button_locator = (By.ID, 'suggestions-notice-confirm')
_rocketbar_input_locator = (By.ID, 'rocketbar-input')
_search_results_offline_locator = (By.ID, 'offline-message')
_search_results_offline_settings_locator = (By.ID, 'settings-connectivity')

def _switch_to_search_results_frame(self):
self.marionette.switch_to_frame()
self.marionette.switch_to_frame(self.marionette.find_element(*self._search_results_app_frame_locator))

@property
def offline_search_message(self):
return self.marionette.find_element(*self._search_results_offline_locator).text

@property
def is_offline_message_visible(self):
return self.is_element_displayed(*self._search_results_offline_locator)

def tap_offline_settings_button(self):
self.marionette.find_element(*self._search_results_offline_settings_locator).tap()
from gaiatest.apps.settings.app import Settings
settings = Settings(self.marionette)
settings.switch_to_settings_app()
return settings

def type_into_search_box(self, search_term):
self.keyboard.send(search_term)
# The search results frame is not findable with AppWindowManager
Expand Down
18 changes: 0 additions & 18 deletions tests/python/gaia-ui-tests/gaiatest/apps/settings/app.py
Expand Up @@ -10,7 +10,6 @@ class Settings(Base):

name = 'Settings'

_settings_iframe_locator = (By.CSS_SELECTOR, 'iframe[src="app://settings.gaiamobile.org/index.html"]')
_header_text_locator = (By.CSS_SELECTOR, '#root > gaia-header > h1')
_data_text_locator = (By.ID, 'data-desc')
_wifi_text_locator = (By.ID, 'wifi-desc')
Expand Down Expand Up @@ -46,11 +45,6 @@ def launch(self):
Base.launch(self)
self.wait_for_element_present(*self._app_loaded_locator)

def switch_to_settings_app(self):
self.marionette.switch_to_frame()
iframe = self.wait_for_element_present(*self._settings_iframe_locator)
self.marionette.switch_to_frame(iframe)

def wait_for_airplane_toggle_ready(self):
checkbox = self.marionette.find_element(*self._airplane_checkbox_locator)
self.wait_for_condition(lambda m: checkbox.is_enabled())
Expand Down Expand Up @@ -193,18 +187,6 @@ def open_homescreen_settings(self):
self._tap_menu_item(self._homescreen_menu_item_locator)
return HomescreenSettings(self.marionette)

@property
def is_airplane_mode_visible(self):
return self.is_element_displayed(*self._airplane_switch_locator)

@property
def is_wifi_menu_visible(self):
return self.is_element_displayed(*self._wifi_menu_item_locator)

@property
def is_cell_data_menu_visible(self):
return self.is_element_displayed(*self._cell_data_menu_item_locator)

def _wait_for_menu_item(self, menu_item_locator):
menu_item = self.marionette.find_element(*menu_item_locator)

Expand Down
@@ -1,6 +1,6 @@
[DEFAULT]
b2g = true
external = true
exernal = true
online = true
smoketest = false

Expand All @@ -11,7 +11,3 @@ smoketest = true
smoketest = true

[test_everythingme_search.py]

[test_rocketbar_offline_behavior.py]
external = false
skip-if = device == "desktop"

This file was deleted.

0 comments on commit cf90923

Please sign in to comment.