Merge branch 'master' into 2761-diagnostic-suite

[arvados.git] / apps / workbench / test / functional / collections_controller_test.rb

diff --git a/apps/workbench/test/functional/collections_controller_test.rb b/apps/workbench/test/functional/collections_controller_test.rb
index 4745d1b9ac7a8f7860e3c10b5b86299f404c7d07..8c6aeab5325286f0d4303e1d38d733520b4ff151 100644 (file)
--- a/apps/workbench/test/functional/collections_controller_test.rb
+++ b/apps/workbench/test/functional/collections_controller_test.rb
@@ -56,8 +56,8 @@ class CollectionsControllerTest < ActionController::TestCase
   end
 
   test "viewing a collection fetches related projects" do
-    show_collection(:foo_file, :active)
-    assert_includes(assigns(:projects).map(&:uuid),
+    show_collection({id: api_fixture('collections')["foo_file"]['portable_data_hash']}, :active)
+    assert_includes(assigns(:same_pdh).map(&:owner_uuid),
                     api_fixture('groups')['aproject']['uuid'],
                     "controller did not find linked project")
   end
@@ -170,7 +170,7 @@ class CollectionsControllerTest < ActionController::TestCase
       uuid: ua_collection['uuid'],
       file: ua_collection['manifest_text'].match(/ \d+:\d+:(\S+)/)[1]
     }, session_for(:inactive)
-    assert_nil(assigns(:required_user_agreements),
+    assert_nil(assigns(:unsigned_user_agreements),
                "Did not skip check_user_agreements filter " +
                "when showing the user agreement.")
     assert_response :success