Merge branch 'master' into 2761-diagnostic-suite

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

diff --git a/apps/workbench/test/unit/group_test.rb b/apps/workbench/test/unit/group_test.rb
index 435463a83e0bbd66682339649d9ffd1b7c70ef9f..3f5cebc9551823fb88c92f5cf09e17c9a188f2ee 100644 (file)
--- a/apps/workbench/test/unit/group_test.rb
+++ b/apps/workbench/test/unit/group_test.rb
@@ -5,24 +5,24 @@ class GroupTest < ActiveSupport::TestCase
     use_token :active
     oi = Group.
       find(api_fixture('groups')['asubproject']['uuid']).
-      contents(include_linked: true)
+      contents()
     assert_operator(0, :<, oi.count,
                     "Expected to find some items belonging to :active user")
     assert_operator(0, :<, oi.items_available,
                     "Expected contents response to have items_available > 0")
-    assert_operator(0, :<, oi.result_links.count,
-                    "Expected to receive name links with contents response")
     oi_uuids = oi.collect { |i| i['uuid'] }
 
     expect_uuid = api_fixture('specimens')['in_asubproject']['uuid']
     assert_includes(oi_uuids, expect_uuid,
                     "Expected '#{expect_uuid}' in asubproject's contents")
+  end
 
-    expect_uuid = api_fixture('specimens')['in_aproject_linked_from_asubproject']['uuid']
-    expect_name = api_fixture('links')['specimen_is_in_two_projects']['name']
-    assert_includes(oi_uuids, expect_uuid,
-                    "Expected '#{expect_uuid}' in asubproject's contents")
-    assert_equal(expect_name, oi.name_for(expect_uuid),
-                 "Expected name_for '#{expect_uuid}' to be '#{expect_name}'")
+  test "can select specific group columns" do
+    use_token :admin
+    Group.select(["uuid", "name"]).limit(5).each do |user|
+      assert_not_nil user.uuid
+      assert_not_nil user.name
+      assert_nil user.owner_uuid
+    end
   end
 end