@@ -84,10 +84,7 @@ class Dash(emulators.UnityEmulatorBase):
8484 'No scope found with id {0}'.format(scope_id))
8585
8686 def _get_scope_from_loader(self, loader):
87− if loader.scopeId == 'applications.scope':
88− return loader.select_single(DashApps)
89− else:
90− return loader.select_single(GenericScopeView)
87+ return loader.select_single(GenericScopeView)
9188
9289 def _open_scope_scrolling(self, scope_loader):
9390 scroll = self._get_scroll_direction(scope_loader)
@@ -170,7 +167,7 @@ class GenericScopeView(emulators.UnityEmulatorBase):
170167 # --elopio - 2014-1-14
171168 self.pointing_device.click_object(icon)
172169 preview = self.get_root_instance().wait_select_single(
173− self.preview_class, isCurrent=True)
170+ objectName="dashPreview", isCurrent=True)
174171 preview.showProcessingAction.wait_for(False)
175172 return preview
176173
@@ -182,6 +179,18 @@ class GenericScopeView(emulators.UnityEmulatorBase):
182179 raise emulators.UnityEmulatorException(
183180 'No category found with name {}'.format(category))
184181
182+ def get_applications(self, category):
183+ """Return the list of applications on a category.
184+
185+ :parameter category: The name of the category.
186+
187+ """
188+ category_element = self._get_category_element(category)
189+ application_tiles = category_element.select_many('Tile')
190+ # TODO return them on the same order they are displayed.
191+ # --elopio - 2014-1-15
192+ return [tile.text for tile in application_tiles]
193+
185194
186195class AppPreview(DashPreview):
187196 """Autopilot emulator for the application preview."""
@@ -195,20 +204,3 @@ class AppPreview(DashPreview):
195204 title=details.get('title'), publisher=details.get('subtitle'),
196205 description=details.get('description'))
197206
198−
199−class DashApps(GenericScopeView):
200− """Autopilot emulator for the applications scope."""
201−
202− preview_class = AppPreview
203−
204− def get_applications(self, category):
205− """Return the list of applications on a category.
206−
207− :parameter category: The name of the category.
208−
209− """
210− category_element = self._get_category_element(category)
211− application_tiles = category_element.select_many('Tile')
212− # TODO return them on the same order they are displayed.
213− # --elopio - 2014-1-15
214− return [tile.text for tile in application_tiles]