Merge trunk

(bzr r2616.7.10)

2 files changed, 33 insertions, 8 deletions

diff --git a/manual-tests/Hud.txt b/manual-tests/Hud.txt
index d3d4ac445..1bf527b5d 100644
--- a/manual-tests/Hud.txt
+++ b/manual-tests/Hud.txt
@@ -1,6 +1,6 @@
 Alt+Enter Crash
 ---------------
-Tests that Alt+Enter does not cause unity to crash (LP: #960957)
+Test that Alt+Enter does not cause Compiz/Unity to crash (LP: #960957)
 
 Setup:
 
@@ -11,4 +11,4 @@ Expected Result:
 Nothing happens
 
 Wrong Result:
- Unity/compiz crashes
+ Unity/Compiz crashes
diff --git a/manual-tests/Launcher.txt b/manual-tests/Launcher.txt
index adad15ece..0b1206518 100644
--- a/manual-tests/Launcher.txt
+++ b/manual-tests/Launcher.txt
@@ -92,6 +92,7 @@ This test verifies that dragging icons to the trash removes them from the
 launcher, and that the animation is smooth.
 
 Setup:
+#. Ensure that you have multiple applications running or pinned to the launcher
 
 Actions:
 #. Move mouse pointer over an application or device icon (not BFB, Workspace switcher or trash)
@@ -110,6 +111,7 @@ Dragging icons to reorder - initial position
 This test is all position of the dragged image in relation to the mouse pointer.
 
 Setup:
+#. Ensure that you have multiple applications running or pinned to the launcher
 
 Actions:
 #. Move the mouse so it is over a launcher icon for an application
@@ -128,6 +130,7 @@ This test is all about the smoothness of the animation around the reordering
 of icons in the launcher.
 
 Setup:
+#. Ensure that you have multiple applications running or pinned to the launcher
 
 Actions:
 #. Move the mouse so it is over a launcher icon for an application
@@ -135,13 +138,15 @@ Actions:
 #. Drag the icon up and down over the icons in the launcher
 
 Expected Result:
- * As the centre of the dragged icon passes the mid-point of the next item
- above or below it, the icon being dragged over moves and is replaced by the
- blank "space".
+ * As the center of the dragged icon passes the mid-point of the next item
+ above or below it, the icon being dragged over moves and is replaced by the
+ blank "space".
 * The animation should be smooth
 * If the dragged icon is moved rapidly, multiple icons can be moving either
- upwards or downwards as the space is moved into place under the dragged icon
- * The BFB and the switcher icons do not move
+ upwards or downwards as the space is moved into place under the dragged icon
+ * Dragging the second application icon (the third icon of the launcher) below
+ the BFB or above the workspace switcher should be possible.
+ * The BFB and the workspace switcher icons do not move
 
 
 Dragging icons to reorder - away from launcher
@@ -149,6 +154,7 @@ Dragging icons to reorder - away from launcher
 This test is about reordering the icons without the animation showing.
 
 Setup:
+#. Ensure that you have multiple applications running or pinned to the launcher
 
 Actions:
 #. Move the mouse so it is over a launcher icon for an application
@@ -161,7 +167,7 @@ Expected Result:
 * As the icon is dragged away from the launcher, the "space" is closed up
 and replaced with a grey line.
 * As the icon is dragged up and down, the line moves between other launcher
- icons.
+ icons of the same type.
 * When released, the icon "flies" back into the launcher, a spaces opens for
 it, and the any pips for running apps show again.
 
@@ -171,6 +177,7 @@ Dragged launcher icons out of the launcher are properly drawn
 This test ensures that the launcher icons out of the launcher are properly drawn
 
 Setup:
+#. Ensure that you have multiple applications running or pinned to the launcher
 
 Actions:
 #. Move the mouse so it is over a launcher icon for an application
@@ -677,3 +684,21 @@ Actions:
 
 Expected Results:
 * The gedit window must not flicker behind the launcher.
+
+
+Custom background color works
+-----------------------------
+This test ensures that the custom background color (set via ccsm) works correctly.
+
+Setup: 
+#. Ensure that ccsm is installed (package compizconfig-settings-manager)
+
+Actions: 
+#. Open ccsm
+#. Click on Ubuntu Unity Plugin
+#. Choose Experimental tab, click on Background Color, set Color name to #000000 and Opacity to 180
+
+Expected Result:
+ The background color of the Launcher is black, and the icons are still visible.
+ The Launcher must stay black when Dash or HUD are opened, and the color must
+ be persistent between sessions (logout/login).