comparison test/integration/api_test/projects_test.rb @ 1115:433d4f72a19b redmine-2.2

Update to Redmine SVN revision 11137 on 2.2-stable branch

 # Redmine - project management software
-# Copyright (C) 2006-2011  Jean-Philippe Lang
+# Copyright (C) 2006-2012  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.

                                         {:success_code => :created})
 
 
         should "create a project with the attributes" do
           assert_difference('Project.count') do
-            post '/projects.xml', @parameters, :authorization => credentials('admin')
+            post '/projects.xml', @parameters, credentials('admin')
           end
 
           project = Project.first(:order => 'id DESC')
           assert_equal 'API test', project.name
           assert_equal 'api-test', project.identifier

 
         should "accept enabled_module_names attribute" do
           @parameters[:project].merge!({:enabled_module_names => ['issue_tracking', 'news', 'time_tracking']})
 
           assert_difference('Project.count') do
-            post '/projects.xml', @parameters, :authorization => credentials('admin')
+            post '/projects.xml', @parameters, credentials('admin')
           end
 
           project = Project.first(:order => 'id DESC')
           assert_equal ['issue_tracking', 'news', 'time_tracking'], project.enabled_module_names.sort
         end
 
         should "accept tracker_ids attribute" do
           @parameters[:project].merge!({:tracker_ids => [1, 3]})
 
           assert_difference('Project.count') do
-            post '/projects.xml', @parameters, :authorization => credentials('admin')
+            post '/projects.xml', @parameters, credentials('admin')
           end
 
           project = Project.first(:order => 'id DESC')
           assert_equal [1, 3], project.trackers.map(&:id).sort
         end

       end
 
       context ".xml" do
         should "return errors" do
           assert_no_difference('Project.count') do
-            post '/projects.xml', @parameters, :authorization => credentials('admin')
+            post '/projects.xml', @parameters, credentials('admin')
           end
 
           assert_response :unprocessable_entity
           assert_equal 'application/xml', @response.content_type
           assert_tag 'errors', :child => {:tag => 'error', :content => "Identifier can't be blank"}

                                         {:project => {:name => 'API update'}},
                                         {:success_code => :ok})
 
         should "update the project" do
           assert_no_difference 'Project.count' do
-            put '/projects/2.xml', @parameters, :authorization => credentials('jsmith')
+            put '/projects/2.xml', @parameters, credentials('jsmith')
           end
           assert_response :ok
+          assert_equal '', @response.body
           assert_equal 'application/xml', @response.content_type
           project = Project.find(2)
           assert_equal 'API update', project.name
         end
 
         should "accept enabled_module_names attribute" do
           @parameters[:project].merge!({:enabled_module_names => ['issue_tracking', 'news', 'time_tracking']})
 
           assert_no_difference 'Project.count' do
-            put '/projects/2.xml', @parameters, :authorization => credentials('admin')
+            put '/projects/2.xml', @parameters, credentials('admin')
           end
           assert_response :ok
+          assert_equal '', @response.body
           project = Project.find(2)
           assert_equal ['issue_tracking', 'news', 'time_tracking'], project.enabled_module_names.sort
         end
 
         should "accept tracker_ids attribute" do
           @parameters[:project].merge!({:tracker_ids => [1, 3]})
 
           assert_no_difference 'Project.count' do
-            put '/projects/2.xml', @parameters, :authorization => credentials('admin')
+            put '/projects/2.xml', @parameters, credentials('admin')
           end
           assert_response :ok
+          assert_equal '', @response.body
           project = Project.find(2)
           assert_equal [1, 3], project.trackers.map(&:id).sort
         end
       end
     end

       end
 
       context ".xml" do
         should "return errors" do
           assert_no_difference('Project.count') do
-            put '/projects/2.xml', @parameters, :authorization => credentials('admin')
+            put '/projects/2.xml', @parameters, credentials('admin')
           end
 
           assert_response :unprocessable_entity
           assert_equal 'application/xml', @response.content_type
           assert_tag 'errors', :child => {:tag => 'error', :content => "Name can't be blank"}

                                       {},
                                       {:success_code => :ok})
 
       should "delete the project" do
         assert_difference('Project.count',-1) do
-          delete '/projects/2.xml', {}, :authorization => credentials('admin')
+          delete '/projects/2.xml', {}, credentials('admin')
         end
         assert_response :ok
+        assert_equal '', @response.body
         assert_nil Project.find_by_id(2)
       end
     end
   end
-
-  def credentials(user, password=nil)
-    ActionController::HttpAuthentication::Basic.encode_credentials(user, password || user)
-  end
 end