merge

(bzr r2601.4.2)

6 files changed, 301 insertions, 52 deletions

diff --git a/manual-tests/Dash.txt b/manual-tests/Dash.txt
index 2a3e9c0c2..6e3dec861 100644
--- a/manual-tests/Dash.txt
+++ b/manual-tests/Dash.txt
@@ -27,26 +27,6 @@ Expected Result:
 that lasts longer than that is not considered a tap.
 
 
-Dash SearchBar middle-click
-Note: Should be automated
----------------------------
-This test shows how the middle click over the dash search bar should work
-(see lp:842462)
-
-Setup:
-
-Actions:
-#. Select this text with you mouse.
-#. Press Super or Alt+F2 to open the Dash
-#. Move the mouse cursor over the dash search entry box.
-#. Middle click.
-
-Expected Result:
- The text previously selected is pasted on the search bar at mouse pointer
- position, if the operation is repeated the text is inserted where
- the mouse pointer is.
-
-
 Dash correct number of "see more" results with horizontal renderer
 ---------------------------
 This test ensures a correct number of "see more" results in the dash when using a horizontal renderer
diff --git a/manual-tests/Hud.txt b/manual-tests/Hud.txt
index ad1c773da..bbe30fc44 100644
--- a/manual-tests/Hud.txt
+++ b/manual-tests/Hud.txt
@@ -16,21 +16,46 @@ Expected Result:
 If the hud does not disappear, this test failed.
 If the buttons under the search box do not highlight, this test failed.
 
+<<<<<<< TREE
 Alt+Arrow keys not passed to application
 ----------------------------------------
 Tests that Alt+ArrowKey events are correctly passed to the active window
 when Unity is not responding to them.
+=======
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 Note: Should be automated
+=======
+Hud Dismiss
+----------
+This test ensures that the hud is dismissable
+>>>>>>> MERGE-SOURCE
 
 Setup:
+<<<<<<< TREE
 #. Open gnome-terminal
+=======
+>>>>>>> MERGE-SOURCE
 
 Actions:
+<<<<<<< TREE
 #. While holding Alt, tap arrow keys: Up, Down, Right, Left
+=======
+#. Tap Alt
+#. Type "test"
+#. Press escape
+#. Click anywhere on the screen that is not the hud interface
+>>>>>>> MERGE-SOURCE
 
 Expected Result:
+<<<<<<< TREE
 The terminal should show the keycodes were received as text "ABCD".
+=======
+ After pressing escape in step three, the text "test" should be removed from the hud search
+ After step four, the hud should dismiss itself and not be present.
+
+>>>>>>> MERGE-SOURCE
 
 Alt+Enter Crash
 ---------------
diff --git a/manual-tests/Launcher.txt b/manual-tests/Launcher.txt
index 9194611f0..19a4a5d87 100644
--- a/manual-tests/Launcher.txt
+++ b/manual-tests/Launcher.txt
@@ -696,8 +696,26 @@ Expected Result:
 * See https://bugs.launchpad.net/unity/+bug/980942/+attachment/3059914/+files/launcher-accordion-effect-tooltip-bug.ogv.
 
 
+Stop SD card by dragging it's icon to trash
+---------------------------------------------------
+
+Setup:
+ * Have an SD Card reader and an SD Card
+
+Actions:
+ * Insert the SD card into the SD card reader.
+ * Wait for the SD card to mount.
+ * Drag and drop the SD card icon into the trash.
+
+Expected result:
+ * The SD card launcher icon appears in the launcher after the SD card is mounted
+ * After the icon is dragged into the trash, the SD card is "stopped"
+ * A notification appears, stating that the SD card has been stopped.
+
+
 No flickering when resizing the launcher
 -----------------------------------------
+
 Actions:
 * Open gedit.
 * Maximize it. Make sure it remains maximized during the test.
