X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/de11b137d4469e9d54e078ac0dd5664bdb90e486..ca6e3f04150dae9af6b86828a5af2a4400892487:/services/api/test/unit/owner_test.rb diff --git a/services/api/test/unit/owner_test.rb b/services/api/test/unit/owner_test.rb index e356f4d9fa..aa0ac5f361 100644 --- a/services/api/test/unit/owner_test.rb +++ b/services/api/test/unit/owner_test.rb @@ -92,12 +92,8 @@ class OwnerTest < ActiveSupport::TestCase "new #{o_class} should really be in DB") old_uuid = o.uuid new_uuid = o.uuid.sub(/..........$/, rand(2**256).to_s(36)[0..9]) - if o.respond_to? :update_uuid - o.update_uuid(new_uuid: new_uuid) - else - assert(o.update_attributes(uuid: new_uuid), - "should change #{o_class} uuid from #{old_uuid} to #{new_uuid}") - end + assert(o.update_attributes(uuid: new_uuid), + "should change #{o_class} uuid from #{old_uuid} to #{new_uuid}") assert_equal(false, o_class.where(uuid: old_uuid).any?, "#{old_uuid} should disappear when renamed to #{new_uuid}") end @@ -142,21 +138,4 @@ class OwnerTest < ActiveSupport::TestCase check_permissions_against_full_refresh end - test "change uuid of User that owns self" do - o = User.create! - assert User.where(uuid: o.uuid).any?, "new User should really be in DB" - assert_equal(true, o.update_attributes(owner_uuid: o.uuid), - "setting owner to self should work") - old_uuid = o.uuid - new_uuid = o.uuid.sub(/..........$/, rand(2**256).to_s(36)[0..9]) - o.update_uuid(new_uuid: new_uuid) - o = User.find_by_uuid(new_uuid) - assert_equal(false, User.where(uuid: old_uuid).any?, - "#{old_uuid} should not be in DB after deleting") - assert_equal(true, User.where(uuid: new_uuid).any?, - "#{new_uuid} should be in DB after renaming") - assert_equal(new_uuid, User.where(uuid: new_uuid).first.owner_uuid, - "#{new_uuid} should be its own owner in DB after renaming") - end - end