kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote branch 'edavis/master' into master-journalized

This commit is contained in:
Tim Felgentreff 2010-11-05 18:50:09 +01:00
parent 0d33f6c01a 4b1dd334a5
commit eb805ff3fd
3 changed files with 84 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/issues_controller.rb
View File

@ -27,7 +27,7 @@ class IssuesController < ApplicationController
before_filter :find_optional_project, :only => [:index] before_filter :find_optional_project, :only => [:index]
before_filter :check_for_default_issue_status, :only => [:new, :create] before_filter :check_for_default_issue_status, :only => [:new, :create]
before_filter :build_new_issue_from_params, :only => [:new, :create] before_filter :build_new_issue_from_params, :only => [:new, :create]
accept_key_auth :index, :show accept_key_auth :index, :show, :create
rescue_from Query::StatementInvalid, :with => :query_statement_invalid rescue_from Query::StatementInvalid, :with => :query_statement_invalid

81
test/integration/api_test/issues_test.rb
View File

@ -90,69 +90,70 @@ class ApiTest::IssuesTest < ActionController::IntegrationTest
end end
context "POST /issues.xml" do context "POST /issues.xml" do
setup do should_allow_api_authentication(:post,
@issue_count = Issue.count '/issues.xml',
@attributes = {:project_id => 1, :subject => 'API test', :tracker_id => 2, :status_id => 3} {:issue => {:project_id => 1, :subject => 'API test', :tracker_id => 2, :status_id => 3}},
post '/issues.xml', {:issue => @attributes}, :authorization => credentials('jsmith') {:success_code => :created})
end
should_respond_with :created
should_respond_with_content_type 'application/xml'
should "create an issue with the attributes" do should "create an issue with the attributes" do
assert_equal Issue.count, @issue_count + 1 assert_difference('Issue.count') do
post '/issues.xml', {:issue => {:project_id => 1, :subject => 'API test', :tracker_id => 2, :status_id => 3}}, :authorization => credentials('jsmith')
issue = Issue.first(:order => 'id DESC')
@attributes.each do |attribute, value|
assert_equal value, issue.send(attribute)
end end
issue = Issue.first(:order => 'id DESC')
assert_equal 1, issue.project_id
assert_equal 2, issue.tracker_id
assert_equal 3, issue.status_id
assert_equal 'API test', issue.subject
end end
end end
context "POST /issues.xml with failure" do context "POST /issues.xml with failure" do
setup do should_allow_api_authentication(:post,
@attributes = {:project_id => 1} '/issues.xml',
post '/issues.xml', {:issue => @attributes}, :authorization => credentials('jsmith') {:issue => {:project_id => 1}},
end {:success_code => :unprocessable_entity})
should_respond_with :unprocessable_entity
should_respond_with_content_type 'application/xml'
should "have an errors tag" do should "have an errors tag" do
assert_no_difference('Issue.count') do
post '/issues.xml', {:issue => {:project_id => 1}}, :authorization => credentials('jsmith')
end
assert_tag :errors, :child => {:tag => 'error', :content => "Subject can't be blank"} assert_tag :errors, :child => {:tag => 'error', :content => "Subject can't be blank"}
end end
end end
context "POST /issues.json" do context "POST /issues.json" do
setup do should_allow_api_authentication(:post,
@issue_count = Issue.count '/issues.json',
@attributes = {:project_id => 1, :subject => 'API test', :tracker_id => 2, :status_id => 3} {:issue => {:project_id => 1, :subject => 'API test', :tracker_id => 2, :status_id => 3}},
post '/issues.json', {:issue => @attributes}, :authorization => credentials('jsmith') {:success_code => :created})
end
should_respond_with :created
should_respond_with_content_type 'application/json'
should "create an issue with the attributes" do should "create an issue with the attributes" do
assert_equal Issue.count, @issue_count + 1 assert_difference('Issue.count') do
post '/issues.json', {:issue => {:project_id => 1, :subject => 'API test', :tracker_id => 2, :status_id => 3}}, :authorization => credentials('jsmith')
issue = Issue.first(:order => 'id DESC')
@attributes.each do |attribute, value|
assert_equal value, issue.send(attribute)
end end
issue = Issue.first(:order => 'id DESC')
assert_equal 1, issue.project_id
assert_equal 2, issue.tracker_id
assert_equal 3, issue.status_id
assert_equal 'API test', issue.subject
end end
end end
context "POST /issues.json with failure" do context "POST /issues.json with failure" do
setup do should_allow_api_authentication(:post,
@attributes = {:project_id => 1} '/issues.json',
post '/issues.json', {:issue => @attributes}, :authorization => credentials('jsmith') {:issue => {:project_id => 1}},
end {:success_code => :unprocessable_entity})
should_respond_with :unprocessable_entity
should_respond_with_content_type 'application/json'
should "have an errors element" do should "have an errors element" do
assert_no_difference('Issue.count') do
post '/issues.json', {:issue => {:project_id => 1}}, :authorization => credentials('jsmith')
end
json = ActiveSupport::JSON.decode(response.body) json = ActiveSupport::JSON.decode(response.body)
assert_equal "can't be blank", json.first['subject'] assert_equal "can't be blank", json.first['subject']
end end

