makes sure right click on a launcher icon while in expo exits it, remove equivalent manual-test

(bzr r2616.7.8)

2 files changed, 14 insertions, 15 deletions

diff --git a/manual-tests/Launcher.txt b/manual-tests/Launcher.txt
index ac95e198a..adad15ece 100644
--- a/manual-tests/Launcher.txt
+++ b/manual-tests/Launcher.txt
@@ -260,21 +260,6 @@ Expected Result:
 compiz process should be much lower than 50.
 
 
-Test Quicklist while on Expo
------------------------------
-This test shows how the launcher quicklists work when the expo plugin is activated.
-
-Setup:
-#. Start with a clear screen
-#. Press Super+S or select the workspace switcher on the launcher
-
-Actions:
-#. When the workspace switcher is running, right-click over a launcher icon
-
-Expected Result:
- The expo should terminate, and the quicklist should be shown once the
- workspace switcher has been closed.
-
 Test highlight BFB
 -------------------
 This test shows that the BFB launcher icon highlights during key navigation.
diff --git a/tests/autopilot/unity/tests/launcher/test_icon_behavior.py b/tests/autopilot/unity/tests/launcher/test_icon_behavior.py
index 798283d21..ea21d8d64 100644
--- a/tests/autopilot/unity/tests/launcher/test_icon_behavior.py
+++ b/tests/autopilot/unity/tests/launcher/test_icon_behavior.py
@@ -150,6 +150,20 @@ class LauncherIconsTests(LauncherTestCase):
 self.assertThat(calc_icon, NotEquals(None))
 self.assertThat(calc_icon.visible, Eventually(Equals(True)))
 
+ def test_right_click_on_icon_ends_expo(self):
+ """Right click on a launcher icon in expo mode must end the expo
+ and show the quicklist.
+
+ """
+ self.keybinding("expo/start")
+ self.addCleanup(self.keybinding, "expo/cancel")
+
+ bfb = self.launcher.model.get_bfb_icon()
+ self.mouse.move(bfb.center_x, bfb.center_y)
+ self.mouse.click(button=3)
+
+ self.assertThat(self.launcher_instance.quicklist_open, Eventually(Equals(True)))
+
 
 class LauncherDragIconsBehavior(LauncherTestCase):
 """Tests dragging icons around the Launcher."""