comparison test/integration/api_test/users_test.rb @ 128:07fa8a8b56a8

Update to Redmine trunk rev 4732

           assert json.has_key?('errors')
           assert_kind_of Array, json['errors']
         end
       end
     end
-    
-    context "DELETE /users/2" do
-      context ".xml" do
-        should "not be allowed" do
-          assert_no_difference('User.count') do
-            delete '/users/2.xml'
-          end
-          
-          assert_response :method_not_allowed
-        end
-      end
-      
-      context ".json" do
-        should "not be allowed" do
-          assert_no_difference('User.count') do
-            delete '/users/2.json'
-          end
-          
-          assert_response :method_not_allowed
-        end
+  end
+    
+  context "DELETE /users/2" do
+    context ".xml" do
+      should_allow_api_authentication(:delete,
+        '/users/2.xml',
+        {},
+        {:success_code => :ok})
+      
+      should "delete user" do
+        assert_difference('User.count', -1) do
+          delete '/users/2.xml', {}, :authorization => credentials('admin')
+        end
+        
+        assert_response :ok
+      end
+    end
+    
+    context ".json" do
+      should_allow_api_authentication(:delete,
+        '/users/2.xml',
+        {},
+        {:success_code => :ok})
+          
+      should "delete user" do
+        assert_difference('User.count', -1) do
+          delete '/users/2.json', {}, :authorization => credentials('admin')
+        end
+        
+        assert_response :ok
       end
     end
   end
   
   def credentials(user, password=nil)