bfb27cf · unity8 · git.iko.soy

open the indicator directly if it is displayed in the menu.

commitbfb27cf2690de6d05de92b3d39a37086bc9d2915 authorLeo Arias <leo.arias@canonical.com> dateTue 20 Jan 2015, 22:11 (12 years ago) parentfccd122

2 files changed+9−5

unifiedsplit

tests/autopilot/unity8/indicators/__init__.py+8−4

@@ -49,16 +49,20 @@ class DisplayIndicator(object):

4949 :return: The custom proxy object for the display indicator page.

5050

5151 """

52− # TODO open the indicator directly if it is displayed in the menu.

52+ if self.is_indicator_icon_visible():

53+ return self._main_window.open_indicator_page(

54+ 'indicator-rotation-lock')

55+ else:

56+ return self._open_indicator_with_icon_not_visible()

57+

58+ def _open_indicator_with_icon_not_visible(self):

5359 # open any displayed indicator.

5460 self._main_window.open_indicator_page('indicator-datetime')

5561 self._make_indicator_icon_visible()

5662 indicator_rotation_icon = self._main_window.select_single(

5763 objectName='indicator-rotation-lock-panelItem')

5864 self._main_window.pointing_device.click_object(indicator_rotation_icon)

59− indicators_menu = self._main_window.select_single('IndicatorsMenu')

60− indicators_menu.fullyOpened.wait_for(True)

61− return self._main_window.select_single(

65+ return self._main_window.wait_select_single(

6266 objectName='indicator-rotation-lock-page')

6367

6468 def _make_indicator_icon_visible(self):

tests/autopilot/unity8/shell/emulators/main_window.py+1−1

@@ -88,7 +88,7 @@ class QQuickView(emulators.UnityEmulatorBase):

8888 self.wait_select_single('IndicatorsMenu', fullyOpened=True)

8989 return self._get_indicator_page(indicator_name)

9090

91− @autopilot_logging.log_action(logger.info)

91+ @autopilot_logging.log_action(logger.info)

9292 def close_indicator_page(self):

9393 """Swipe to close the opened indicator, wait until it's closed."""

9494 indicators_menu = self.wait_select_single('IndicatorsMenu')