48bb475 · unity8 · git.iko.soy

Reverted the change that returns application cards instead of titles.

commit48bb47549bb88fd4ed4ee25f8ed765139e48e218 authorLeo Arias <leo.arias@canonical.com> dateTue 1 Apr 2014, 11:19 (13 years ago) parent32b0809

2 files changed+6−8

unifiedsplit

tests/autopilot/unity8/shell/emulators/dash.py+5−3

@@ -175,11 +175,13 @@ class DashApps(GenericScopeView):

175175

176176 """

177177 category_element = self._get_category_element(category)

178− application_tiles = category_element.select_many('Card')

178+ application_cards = category_element.select_many('Card')

179179 # TODO return them on the same order they are displayed.

180180 # --elopio - 2014-1-15

181181 result = []

182− for card in application_tiles:

182+ for card in application_cards:

183183 if card.objectName != 'cardToolCard':

184− result.append(card)

184+ card_header = card.select_single('CardHeader')

185+ result.append(card_header.title)

186+

185187 return result

tests/autopilot/unity8/shell/tests/test_emulators.py+1−5

@@ -172,14 +172,10 @@ class DashAppsEmulatorTestCase(DashBaseTestCase):

172172 :expected_apps_count]

173173

174174 applications = self.applications_scope.get_applications(category)

175− applications_titles = []

176− for application in applications:

177− cardHeader = application.select_single('CardHeader')

178− applications_titles.append(cardHeader.title)

179175

180176 self.assertThat(applications, HasLength(expected_apps_count))

181177 for expected in expected_applications:

182− self.assertThat(applications_titles, Contains(expected))

178+ self.assertThat(applications, Contains(expected))

183179

184180 def _get_number_of_application_slots(self, category):

185181 category_element = self.applications_scope._get_category_element(