Merge lp:~brendan-donegan/ubuntu-weather-app/remove_app_header_override into lp:ubuntu-weather-app/obsolete.trunk

[Brendan Donegan]

Remove overridden AppHeader since the version in ubuntuuitoolkit works just fine. Also remove the redundant second copyright notice.

The overridden AppHeader custom proxy object was using a function that was removed from the UI toolkit helper (_show_if_not_visible). Further investigation found that the override is no longer necessary so I propose to remove it altogether. Running the tests with this modification means that they all pass (previously there were 5 failures).

There was also a stray copyright header that was added by mistake so removed that as well.

[Leo Arias (elopio)]

Looks good, and if you say that the test pass, then +1.

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:390
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/300/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid-weather-app/10
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid-weather-app/10/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-vivid-amd64-ci/8

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/300/rebuild

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/__init__.py'
--- tests/autopilot/ubuntu_weather_app/tests/__init__.py	2014-09-04 16:21:49 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/__init__.py	2014-12-02 15:38:21 +0000
@@ -25,22 +25,10 @@
     base,
     emulators as toolkit_emulators
 )
-from ubuntuuitoolkit._custom_proxy_objects import AppHeader
 import ubuntu_weather_app
 
 logger = logging.getLogger(__name__)
 
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# Authored by: Martin Borho <[e-mail]>
-
-"""weather app autopilot tests and emulators - top level package."""
-
 import ubuntuuitoolkit
 
 
@@ -125,24 +113,6 @@
         return self.app.wait_select_single(MainView)
 
 
-class AppHeader(AppHeader):
-    """AppHeader Autopilot custom proxy object."""
-
-    def click_action_button(self, action_object_name):
-        """Click an action button of the header.
-
-        :parameter object_name: The QML objectName property of the action
-        :raise ToolkitException: If there is no action button with that object
-            name.
-
-        """
-        self._show_if_not_visible()
-
-        button = self._get_action_button(action_object_name)
-        time.sleep(2)
-        self.pointing_device.click_object(button)
-
-
 class Tabs(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
     """LocationTabs Autopilot emulator."""