Merge lp:~michael-sheldon/ubuntu-keyboard/fix-1521803 into lp:ubuntu-keyboard

[Michael Sheldon]

Fix keyboard shifting out of capslock when in fields without preedit

Fix keyboard shifting out of capslock when in fields without preedit

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:429
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/641/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5861
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/141
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/141
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/141/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/141
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4518
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5872
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5872/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26201

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/641/rebuild

review: Needs Fixing (continuous-integration)

[lp:~michael-sheldon/ubuntu-keyboard/fix-1521803]

430. By Michael Sheldon on 2015-12-18

Wait longer for word suggestion generation in tests

[Michael Sheldon (michael-sheldon)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/ubuntu-keyboard) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed UI labels, did you update the pot file?

 * No change

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * No change

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:430
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/642/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5866
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/142
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/142
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/142/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/142
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4525
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5877
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5877/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26242

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/642/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'qml/Keyboard.qml'
--- qml/Keyboard.qml	2015-07-16 13:55:08 +0000
+++ qml/Keyboard.qml	2015-12-18 14:00:54 +0000
@@ -235,7 +235,7 @@
         Connections {
             target: input_method
             onActivateAutocaps: {
-                if (keypad.state == "CHARACTERS") {
+                if (keypad.state == "CHARACTERS" && keypad.activeKeypadState != "CAPSLOCK") {
                     keypad.activeKeypadState = "SHIFTED";
                     keypad.autoCapsTriggered = true;
                 } else {

=== modified file 'tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py'
--- tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py	2015-11-26 14:11:52 +0000
+++ tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py	2015-12-18 14:00:54 +0000
@@ -397,6 +397,27 @@
             Eventually(Equals(KeyPadState.CAPSLOCK))
         )
 
+    def test_capslock_stays_on(self):
+        """Capslock should remain on when typing text.
+
+        """
+        text_area = self.launch_test_input_area(
+            input_hints=['Qt.ImhNoPredictiveText'])
+        self.ensure_focus_on_input(text_area)
+        keyboard = Keyboard()
+        self.addCleanup(keyboard.dismiss)
+
+        keyboard.press_key('shift')
+        keyboard.press_key('shift', True)
+        keyboard.press_key('A', True)
+        keyboard.press_key('B', True)
+        keyboard.press_key('C', True)
+
+        self.assertThat(
+            keyboard.active_keypad_state,
+            Eventually(Equals(KeyPadState.CAPSLOCK))
+        )
+
     # Note: based on UX design doc
     def test_shift_state_returns_to_default_after_letter_typed(self):
         """Pushing shift and then typing an uppercase letter must automatically
@@ -692,7 +713,7 @@
 
         keyboard.type('Helfn')
 
-        sleep(1)
+        sleep(2)
 
         keyboard.type(' ')