57
test/test_helper.rb
View File

@ -191,10 +191,13 @@ class ActiveSupport::TestCase
# @param [Symbol] http_method the HTTP method for request (:get, :post, :put, :delete) # @param [Symbol] http_method the HTTP method for request (:get, :post, :put, :delete)
# @param [String] url the request url # @param [String] url the request url
# @param [optional, Hash] parameters additional request parameters # @param [optional, Hash] parameters additional request parameters
def self.should_allow_api_authentication(http_method, url, parameters={}) # @param [optional, Hash] options additional options
should_allow_http_basic_auth_with_username_and_password(http_method, url, parameters) # @option options [Symbol] :success_code Successful response code (:success)
should_allow_http_basic_auth_with_key(http_method, url, parameters) # @option options [Symbol] :failure_code Failure response code (:unauthorized)
should_allow_key_based_auth(http_method, url, parameters) def self.should_allow_api_authentication(http_method, url, parameters={}, options={})
should_allow_http_basic_auth_with_username_and_password(http_method, url, parameters, options)
should_allow_http_basic_auth_with_key(http_method, url, parameters, options)
should_allow_key_based_auth(http_method, url, parameters, options)
end end
# Test that a request allows the username and password for HTTP BASIC # Test that a request allows the username and password for HTTP BASIC
@ -202,7 +205,13 @@ class ActiveSupport::TestCase
# @param [Symbol] http_method the HTTP method for request (:get, :post, :put, :delete) # @param [Symbol] http_method the HTTP method for request (:get, :post, :put, :delete)
# @param [String] url the request url # @param [String] url the request url
# @param [optional, Hash] parameters additional request parameters # @param [optional, Hash] parameters additional request parameters
def self.should_allow_http_basic_auth_with_username_and_password(http_method, url, parameters={}) # @param [optional, Hash] options additional options
# @option options [Symbol] :success_code Successful response code (:success)
# @option options [Symbol] :failure_code Failure response code (:unauthorized)
def self.should_allow_http_basic_auth_with_username_and_password(http_method, url, parameters={}, options={})
success_code = options[:success_code] || :success
failure_code = options[:failure_code] || :unauthorized
context "should allow http basic auth using a username and password for #{http_method} #{url}" do context "should allow http basic auth using a username and password for #{http_method} #{url}" do
context "with a valid HTTP authentication" do context "with a valid HTTP authentication" do
setup do setup do
@ -211,7 +220,7 @@ class ActiveSupport::TestCase
send(http_method, url, parameters, {:authorization => @authorization}) send(http_method, url, parameters, {:authorization => @authorization})
end end
should_respond_with :success should_respond_with success_code
should_respond_with_content_type_based_on_url(url) should_respond_with_content_type_based_on_url(url)
should "login as the user" do should "login as the user" do
assert_equal @user, User.current assert_equal @user, User.current
@ -225,7 +234,7 @@ class ActiveSupport::TestCase
send(http_method, url, parameters, {:authorization => @authorization}) send(http_method, url, parameters, {:authorization => @authorization})
end end
should_respond_with :unauthorized should_respond_with failure_code
should_respond_with_content_type_based_on_url(url) should_respond_with_content_type_based_on_url(url)
should "not login as the user" do should "not login as the user" do
assert_equal User.anonymous, User.current assert_equal User.anonymous, User.current
@ -237,7 +246,7 @@ class ActiveSupport::TestCase
send(http_method, url, parameters, {:authorization => ''}) send(http_method, url, parameters, {:authorization => ''})
end end
should_respond_with :unauthorized should_respond_with failure_code
should_respond_with_content_type_based_on_url(url) should_respond_with_content_type_based_on_url(url)
should "include_www_authenticate_header" do should "include_www_authenticate_header" do
assert @controller.response.headers.has_key?('WWW-Authenticate') assert @controller.response.headers.has_key?('WWW-Authenticate')
@ -252,7 +261,13 @@ class ActiveSupport::TestCase
# @param [Symbol] http_method the HTTP method for request (:get, :post, :put, :delete) # @param [Symbol] http_method the HTTP method for request (:get, :post, :put, :delete)
# @param [String] url the request url # @param [String] url the request url
# @param [optional, Hash] parameters additional request parameters # @param [optional, Hash] parameters additional request parameters
def self.should_allow_http_basic_auth_with_key(http_method, url, parameters={}) # @param [optional, Hash] options additional options
# @option options [Symbol] :success_code Successful response code (:success)
# @option options [Symbol] :failure_code Failure response code (:unauthorized)
def self.should_allow_http_basic_auth_with_key(http_method, url, parameters={}, options={})
success_code = options[:success_code] || :success
failure_code = options[:failure_code] || :unauthorized
context "should allow http basic auth with a key for #{http_method} #{url}" do context "should allow http basic auth with a key for #{http_method} #{url}" do
context "with a valid HTTP authentication using the API token" do context "with a valid HTTP authentication using the API token" do
setup do setup do
@ -262,7 +277,7 @@ class ActiveSupport::TestCase
send(http_method, url, parameters, {:authorization => @authorization}) send(http_method, url, parameters, {:authorization => @authorization})
end end
should_respond_with :success should_respond_with success_code
should_respond_with_content_type_based_on_url(url) should_respond_with_content_type_based_on_url(url)
should_be_a_valid_response_string_based_on_url(url) should_be_a_valid_response_string_based_on_url(url)
should "login as the user" do should "login as the user" do
@ -278,7 +293,7 @@ class ActiveSupport::TestCase
send(http_method, url, parameters, {:authorization => @authorization}) send(http_method, url, parameters, {:authorization => @authorization})
end end
should_respond_with :unauthorized should_respond_with failure_code
should_respond_with_content_type_based_on_url(url) should_respond_with_content_type_based_on_url(url)
should "not login as the user" do should "not login as the user" do
assert_equal User.anonymous, User.current assert_equal User.anonymous, User.current
@ -292,7 +307,13 @@ class ActiveSupport::TestCase
# @param [Symbol] http_method the HTTP method for request (:get, :post, :put, :delete) # @param [Symbol] http_method the HTTP method for request (:get, :post, :put, :delete)
# @param [String] url the request url, without the key=ZXY parameter # @param [String] url the request url, without the key=ZXY parameter
# @param [optional, Hash] parameters additional request parameters # @param [optional, Hash] parameters additional request parameters
def self.should_allow_key_based_auth(http_method, url, parameters={}) # @param [optional, Hash] options additional options
# @option options [Symbol] :success_code Successful response code (:success)
# @option options [Symbol] :failure_code Failure response code (:unauthorized)
def self.should_allow_key_based_auth(http_method, url, parameters={}, options={})
success_code = options[:success_code] || :success
failure_code = options[:failure_code] || :unauthorized
context "should allow key based auth using key=X for #{http_method} #{url}" do context "should allow key based auth using key=X for #{http_method} #{url}" do
context "with a valid api token" do context "with a valid api token" do
setup do setup do
@ -307,7 +328,7 @@ class ActiveSupport::TestCase
send(http_method, request_url, parameters) send(http_method, request_url, parameters)
end end
should_respond_with :success should_respond_with success_code
should_respond_with_content_type_based_on_url(url) should_respond_with_content_type_based_on_url(url)
should_be_a_valid_response_string_based_on_url(url) should_be_a_valid_response_string_based_on_url(url)
should "login as the user" do should "login as the user" do
@ -319,10 +340,16 @@ class ActiveSupport::TestCase
setup do setup do
@user = User.generate_with_protected! @user = User.generate_with_protected!
@token = Token.generate!(:user => @user, :action => 'feeds') @token = Token.generate!(:user => @user, :action => 'feeds')
send(http_method, url + "?key=#{@token.value}") # Simple url parse to add on ?key= or &key=
request_url = if url.match(/\?/)
url + "&key=#{@token.value}"
else
url + "?key=#{@token.value}"
end
send(http_method, request_url, parameters)
end end
should_respond_with :unauthorized should_respond_with failure_code
should_respond_with_content_type_based_on_url(url) should_respond_with_content_type_based_on_url(url)
should "not login as the user" do should "not login as the user" do
assert_equal User.anonymous, User.current assert_equal User.anonymous, User.current