14717: Fixups since tests now use config.yml

[arvados.git] / 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 88aa7dbdae104e52ede4ca22ca91c4847b701d0a..024a14605a239efde44ec094489a619f2dbc7199 100644 (file)
--- 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
@@ -57,7 +55,7 @@ class CollectionsTest < ActionDispatch::IntegrationTest
   test "can download an entire collection with a reader token" do
     use_keep_web_config
 
-    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?, $?
@@ -88,7 +86,7 @@ class CollectionsTest < ActionDispatch::IntegrationTest
         link
       end
     end
-    assert_equal(['foo'], hrefs.compact.sort,
+    assert_equal(['./foo'], hrefs.compact.sort,
                  "download page did provide strictly file links")
     click_link "foo"
     assert_text "foo\nfile\n"
@@ -434,87 +432,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