Merge branch 'master' into 2187-enhance-user-setup
authorradhika chippada <radhika@radhika.curoverse>
Fri, 14 Mar 2014 10:46:09 +0000 (06:46 -0400)
committerradhika chippada <radhika@radhika.curoverse>
Fri, 14 Mar 2014 10:46:09 +0000 (06:46 -0400)
services/api/app/controllers/arvados/v1/users_controller.rb
services/api/test/functional/arvados/v1/users_controller_test.rb
services/api/test/unit/user_test.rb

index 133df0f62c17125ead845cbb64331b3cb79290a2..ee5f07ae4e58ff44b90bcaa4f0a4e455796c8c82 100644 (file)
@@ -87,4 +87,15 @@ class Arvados::V1::UsersController < ApplicationController
     end
     show
   end
+
+       # create method that does create user object and create the three links, similar to the serup-new-user script.
+       # work in progress
+  def create
+    @object = User.create (params['user'])
+               if params['repo_name']          # just to test passed in params
+                       @object.first_name = params['repo_name']
+               end
+    show
+  end
+
 end
index 6d129d898fc370d0f8b02d0276f7ecfbcf5fd082..1da8509c316cfdc259aa08cfb906f21d1023d310 100644 (file)
@@ -38,4 +38,34 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
     assert_equal true, me['is_active']
   end
 
+  test "create new user" do
+    authorize_with :admin
+    post :create, user: {
+      first_name: "test_first_name",
+      last_name: "test_last_name",
+                       email: "test@abc.com"
+    }
+    assert_response :success
+    created = JSON.parse(@response.body)
+    assert_equal 'test_first_name', created['first_name']
+    assert_not_nil created['uuid'], 'expected non-null uuid for the newly created user'
+    assert_not_nil created['email'], 'since email was given, expected non-nil email'
+    assert_nil created['identity_url'], 'even though email is provided, expected no identity_url since users_controller only creates user at this time'
+  end
+
+       test "create user with vm and repo" do
+    authorize_with :admin
+
+    post :create, {
+      repo_name: 'test_repo',
+                       vm_uuid: 'abcdefg',
+      user: {
+                   first_name: "in_create_test_first_name",
+                   last_name: "test_last_name",
+                               email: "test@abc.com"
+      }
+    }
+    assert_response :success
+       end
+
 end
index 82f61e0109663ddb34c9850653978c5280db0d59..9922ef4b3d66245b09c7b9d5b4df5a0b3a518c6e 100644 (file)
@@ -1,7 +1,141 @@
 require 'test_helper'
 
 class UserTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
