Merge lp:~carla-sella/ubuntu-calendar-app/weekview-testing-stubs-completed into lp:ubuntu-calendar-app

Proposed by Carla Sella
Status: Superseded
Proposed branch: lp:~carla-sella/ubuntu-calendar-app/weekview-testing-stubs-completed
Merge into: lp:ubuntu-calendar-app
Diff against target: 39 lines (+17/-1)
2 files modified
tests/autopilot/calendar_app/__init__.py (+11/-0)
tests/autopilot/calendar_app/tests/test_weekview.py (+6/-1)
To merge this branch: bzr merge lp:~carla-sella/ubuntu-calendar-app/weekview-testing-stubs-completed
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Nicholas Skaggs Pending
Review via email: mp+254493@code.launchpad.net

This proposal has been superseded by a proposal from 2015-03-29.

Commit message

Autopilot tests for Calendar app

Description of the change

Completing test_default_view in test_weekview.py.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Carla Sella (carla-sella) wrote :

This can be merged if ok as checking if current day is highlighted has been completed.

617. By Carla Sella

Added test_day_to_week.

618. By Carla Sella

Fixed test_day_to_week test.

619. By Carla Sella

Fixed pep8 and pylflakes.

620. By Carla Sella

Adding test test_month_to_week.

621. By Carla Sella

Completed test_month_to_week.

622. By Carla Sella

Added test_today_button in month view.

623. By Carla Sella

Added test_today_button in year view.

624. By Carla Sella

Completed test test_scroll_week_must_scroll_weekdays.

625. By Carla Sella

Completed test_change_week_across_months.

626. By Carla Sella

Completed test_change_week_across_year.

627. By Carla Sella

Fixed two text conflicts.

628. By Carla Sella

Fixed wrong function name.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/autopilot/calendar_app/__init__.py'
--- tests/autopilot/calendar_app/__init__.py 2015-03-07 10:14:46 +0000
+++ tests/autopilot/calendar_app/__init__.py 2015-03-29 13:41:25 +0000
@@ -427,6 +427,17 @@
427 sorteddays.insert(0, day)427 sorteddays.insert(0, day)
428 return sorteddays428 return sorteddays
429429
430 @autopilot.logging.log_action(logger.info)
431 def get_headerdatecomponent(self, now):
432 today = datetime.date(now.year, now.month, now.day)
433 header_date_components = self.select_many('HeaderDateComponent')
434 for header in header_date_components:
435 header_date = datetime.date(header.date.datetime.year,
436 header.date.datetime.month,
437 header.date.datetime.day)
438 if header_date == today:
439 return header
440
430441
431class MonthView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):442class MonthView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
432443
433444
=== modified file 'tests/autopilot/calendar_app/tests/test_weekview.py'
--- tests/autopilot/calendar_app/tests/test_weekview.py 2015-02-26 16:29:18 +0000
+++ tests/autopilot/calendar_app/tests/test_weekview.py 2015-03-29 13:41:25 +0000
@@ -61,7 +61,12 @@
61 self.assertThat(self.app.main_view.get_month_year(self.week_view),61 self.assertThat(self.app.main_view.get_month_year(self.week_view),
62 Equals(expected_month_name_year))62 Equals(expected_month_name_year))
6363
64 # TODO: check current day is highlighted64 # check current day is highlighted
65 header_date = self.week_view.get_headerdatecomponent(now)
66 self.assertEquals(header_date.dayColor[0], 221)
67 self.assertEquals(header_date.dayColor[1], 72)
68 self.assertEquals(header_date.dayColor[2], 20)
69 self.assertEquals(header_date.dayColor[3], 255)
6570
66 # These testing stubs need completed71 # These testing stubs need completed
67 # def test_scroll_week_must_scroll_within_week(self):72 # def test_scroll_week_must_scroll_within_week(self):

Subscribers

People subscribed via source and target branches

to status/vote changes: