Merge branch '5416-arv-git-httpd' refs #5416

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

diff --git a/services/api/test/unit/arvados_model_test.rb b/services/api/test/unit/arvados_model_test.rb
index b569d335639e51c46d3b6b851328eaa4cb858df8..0418a94510d9e046564cd5b49db5f659bd194330 100644 (file)
--- a/services/api/test/unit/arvados_model_test.rb
+++ b/services/api/test/unit/arvados_model_test.rb
@@ -174,7 +174,7 @@ class ArvadosModelTest < ActiveSupport::TestCase
     assert group.valid?, "group is not valid"
 
     results = Group.where(created_at: group.created_at)
-    assert_equal true, results.map(&:uuid).include?(group.uuid),
+    assert_includes results.map(&:uuid), group.uuid,
       "Expected new group uuid in results when searched with its created_at timestamp"
   end
 
@@ -185,14 +185,14 @@ class ArvadosModelTest < ActiveSupport::TestCase
 
     # update 1
     group.update_attributes!(name: "test create and update name 1")
-    results = Group.where(name: "test create and update name 1")
-    assert_equal group.uuid, results.first.uuid, "Expected group uuid in results"
+    results = Group.where(uuid: group.uuid)
+    assert_equal "test create and update name 1", results.first.name, "Expected name to be updated to 1"
     updated_at_1 = results.first.updated_at.to_f
 
     # update 2
     group.update_attributes!(name: "test create and update name 2")
-    results = Group.where(name: "test create and update name 2")
-    assert_equal group.uuid, results.first.uuid, "Expected group uuid in results"
+    results = Group.where(uuid: group.uuid)
+    assert_equal "test create and update name 2", results.first.name, "Expected name to be updated to 2"
     updated_at_2 = results.first.updated_at.to_f
 
     assert_equal true, (updated_at_2 > updated_at_1), "Expected updated time 2 to be newer than 1"