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

[Albert Astals Cid]

[spread] Make toggling the spread from the launcher work

Make the connection for onViewVisibleChanged queued, this way when we get there the window has already been shown, otherwise the forceActivateWindow fails

Make toggling the spread from the launcher work

Make the connection for onViewVisibleChanged queued, this way when we get there the window has already been shown, otherwise the forceActivateWindow fails

No idea why i need the loop to wait for the spread in the test, but otherwise weird things happen

[Gerry Boland (gerboland)]

Being pedantic, you could use "pgrep" instead of
bash -c "ps -A | grep unity-2d-spread"

Please also add the bug URL to the References section. Helps explain why we have such a test, in case manual tests are done too.

Also any reason why you don't use "spreadItem.tap" instead of "spreadItem.move_mouse; XDo::Mouse.click"

review: Needs Fixing

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

1022. By Albert Astals Cid on 2012-03-29

Use pgrep

1023. By Albert Astals Cid on 2012-03-29

Add bug url

[Albert Astals Cid (aacid)]

Can't use tap because tap simulates a click (i.e. MousePressEvent), we need a real click because we are grabbing the mouse

=== modified file 'spread/app/spreadmanager.cpp'
--- spread/app/spreadmanager.cpp	2012-03-13 15:49:19 +0000
+++ spread/app/spreadmanager.cpp	2012-03-29 11:30:25 +0000
@@ -76,7 +76,7 @@
     view->engine()->setBaseUrl(QUrl::fromLocalFile(unity2dDirectory() + "/spread/"));
 
     /* Add a SpreadControl instance to the QML context */
-    connect(view, SIGNAL(visibleChanged(bool)), this, SLOT(onViewVisibleChanged(bool)));
+    connect(view, SIGNAL(visibleChanged(bool)), this, SLOT(onViewVisibleChanged(bool)), Qt::QueuedConnection);
     view->rootContext()->setContextProperty("control", &m_control);
     view->rootContext()->setContextProperty("spreadManager", this);
 

=== modified file 'tests/spread/spread-tests.rb'
--- tests/spread/spread-tests.rb	2012-02-13 14:42:06 +0000
+++ tests/spread/spread-tests.rb	2012-03-29 11:30:25 +0000
@@ -65,6 +65,13 @@
     #Need to kill Launcher as it does not shutdown when politely asked
     $SUT.execute_shell_command 'pkill -nf unity-2d-shell'
     $SUT.execute_shell_command 'pkill -nf unity-2d-spread'
+    # Need to wait for the spread to really die, otherwise bad things happen
+    # on the second test
+    spread = $SUT.execute_shell_command 'pgrep unity-2d-spread'
+    while spread != ""
+      sleep 0.1
+      spread = $SUT.execute_shell_command 'pgrep unity-2d-spread'
+    end
   end
 
   #####################################################################################
@@ -106,4 +113,40 @@
     }
     xid.close!
   end
+
+  # Test case objectives:
+  #   * Check that clicking in the spread item of the launcher toggles the spread
+  # Pre-conditions
+  #   * Desktop with no running applications
+  # Test steps
+  #   * Verify spread is not showing
+  #   * Click in the spread item of the launcher
+  #   * Verify spread is showing
+  #   * Click in the spread item of the launcher
+  #   * Verify spread is not showing
+  # Post-conditions
+  #   * None
+  # References
+  #   * https://bugs.launchpad.net/unity-2d/+bug/968146
+  test "Spread launcher item toggles the spread" do
+    hide_mode = $SUT.execute_shell_command('gsettings get com.canonical.Unity2d.Launcher hide-mode')
+    $SUT.execute_shell_command 'gsettings set com.canonical.Unity2d.Launcher hide-mode 0'
+
+    verify_not(2, 'There should not be a Spread declarative view on startup') {
+      @app_spread.SpreadView()
+    }
+    spreadItem = @app_shell.LauncherList( :name => 'main' ).LauncherList( :icon => "image://icons/unity-icon-theme/workspace-switcher" );
+    spreadItem.move_mouse()
+    XDo::Mouse.click
+
+    verify_equal("true", TIMEOUT, 'There should be a visible Spread declarative view after clicking on the spread item') {
+      @app_spread.SpreadView()['visible']
+    }
+    sleep 2 # Do not really need it, but otherwise the animation looks weird
+    XDo::Mouse.click
+    verify_not(2, 'There should not be a visible Spread declarative view after clicking again on the spread item') {
+      @app_spread.SpreadView()
+    }
+    $SUT.execute_shell_command 'gsettings set com.canonical.Unity2d.Launcher hide-mode ' + hide_mode
+  end
 end