Merge branch 'master' into 3699-arv-copy

[arvados.git] / services / api / test / unit / log_test.rb

diff --git a/services/api/test/unit/log_test.rb b/services/api/test/unit/log_test.rb
index be8498d4bac3883621df2688dcf4ad5423f8c900..0c85d4c6e4b9a8e2744268a22ace33a8613e2655 100644 (file)
--- a/services/api/test/unit/log_test.rb
+++ b/services/api/test/unit/log_test.rb
@@ -65,13 +65,6 @@ class LogTest < ActiveSupport::TestCase
     end
   end
 
-  def set_user_from_auth(auth_name)
-    client_auth = api_client_authorizations(auth_name)
-    Thread.current[:api_client_authorization] = client_auth
-    Thread.current[:api_client] = client_auth.api_client
-    Thread.current[:user] = client_auth.user
-  end
-
   test "creating a user makes a log" do
     set_user_from_auth :admin_trustedclient
     u = User.new(first_name: "Log", last_name: "Test")
@@ -227,18 +220,20 @@ class LogTest < ActiveSupport::TestCase
 
   test "use ownership and permission links to determine which logs a user can see" do
     c = Log.readable_by(users(:admin)).order("id asc").each.to_a
-    assert_equal 5, c.size
+    assert_equal 6, c.size
     assert_equal 1, c[0].id # no-op
     assert_equal 2, c[1].id # admin changes repository foo, which is owned by active user
     assert_equal 3, c[2].id # admin changes specimen owned_by_spectator
     assert_equal 4, c[3].id # foo collection added, readable by active through link
     assert_equal 5, c[4].id # baz collection added, readable by active and spectator through group 'all users' group membership
+    assert_equal 6, c[5].id # log_owned_by_active
 
     c = Log.readable_by(users(:active)).order("id asc").each.to_a
-    assert_equal 3, c.size
+    assert_equal 4, c.size
     assert_equal 2, c[0].id # admin changes repository foo, which is owned by active user
     assert_equal 4, c[1].id # foo collection added, readable by active through link
     assert_equal 5, c[2].id # baz collection added, readable by active and spectator through group 'all users' group membership
+    assert_equal 6, c[3].id # log_owned_by_active
 
     c = Log.readable_by(users(:spectator)).order("id asc").each.to_a
     assert_equal 2, c.size