Merge lp:~nik90/ubuntu-clock-app/focus-textfields-automatically into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Focus textfields automatically as requested by design.

Focus textfields automatically as requested by design.

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

FAILED: Continuous integration, rev:113
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/482/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/447
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/447/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/129

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

review: Needs Fixing (continuous-integration)

[Leo Arias (elopio)]

What about adding a QML test here?

[lp:~nik90/ubuntu-clock-app/focus-textfields-automatically]

114. By Nekhelesh Ramananthan on 2014-09-23

Added debug to qml test

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

PASSED: Continuous integration, rev:114
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/486/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/479
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/479/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/133

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

review: Approve (continuous-integration)

[lp:~nik90/ubuntu-clock-app/focus-textfields-automatically]

115. By Nekhelesh Ramananthan on 2014-09-23

Fixed failing qml test

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

PASSED: Continuous integration, rev:115
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/487/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/484
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/484/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/134

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

review: Approve (continuous-integration)

[lp:~nik90/ubuntu-clock-app/focus-textfields-automatically]

116. By Nekhelesh Ramananthan on 2014-09-23

Added qml test for label focus in alarm label page

[Nekhelesh Ramananthan (nik90)]

@elopio I fixed the failing QML Tests. So from now on all qml tests should pass. I added a qml test to check the default focus in the alarm label page as you requested. I haven't done it for the world city page since that page doesn't have any qml tests yet and as such I need to start from scratch which this MP is not ideal for.

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

PASSED: Continuous integration, rev:116
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/488/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/490
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/490/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/135

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

review: Approve (continuous-integration)

[lp:~nik90/ubuntu-clock-app/focus-textfields-automatically]

117. By Nekhelesh Ramananthan on 2014-09-23

Prepended numbers to test names to ensure the correct order of execution is followed

118. By Nekhelesh Ramananthan on 2014-09-23

Prepended numbers to test names to ensure the correct order of execution is followed for alarm repeat as well

119. By Nekhelesh Ramananthan on 2014-09-23

Fixed test names as suggested by leo

[Leo Arias (elopio)]

Test looks good, and they pass. The code also looks good from my limited QML knowledge, but having a test to confirm the change makes me confident. Thanks nik. Awesome work as always.

review: Approve

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

PASSED: Continuous integration, rev:119
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/489/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/493
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/493/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/136

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

review: Approve (continuous-integration)

=== modified file 'app/alarm/AlarmLabel.qml'
--- app/alarm/AlarmLabel.qml	2014-08-24 12:47:50 +0000
+++ app/alarm/AlarmLabel.qml	2014-09-23 15:15:38 +0000
@@ -38,6 +38,10 @@
         }
     }
 
