jro_apps/redmine Commit - r4252:7d934c984ae8

Allow key authentication when updating issues (with tests) #6447...

Eric Davis -

r4252:7d934c984ae8

parent child

Context file:

r4252:7d934c984ae8

Collapse all files

app/controllers/issues_controller.rb +1 -1

                before_filter :find_optional_project, :only => [:index]
                before_filter :check_for_default_issue_status, :only => [:new, :create]
                before_filter :build_new_issue_from_params, :only => [:new, :create]
-               accept_key_auth :index, :show, :create
+               accept_key_auth :index, :show, :create, :update
                rescue_from Query::StatementInvalid, :with => :query_statement_invalid

test/integration/api_test/issues_test.rb +74 -53

                  end
                end
-               context "PUT /issues/1.xml" do
+               # Issue 6 is on a private project
+               context "PUT /issues/6.xml" do
                  setup do
-                   @issue_count = Issue.count
-                   @journal_count = Journal.count
-                   @attributes = {:subject => 'API update', :notes => 'A new note'}
-                   put '/issues/1.xml', {:issue => @attributes}, :authorization => credentials('jsmith')
+                   @parameters = {:issue => {:subject => 'API update', :notes => 'A new note'}}
+                   @headers = { :authorization => credentials('jsmith') }
                  end
-                 should_respond_with :ok
-                 should_respond_with_content_type 'application/xml'
+                 should_allow_api_authentication(:put,
+                                                 '/issues/6.xml',
+                                                 {:issue => {:subject => 'API update', :notes => 'A new note'}},
+                                                 {:success_code => :ok})
                  should "not create a new issue" do
-                   assert_equal Issue.count, @issue_count
+                   assert_no_difference('Issue.count') do
+                     put '/issues/6.xml', @parameters, @headers
+                   end
                  end
                  should "create a new journal" do
-                   assert_equal Journal.count, @journal_count + 1
+                   assert_difference('Journal.count') do
+                     put '/issues/6.xml', @parameters, @headers
+                   end
                  end
                  should "add the note to the journal" do
+                   put '/issues/6.xml', @parameters, @headers
                    journal = Journal.last
                    assert_equal "A new note", journal.notes
                  end
                  should "update the issue" do
-                   issue = Issue.find(1)
-                   @attributes.each do |attribute, value|
-                     assert_equal value, issue.send(attribute) unless attribute == :notes
-                   end
+                   put '/issues/6.xml', @parameters, @headers
+                   issue = Issue.find(6)
+                   assert_equal "API update", issue.subject
                  end
                end
-               context "PUT /issues/1.xml with failed update" do
+               context "PUT /issues/6.xml with failed update" do
                  setup do
-                   @attributes = {:subject => ''}
-                   @issue_count = Issue.count
-                   @journal_count = Journal.count
-                   put '/issues/1.xml', {:issue => @attributes}, :authorization => credentials('jsmith')
+                   @parameters = {:issue => {:subject => ''}}
+                   @headers = { :authorization => credentials('jsmith') }
                  end
-                 should_respond_with :unprocessable_entity
-                 should_respond_with_content_type 'application/xml'
+                 should_allow_api_authentication(:put,
+                                                 '/issues/6.xml',
+                                                 {:issue => {:subject => ''}}, # Missing subject should fail
+                                                 {:success_code => :unprocessable_entity})
                  should "not create a new issue" do
-                   assert_equal Issue.count, @issue_count
+                   assert_no_difference('Issue.count') do
+                     put '/issues/6.xml', @parameters, @headers
+                   end
                  end
                  should "not create a new journal" do
-                   assert_equal Journal.count, @journal_count
+                   assert_no_difference('Journal.count') do
+                     put '/issues/6.xml', @parameters, @headers
+                   end
                  end
                  should "have an errors tag" do
+                   put '/issues/6.xml', @parameters, @headers
                    assert_tag :errors, :child => {:tag => 'error', :content => "Subject can't be blank"}
                  end
                end
-               context "PUT /issues/1.json" do
+               context "PUT /issues/6.json" do
                  setup do
-                   @issue_count = Issue.count
-                   @journal_count = Journal.count
-                   @attributes = {:subject => 'API update', :notes => 'A new note'}
-                   put '/issues/1.json', {:issue => @attributes}, :authorization => credentials('jsmith')
+                   @parameters = {:issue => {:subject => 'API update', :notes => 'A new note'}}
+                   @headers = { :authorization => credentials('jsmith') }
                  end
-                 should_respond_with :ok
-                 should_respond_with_content_type 'application/json'
+                 should_allow_api_authentication(:put,
+                                                 '/issues/6.json',
+                                                 {:issue => {:subject => 'API update', :notes => 'A new note'}},
+                                                 {:success_code => :ok})
                  should "not create a new issue" do
-                   assert_equal Issue.count, @issue_count
+                   assert_no_difference('Issue.count') do
+                     put '/issues/6.json', @parameters, @headers
+                   end
                  end
                  should "create a new journal" do
-                   assert_equal Journal.count, @journal_count + 1
+                   assert_difference('Journal.count') do
+                     put '/issues/6.json', @parameters, @headers
+                   end
                  end
                  should "add the note to the journal" do
+                   put '/issues/6.json', @parameters, @headers
                    journal = Journal.last
                    assert_equal "A new note", journal.notes
                  end
                  should "update the issue" do
-                   issue = Issue.find(1)
-                   @attributes.each do |attribute, value|
-                     assert_equal value, issue.send(attribute) unless attribute == :notes
-                   end
+                   put '/issues/6.json', @parameters, @headers
+                   issue = Issue.find(6)
+                   assert_equal "API update", issue.subject
                  end
                end
-               context "PUT /issues/1.json with failed update" do
+               context "PUT /issues/6.json with failed update" do
                  setup do
-                   @attributes = {:subject => ''}
-                   @issue_count = Issue.count
-                   @journal_count = Journal.count
-                   put '/issues/1.json', {:issue => @attributes}, :authorization => credentials('jsmith')
+                   @parameters = {:issue => {:subject => ''}}
+                   @headers = { :authorization => credentials('jsmith') }
                  end
-                 should_respond_with :unprocessable_entity
-                 should_respond_with_content_type 'application/json'
+                 should_allow_api_authentication(:put,
+                                                 '/issues/6.json',
+                                                 {:issue => {:subject => ''}}, # Missing subject should fail
+                                                 {:success_code => :unprocessable_entity})
                  should "not create a new issue" do
-                   assert_equal Issue.count, @issue_count
+                   assert_no_difference('Issue.count') do
+                     put '/issues/6.json', @parameters, @headers
+                   end
                  end
                  should "not create a new journal" do
-                   assert_equal Journal.count, @journal_count
+                   assert_no_difference('Journal.count') do
+                     put '/issues/6.json', @parameters, @headers
+                   end
                  end
                  should "have an errors attribute" do
+                   put '/issues/6.json', @parameters, @headers
                    json = ActiveSupport::JSON.decode(response.body)
                    assert_equal "can't be blank", json.first['subject']
                  end

test/test_helper.rb +2 -2

                # Checks that the response is a valid JSON string
                def self.should_be_a_valid_json_string
-                 should "be a valid JSON string" do
-                   assert ActiveSupport::JSON.decode(response.body)
+                 should "be a valid JSON string (or empty)" do
+                   assert (response.body.blank? || ActiveSupport::JSON.decode(response.body))
                  end
                end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages