Merge lp:~michael-sheldon/ubuntu-keyboard/fix-extended-key-ordering into lp:ubuntu-keyboard

[Michael Sheldon]

Ensure that extended key selector array is cloned

Ensure that extended key selector array is cloned (Qt 5.4 just creates a reference)

[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)]

PASSED: Continuous integration, rev:327
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/561/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1487
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/62
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/62/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1321
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1485
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1485/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18279

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

review: Approve (continuous-integration)

=== modified file 'qml/keys/ExtendedKeysSelector.qml'
--- qml/keys/ExtendedKeysSelector.qml	2014-08-21 11:18:02 +0000
+++ qml/keys/ExtendedKeysSelector.qml	2015-02-23 15:36:08 +0000
@@ -41,7 +41,7 @@
             // Place the first key in the middle of the model so that it gets
             // selected by default
             var middleKey = Math.floor(extendedKeysModel.length / 2);
-            var reorderedModel = extendedKeysModel;
+            var reorderedModel = extendedKeysModel.slice(0); // Ensure the array is cloned
             reorderedModel.splice(extendedKeysModel.length % 2 == 0 ? middleKey : middleKey + 1, 0, extendedKeysModel[0]);
             reorderedModel.shift();
             keyRepeater.model = reorderedModel;

=== modified file 'tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py'
--- tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py	2015-02-09 18:18:20 +0000
+++ tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py	2015-02-23 15:36:08 +0000
@@ -570,7 +570,6 @@
             text_area.text,
             Eventually(Equals(expected))
         )
-        
 
     def test_long_press(self):
         """Long pressing a key should enter the default extended character.
@@ -590,6 +589,26 @@
             Eventually(Equals(expected))
         )
 
+    def test_repeated_long_press(self):
+        """The default key should stay in the middle after each long press.
+
+        """
+
+        text_area = self.launch_test_input_area()
+        self.ensure_focus_on_input(text_area)
+        keyboard = Keyboard()
+        self.addCleanup(keyboard.dismiss)
+
+        keyboard.press_key('u', long_press=True)
+        keyboard.press_key('u', long_press=True)
+        keyboard.press_key('u', long_press=True)
+
+        expected = "777"
+        self.assertThat(
+            text_area.text,
+            Eventually(Equals(expected))
+        )
+
 
 class UbuntuKeyboardPinyin(UbuntuKeyboardTests):