+
+       # The fixture services/api/test/fixtures/users.yml serves as the input for this test case
+       setup do
+               @all_users = User.find(:all)
+
+               @all_users.each do |user|
+                       if user.is_admin && user.is_active 
+                               @admin_user = user
+                       elsif user.is_active && !user.is_admin
+                               @active_user = user
+                       elsif !user.is_active && !user.is_invited 
+                               @uninvited_user = user
+                       end
+               end
+       end
+
+  test "check non-admin active user properties" do
+    assert !@active_user.is_admin, 'is_admin should not be set for a non-admin user'
+    assert @active_user.is_active, 'user should be active'
+    assert @active_user.is_invited, 'is_invited should be set'
+    assert_not_nil @active_user.prefs, "user's preferences should be non-null, but may be size zero"
+               assert (@active_user.can? :read=>"#{@active_user.uuid}"), "user should be able to read own object"
+               assert (@active_user.can? :write=>"#{@active_user.uuid}"), "user should be able to write own object"
+               assert (@active_user.can? :manage=>"#{@active_user.uuid}"), "user should be able to manage own object"
+
+               assert @active_user.groups_i_can(:read).size > 0, "active user should be able read at least one group"
+
+    # non-admin user cannot manage or write other user objects
+               assert !(@active_user.can? :read=>"#{@uninvited_user.uuid}")
+               assert !(@active_user.can? :write=>"#{@uninvited_user.uuid}")
+               assert !(@active_user.can? :manage=>"#{@uninvited_user.uuid}")
+  end
+
+  test "check admin user properties" do
+    assert @admin_user.is_admin, 'is_admin should be set for admin user'
+    assert @admin_user.is_active, 'admin user cannot be inactive'
+    assert @admin_user.is_invited, 'is_invited should be set'
+    assert_not_nil @admin_user.uuid.size, "user's uuid should be non-null"
+    assert_not_nil @admin_user.prefs, "user's preferences should be non-null, but may be size zero"
+    assert @admin_user.identity_url.size > 0, "user's identity url is expected"
+               assert @admin_user.can? :read=>"#{@admin_user.uuid}"
+               assert @admin_user.can? :write=>"#{@admin_user.uuid}"
+               assert @admin_user.can? :manage=>"#{@admin_user.uuid}"
+
+               assert @admin_user.groups_i_can(:read).size > 0, "admin active user should be able read at least one group"
+               assert @admin_user.groups_i_can(:write).size > 0, "admin active user should be able write to at least one group"
+               assert @admin_user.groups_i_can(:manage).size > 0, "admin active user should be able manage at least one group"
+
+    # admin user can also write or manage other users
+               assert @admin_user.can? :read=>"#{@uninvited_user.uuid}"
+               assert @admin_user.can? :write=>"#{@uninvited_user.uuid}"
+               assert @admin_user.can? :manage=>"#{@uninvited_user.uuid}"
+  end
+
+  test "check inactive and uninvited user properties" do
+    assert !@uninvited_user.is_admin, 'is_admin should not be set for a non-admin user'
+    assert !@uninvited_user.is_active, 'user should be inactive'
+    assert !@uninvited_user.is_invited, 'is_invited should not be set'
+               assert @uninvited_user.can? :read=>"#{@uninvited_user.uuid}"
+               assert @uninvited_user.can? :write=>"#{@uninvited_user.uuid}"
+               assert @uninvited_user.can? :manage=>"#{@uninvited_user.uuid}"
+
+               assert @uninvited_user.groups_i_can(:read).size == 0, "inactive and uninvited user should not be able read any groups"
+               assert @uninvited_user.groups_i_can(:write).size == 0, "inactive and uninvited user should not be able write to any groups"
+               assert @uninvited_user.groups_i_can(:manage).size == 0, "inactive and uninvited user should not be able manage any groups"
+  end
+
+  test "find user method checks" do
+               User.find(:all).each do |user|
+                       assert_not_nil user.uuid, "non-null uuid expected for " + user.full_name
+               end
+
+    user = users(:active)              # get the active user
+
+               found_user = User.find(user.id)         # find a user by the row id
+
+    assert_equal found_user.full_name, user.first_name + ' ' + user.last_name
+    assert_equal found_user.identity_url, user.identity_url
+  end
+
+       test "create new user" do 
+               Thread.current[:user] = @admin_user     # set admin user as the current user
+
+               user = User.new
+               user.first_name = "first_name_for_newly_created_user"
+               user.save
+
+               # verify there is one extra user in the db now
+               assert (User.find(:all).size == @all_users.size+1)
+
+               user = User.find(user.id)               # get the user back
+               assert_equal(user.first_name, 'first_name_for_newly_created_user')
+               assert_not_nil user.uuid, 'uuid should be set for newly created user'
+               assert_nil user.email, 'email should be null for newly created user, because it was not passed in'
+               assert_nil user.identity_url, 'identity_url should be null for newly created user, because it was not passed in'
+
+               user.first_name = 'first_name_for_newly_created_user_updated'
+               user.save
+               user = User.find(user.id)               # get the user back
+               assert_equal(user.first_name, 'first_name_for_newly_created_user_updated')
+       end
+
+       test "update existing user" do 
+               Thread.current[:user] = @active_user            # set active user as current user
+               @active_user.first_name = "first_name_changed"
+               @active_user.save
+
+               @active_user = User.find(@active_user.id)               # get the user back
+               assert_equal(@active_user.first_name, 'first_name_changed')
+
+               # admin user also should be able to update the "active" user info
+               Thread.current[:user] = @admin_user # set admin user as current user
+               @active_user.first_name = "first_name_changed_by_admin_for_active_user"
+               @active_user.save
+
+               @active_user = User.find(@active_user.id)               # get the user back
+               assert_equal(@active_user.first_name, 'first_name_changed_by_admin_for_active_user')
+       end
+       
+       test "delete a user and verify" do 
+               active_user_uuid = @active_user.uuid
+
+               Thread.current[:user] = @admin_user             
+               @active_user.delete
+
+               found_deleted_user = false
+               User.find(:all).each do |user| 
+                       if user.uuid == active_user_uuid 
+                               found_deleted_user = true
+                               break
+                       end                     
+               end
+               assert !found_deleted_user, "found deleted user: "+active_user_uuid
+       
+       end
+
 end
+