From 054b7d28f1994a61c04d837a066fa0164d439858 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 27 Nov 2010 16:32:48 +0000
Subject: [PATCH] Accept key auth for ProjectsController#update (#6841).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4442 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
app/controllers/projects_controller.rb | 2 +-
test/integration/api_test/projects_test.rb | 24 +++++++++++++---------
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 1e4affb26..3bedd2c78 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -24,7 +24,7 @@ class ProjectsController < ApplicationController
before_filter :authorize, :except => [ :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy]
before_filter :authorize_global, :only => [:new, :create]
before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ]
- accept_key_auth :index, :create
+ accept_key_auth :index, :create, :update
after_filter :only => [:create, :edit, :update, :archive, :unarchive, :destroy] do |controller|
if controller.request.post?
diff --git a/test/integration/api_test/projects_test.rb b/test/integration/api_test/projects_test.rb
index d898b42ac..c2ffa6920 100644
--- a/test/integration/api_test/projects_test.rb
+++ b/test/integration/api_test/projects_test.rb
@@ -78,16 +78,20 @@ class ApiTest::ProjectsTest < ActionController::IntegrationTest
assert_tag :errors, :child => {:tag => 'error', :content => "Identifier can't be blank"}
end
- def test_update
- attributes = {:name => 'API update'}
- assert_no_difference 'Project.count' do
- put '/projects/1.xml', {:project => attributes}, :authorization => credentials('jsmith')
- end
- assert_response :ok
- assert_equal 'application/xml', @response.content_type
- project = Project.find(1)
- attributes.each do |attribute, value|
- assert_equal value, project.send(attribute)
+ context "PUT /projects/2.xml" do
+ should_allow_api_authentication(:put,
+ '/projects/2.xml',
+ {:project => {:name => 'API test'}},
+ {:success_code => :ok})
+
+ should "update the project" do
+ assert_no_difference 'Project.count' do
+ put '/projects/2.xml', {:project => {:name => 'API update'}}, :authorization => credentials('jsmith')
+ end
+ assert_response :ok
+ assert_equal 'application/xml', @response.content_type
+ project = Project.find(2)
+ assert_equal 'API update', project.name
end
end
--
GitLab