Download as
Browse Code »

Commit 0e54aafd8482c58802e931956e3aeec9aabf2adc

Authored by Rodrigo Souto
Committed by Daniela Feitosa
1 parent 0f3973a7
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Fixing create_enterprise task crash 

(ActionItem1893)
Showing 2 changed files with 35 additions and 13 deletions   Show diff stats
app/controllers/my_profile/tasks_controller.rb
  Diff comments   View file @0e54aaf
... ... @@ -16,16 +16,18 @@ class TasksController < MyProfileController
16 16 def close
17 17 failed = {}
18 18  
19   - params[:tasks].each do |id, value|
20   - decision = value[:decision]
21   - if request.post? && VALID_DECISIONS.include?(decision) && id && decision != 'skip'
22   - task = profile.find_in_all_tasks(id)
23   - task.update_attributes!(value[:task])
24   - begin
25   - task.send(decision)
26   - rescue Exception => ex
27   - message = "#{task.title} (#{task.requestor ? task.requestor.name : task.author_name})"
28   - failed[ex.clean_message] ? failed[ex.clean_message] << message : failed[ex.clean_message] = [message]
  19 + if params[:tasks]
  20 + params[:tasks].each do |id, value|
  21 + decision = value[:decision]
  22 + if request.post? && VALID_DECISIONS.include?(decision) && id && decision != 'skip'
  23 + task = profile.find_in_all_tasks(id)
  24 + begin
  25 + task.update_attributes(value[:task])
  26 + task.send(decision)
  27 + rescue Exception => ex
  28 + message = "#{task.title} (#{task.requestor ? task.requestor.name : task.author_name})"
  29 + failed[ex.clean_message] ? failed[ex.clean_message] << message : failed[ex.clean_message] = [message]
  30 + end
29 31 end
30 32 end
31 33 end
... ...
test/functional/tasks_controller_test.rb
  Diff comments   View file @0e54aaf
... ... @@ -217,16 +217,18 @@ class TasksControllerTest &lt; Test::Unit::TestCase
217 217 assert_includes c_blog2.children(true), p_article
218 218 end
219 219  
220   - should 'raise error if there is an enterprise with the same identifier and keep the task active' do
  220 + should 'display error if there is an enterprise with the same identifier and keep the task active' do
221 221 e = Environment.default
222 222 e.add_admin(profile)
223 223 task = CreateEnterprise.create!(:name => "My Enterprise", :identifier => "my-enterprise", :requestor => profile, :target => e)
224 224 enterprise = fast_create(Enterprise, :name => "My Enterprise", :identifier => "my-enterprise")
225 225  
226   - assert_raise ActiveRecord::RecordInvalid do
227   - post :close, :tasks => {task.id => { :task => {:reject_explanation => "Bla bla"}, :decision => "cancel"}}
  226 + assert_nothing_raised do
  227 + post :close, :tasks => {task.id => {:decision => "finish"}}
228 228 end
229 229  
  230 + assert_match /Validation.failed/, @response.body
  231 +
230 232 task.reload
231 233 assert_equal Task::Status::ACTIVE, task.status
232 234 end
... ... @@ -280,4 +282,22 @@ class TasksControllerTest &lt; Test::Unit::TestCase
280 282 assert_equal 'new source', TinyMceArticle.find(:first).source_name
281 283 end
282 284  
  285 + should "not crash if accessing close without tasks parameter" do
  286 + assert_nothing_raised do
  287 + post :close
  288 + end
  289 + end
  290 +
  291 + should 'close create enterprise if trying to cancel even if there is already an existing identifier' do
  292 + identifier = "common-identifier"
  293 + task = CreateEnterprise.create!(:identifier => identifier, :name => identifier, :requestor => profile, :target => profile)
  294 + fast_create(Profile, :identifier => identifier)
  295 +
  296 + assert_nothing_raised do
  297 + post :close, :tasks => {task.id => {:task => {:reject_explanation => "Some explanation"}, :decision => 'cancel'}}
  298 + end
  299 +
  300 + task.reload
  301 + assert_equal Task::Status::CANCELLED, task.status
  302 + end
283 303 end
... ...