[ARVADOS] created: d0c88c9fbcee53fd74ec2afa965fe60a7ae2aa87

[git at public.curoverse.com]

        at  d0c88c9fbcee53fd74ec2afa965fe60a7ae2aa87 (commit)


commit d0c88c9fbcee53fd74ec2afa965fe60a7ae2aa87
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Apr 4 17:21:45 2014 -0400

    Document capybara-webkit qt dependencies, and add phantomjs recipe.

diff --git a/apps/workbench/README.textile b/apps/workbench/README.textile
index ea01724..00588e8 100644
--- a/apps/workbench/README.textile
+++ b/apps/workbench/README.textile
@@ -6,8 +6,22 @@ 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:
+
+<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/
+</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.
 
 h2. Writing tests

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


hooks/post-receive
--