Unity

Merge lp:~mhr3/unity/capital-s into lp:unity

  1. capital-s
  2. Merge into trunk
Proposed by Michal Hruby
Status: Rejected
Rejected by: Michal Hruby
Proposed branch: lp:~mhr3/unity/capital-s
Merge into: lp:unity
Diff against target: 92 lines (+11/-11)
2 files modified
tests/autopilot/unity/tests/test_dash.py (+5/-5)
tests/autopilot/unity/tests/test_shopping_lens.py (+6/-6)
To merge this branch: bzr merge lp:~mhr3/unity/capital-s
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michal Hruby (community) Disapprove
Łukasz Zemczak Approve
Paweł Stołowski (community) Approve
Review via email: mp+170045@code.launchpad.net

Commit message

Capitalize S in "More Suggestions".

Description of the change

Capitalize S in "More Suggestions".

To post a comment you must log in.
Revision history for this message
Paweł Stołowski (stolowski) wrote :

+1

review: Approve
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Awesome

review: Approve
Revision history for this message
Michal Hruby (mhr3) wrote :

Re-checked with design, only capitalizing the first word is the desired solution.

review: Disapprove
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3378
http://jenkins.qa.ubuntu.com/job/unity-ci/141/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/29

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/141/rebuild

review: Approve (continuous-integration)

Unmerged revisions

3378. By Michal Hruby

Use capital S in More Suggestions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/unity/tests/test_dash.py'
2--- tests/autopilot/unity/tests/test_dash.py 2013-06-14 16:30:01 +0000
3+++ tests/autopilot/unity/tests/test_dash.py 2013-06-18 11:47:32 +0000
4@@ -785,7 +785,7 @@
5 scope = self.unity.dash.reveal_application_scope()
6 self.addCleanup(self.unity.dash.ensure_hidden)
7
8- # wait for "More suggestions" category
9+ # wait for "Installed" category
10 category = self.wait_for_category(scope, _("Installed"))
11
12 # wait for some results
13@@ -908,8 +908,8 @@
14 scope = self.unity.dash.reveal_application_scope()
15 self.addCleanup(self.unity.dash.ensure_hidden)
16
17- # wait for "More suggestions" category
18- category = self.wait_for_category(scope, _("More suggestions"))
19+ # wait for "More Suggestions" category
20+ category = self.wait_for_category(scope, _("More Suggestions"))
21
22 # wait for results
23 self.assertThat(lambda: len(category.get_results()), Eventually(GreaterThan(0), timeout=20))
24@@ -931,8 +931,8 @@
25 scope = self.unity.dash.reveal_application_scope()
26 self.addCleanup(self.unity.dash.ensure_hidden)
27
28- # wait for "More suggestions" category
29- category = self.wait_for_category(scope, _("More suggestions"))
30+ # wait for "More Suggestions" category
31+ category = self.wait_for_category(scope, _("More Suggestions"))
32
33 # wait for results (we need 4 results to perorm the multi-navigation tests)
34 self.assertThat(lambda: len(category.get_results()), Eventually(GreaterThan(4), timeout=20))
35
36=== modified file 'tests/autopilot/unity/tests/test_shopping_lens.py'
37--- tests/autopilot/unity/tests/test_shopping_lens.py 2013-05-24 15:54:49 +0000
38+++ tests/autopilot/unity/tests/test_shopping_lens.py 2013-06-18 11:47:32 +0000
39@@ -37,7 +37,7 @@
40 self.unity.dash.ensure_visible()
41 scope = self.unity.dash.get_current_scope()
42
43- results_category = scope.get_category_by_name(_("More suggestions"))
44+ results_category = scope.get_category_by_name(_("More Suggestions"))
45 refresh_results_fn = lambda: len(results_category.get_results())
46 self.assertThat(refresh_results_fn, Eventually(Equals(0)))
47
48@@ -47,7 +47,7 @@
49 scope = self.unity.dash.get_current_scope()
50
51 self.keyboard.type("playstation")
52- results_category = scope.get_category_by_name(_("More suggestions"))
53+ results_category = scope.get_category_by_name(_("More Suggestions"))
54
55 refresh_results_fn = lambda: len(results_category.get_results())
56 self.assertThat(refresh_results_fn, Eventually(GreaterThan(1), timeout=25))
57@@ -58,7 +58,7 @@
58 scope = self.unity.dash.get_current_scope()
59
60 self.keyboard.type("Text Editor")
61- results_category = scope.get_category_by_name(_("More suggestions"))
62+ results_category = scope.get_category_by_name(_("More Suggestions"))
63
64 refresh_results_fn = lambda: len(results_category.get_results())
65 self.assertThat(refresh_results_fn, Eventually(GreaterThan(1), timeout=25))
66@@ -69,7 +69,7 @@
67 scope = self.unity.dash.get_current_scope()
68
69 self.keyboard.type("megadeth")
70- results_category = scope.get_category_by_name(_("More suggestions"))
71+ results_category = scope.get_category_by_name(_("More Suggestions"))
72
73 refresh_results_fn = lambda: len(results_category.get_results())
74 self.assertThat(refresh_results_fn, Eventually(GreaterThan(1), timeout=25))
75@@ -80,7 +80,7 @@
76 scope = self.unity.dash.get_current_scope()
77
78 self.keyboard.type("playstation")
79- results_category = scope.get_category_by_name(_("More suggestions"))
80+ results_category = scope.get_category_by_name(_("More Suggestions"))
81
82 refresh_results_fn = lambda: len(results_category.get_results())
83 self.assertThat(refresh_results_fn, Eventually(GreaterThan(1), timeout=25))
84@@ -98,7 +98,7 @@
85 scope = self.unity.dash.get_current_scope()
86
87 self.keyboard.type("playstation")
88- results_category = scope.get_category_by_name(_("More suggestions"))
89+ results_category = scope.get_category_by_name(_("More Suggestions"))
90
91 refresh_results_fn = lambda: len(results_category.get_results())
92 self.assertThat(refresh_results_fn, Eventually(GreaterThan(2), timeout=25))