Merge branch 'origin-9043-test-edit-container-request' closes #9043

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

diff --git a/services/api/test/unit/container_request_test.rb b/services/api/test/unit/container_request_test.rb
index 648b92def668ebd2d5415613beabef69c054f842..3ab4a891f713421693a5c3a56ebd7ac47f80c935 100644 (file)
--- a/services/api/test/unit/container_request_test.rb
+++ b/services/api/test/unit/container_request_test.rb
@@ -53,38 +53,49 @@ class ContainerRequestTest < ActiveSupport::TestCase
     assert_nil cr.container_uuid
   end
 
-  test "Container request constraints must include valid vcpus and ram fields when committed" do
-    set_user_from_auth :active
-    # Validations on creation
-    [{"vcpus" => 1},
-     {"vcpus" => 1, "ram" => nil},
-     {"vcpus" => 0, "ram" => 123}].each do |invalid_constraint|
+  [
+    {"vcpus" => 1},
+    {"vcpus" => 1, "ram" => nil},
+    {"vcpus" => 0, "ram" => 123},
+    {"vcpus" => "1", "ram" => "123"}
+  ].each do |invalid_constraints|
+    test "Create with #{invalid_constraints}" do
+      set_user_from_auth :active
       assert_raises(ActiveRecord::RecordInvalid) do
-        cr = create_minimal_req!(state: "Committed", priority: 1,
-                                 runtime_constraints: invalid_constraint)
+        cr = create_minimal_req!(state: "Committed",
+                                 priority: 1,
+                                 runtime_constraints: invalid_constraints)
         cr.save!
       end
     end
-    cr = create_minimal_req!(state: "Committed", priority: 1)
-    cr.save!
-    # Validations on update
-    cr = create_minimal_req!(state: "Uncommitted", priority: 1)
-    cr.save!
 
-    [{"vcpus" => 1},
-     {"vcpus" => 1, "ram" => nil},
-     {"vcpus" => 0, "ram" => 123}].each do |invalid_constraint|
-      cr = ContainerRequest.find_by_uuid cr.uuid
+    test "Update with #{invalid_constraints}" do
+      set_user_from_auth :active
+      cr = create_minimal_req!(state: "Uncommitted", priority: 1)
+      cr.save!
       assert_raises(ActiveRecord::RecordInvalid) do
+        cr = ContainerRequest.find_by_uuid cr.uuid
         cr.update_attributes!(state: "Committed",
-                              runtime_constraints: invalid_constraint)
-        cr.save!
+                              runtime_constraints: invalid_constraints)
       end
     end
-    cr = ContainerRequest.find_by_uuid cr.uuid
-    cr.update_attributes!(state: "Committed",
-                          runtime_constraints: {"vcpus" => 1, "ram" => 23})
-    cr.save!
+  end
+
+  test "Update from fixture" do
+    set_user_from_auth :active
+    cr = ContainerRequest.find_by_uuid(container_requests(:running).uuid)
+    cr.update_attributes!(description: "New description")
+    assert_equal "New description", cr.description
+  end
+
+  test "Update with valid runtime constraints" do
+      set_user_from_auth :active
+      cr = create_minimal_req!(state: "Uncommitted", priority: 1)
+      cr.save!
+      cr = ContainerRequest.find_by_uuid cr.uuid
+      cr.update_attributes!(state: "Committed",
+                            runtime_constraints: {"vcpus" => 1, "ram" => 23})
+      assert_not_nil cr.container_uuid
   end
 
   test "Container request priority must be non-nil" do
@@ -325,7 +336,7 @@ class ContainerRequestTest < ActiveSupport::TestCase
       },
     }
     cr = ContainerRequest.new(mounts: m)
-    assert_raises(ActiveRecord::RecordNotFound) do
+    assert_raises(ArvadosModel::UnresolvableContainerError) do
       cr.send :mounts_for_container
     end
   end
@@ -370,10 +381,10 @@ class ContainerRequestTest < ActiveSupport::TestCase
    'ENOEXIST',
    'arvados/apitestfixture:ENOEXIST',
   ].each do |img|
-    test "container_image_for_container(#{img.inspect}) => 404" do
+    test "container_image_for_container(#{img.inspect}) => 422" do
       set_user_from_auth :active
       cr = ContainerRequest.new(container_image: img)
-      assert_raises(ActiveRecord::RecordNotFound) do
+      assert_raises(ArvadosModel::UnresolvableContainerError) do
         cr.send :container_image_for_container
       end
     end