[ARVADOS] updated: 02a0ac50b218e518c3ffbcd35c05ae7220450e2a

[Git user]

Summary of changes:
 apps/workbench/app/controllers/collections_controller.rb | 6 +-----
 apps/workbench/app/views/jobs/_show_log.html.erb         | 2 +-
 apps/workbench/test/integration/jobs_test.rb             | 1 +
 3 files changed, 3 insertions(+), 6 deletions(-)

       via  02a0ac50b218e518c3ffbcd35c05ae7220450e2a (commit)
       via  82d2cce62202d2a17ee184ad2923492f3abaac56 (commit)
      from  57647945b08a74bab02fed6adf947eb9adb8321f (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 02a0ac50b218e518c3ffbcd35c05ae7220450e2a
Author: Lucas Di Pentima <lucas at curoverse.com>
Date:   Tue Aug 8 17:26:35 2017 -0300

    11167: Removed unnecessary conditional
    
    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 dcd47e1..5fcb2dc 100644
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -234,11 +234,7 @@ class CollectionsController < ApplicationController
 
   def download_link
     token = @search_sharing.first.api_token
-    if Rails.configuration.keep_web_url || Rails.configuration.keep_web_download_url
-      keep_web_url(@object.uuid, nil, {path_token: token})
-    else
-      collections_url + "/download/#{@object.uuid}/#{token}/"
-    end
+    keep_web_url(@object.uuid, nil, {path_token: token})
   end
 
   def share

commit 82d2cce62202d2a17ee184ad2923492f3abaac56
Author: Lucas Di Pentima <lucas at curoverse.com>
Date:   Tue Aug 8 16:53:32 2017 -0300

    11167: Fixed integration test by replacing the use of PhantomJS with
    Selenium, as the former wasn't returning all the expected response
    headers.
    Also, fixed the Range header used when asking for a partial log.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at curoverse.com>

diff --git a/apps/workbench/app/views/jobs/_show_log.html.erb b/apps/workbench/app/views/jobs/_show_log.html.erb
index b4ede75..821b4bc 100644
--- a/apps/workbench/app/views/jobs/_show_log.html.erb
+++ b/apps/workbench/app/views/jobs/_show_log.html.erb
@@ -74,7 +74,7 @@ var makeFilter = function() {
     $("#log-viewer-download-pane").show();
     var headers = {};
     if (log_size > log_maxbytes) {
-      headers['Range'] = 'bytes=0-' + log_maxbytes;
+      headers['Range'] = 'bytes=0-' + (log_maxbytes - 1);
     }
     var ajax_opts = { dataType: 'text', headers: headers };
     load_log();
diff --git a/apps/workbench/test/integration/jobs_test.rb b/apps/workbench/test/integration/jobs_test.rb
index 4b89b5d..bfed03b 100644
--- a/apps/workbench/test/integration/jobs_test.rb
+++ b/apps/workbench/test/integration/jobs_test.rb
@@ -40,6 +40,7 @@ class JobsTest < ActionDispatch::IntegrationTest
   end
 
   test 'view partial job log' do
+    need_selenium 'to be able to see the CORS response headers (PhantomJS 1.9.8 does not)'
     use_keep_web_config
 
     # This config will be restored during teardown by ../test_helper.rb:

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


hooks/post-receive
--