dialer-app

Merge lp:~tiagosh/dialer-app/fix-1410500 into lp:dialer-app

  1. fix-1410500
  2. Merge into trunk
Proposed by Tiago Salem Herrmann
Status: Merged
Approved by: Gustavo Pichorim Boiko
Approved revision: 339
Merged at revision: 347
Proposed branch: lp:~tiagosh/dialer-app/fix-1410500
Merge into: lp:dialer-app
Diff against target: 81 lines (+43/-2)
3 files modified
src/qml/HistoryPage/HistoryDelegate.qml (+1/-1)
src/qml/HistoryPage/HistoryDetailsPage.qml (+17/-1)
tests/autopilot/dialer_app/tests/test_calls.py (+25/-0)
To merge this branch: bzr merge lp:~tiagosh/dialer-app/fix-1410500
Reviewer Review Type Date Requested Status
Gustavo Pichorim Boiko (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+247063@code.launchpad.net

Commit message

Change HistoryDetailsPage to display the exact phone number that was used on each call and populate the Dialpad accordingly.

Description of the change

Change HistoryDetailsPage to display the exact phone number that was used on each call and populate the Dialpad accordingly.

--Checklist--
Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~boiko/history-service/store_remote_participant_id/+merge/246710

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/dialer-app) on device or emulator?
Yes

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

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

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

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:337
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/504/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/888
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/418
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/778
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/886
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/886/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17249
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/341
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/473
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/473/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/504/rebuild

review: Needs Fixing (continuous-integration)
lp:~tiagosh/dialer-app/fix-1410500 updated
338. By Tiago Salem Herrmann

merge trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:338
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/506/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/16
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1031/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/478
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/912/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1029
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1029/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17524
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/386
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/584
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/584/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/506/rebuild

review: Needs Fixing (continuous-integration)
lp:~tiagosh/dialer-app/fix-1410500 updated
339. By Tiago Salem Herrmann

add autopilot test

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:339
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/508/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/18
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1060/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/496
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/938/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1058
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1058/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17576
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/399
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/602
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/602/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/508/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

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.
No, but not related to the changes

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/qml/HistoryPage/HistoryDelegate.qml'
--- src/qml/HistoryPage/HistoryDelegate.qml 2014-10-21 14:19:11 +0000
+++ src/qml/HistoryPage/HistoryDelegate.qml 2015-01-28 21:11:55 +0000
@@ -51,7 +51,7 @@
51 }51 }
5252
53 // clicking an item only populates the dialpad view, it doesn't call directly53 // clicking an item only populates the dialpad view, it doesn't call directly
54 mainView.populateDialpad(participant.phoneNumber, mainView.account ? mainView.account.accountId : "");54 mainView.populateDialpad(model.remoteParticipant, mainView.account ? mainView.account.accountId : "");
55 }55 }
5656
57 function selectCallType() {57 function selectCallType() {
5858
=== modified file 'src/qml/HistoryPage/HistoryDetailsPage.qml'
--- src/qml/HistoryPage/HistoryDetailsPage.qml 2015-01-08 21:23:40 +0000
+++ src/qml/HistoryPage/HistoryDetailsPage.qml 2015-01-28 21:11:55 +0000
@@ -256,14 +256,30 @@
256 left: parent.left256 left: parent.left
257 verticalCenter: parent.verticalCenter257 verticalCenter: parent.verticalCenter
258 }258 }
259 verticalAlignment: Qt.AlignVCenter
260 }
261
262 Label {
263 id: remoteParticipantId
264 // FIXME: we need to check if the id is actually a phone number
265 text: PhoneUtils.PhoneUtils.format(modelData.remoteParticipant)
266 anchors {
267 left: timeLabel.right
268 leftMargin: units.gu(1)
269 verticalCenter: parent.verticalCenter
270 }
259 color: UbuntuColors.lightAubergine271 color: UbuntuColors.lightAubergine
260 verticalAlignment: Qt.AlignVCenter272 verticalAlignment: Qt.AlignVCenter
273 MouseArea {
274 anchors.fill:parent
275 onClicked: mainView.populateDialpad(modelData.remoteParticipant, mainView.account ? mainView.account.accountId : "");
276 }
261 }277 }
262278
263 Label {279 Label {
264 id: simLabel280 id: simLabel
265 anchors {281 anchors {
266 left: timeLabel.right282 left: remoteParticipantId.right
267 leftMargin: units.gu(1)283 leftMargin: units.gu(1)
268 verticalCenter: timeLabel.verticalCenter284 verticalCenter: timeLabel.verticalCenter
269 }285 }
270286
=== modified file 'tests/autopilot/dialer_app/tests/test_calls.py'
--- tests/autopilot/dialer_app/tests/test_calls.py 2014-09-30 00:49:13 +0000
+++ tests/autopilot/dialer_app/tests/test_calls.py 2015-01-28 21:11:55 +0000
@@ -170,3 +170,28 @@
170 except MismatchError as e:170 except MismatchError as e:
171 print('Expected failure due to known Mir crash '171 print('Expected failure due to known Mir crash '
172 '(https://launchpad.net/bugs/1240400): %s' % e)172 '(https://launchpad.net/bugs/1240400): %s' % e)
173
174 def test_last_called_number(self):
175 number = "1234567"
176 formattedNumber = "1 234-567"
177
178 number2 = "1231234567"
179 formattedNumber2 = "1 231-234-567"
180
181 self.main_view.dialer_page.call_number(number, formattedNumber)
182 time.sleep(1)
183 self.main_view.live_call_page.click_hangup_button()
184 self.main_view.dialer_page.active.wait_for(True)
185
186 self.main_view.dialer_page.call_number(number2, formattedNumber2)
187 time.sleep(1)
188 self.main_view.live_call_page.click_hangup_button()
189 self.main_view.dialer_page.active.wait_for(True)
190
191 self.main_view.dialer_page.reveal_bottom_edge_page()
192 self.assertThat(self.history_list.visible, Eventually(Equals(True)))
193 self.assertThat(self.history_list.count, Eventually(Equals(1)))
194 historyEntry = self.get_history_for_number(number)
195 self.main_view._click_button(historyEntry)
196 self.assertThat(
197 self.main_view.dialer_page.dialNumber, Eventually(Equals(formattedNumber2)))

Subscribers

People subscribed via source and target branches