Merge lp:~boiko/dialer-app/fix_1471306 into lp:dialer-app

[Gustavo Pichorim Boiko]

Always force dialer-app to go back to the dialpad view when all calls end.

Always force dialer-app to go back to the dialpad view when all calls end.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:435
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/581/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/94
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3444
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2868
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3441
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3441/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21927

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

review: Needs Fixing (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

Looks good to me.

review: Approve

=== modified file 'src/qml/LiveCallPage/LiveCall.qml'
--- src/qml/LiveCallPage/LiveCall.qml	2015-04-15 13:39:45 +0000
+++ src/qml/LiveCallPage/LiveCall.qml	2015-07-16 21:47:45 +0000
@@ -290,7 +290,7 @@
         interval: 1000
         repeat: false
         running: false
-        onTriggered: mainView.removeLiveCallView()
+        onTriggered: mainView.switchToKeypadView()
     }
  
     Timer {
@@ -301,8 +301,9 @@
         onTriggered: {
             if (!callManager.hasCalls) {
                 if (!mainView.greeterMode) {
-                    mainView.removeLiveCallView();
+                    mainView.switchToKeypadView();
                 }
+
                 // TODO: we can't be sure that the currentPage is a DialerPage instance
                 if (pageStackNormalMode.currentPage.dialNumber) {
                     pageStackNormalMode.currentPage.dialNumber = pendingNumberToDial;
 
=== modified file 'tests/autopilot/dialer_app/__init__.py'
--- tests/autopilot/dialer_app/__init__.py	2015-05-14 21:38:07 +0000
+++ tests/autopilot/dialer_app/__init__.py	2015-07-16 21:47:45 +0000
@@ -102,6 +102,9 @@
         """Return the swap calls button"""
         return self._get_call_hold_button()
 
+    def _get_new_call_button(self):
+        return self.wait_select_single(objectName='newCallButton')
+
     def get_multi_call_display(self):
         """Return the multi call display panel"""
         return self.wait_select_single(objectName='multiCallDisplay')
@@ -123,6 +126,10 @@
         """Click the swap calls button"""
         return self._click_button(self._get_swap_calls_button())
 
+    def click_new_call_button(self):
+        """Click the new call button"""
+        return self._click_button(self._get_new_call_button())
+
 
 class PageWithBottomEdge(MainView):
 
 
=== modified file 'tests/autopilot/dialer_app/helpers.py'
--- tests/autopilot/dialer_app/helpers.py	2015-04-27 22:15:19 +0000
+++ tests/autopilot/dialer_app/helpers.py	2015-07-16 21:47:45 +0000
@@ -41,30 +41,41 @@
         raise RuntimeError('timed out waiting for incoming phonesim call')
 
 
-def invoke_incoming_call(caller):
-    """Receive an incoming call from the given caller
-
-    :parameter caller: the phone number calling
-    """
-
+def run_script(script):
     # prepare and send a Qt GUI script to phonesim, over its private D-BUS
     # set up by ofono-phonesim-autostart
     script_dir = tempfile.mkdtemp(prefix="phonesim_script")
     os.chmod(script_dir, 0o755)
-    with open(os.path.join(script_dir, "call.js"), "w") as f:
-        f.write("""tabCall.gbIncomingCall.leCaller.text = "%s";
-tabCall.gbIncomingCall.pbIncomingCall.click();
-""" % (caller))
+    with open(os.path.join(script_dir, "script.js"), "w") as f:
+        f.write(script)
 
     with open("/run/lock/ofono-phonesim-dbus.address") as f:
         phonesim_bus = f.read().strip()
     bus = dbus.bus.BusConnection(phonesim_bus)
     script_proxy = bus.get_object("org.ofono.phonesim", "/")
     script_proxy.SetPath(script_dir)
-    script_proxy.Run("call.js")
+    script_proxy.Run("script.js")
     shutil.rmtree(script_dir)
 
 
+def invoke_incoming_call(caller):
+    """Receive an incoming call from the given caller
+
+    :parameter caller: the phone number calling
+    """
+
+    run_script("""tabCall.gbIncomingCall.leCaller.text = "%s";
+tabCall.gbIncomingCall.pbIncomingCall.click();
+""" % (caller))
+
+
+def hangup_call():
+    """Hangup an existing call. This only works when there is only one call"""
+
+    run_script("""tabCall.twCallMgt.selectColumn(0);
+tabCall.pbHangup.click();""")
+
+
 def accept_incoming_call():
     """Accept an existing incoming call"""
     subprocess.check_call(
 
=== modified file 'tests/autopilot/dialer_app/tests/test_calls.py'
--- tests/autopilot/dialer_app/tests/test_calls.py	2015-04-27 22:15:19 +0000
+++ tests/autopilot/dialer_app/tests/test_calls.py	2015-07-16 21:47:45 +0000
@@ -36,6 +36,10 @@
         self.useFixture(phonesim_modem)
         notification_mock = fixture_setup.MockNotificationSystem()
         self.useFixture(notification_mock)
+        memory_backend = fixture_setup.UseMemoryContactBackend()
+        self.useFixture(memory_backend)
+        preload_data = fixture_setup.PreloadVcards()
+        self.useFixture(preload_data)
         super().setUp()
 
     def tearDown(self):
@@ -172,3 +176,31 @@
         self.assertThat(
             self.main_view.dialer_page.dialNumber,
             Eventually(Equals(formattedNumber2)))
+
+    def test_call_ending_goes_to_dialpad(self):
+        """Make sure that when a call ends, the app goes back to dialpad"""
+        number = "1234567"
+        helpers.invoke_incoming_call(number)
+
+        # wait for incoming call, accept; it would be nicer to fake-click the
+        # popup notification, but as this isn't generated by dialer-app it
+        # isn't exposed to autopilot
+        helpers.wait_for_incoming_call()
+        time.sleep(1)  # let's hear the ringing sound for a second :-)
+        helpers.accept_incoming_call()
+
+        # call back is from that number
+        self.assertThat(
+            self.main_view.live_call_page.caller, Eventually(Equals(number)))
+
+        # now enter the contacts page and select the first contact
+        self.main_view.live_call_page.click_new_call_button()
+        self.main_view.contacts_page.open_contact(0)
+
+        # at this point we have a pagestack full of pages, so hanging up the
+        # call needs to clear that up
+        helpers.hangup_call()
+
+        # check that the dialpad view is there
+        self.assertThat(self.main_view.dialer_page.active,
+                        Eventually(Equals(True)))