[ARVADOS] updated: 359d96e3442f93094703a6966aecca9b0a90f55b

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/Gemfile                             |  1 +
 apps/workbench/Gemfile.lock                        |  4 +++
 .../test/functional/collections_controller_test.rb | 37 +++++++++++-----------
 apps/workbench/test/test_helper.rb                 |  1 +
 4 files changed, 25 insertions(+), 18 deletions(-)

       via  359d96e3442f93094703a6966aecca9b0a90f55b (commit)
       via  d9d74825806615a539da950686ae801bbbf60e24 (commit)
       via  4769d3156e5d486837f7eb524ab5ca798ed090dc (commit)
       via  8f1554cf9cfc279e0127d7ea2c7a79a98e323f13 (commit)
       via  407f1cf196f60f4af21c89cbdccb2c98e05518fb (commit)
       via  5a341ad3a358bfadb96c83fb95acb7ce3f50cd83 (commit)
      from  3ee8ac519f0c3f3fd211372d2a4699586d5c2aa8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 359d96e3442f93094703a6966aecca9b0a90f55b
Merge: 3ee8ac5 d9d7482
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Oct 1 15:36:46 2014 -0400

    Merge branch '3782-stub-file-content' refs #3782


commit d9d74825806615a539da950686ae801bbbf60e24
Merge: 4769d31 3ee8ac5
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Oct 1 15:35:33 2014 -0400

    3782: Merge branch 'master' into 3782-stub-file-content


commit 4769d3156e5d486837f7eb524ab5ca798ed090dc
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Oct 1 15:12:07 2014 -0400

    3782: Use stubbed file content for "inactive user can retrieve user agreement" test.

diff --git a/apps/workbench/test/functional/collections_controller_test.rb b/apps/workbench/test/functional/collections_controller_test.rb
index 569343e..b334f9f 100644
--- a/apps/workbench/test/functional/collections_controller_test.rb
+++ b/apps/workbench/test/functional/collections_controller_test.rb
@@ -163,6 +163,10 @@ class CollectionsControllerTest < ActionController::TestCase
 
   test "inactive user can retrieve user agreement" do
     ua_collection = api_fixture('collections')['user_agreement']
+    # Here we don't test whether the agreement can be retrieved from
+    # Keep. We only test that show_file decides to send file content,
+    # so we use the file content stub.
+    stub_file_content
     get :show_file, {
       uuid: ua_collection['uuid'],
       file: ua_collection['manifest_text'].match(/ \d+:\d+:(\S+)/)[1]

commit 8f1554cf9cfc279e0127d7ea2c7a79a98e323f13
Merge: 407f1cf 74cdb44
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Oct 1 12:08:01 2014 -0400

    3782: Merge branch 'master' into 3782-stub-file-content


commit 407f1cf196f60f4af21c89cbdccb2c98e05518fb
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Oct 1 12:07:58 2014 -0400

    3782: Remove obsolete helper method.

diff --git a/apps/workbench/test/functional/collections_controller_test.rb b/apps/workbench/test/functional/collections_controller_test.rb
index 9e668a8..569343e 100644
--- a/apps/workbench/test/functional/collections_controller_test.rb
+++ b/apps/workbench/test/functional/collections_controller_test.rb
@@ -19,13 +19,6 @@ class CollectionsControllerTest < ActionController::TestCase
     params
   end
 
-  def expected_contents(params, token)
-    unless token.is_a? String
-      token = params[:api_token] || token[:arvados_api_token]
-    end
-    [token, params[:uuid], params[:file]].join('/')
-  end
-
   def assert_hash_includes(actual_hash, expected_hash, msg=nil)
     expected_hash.each do |key, value|
       assert_equal(value, actual_hash[key], msg)

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


hooks/post-receive
--