[ARVADOS] updated: c7187ec723f28d676661ef4f44c9ddcef14b2546

Git user git at public.curoverse.com
Fri Jul 21 12:55:31 EDT 2017


Summary of changes:
 apps/workbench/app/controllers/collections_controller.rb       | 4 ----
 apps/workbench/test/controllers/collections_controller_test.rb | 3 +--
 2 files changed, 1 insertion(+), 6 deletions(-)

       via  c7187ec723f28d676661ef4f44c9ddcef14b2546 (commit)
       via  058e06eb085bae6c72de28a6a88096a8643e7322 (commit)
      from  cd698336f2b7aebe78517993e0b3b07b45c16c87 (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 c7187ec723f28d676661ef4f44c9ddcef14b2546
Author: Lucas Di Pentima <lucas at curoverse.com>
Date:   Fri Jul 21 13:54:49 2017 -0300

    11167: Test adjusted.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at curoverse.com>

diff --git a/apps/workbench/test/controllers/collections_controller_test.rb b/apps/workbench/test/controllers/collections_controller_test.rb
index 5f67837..773a4f4 100644
--- a/apps/workbench/test/controllers/collections_controller_test.rb
+++ b/apps/workbench/test/controllers/collections_controller_test.rb
@@ -125,8 +125,7 @@ class CollectionsControllerTest < ActionController::TestCase
     params[:reader_token] = api_fixture("api_client_authorizations",
                                         "active_all_collections", "api_token")
     get(:show_file_links, params)
-    assert_response :success
-    assert_equal([['.', 'foo', 3]], assigns(:object).files)
+    assert_response :redirect
     assert_no_session
   end
 

commit 058e06eb085bae6c72de28a6a88096a8643e7322
Author: Lucas Di Pentima <lucas at curoverse.com>
Date:   Fri Jul 21 12:25:04 2017 -0300

    11167: Removed outdated comment.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at curoverse.com>

diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index 8da1a20..6dd190e 100644
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -125,10 +125,6 @@ class CollectionsController < ApplicationController
   end
 
   def show_file
-    # We pipe from arv-get to send the file to the user.  Before we start it,
-    # we ask the API server if the file actually exists.  This serves two
-    # purposes: it lets us return a useful status code for common errors, and
-    # helps us figure out which token to provide to arv-get.
     # The order of searched tokens is important: because the anonymous user
     # token is passed along with every API request, we have to check it first.
     # Otherwise, it's impossible to know whether any other request succeeded

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list