9005: Serve keep_services/accessible regardless of auth status.

[arvados.git] / services / api / test / functional / arvados / v1 / users_controller_test.rb

diff --git a/services/api/test/functional/arvados/v1/users_controller_test.rb b/services/api/test/functional/arvados/v1/users_controller_test.rb
index 579b8cc6d05256a88086cd0a50592e3d8a1afaa7..f98e482dd84a190fb08f3e606be45835119f986f 100644 (file)
--- a/services/api/test/functional/arvados/v1/users_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/users_controller_test.rb
@@ -6,8 +6,9 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
   include UsersTestHelper
 
   setup do
   include UsersTestHelper
 
   setup do

-    @all_links_at_start = Link.all
+    @initial_link_count = Link.count

     @vm_uuid = virtual_machines(:testvm).uuid
     @vm_uuid = virtual_machines(:testvm).uuid

+    ActionMailer::Base.deliveries = []

   end
 
   test "activate a user after signing UA" do
   end
 
   test "activate a user after signing UA" do


@@ -107,7 +108,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
     assert_nil created['identity_url'], 'expected no identity_url'
 
     # arvados#user, repo link and link add user to 'All users' group
     assert_nil created['identity_url'], 'expected no identity_url'
 
     # arvados#user, repo link and link add user to 'All users' group

-    verify_num_links @all_links_at_start, 4
+    verify_links_added 4

 
     verify_link response_items, 'arvados#user', true, 'permission', 'can_login',
         created['uuid'], created['email'], 'arvados#user', false, 'User'
 
     verify_link response_items, 'arvados#user', true, 'permission', 'can_login',
         created['uuid'], created['email'], 'arvados#user', false, 'User'


@@ -269,7 +270,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
     assert_equal response_object['email'], 'foo@example.com', 'expected given email'
 
     # four extra links; system_group, login, group and repo perms
     assert_equal response_object['email'], 'foo@example.com', 'expected given email'
 
     # four extra links; system_group, login, group and repo perms

-    verify_num_links @all_links_at_start, 4
+    verify_links_added 4

   end
 
   test "setup user with fake vm and expect error" do
   end
 
   test "setup user with fake vm and expect error" do


@@ -306,7 +307,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
     assert_equal response_object['email'], 'foo@example.com', 'expected given email'
 
     # five extra links; system_group, login, group, vm, repo
     assert_equal response_object['email'], 'foo@example.com', 'expected given email'
 
     # five extra links; system_group, login, group, vm, repo

-    verify_num_links @all_links_at_start, 5
+    verify_links_added 5

   end
 
   test "setup user with valid email, no vm and no repo as input" do
   end
 
   test "setup user with valid email, no vm and no repo as input" do


@@ -324,7 +325,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
     assert_equal response_object['email'], 'foo@example.com', 'expected given email'
 
     # three extra links; system_group, login, and group
     assert_equal response_object['email'], 'foo@example.com', 'expected given email'
 
     # three extra links; system_group, login, and group

-    verify_num_links @all_links_at_start, 3
+    verify_links_added 3

 
     verify_link response_items, 'arvados#user', true, 'permission', 'can_login',
         response_object['uuid'], response_object['email'], 'arvados#user', false, 'User'
 
     verify_link response_items, 'arvados#user', true, 'permission', 'can_login',
         response_object['uuid'], response_object['email'], 'arvados#user', false, 'User'


@@ -361,7 +362,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
         'expecting first name'
 
     # five extra links; system_group, login, group, repo and vm
         'expecting first name'
 
     # five extra links; system_group, login, group, repo and vm

-    verify_num_links @all_links_at_start, 5
+    verify_links_added 5

   end
 
   test "setup user with an existing user email and check different object is created" do
   end
 
   test "setup user with an existing user email and check different object is created" do


@@ -384,7 +385,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
         'expected different uuid after create operation'
     assert_equal inactive_user['email'], response_object['email'], 'expected given email'
     # system_group, openid, group, and repo. No vm link.
         'expected different uuid after create operation'
     assert_equal inactive_user['email'], response_object['email'], 'expected given email'
     # system_group, openid, group, and repo. No vm link.

-    verify_num_links @all_links_at_start, 4
+    verify_links_added 4

   end
 
   test "setup user with openid prefix" do
   end
 
   test "setup user with openid prefix" do


@@ -412,7 +413,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
 
     # verify links
     # four new links: system_group, arvados#user, repo, and 'All users' group.
 
     # verify links
     # four new links: system_group, arvados#user, repo, and 'All users' group.

-    verify_num_links @all_links_at_start, 4
+    verify_links_added 4

 
     verify_link response_items, 'arvados#user', true, 'permission', 'can_login',
         created['uuid'], created['email'], 'arvados#user', false, 'User'
 
     verify_link response_items, 'arvados#user', true, 'permission', 'can_login',
         created['uuid'], created['email'], 'arvados#user', false, 'User'


@@ -472,7 +473,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
 
     # five new links: system_group, arvados#user, repo, vm and 'All
     # users' group link
 
     # five new links: system_group, arvados#user, repo, vm and 'All
     # users' group link

-    verify_num_links @all_links_at_start, 5
+    verify_links_added 5

 
     verify_link response_items, 'arvados#user', true, 'permission', 'can_login',
         created['uuid'], created['email'], 'arvados#user', false, 'User'
 
     verify_link response_items, 'arvados#user', true, 'permission', 'can_login',
         created['uuid'], created['email'], 'arvados#user', false, 'User'


@@ -841,9 +842,9 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
                  "admin's filtered index did not return inactive user")
   end
 
                  "admin's filtered index did not return inactive user")
   end
 

-  def verify_num_links (original_links, expected_additional_links)
-    assert_equal expected_additional_links, Link.all.size-original_links.size,
-        "Expected #{expected_additional_links.inspect} more links"
+  def verify_links_added more
+    assert_equal @initial_link_count+more, Link.count,
+        "Started with #{@initial_link_count} links, expected #{more} more"

   end
 
   def find_obj_in_resp (response_items, object_type, head_kind=nil)
   end
 
   def find_obj_in_resp (response_items, object_type, head_kind=nil)