diff --git a/manual-tests/Panel.txt b/manual-tests/Panel.txt
index dbe89dd39..d36af4588 100644
--- a/manual-tests/Panel.txt
+++ b/manual-tests/Panel.txt
@@ -20,22 +20,6 @@ Expected Result:
 Once all the maximized windows are closed, restored or not visible,
 the panel should go back to its defined opacity.
 
-Panel Double Clicks
--------------------
-This test shows how the double click over the top panel should work.
-
-Setup:
-
-Actions:
-#. Start with a clear screen
-#. Open a window and maximize it
-#. Double-click on the top-panel grab area (the empty area between the menus and
- the indicators).
-
-Expected Result:
- The maximized window should restore. If no maximized window is available on
- the current workspace, nothing should happen.
-
 Menu Color
 ----------
 This test shows the color of the menus using the Ambiance theme:
diff --git a/manual-tests/Preview.txt b/manual-tests/Preview.txt
new file mode 100644
index 000000000..77050010d
--- /dev/null
+++ b/manual-tests/Preview.txt
@@ -0,0 +1,258 @@
+Preview Tests
+=============
+
+Application Preview Open
+------------
+This tests that the dash preview opens using mouse right-click
+
+Setup:
+#. Open application lens (Super+A)
+#. Enter arbitrary search string and ensure a result is available.
+
+Actions:
+#. Right-click the mouse on one of the results.
+
+Expected Result:
+ A application preview view will replace the dash lens view.
+ If multiple results were available in the dash, there will be navigator
+ buttons on either side of the preview.
+
+
+File Preview Open
+------------
+This tests that the dash preview opens using mouse right-click
+
+Setup:
+#. Open file lens (Super+F)
+#. Enter arbitrary search string and ensure a result is available.
+
+Actions:
+#. Right-click the mouse on one of the results.
+
+Expected Result:
+ A file preview view will replace the dash lens view.
+ If multiple results were available in the dash, there will be navigator
+ icons on either side of the preview.
+
+
+Music Preview Open
+note: Should be automated.
+------------
+This tests that the dash preview opens using mouse right-click
+
+Setup:
+#. Open music lens (Super+M)
+#. Enter arbitrary search string and ensure a result is available.
+
+Actions:
+#. Right-click the mouse on one of the results.
+
+Expected Result:
+ A music preview view will replace the dash lens view.
+ If multiple results were available in the dash, there will be navigator
+ icons on either side of the preview.
+
+
+Video Preview Open
+note: Should be automated.
+------------
+This tests that the dash preview opens using mouse right-click
+
+Setup:
+#. Open video lens (Super+V)
+#. Enter arbitrary search string and ensure a result is available.
+
+Actions:
+#. Right-click the mouse on one of the results.
+
+Expected Result:
+ A video preview view will replace the dash lens view.
+ If multiple results were available in the dash, there will be navigator
+ icons on either side of the preview.
+
+
+Preview Left Navigation
+------------
+This tests the dash preview animation
+
+Setup:
+#. Open dash super
+#. Open a lens which supports previeing (eg Application, Music, File)
+#. Enter arbitrary search string and ensure at least 2 results are available.
+
+Actions:
+#. Right-click the mouse on at least the second result.
+#. Wait for the preview window to open and finish animating.
+#. Click the 'navigate left' icon.
+
+Expected Result:
+ The current preview will be replaced with a preview modelled on the previous result
+ in the dash.
+ 
+
+Preview Right Navigation
+------------
+This tests the dash preview animation
+
+Setup:
+#. Open dash super
+#. Open a lens which supports previeing (eg Application, Music, File)
+#. Enter arbitrary search string and ensure at least 2 results are available.
+
+Actions:
+#. Right-click the mouse on at most the second last result.
+#. Wait for the preview window to open and finish animating.
+#. Click the 'navigate right' icon.
+
+Expected Result:
+ The current preview will be replaced with a preview modelled on the next result
+ in the dash.
+
+
+Preview Open Animation
+note: Should be automated.
+------------
+This tests the dash preview open animation
+
+Setup:
+#. Open dash super
+#. Open a lens which supports previeing (eg Application, Music, File)
+#. Enter arbitrary search string and ensure a result is available.
+
+Actions:
+#. Open preview for result.
+
+Expected Result:
+ A preview will open by animating a swipe from left to right using an
+ ease in-out curve progression.
+
+
+Preview Left Navigation Animation
+note: Should be automated.
+------------
+This tests the dash preview navigate left animation
+
+Setup:
+#. Open dash super
+#. Open a lens which supports previeing (eg 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.
+
+Actions:
+#. Click the 'navigate left' icon.
+
+Expected Result:
+ The current preview will swipe out and the new prevew result will swipe from right
+ to left using an ease in-out curve progression.
+
+
+Preview Right Navigation Animation
+note: Should be automated.
+------------
+This tests the dash preview navigate right animation
+
+Setup:
+#. Open dash super
+#. Open a lens which supports previeing (eg 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.
+
+Actions:
+#. Click the navigate right icon.
+
+Expected Result:
+ The current preview will swipe out and the new prevew result will swipe from right
+ to left using an ease in-out curve progression.
+
+
+Preview Navigate Many
+------------
+This tests the dash preview multi-navigation support
+
+Setup:
+#. Open dash super
+#. Open a lens which supports previeing (eg Application, Music, File)
+#. Enter arbitrary search string and ensure at least 3 results are available.
+#. Right-click first result.
+#. Wait for the preview window to open and finish animating.
+
+Actions:
+#. Click 'navigate right' icon twice quickly.
+
+Expected Result:
+ The current preview will swipe out, being replaced intermittently by the next preview,
+ which will then be replaced by the next preview.
+
+
+Preview Music Tracks
+note: Should be automated.
+------------
+This tests the dash music preview track play
+
+Setup:
+#. Open music lens (Super+M)
+#. Enter arbitrary search string and ensure a result is available.
+
+Actions:
+#. Open a preview for a result.
+
+Expected Result:
+ A music preview will open and tracks for the music result will be populated.
+ The Track information will contain a title and duration.
+
+
+Preview Music Play
+note: Should be automated.
+------------
+This tests the dash music preview track play
+
+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.
+
+Actions:
+#. Play first track.
+
+Expected Result:
+ 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
+note: Should be automated.
+------------
+This tests the dash preview preview navigate right animation
+
+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.
+
+Actions:
+#. Pause playing track.
+
+Expected Result:
+ Music Player daemon will pause the playing track and update it's status
+ to paused. Progress will stop incresing.
+
+
+Preview Application Launch
+note: Should be automated.
+------------
+This tests the dash application preview launch action
+
+Setup:
+#. Open application lens (Super+F)
+#. Enter 'gedit' search string.
+#. Wait for result.
+#. Open preview for result. (Right-click)
+
+Actions:
+#. Click 'Launch' action button.
+
+Expected Result:
+ Preview should close and launch the gedit application.
diff --git a/manual-tests/Switcher.txt b/manual-tests/Switcher.txt
index a78c408ff..6187d3564 100644
--- a/manual-tests/Switcher.txt
+++ b/manual-tests/Switcher.txt
@@ -24,22 +24,6 @@ Scenario 2:
 Firefox is shown in the alt-tab switcher, but the terminal on workspace 1 is not.
 
 
-Panel on Alt+Tab
-----------------
-This tests that the panel title changes with Alt+Tab
-
-Setup:
-#. Open some new applications
-
-Actions:
-#. Press Alt+Tab
-
-Expected Result:
- When you press Alt+Tab to switch window, the application title in the top left
- of the panel should change inline with changes in alt-tab focus.
- Also the menus shouldn't ever show. Even if the mouse has been left over
- the panel when starting the Alt+Tab.
-
 Full app title in Chinese
 -------------------------
 This test ensures that the App Switcher (Alt+Tab) displays the full title