[ARVADOS] created: 013ced576824a05cd9a162fbd11e65d4d183a6d5

[git at public.curoverse.com]

        at  013ced576824a05cd9a162fbd11e65d4d183a6d5 (commit)


commit 013ced576824a05cd9a162fbd11e65d4d183a6d5
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Apr 10 23:20:36 2014 -0400

    Update README for selenium+headless: install firefox+xvfb
    instead of libqt+phantomjs

diff --git a/apps/workbench/README.textile b/apps/workbench/README.textile
index 00588e8..7991978 100644
--- a/apps/workbench/README.textile
+++ b/apps/workbench/README.textile
@@ -6,20 +6,10 @@ h2. Running tests
 
 The Workbench application includes a series of integration tests.  When you run these, it starts the API server in a test environment, with all of its fixtures loaded, then tests Workbench by starting that server and making requests against it.
 
-Before running @bundle install@, make sure you install QT development dependencies (otherwise, capybara-webkit installation will fail). For example, on a Debian or Ubuntu system:
+In order for this to work, you must have Firefox installed (or Iceweasel, if you're running Debian), as well as the X Virtual Frame Buffer driver.
 
 <pre>
-arvados/apps/workbench$ sudo apt-get install qt4-qmake libqt4-dev
-arvados/apps/workbench$ RAILS_ENV=test bundle install
-</pre>
-
-In addition to bundled gems, running the integration tests requires "PhantomJS":http://phantomjs.org/download.html to test JavaScript elements.  The simplest way to get started is to download one of the binary builds provided, and install the executable into one of the directories in your @$PATH at .
-
-<pre>
-$ cd /tmp
-/tmp$ wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-x86_64.tar.bz2
-/tmp$ tar xjf phantomjs-1.9.7-linux-x86_64.tar.bz2
-/tmp$ sudo cp -ip phantomjs-1.9.7-linux-x86_64/bin/phantomjs /usr/local/bin/
+$ sudo apt-get install iceweasel xvfb
 </pre>
 
 If you install the Workbench Bundle in deployment mode, you must also install the API server Bundle in deployment mode, and vice versa.  If your Bundle installs have mismatched modes, the integration tests will fail with "Gem not found" errors.

-----------------------------------------------------------------------


hooks/post-receive
--