Merge lp:~aacid/unity-2d/unity-2d_test_launcher_show_desktop into lp:unity-2d

[Albert Astals Cid]

[test] Check that showing the desktop shows also the launcher

[Gerry Boland (gerboland)]

Ctrl+Alt+D is not the correct keystroke for this, see the Google Doc on Shortcuts.

I suggest you use Xdo::Window.toggle_minimize_all which pretty much does the same thing

I'd also prefer a mode descriptive name like "check launcher shows when show-desktop triggered"

review: Needs Fixing

[lp:~aacid/unity-2d/unity-2d_test_launcher_show_desktop]

850. By Albert Astals Cid on 2012-01-17

Use XDo::XWindow.toggle_minimize_all instead ctrl+alt+d

According to Gerry it's the same, just more portable to different configs

851. By Albert Astals Cid on 2012-01-17

Eeeek, forgot to remove this

852. By Albert Astals Cid on 2012-01-17

This has a testability test now

=== modified file 'tests/launcher/autohide_show_tests.rb'
--- tests/launcher/autohide_show_tests.rb	2012-01-17 11:25:32 +0000
+++ tests/launcher/autohide_show_tests.rb	2012-01-17 15:30:38 +0000
@@ -213,5 +213,22 @@
                   'terminal does not have focus when it should' )
     xid.close!
   end
+  
+  test "Launcher visible on show-desktop" do
+    xid = open_window_at(10,100)
+    sleep 0.5
+    assert_equal( Integer(@app.Unity2dPanel()['x_absolute']), -WIDTH, \
+                  'Launcher visible with window in the way, should be hidden' )
+    XDo::XWindow.toggle_minimize_all # This is effectively the show-desktop shortcut
+    sleep 2
+    assert_equal( Integer(@app.Unity2dPanel()['x_absolute']), 0, \
+                  'Launcher hiding after triggering show-desktop, should be visible' )
+
+    XDo::XWindow.toggle_minimize_all
+    sleep 2
+    assert_equal( Integer(@app.Unity2dPanel()['x_absolute']), -WIDTH, \
+                  'Launcher visible with window in the way, should be hidden' )
+    xid.close!
+  end
 
 end

=== modified file 'tests/manual-tests/launcher.txt'
--- tests/manual-tests/launcher.txt	2011-12-07 15:01:18 +0000
+++ tests/manual-tests/launcher.txt	2012-01-17 15:30:38 +0000
@@ -77,12 +77,6 @@
 -> Launcher is hidden - The launcher should not still be visible when you have the mouse on the top panel (lp:892004)
 
 ----
- * Open an application & maximize the same
- * Hit show-desktop shortcut [Ctrl+Alt+D?] key to see the Desktop
-
---> Launcher is revealed - Showing the Desktop should reveal launcher (lp:898161)
-
-----
  
  * Drag a file(example .txt) onto a tile(gedit) in the launcher