2872: Merge branch 'master' into 2872-folder-nav

[arvados.git] / apps / workbench / test / unit / arvados_resource_list_test.rb

diff --git a/apps/workbench/test/unit/arvados_resource_list_test.rb b/apps/workbench/test/unit/arvados_resource_list_test.rb
index 24bb0febb61adc2ea2f9d7baca79fdc57b9fb380..fa4f9c5697affc09c685f4ecca2ecd89c1509c2a 100644 (file)
--- a/apps/workbench/test/unit/arvados_resource_list_test.rb
+++ b/apps/workbench/test/unit/arvados_resource_list_test.rb
@@ -10,7 +10,7 @@ class ResourceListTest < ActiveSupport::TestCase
 
   test 'links_for on non-empty resource list' do
     use_token :active
-    results = Group.find(api_fixture('groups')['afolder']['uuid']).contents(include_linked: true)
+    results = Group.find(api_fixture('groups')['aproject']['uuid']).contents(include_linked: true)
     assert_equal [], results.links_for(api_fixture('users')['active']['uuid'])
     assert_equal [], results.links_for(api_fixture('jobs')['running_cancelled']['uuid'])
     assert_equal [], results.links_for(api_fixture('jobs')['running']['uuid'], 'bogus-link-class')
@@ -18,34 +18,35 @@ class ResourceListTest < ActiveSupport::TestCase
   end
 
   test 'links_for returns all link classes (simulated results)' do
-    folder_uuid = api_fixture('groups')['afolder']['uuid']
-    specimen_uuid = api_fixture('specimens')['in_afolder']['uuid']
+    project_uuid = api_fixture('groups')['aproject']['uuid']
+    specimen_uuid = api_fixture('specimens')['in_aproject']['uuid']
     api_response = {
       kind: 'arvados#specimenList',
       links: [{kind: 'arvados#link',
                 uuid: 'zzzzz-o0j2j-asdfasdfasdfas0',
-                tail_uuid: folder_uuid,
+                tail_uuid: project_uuid,
                 head_uuid: specimen_uuid,
                 link_class: 'name',
                 name: 'Alice'},
               {kind: 'arvados#link',
                 uuid: 'zzzzz-o0j2j-asdfasdfasdfas1',
-                tail_uuid: folder_uuid,
+                tail_uuid: project_uuid,
                 head_uuid: specimen_uuid,
                 link_class: 'foo',
                 name: 'Bob'},
               {kind: 'arvados#link',
                 uuid: 'zzzzz-o0j2j-asdfasdfasdfas2',
-                tail_uuid: folder_uuid,
+                tail_uuid: project_uuid,
                 head_uuid: specimen_uuid,
                 link_class: nil,
                 name: 'Clydesdale'}],
       items: [{kind: 'arvados#specimen',
                 uuid: specimen_uuid}]
     }
-    results = ArvadosApiClient.new.unpack_api_response(api_response)
+    arl = ArvadosResourceList.new
+    arl.results = ArvadosApiClient.new.unpack_api_response(api_response)
     assert_equal(['name', 'foo', nil],
-                 (results.
+                 (arl.
                   links_for(specimen_uuid).
                   collect { |x| x.link_class }),
                  "Expected links_for to return all link_classes")