+    Component.onCompleted: {
+        _labelEntry.forceActiveFocus()
+    }
+
     Column {
         id: _labelColumn
 

=== modified file 'app/worldclock/WorldCityList.qml'
--- app/worldclock/WorldCityList.qml	2014-08-24 12:47:50 +0000
+++ app/worldclock/WorldCityList.qml	2014-09-23 15:15:38 +0000
@@ -65,6 +65,7 @@
                 iconName: "back"
                 text: i18n.tr("Back")
                 onTriggered: {
+                    cityList.forceActiveFocus()
                     searchField.text = ""
                     worldCityList.state = "default"
                     isOnlineMode = false
@@ -224,7 +225,7 @@
         }
 
         onFlickStarted: {
-            Qt.inputMethod.hide()
+            forceActiveFocus()
         }
 
         anchors.fill: parent

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-19 21:03:09 +0000
+++ debian/changelog	2014-09-23 15:15:38 +0000
@@ -33,6 +33,7 @@
   * Added alarm snooze settings (LP: #1354400)
   * Fixed default alarm label not being translatable (LP: #1365012)
   * Improved multiselect mode behavior and appearance (LP: #1370146)
+  * Automatically focus textfield (LP: #1372089)
 
   [Zsombor Egri]
   * Fixed alarm status toggle being reverted immediately (LP: #1272337)

=== modified file 'tests/unit/tst_alarmLabel.qml'
--- tests/unit/tst_alarmLabel.qml	2014-08-13 22:18:55 +0000
+++ tests/unit/tst_alarmLabel.qml	2014-09-23 15:15:38 +0000
@@ -37,12 +37,6 @@
             backButton = findChild(header, "customBackButton")
         }
 
-        function cleanup() {
-            clearTextField(alarmLabel)
-            typeString("Alarm")
-            alarmLabelPage.alarm.message = "Alarm"
-        }
-
         function clearTextField(textfield) {
             // Get textfield focus by clicking once
             mouseClick(textfield, textfield.width - units.gu(2), textfield.height/2)
@@ -51,6 +45,14 @@
             mouseClick(textfield, textfield.width - units.gu(2), textfield.height/2)
         }
 
+        /*
+         Test to check if the alarm label has focus true by default to ensure
+         that the OSK is shown when the opens the alarm label page.
+        */
+        function test_01_alarmLabelHasFocus() {
+            compare(alarmLabel.focus, true, "Alarm Label does not have focus by default")
+        }
+
         function test_backButtonEnabled_data() {
             return [
                         {tag: "EmptyAlarmLabel",       string: "",           enableStatus: false},
@@ -72,6 +74,8 @@
 
             compare(alarmLabel.text, data.string, "Alarm label is not what was type in the textfield")
             compare(backButton.enabled, data.enableStatus, "Back Button enable status is not as expected")
+
+            alarmLabel.text = _alarm.message
         }
 
         /*
@@ -79,8 +83,9 @@
          when the page is loaded.
         */
         function test_alarmLabelIsSameAsAlarmMessage() {
-            alarmLabelPage.alarm.message = "Random Alarm Label"
+            _alarm.message = "Random Alarm Label"
             compare(alarmLabel.text, "Random Alarm Label", "Alarm label set is not the same as alarm message")
+            _alarm.reset()
         }
     }
 }

=== modified file 'tests/unit/tst_alarmRepeat.qml'
--- tests/unit/tst_alarmRepeat.qml	2014-09-02 20:56:44 +0000
+++ tests/unit/tst_alarmRepeat.qml	2014-09-23 15:15:38 +0000
@@ -44,6 +44,7 @@
         function init() {
             alarmRepeatPageLoader.sourceComponent = alarmRepeatPage
             alarmRepeatPageLoader.item.visible = true
+            spy.target = alarmRepeatPageLoader.item.Component
             header = findChild(mainView, "MainView_Header")
             backButton = findChild(header, "customBackButton")
             repeater = findChild(alarmRepeatPageLoader.item, "alarmDays")
@@ -51,8 +52,17 @@
 
         function cleanup() {
             alarmRepeatPageLoader.sourceComponent = undefined
+            spy.wait()
+            tryCompare(spy, "count", 1)
             _alarm.reset()
             tryCompare(_alarm, "status", Alarm.Ready)
+            spy.clear()
+            spy.target = undefined
+        }
+
+        SignalSpy {
+            id: spy
+            signalName: "destruction"
         }
 
         /*
@@ -60,7 +70,7 @@
          default an alarm is an one-time alarm and in the repeat page none of
          the days must be checked
         */
-        function test_allSwitchesAreUncheckedByDefault() {
+        function test_01_allSwitchesAreUncheckedByDefault() {
             waitForRendering(alarmRepeatPageLoader.item);
 
             tryCompare(_alarm, "daysOfWeek", 0, 3000, "Alarm days of weeks is not 0 by default")
@@ -82,15 +92,6 @@
         function test_alarmTypeSwitch() {
             waitForRendering(alarmRepeatPageLoader.item);
 
-            // TEST FAILS HERE //
-            // Alarm should be one-time by default. By the test before this
-            // changed the value and the alarm.reset() in the cleanup doesn't
-            // seem to do its job.
-
-            // test_alarmObjectSetsSwitchStatus() is run before this test. And in
-            // that test I set the alarm type to repeating. However the cleanup
-            // should reset back to one-time when calling the alarm.reset() function.
-
             tryCompare(_alarm, "type", Alarm.OneTime, 3000, "Alarm type is not OneTime by default")
 
             var dayListItem = findChild(alarmRepeatPageLoader.item, "alarmDay"+3)