git.iko.soy/unity8
on xenial help sign in
Workaround keyboard issues and make test pass again
4b3262dAlbert Astals Cid
tests/autopilot/unity8/dash.py+3−4
compare with xenial
unifiedsplit
@@ -155,7 +155,7 @@ class Dash(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
155 self.pointing_device.drag(start_x, start_y, stop_x, stop_y, rate)
155 self.pointing_device.drag(start_x, start_y, stop_x, stop_y, rate)
156 self.dash_content_list.currentIndex.wait_for(original_index + 1)
156 self.dash_content_list.currentIndex.wait_for(original_index + 1)
157
157
158− def enter_search_query(self, query):
158+ def enter_search_query(self, query, keyboard):
159 current_header = self._get_current_page_header()
159 current_header = self._get_current_page_header()
160 search_button = \
160 search_button = \
161 current_header.select_single(objectName="search_header_button")
161 current_header.select_single(objectName="search_header_button")
@@ -166,12 +166,11 @@ class Dash(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
166 headerContainer = current_header.select_single(
166 headerContainer = current_header.select_single(
167 objectName="headerContainer")
167 objectName="headerContainer")
168 headerContainer.contentY.wait_for(0)
168 headerContainer.contentY.wait_for(0)
169− search_text_field = self._get_search_text_field()
169+ keyboard.type(query)
170− search_text_field.write(query)
171 self.select_single(
170 self.select_single(
172 objectName="processingIndicator").visible.wait_for(False)
171 objectName="processingIndicator").visible.wait_for(False)
173
172
174− def _get_search_text_field(self):
173+ def get_search_text_field(self):
175 page_header = self._get_current_page_header()
174 page_header = self._get_current_page_header()
176 return page_header.select_single(objectName='searchTextField')
175 return page_header.select_single(objectName='searchTextField')
177
176
tests/autopilot/unity8/shell/tests/test_helpers.py+2−2
@@ -47,8 +47,8 @@ class MainWindowTestCase(tests.UnityTestCase):
47class DashHelperTestCase(tests.DashBaseTestCase):
47class DashHelperTestCase(tests.DashBaseTestCase):
48
48
49 def test_search(self):
49 def test_search(self):
50− self.dash.enter_search_query('Test')
50+ self.dash.enter_search_query('Test', self.keyboard)
51− text_field = self.dash._get_search_text_field()
51+ text_field = self.dash.get_search_text_field()
52 self.assertEqual(text_field.text, 'Test')
52 self.assertEqual(text_field.text, 'Test')
53
53
54 def test_open_scope_to_the_right(self):
54 def test_open_scope_to_the_right(self):