X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5cd85a21e20d191f7fb67dd20023196001930928..5e9787f914dd1a2f762ae7a653fe8dda36f8f555:/apps/workbench/test/integration/collections_test.rb

diff --git a/apps/workbench/test/integration/collections_test.rb b/apps/workbench/test/integration/collections_test.rb
index 88aa7dbdae..e7b27fff86 100644
--- a/apps/workbench/test/integration/collections_test.rb
+++ b/apps/workbench/test/integration/collections_test.rb
@@ -6,8 +6,6 @@ require 'integration_helper'
 require_relative 'integration_test_utils'
 
 class CollectionsTest < ActionDispatch::IntegrationTest
-  include KeepWebConfig
-
   setup do
     need_javascript
   end
@@ -55,9 +53,9 @@ class CollectionsTest < ActionDispatch::IntegrationTest
   end
 
   test "can download an entire collection with a reader token" do
-    use_keep_web_config
+    need_selenium "phantomjs does not follow redirects reliably, maybe https://github.com/ariya/phantomjs/issues/10389"
 
-    token = api_fixture('api_client_authorizations')['active']['api_token']
+    token = api_token('active')
     data = "foo\nfile\n"
     datablock = `echo -n #{data.shellescape} | ARVADOS_API_TOKEN=#{token.shellescape} arv-put --no-progress --raw -`.strip
     assert $?.success?, $?
@@ -72,24 +70,16 @@ class CollectionsTest < ActionDispatch::IntegrationTest
     token = api_fixture('api_client_authorizations')['active_all_collections']['api_token']
     url_head = "/collections/download/#{uuid}/#{token}/"
     visit url_head
+    assert_text "You can download individual files listed below"
     # It seems that Capybara can't inspect tags outside the body, so this is
     # a very blunt approach.
     assert_no_match(/<\s*meta[^>]+\bnofollow\b/i, page.html,
                     "wget prohibited from recursing the collection page")
     # Look at all the links that wget would recurse through using our
     # recommended options, and check that it's exactly the file list.
-    hrefs = page.all('a').map do |anchor|
-      link = anchor[:href] || ''
-      if link.start_with? url_head
-        link[url_head.size .. -1]
-      elsif link.start_with? '/'
-        nil
-      else
-        link
-      end
-    end
-    assert_equal(['foo'], hrefs.compact.sort,
-                 "download page did provide strictly file links")
+    hrefs = []
+    page.html.scan(/href="(.*?)"/) { |m| hrefs << m[0] }
+    assert_equal(['./foo'], hrefs, "download page did provide strictly file links")
     click_link "foo"
     assert_text "foo\nfile\n"
   end
@@ -434,87 +424,4 @@ class CollectionsTest < ActionDispatch::IntegrationTest
     first('.lock-collection-btn').click
     accept_alert
   end
-
-  # test "collection tags tab" do
-  #   visit page_with_token('active', '/collections/zzzzz-4zz18-bv31uwvy3neko21')
-
-  #   click_link 'Tags'
-  #   wait_for_ajax
-
-  #   # verify initial state
-  #   assert_selector 'a.disabled', text: ' Saved '
-  #   assert_selector 'a', text: 'Add new tag'
-
-  #   # Verify controls in edit mode
-  #   # first('.edit-collection-tags').click
-  #   # assert_selector 'a.disabled', text: 'Edit'
-  #   # assert_selector 'a', text: 'Add new tag'
-  #   # assert_selector 'a', text: 'Save'
-  #   # assert_selector 'a', text: 'Cancel'
-
-  #   # add two tags
-  #   first('.glyphicon-plus').click
-  #   assert_selector 'a', text: 'Save changes'
-  #   first('.collection-tag-field-key').click
-  #   first('.collection-tag-field-key').set('key 1')
-  #   first('.collection-tag-field-value').click
-  #   first('.collection-tag-field-value').set('value 1')
-
-  #   first('.glyphicon-plus').click
-  #   editable_key_fields = page.all('.collection-tag-field-key')
-  #   editable_key_fields[1].click
-  #   editable_key_fields[1].set('key 2')
-  #   editable_val_fields = page.all('.collection-tag-field-value')
-  #   editable_val_fields[1].click
-  #   editable_val_fields[1].set('value 2')
-
-  #   click_on 'Save'
-  #   wait_for_ajax
-
-  #   # added tags; verify
-  #   assert_text 'key 1'
-  #   assert_text 'value 1'
-  #   assert_text 'key 2'
-  #   assert_text 'value 2'
-  #   assert_selector 'a', text: 'Edit'
-  #   assert_no_selector 'a', text: 'Save'
-
-  #   # remove first tag
-  #   first('.edit-collection-tags').click
-  #   assert_not_nil first('.glyphicon-remove')
-  #   first('.glyphicon-remove').click
-  #   click_on 'Save'
-  #   wait_for_ajax
-
-  #   assert_text 'key 2'
-  #   assert_text 'value 2'
-  #   assert_no_text 'key 1'
-  #   assert_no_text 'value 1'
-  #   assert_selector 'a', text: 'Edit'
-
-  #   # Click on cancel and verify
-  #   first('.edit-collection-tags').click
-  #   first('.collection-tag-field-key').click
-  #   first('.collection-tag-field-key').set('this key wont stick')
-  #   first('.collection-tag-field-value').click
-  #   first('.collection-tag-field-value').set('this value wont stick')
-
-  #   click_on 'Cancel'
-  #   wait_for_ajax
-
-  #   assert_text 'key 2'
-  #   assert_text 'value 2'
-  #   assert_no_text 'this key wont stick'
-  #   assert_no_text 'this value wont stick'
-
-  #   # remove all tags
-  #   first('.edit-collection-tags').click
-  #   first('.glyphicon-remove').click
-  #   click_on 'Save'
-  #   wait_for_ajax
-
-  #   assert_selector 'a', text: 'Edit'
-  #   assert_no_text 'key 2'
-  #   assert_no_text 'value 2'
-  # end
 end