Merge lp:~mandel/unity/no-global-search-previews into lp:unity

[Manuel de la Peña]

- Check that the previews are not shown when stealing input (LP:1050967).

- Check that the previews are not shown when stealing input (LP:1050967).

To test you can do the following:

Launch dash
Show Music preview
Type like crazy
ESC -> search bar should have no input.

[Brandon Schaefer (brandontschaefer)]

The code looks good but this would be very easy to add a test. Here is what an AP test for this, please add it and Ill re-review it :).

http://paste.ubuntu.com/1205779/

Add it under:
unity/tests/autopilot/unity/tests/test_dash.py

Under the class PreviewInvocationTests(DashTestCase):

review: Needs Fixing

[lp:~mandel/unity/no-global-search-previews]

2694. By Manuel de la Peña on 2012-09-17

Added tests for the new functionality.

2695. By Manuel de la Peña on 2012-09-17

Merged with trunk.

[Manuel de la Peña (mandel)]

> The code looks good but this would be very easy to add a test. Here is what an
> AP test for this, please add it and Ill re-review it :).
>
> http://paste.ubuntu.com/1205779/
>
> Add it under:
> unity/tests/autopilot/unity/tests/test_dash.py
>
> Under the class PreviewInvocationTests(DashTestCase):

Thx, I have added the test you suggested, next branch I propose will already have them :)

[Brandon Schaefer (brandontschaefer)]

No problem, but some a little problem.

The tab spaces for the AP are 4 not 2 ( I should have mentioned that)

The other problem is you have the test under the class DashCrossMonitorsTests, which means it will get skipped if the testing machine doesn't have more then 1 monitor. (So moving the test under the class PreviewInvocationTests(DashTestCase): would fix that problem) :)

review: Needs Fixing

[Brandon Schaefer (brandontschaefer)]

No problem, but some a little problem.

*No problem, but still a little problem.

[lp:~mandel/unity/no-global-search-previews]

2696. By Manuel de la Peña on 2012-09-18

Place the test in the correct test case.

[Manuel de la Peña (mandel)]

> No problem, but some a little problem.
>
> The tab spaces for the AP are 4 not 2 ( I should have mentioned that)

All the python code I added is using tabspaces to 4 unless vim is lying (ts=4; expandtab; retab)

>
> The other problem is you have the test under the class DashCrossMonitorsTests,
> which means it will get skipped if the testing machine doesn't have more then
> 1 monitor. (So moving the test under the class
> PreviewInvocationTests(DashTestCase): would fix that problem) :)

I'm stupid, I just appended the test to the last test case.

[Brandon Schaefer (brandontschaefer)]

Sorry, I must have been blind! Looks good :) +1

review: Approve

[Brandon Schaefer (brandontschaefer)]

Well this seems to be fixed in trunk now...(Im not sure when that happened...)

[Manuel de la Peña (mandel)]

I think niel or didier where talking about it and pushed it to trunk (reading the irc backlog). No a problem :)

Unmerged revisions

2696. By Manuel de la Peña on 2012-09-18

Place the test in the correct test case.

2695. By Manuel de la Peña on 2012-09-17

Merged with trunk.

2694. By Manuel de la Peña on 2012-09-17

Added tests for the new functionality.

2693. By Manuel de la Peña on 2012-09-14

Check that the previews are not displayed when we still the input.

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2012-09-17 10:00:38 +0000
+++ dash/DashView.cpp	2012-09-18 09:11:20 +0000
@@ -1046,7 +1046,7 @@
     }
   }
 
-  if (search_key || search_bar_->im_preedit)
+  if (!preview_displaying_ && (search_key || search_bar_->im_preedit))
   {
     // then send the event to the search entry
     return search_bar_->text_entry();

=== modified file 'tests/autopilot/unity/tests/test_dash.py'
--- tests/autopilot/unity/tests/test_dash.py	2012-09-18 01:41:46 +0000
+++ tests/autopilot/unity/tests/test_dash.py	2012-09-18 09:11:20 +0000
@@ -726,6 +726,21 @@
 
         self.assertThat(self.dash.preview_displaying, Eventually(Equals(False)))
 
+    def test_dash_searchbar_loses_keyfocus_in_preview(self):
+        """When in preview mode the SearchBar must not have focus."""
+        lens = self.dash.reveal_file_lens()
+        self.addCleanup(self.dash.ensure_hidden)
+
+        category = lens.get_category_by_name("Folders")
+        results = category.get_results()
+        result = results[0]
+        # result.preview handles finding xy co-ords and right mouse-click
+        result.preview()
+        self.assertThat(self.dash.preview_displaying, Eventually(Equals(True)))
+        self.keyboard.type("NoFocus")
+        self.keyboard.press_and_release("Escape")
+        self.assertThat(self.dash.search_string, Equals(""))
+
 
 class PreviewNavigateTests(DashTestCase):
     """Tests that mouse navigation works with previews."""