[ARVADOS] created: 8bbc411dbbff17445c32782e8faa4947ba8481bc

[Git user]

        at  8bbc411dbbff17445c32782e8faa4947ba8481bc (commit)


commit 8bbc411dbbff17445c32782e8faa4947ba8481bc
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Sep 18 10:11:01 2017 -0400

    12279: Use selenium for workbench tests that access keep-web.
    
    Needed for workbench tests to pass in Arvbox (workaround for PhantomJS bug).
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/apps/workbench/test/integration/anonymous_access_test.rb b/apps/workbench/test/integration/anonymous_access_test.rb
index 6971c39..325a367 100644
--- a/apps/workbench/test/integration/anonymous_access_test.rb
+++ b/apps/workbench/test/integration/anonymous_access_test.rb
@@ -119,6 +119,7 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
   end
 
   test 'view file' do
+    need_selenium 'for keep-web to work'
     use_keep_web_config
 
     magic = rand(2**512).to_s 36
diff --git a/apps/workbench/test/integration/collections_test.rb b/apps/workbench/test/integration/collections_test.rb
index 71cfe38..1247482 100644
--- a/apps/workbench/test/integration/collections_test.rb
+++ b/apps/workbench/test/integration/collections_test.rb
@@ -55,6 +55,7 @@ class CollectionsTest < ActionDispatch::IntegrationTest
   end
 
   test "can download an entire collection with a reader token" do
+    need_selenium 'for keep-web to work'
     use_keep_web_config
 
     token = api_fixture('api_client_authorizations')['active']['api_token']
@@ -88,7 +89,7 @@ class CollectionsTest < ActionDispatch::IntegrationTest
         link
       end
     end
-    assert_equal(['foo'], hrefs.compact.sort,
+    assert_equal([Rails.configuration.keep_web_url % {:uuid_or_pdh => "#{uuid}/t=#{token}/_/foo"}], hrefs.compact.sort,
                  "download page did provide strictly file links")
     click_link "foo"
     assert_text "foo\nfile\n"
diff --git a/apps/workbench/test/integration/jobs_test.rb b/apps/workbench/test/integration/jobs_test.rb
index bfed03b..6d75d8f 100644
--- a/apps/workbench/test/integration/jobs_test.rb
+++ b/apps/workbench/test/integration/jobs_test.rb
@@ -61,6 +61,7 @@ class JobsTest < ActionDispatch::IntegrationTest
   end
 
   test 'view log via keep-web redirect' do
+    need_selenium 'for keep-web to work'
     use_keep_web_config
 
     token = api_fixture('api_client_authorizations')['active']['api_token']

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


hooks/post-receive
--