Merging with trunk

(bzr r2529.14.147)

3 files changed, 68 insertions, 11 deletions

diff --git a/manual-tests/Dash.txt b/manual-tests/Dash.txt
index 9ab7579ca..9174f8ceb 100644
--- a/manual-tests/Dash.txt
+++ b/manual-tests/Dash.txt
@@ -100,6 +100,19 @@ Expected result:
 * When a single row of results isn't enough to contain all returned search results, and there are no other category headers, the displayed category
 header expands automatically
 
+
+Test the Panel does not lose track of when the Dash is opened then closed.
+--------------------------------------------------------------------------
+This tests shows the panel will not think the Dash is opened when it is closed.
+(see lp:1044086)
+
+Actions:
+#. Press Super twice (Quickly)
+
+Expected Result:
+ The screen should look the same as if you had never opened the dash.
+
+
 Filter Results Tests
 ========================
 These tests show that the dash "All" button works well.
diff --git a/manual-tests/Launcher.txt b/manual-tests/Launcher.txt
index adc77fee5..fa5e5268b 100644
--- a/manual-tests/Launcher.txt
+++ b/manual-tests/Launcher.txt
@@ -106,6 +106,25 @@ Expected Result:
 * The operation should NOT LOOK LIKE THIS: https://bugs.launchpad.net/unity/+bug/932365/+attachment/2739868/+files/out-2.ogv
 
 
+Drag file to Trash
+------------------
+
+This test verifies that dragging file icons from File Lens to trash moves
+the file to ~/Trash folder and removes it from File Lens results.
+
+Setup:
+#. Create a file via Nautilus > File > Create New Document.
+
+Actions:
+#. Open the Dash - File Lens
+#. Find the new file in File Lens results and drag it to the Trash icon on the launcher.
+#. Open the Dash - File Lens again.
+
+Expected Result:
+ * The file is no longer listed by File Lens.
+ * The file has been moved to ~/Trash folder.
+
+
 Dragging icons to reorder - initial position
 --------------------------------------------
 This test is all position of the dragged image in relation to the mouse pointer.
diff --git a/manual-tests/Preview.txt b/manual-tests/Preview.txt
index 4b6e6093c..47a9770c6 100644
--- a/manual-tests/Preview.txt
+++ b/manual-tests/Preview.txt
@@ -5,7 +5,7 @@ This tests the dash preview open animation
 
 Setup:
 #. Open dash super
-#. Open a lens which supports previeing (eg Application, Music, File)
+#. Open a lens which supports previewing (e.g. Application, Music, File)
 #. Enter arbitrary search string and ensure a result is available.
 
 Actions:
@@ -23,7 +23,7 @@ This tests the dash preview navigate left animation
 
 Setup:
 #. Open dash super
-#. Open a lens which supports previeing (eg Application, Music, File)
+#. Open a lens which supports previewing (e.g. Application, Music, File)
 #. Enter arbitrary search string and ensure at least 2 results are available.
 #. Right-click the mouse on at least the second result.
 #. Wait for the preview window to open and finish animating.
@@ -32,7 +32,7 @@ Actions:
 #. Click the 'navigate left' icon.
 
 Expected Result:
- The current preview will swipe out and the new prevew result will swipe from right
+ The current preview will swipe out and the new preview result will swipe from right
 to left using an ease in-out curve progression.
 
 
@@ -43,7 +43,7 @@ This tests the dash preview navigate right animation
 
 Setup:
 #. Open dash super
-#. Open a lens which supports previeing (eg Application, Music, File)
+#. Open a lens which supports previewing (e.g. Application, Music, File)
 #. Enter arbitrary search string and ensure at least 2 results are available.
 #. Right-click the mouse on at most the second last result.
 #. Wait for the preview window to open and finish animating.
@@ -52,7 +52,7 @@ Actions:
 #. Click the navigate right icon.
 
 Expected Result:
- The current preview will swipe out and the new prevew result will swipe from right
+ The current preview will swipe out and the new preview result will swipe from right
 to left using an ease in-out curve progression.
 
 
@@ -73,7 +73,7 @@ Expected Result:
 The Track information will contain a title and duration.
 
 
-Preview Music Play
+Preview Music Track Play
 note: Should be automated.
 ------------
 This tests the dash music preview track play
@@ -84,14 +84,16 @@ Setup:
 #. Open a preview for a result which contains tracks.
 
 Actions:
-#. Play first track.
+#. Hover over track number for the track you wish to play.
+#. Click play icon.
 
 Expected Result:
+ When hovering on track number, it will change to a play icon.
 Music Player daemon will start playing track and update status of the track
 in the preview to playing as well as update it's progress.
 
 
-Preview Music Pause
+Preview Music Track Pause
 note: Should be automated.
 ------------
 This tests the dash preview preview navigate right animation
@@ -100,14 +102,16 @@ Setup:
 #. Open music lens (Super+M)
 #. Enter arbitrary search string and ensure a result is available.
 #. Open a preview for a result which contains tracks.
-#. Play first track.
+#. Play first track. (by hovering+click on track number.)
 
 Actions:
-#. Pause playing track.
+#. Hover over pause icon for the track which is playing.
+#. Click pause icon.
 
 Expected Result:
+ When hovering on play icon, it will change to a pause icon.
 Music Player daemon will pause the playing track and update it's status
- to paused. Progress will stop incresing.
+ to paused. Progress will stop increasing.
 
 
 Preview Application Launch
@@ -126,3 +130,24 @@ Actions:
 
 Expected Result:
 Preview should close and launch the gedit application.
+
+
+Preview Open Geometry
+------------
+This tests the dash preview opens with the correct size and
+its geometry is updated when changing between form factor (desktop & netbook)
+
+Setup:
+#. Open dash super
+#. Ensure dash is in windowed mode (not full screen)
+#. Open a lens which supports previewing (e.g. Application, Music, File)
+#. Enter arbitrary search string and ensure a result is available.
+
+Actions:
+#. Open preview for result.
+#. Resize dash to full screen.
+#. Resize dash back to windowed mode.
+
+Expected Result:
+ A preview will open with the correct size initially (no size flicker).
+ When the dash is resized, the preview will center its geometry and stay the correct size.