Merge lp:~ahayzen/music-app/remix-walkthrough-ap-skip-walkthrough into lp:~vthompson/music-app/remix-walkthrough

[Andrew Hayzen]

* Skip the walkthrough when running autopilot

* Skip the walkthrough when running autopilot

=== modified file 'common/Walkthrough/Walkthrough.qml'
--- common/Walkthrough/Walkthrough.qml	2015-01-18 23:28:28 +0000
+++ common/Walkthrough/Walkthrough.qml	2015-01-19 17:14:50 +0000
@@ -77,6 +77,7 @@
 
         color: "grey"
         fontSize: "medium"
+        objectName: "skipLabel"
         width: contentWidth
         text: i18n.tr("Skip")
 
 
=== modified file 'music-app.qml'
--- music-app.qml	2015-01-19 00:27:35 +0000
+++ music-app.qml	2015-01-19 17:14:50 +0000
@@ -1393,6 +1393,7 @@
 
     FirstRunWalkthrough {
         id: walkthrough
+        objectName: "walkthroughPage"
         visible: false
 
         onVisibleChanged: {
 
=== modified file 'tests/autopilot/music_app/__init__.py'
--- tests/autopilot/music_app/__init__.py	2015-01-10 15:53:24 +0000
+++ tests/autopilot/music_app/__init__.py	2015-01-19 17:14:50 +0000
@@ -107,6 +107,10 @@
         return self.main_view.wait_select_single(
             MusicPage, objectName='tracksPage')
 
+    def get_walkthrough_page(self):
+        return self.main_view.wait_select_single(Walkthrough,
+                                                 objectName="walkthroughPage")
+
     @property
     def loaded(self):
         return (not self.main_view.select_single("ActivityIndicator",
@@ -137,6 +141,18 @@
         self.main_view = self.get_root_instance().select_single(MainView)
 
 
+class Walkthrough(Page):
+    """ Autopilot helper for the walkthrough page """
+    def __init__(self, *args):
+        super(Walkthrough, self).__init__(*args)
+
+        self.visible.wait_for(True)
+
+    @click_object
+    def skip(self):
+        return self.wait_select_single("Label", objectName="skipLabel")
+
+
 class MusicAlbums():
     """ Autopilot helper for the albums page """
     def __init__(self, *args):
 
=== modified file 'tests/autopilot/music_app/tests/test_music.py'
--- tests/autopilot/music_app/tests/test_music.py	2014-11-07 23:08:29 +0000
+++ tests/autopilot/music_app/tests/test_music.py	2015-01-19 17:14:50 +0000
@@ -1,5 +1,5 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013, 2014 Canonical
+# Copyright 2013, 2014, 2015 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
@@ -47,6 +47,9 @@
             }
         ]
 
+        # Skip the walkthrough for every test
+        self.app.get_walkthrough_page().skip()
+
     @property
     def player(self):
         return self.app.player