Merge branch 'master' into 3714-report-issue-issues

[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 19720cb752cfc83823e77337956d08c29b4227b6..ac2625aaeaca6204b327cff6874d188516a57ded 100644 (file)
--- a/apps/workbench/test/integration/collections_test.rb
+++ b/apps/workbench/test/integration/collections_test.rb
@@ -3,44 +3,10 @@ require 'selenium-webdriver'
 require 'headless'
 
 class CollectionsTest < ActionDispatch::IntegrationTest
-  def change_persist oldstate, newstate
-    find "div[data-persistent-state='#{oldstate}']"
-    page.assert_no_selector "div[data-persistent-state='#{newstate}']"
-    find('.btn', text: oldstate.capitalize).click
-    find '.btn', text: newstate.capitalize
-    page.assert_no_selector '.btn', text: oldstate.capitalize
-    find "div[data-persistent-state='#{newstate}']"
-    page.assert_no_selector "div[data-persistent-state='#{oldstate}']"
-  end
-
-  test "Flip persistent switch at /collections" do
-    Capybara.current_driver = Capybara.javascript_driver
-    uuid = api_fixture('collections')['foo_file']['uuid']
-    visit page_with_token('active', '/collections')
-    within "tr[data-object-uuid='#{uuid}']" do
-      change_persist 'cache', 'persistent'
-    end
-    # Refresh page and make sure the change was committed.
-    visit current_path
-    within "tr[data-object-uuid='#{uuid}']" do
-      change_persist 'persistent', 'cache'
-    end
-  end
-
-  test 'Flip persistent switch on collection#show' do
-    Capybara.current_driver = Capybara.javascript_driver
+  test "Collection page renders name" do
     uuid = api_fixture('collections')['foo_file']['uuid']
+    coll_name = api_fixture('collections')['foo_file']['name']
     visit page_with_token('active', "/collections/#{uuid}")
-    change_persist 'cache', 'persistent'
-    visit current_path
-    change_persist 'persistent', 'cache'
-  end
-
-  test "Collection page renders default name links" do
-    uuid = api_fixture('collections')['foo_file']['uuid']
-    coll_name = api_fixture('links')['foo_collection_name_in_aproject']['name']
-    name_uuid = api_fixture('links')['foo_collection_name_in_aproject']['uuid']
-    visit page_with_token('active', "/collections/#{name_uuid}")
     assert(page.has_text?(coll_name), "Collection page did not include name")
     # Now check that the page is otherwise normal, and the collection name
     # isn't only showing up in an error message.
@@ -48,6 +14,8 @@ class CollectionsTest < ActionDispatch::IntegrationTest
   end
 
   test "can download an entire collection with a reader token" do
+    Capybara.current_driver = :rack_test
+
     uuid = api_fixture('collections')['foo_file']['uuid']
     token = api_fixture('api_client_authorizations')['active_all_collections']['api_token']
     url_head = "/collections/download/#{uuid}/#{token}/"