4533: Move "database reset does not break basic operations" into its own test.

diff --git a/services/api/test/integration/remote_reset_test.rb b/services/api/test/integration/remote_reset_test.rb
index 9cd9d0ff1a550d7fae3649d58349a5efc93e528e..b3a7c63ff8d673949d6840b5dbd2e759ba255787 100644 (file)
--- a/services/api/test/integration/remote_reset_test.rb
+++ b/services/api/test/integration/remote_reset_test.rb
@@ -3,42 +3,55 @@ require 'test_helper'
 class RemoteResetTest < ActionDispatch::IntegrationTest
   self.use_transactional_fixtures = false
 
-  test "roll back database change" do
+  test "database reset doesn't break basic CRUD operations" do
     active_auth = auth(:active)
     admin_auth = auth(:admin)
 
-    old_uuid = specimens(:owned_by_active_user).uuid
-    new_uuid = nil
     authorize_with :admin
     post '/database/reset', {}, admin_auth
     assert_response :success
 
-    delete '/arvados/v1/specimens/' + old_uuid, {}, active_auth
-    assert_response :success
     post '/arvados/v1/specimens', {specimen: '{}'}, active_auth
     assert_response :success
     new_uuid = json_response['uuid']
 
-    # Perhaps redundant: confirm the above changes are observable from
-    # here using get(). Otherwise, the assertions below would not be
-    # informative. (Aside from confirming that integration-testing
-    # features work, this confirms that /database/reset didn't somehow
-    # put the database into a "don't persist any changes" mode -- not
-    # that I can think of a way for that to happen.)
     get '/arvados/v1/specimens/'+new_uuid, {}, active_auth
     assert_response :success
-    get '/arvados/v1/specimens/'+old_uuid, {}, active_auth
+
+    put('/arvados/v1/specimens/'+new_uuid,
+        {specimen: '{"properties":{}}'}, active_auth)
+    assert_response :success
+
+    delete '/arvados/v1/specimens/'+new_uuid, {}, active_auth
+    assert_response :success
+
+    get '/arvados/v1/specimens/'+new_uuid, {}, active_auth
     assert_response 404
+  end
+
+  test "roll back database change" do
+    active_auth = auth(:active)
+    admin_auth = auth(:admin)
+
+    old_uuid = specimens(:owned_by_active_user).uuid
+    authorize_with :admin
+    post '/database/reset', {}, admin_auth
+    assert_response :success
+
+    delete '/arvados/v1/specimens/' + old_uuid, {}, active_auth
+    assert_response :success
+    post '/arvados/v1/specimens', {specimen: '{}'}, active_auth
+    assert_response :success
+    new_uuid = json_response['uuid']
 
     # Reset to fixtures.
     post '/database/reset', {}, admin_auth
     assert_response :success
 
-    # New speciment should disappear. Old specimen should reappear.
+    # New specimen should disappear. Old specimen should reappear.
     get '/arvados/v1/specimens/'+new_uuid, {}, active_auth
     assert_response 404
     get '/arvados/v1/specimens/'+old_uuid, {}, active_auth
     assert_response :success
-    assert_empty Specimen.where(uuid: new_uuid)
   end
 end