Merge lp:~renatofilho/address-book-app/fix-phone-number-field into lp:address-book-app

[Renato Araujo Oliveira Filho]

Fixed phone number field cleanup.

[Renato Araujo Oliveira Filho (renatofilho)]

Are there any related MPs required for this MP to build/function as expected? 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 on device or emulator? YES

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

If you changed the packaging (debian), did you subscribe a core-dev to this MP? N/A

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:190
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/575/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/28
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/28/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-i386-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/290
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/264
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/777
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/581
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/581/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7285
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/239
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/328
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/328/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/575/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

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

Did CI run pass? If not, please explain why.
Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good and works as expected.

review: Approve

=== modified file 'src/imports/ContactEdit/TextInputDetail.qml'
--- src/imports/ContactEdit/TextInputDetail.qml	2014-05-13 18:54:26 +0000
+++ src/imports/ContactEdit/TextInputDetail.qml	2014-05-16 20:35:15 +0000
@@ -41,7 +41,6 @@
 
     readOnly: detail ? detail.readOnly : true
     focus: true
-    text: originalValue ? originalValue : ""
     style: TextFieldStyle {
         overlaySpacing: 0
         frameSpacing: 0
@@ -62,4 +61,9 @@
     }
 
     Keys.onReturnPressed: application.sendTabEvent();
+    onOriginalValueChanged: {
+        if (originalValue && (originalValue !== "")) {
+            text = originalValue
+        }
+    }
 }

=== modified file 'tests/autopilot/address_book_app/data.py'
--- tests/autopilot/address_book_app/data.py	2014-03-27 19:37:33 +0000
+++ tests/autopilot/address_book_app/data.py	2014-05-16 20:35:15 +0000
@@ -53,7 +53,7 @@
     @classmethod
     def make(cls):
         """Return a Phone data object."""
-        return cls(type_='Mobile', number='81 8777 7755')
+        return cls(type_='Mobile', number='[phone]')
 
 
 class Email(DataMixin):

=== modified file 'tests/autopilot/address_book_app/tests/test_add_contact.py'
--- tests/autopilot/address_book_app/tests/test_add_contact.py	2014-05-07 18:02:58 +0000
+++ tests/autopilot/address_book_app/tests/test_add_contact.py	2014-05-16 20:35:15 +0000
@@ -229,15 +229,15 @@
             data.Contact(first_name='Sherlock', last_name='Holmes'))
 
         # Home
-        self.set_phone_number(0, "00 0000 0000", 0)
+        self.set_phone_number(0, "[phone]", 0)
         # Work
-        self.set_phone_number(1, "11 1111 1111", 1)
+        self.set_phone_number(1, "[phone]", 1)
         # Mobile
-        self.set_phone_number(2, "22 2222 2222", 2)
+        self.set_phone_number(2, "[phone]", 2)
         # Work Mobile
-        self.set_phone_number(3, "33 3333 3333", 3)
+        self.set_phone_number(3, "[phone]", 3)
         # Other
-        self.set_phone_number(4, "44 4444 4444", 4)
+        self.set_phone_number(4, "[phone]", 4)
 
         # Save contact
         self.main_window.save()
@@ -255,11 +255,11 @@
             objectName="phones")
         self.assertThat(phone_group.detailsCount, Eventually(Equals(5)))
 
-        phones = {"00 0000 0000" : "Home",
-                  "11 1111 1111" : "Work",
-                  "22 2222 2222" : "Mobile",
-                  "33 3333 3333" : "Work Mobile",
-                  "44 4444 4444" : "Other"}
+        phones = {"[phone]" : "Home",
+                  "[phone]" : "Work",
+                  "[phone]" : "Mobile",
+                  "[phone]" : "Work Mobile",
+                  "[phone]" : "Other"}
 
         # Check if they have the correct label
         for idx in range(5):

=== modified file 'tests/autopilot/address_book_app/tests/test_data.py'
--- tests/autopilot/address_book_app/tests/test_data.py	2014-03-01 12:07:36 +0000
+++ tests/autopilot/address_book_app/tests/test_data.py	2014-05-16 20:35:15 +0000
@@ -42,7 +42,7 @@
         phone = data.Phone.make()
 
         self.assertEqual(phone.type, 'Mobile')
-        self.assertEqual(phone.number, '81 8777 7755')
+        self.assertEqual(phone.number, '[phone]')
 
     def test_make_phone_with_unknown_type(self):
         """Test the error when we try to create a phone with a wrong type."""

=== modified file 'tests/autopilot/address_book_app/tests/test_edit_contact.py'
--- tests/autopilot/address_book_app/tests/test_edit_contact.py	2014-03-26 19:30:14 +0000
+++ tests/autopilot/address_book_app/tests/test_edit_contact.py	2014-05-16 20:35:15 +0000
@@ -15,9 +15,10 @@
 
 class TestEditContact(AddressBookAppTestCase):
     """Tests edit a contact"""
+    PHONE_NUMBERS = ['[phone]', '[phone]', '[phone]']
 
     def test_add_new_phone(self):
-        self.add_contact("Fulano", "de Tal", ["3321 2300"])
+        self.add_contact("Fulano", "de Tal", [self.PHONE_NUMBERS[0]])
         edit_page = self.edit_contact(0)
 
         # Add a new phone
@@ -30,7 +31,7 @@
         phone_number_1 = self.main_window.select_single(
             "TextInputDetail",
             objectName="phoneNumber_1")
-        self.type_on_field(phone_number_1, "22 2222 2222")
+        self.type_on_field(phone_number_1, self.PHONE_NUMBERS[1])
 
         self.main_window.save()
 
@@ -48,11 +49,11 @@
         phone_label_1 = view_page.select_single(
             "Label",
             objectName="label_phoneNumber_1.0")
-        self.assertThat(phone_label_1.text, Eventually(Equals("22 2222 2222")))
+        self.assertThat(phone_label_1.text, Eventually(Equals(self.PHONE_NUMBERS[1])))
 
     def test_remove_phone(self):
-        self.add_contact("Fulano", "de Tal", ["3321 2300", "3321 2301"])
-        self.edit_contact(0)
+        self.add_contact("Fulano", "de Tal", self.PHONE_NUMBERS[1:3])
+        edit_page = self.edit_contact(0)
 
         # clear phone 1
         phone_number_1 = self.main_window.select_single(
@@ -74,7 +75,7 @@
         phone_label_1 = view_page.select_single(
             "Label",
             objectName="label_phoneNumber_0.0")
-        self.assertThat(phone_label_1.text, Eventually(Equals("3321 2300")))
+        self.assertThat(phone_label_1.text, Eventually(Equals(self.PHONE_NUMBERS[1])))
 
     def test_add_email(self):
         self.add_contact("Fulano", "")