Download as
Browse Code »

Commit da464f010dbd05a41df4bd71a6fead897731309a

Authored by Daniela Feitosa
1 parent 108f6a21
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

Prevent templates from being destroyed 

Check if is template before creating job to check activation
Showing 3 changed files with 9 additions and 1 deletions   Show diff stats
app/models/user.rb
  Diff comments   View file @da464f0
@@ -350,6 +350,7 @@ class User < ActiveRecord::Base @@ -350,6 +350,7 @@ class User < ActiveRecord::Base
350 end 350 end
351 351
352 def delay_activation_check 352 def delay_activation_check
  353 + return if person.is_template?
353 Delayed::Job.enqueue(UserActivationJob.new(self.id), {:priority => 0, :run_at => 72.hours.from_now}) 354 Delayed::Job.enqueue(UserActivationJob.new(self.id), {:priority => 0, :run_at => 72.hours.from_now})
354 end 355 end
355 end 356 end
test/unit/user_activation_job_test.rb
  Diff comments   View file @da464f0
@@ -34,7 +34,7 @@ class NotifyActivityToProfilesJobTest < ActiveSupport::TestCase @@ -34,7 +34,7 @@ class NotifyActivityToProfilesJobTest < ActiveSupport::TestCase
34 user.person.is_template = true 34 user.person.is_template = true
35 user.person.save 35 user.person.save
36 job = UserActivationJob.new(user.id) 36 job = UserActivationJob.new(user.id)
37 - assert_no_difference User, :count do 37 + assert_no_difference 'User.count' do
38 job.perform 38 job.perform
39 process_delayed_job_queue 39 process_delayed_job_queue
40 end 40 end
test/unit/user_test.rb
  Diff comments   View file @da464f0
@@ -525,6 +525,13 @@ class UserTest < ActiveSupport::TestCase @@ -525,6 +525,13 @@ class UserTest < ActiveSupport::TestCase
525 assert_match /UserActivationJob/, Delayed::Job.last.handler 525 assert_match /UserActivationJob/, Delayed::Job.last.handler
526 end 526 end
527 527
  528 + should 'not create job to check activation to template users' do
  529 + Person.any_instance.stubs(:is_template?).returns(true)
  530 +
  531 + user = new_user
  532 + assert_equal 0, Delayed::Job.by_handler("--- !ruby/struct:UserActivationJob\nuser_id: #{user.id}\n").count
  533 + end
  534 +
528 should 'deactivate an user' do 535 should 'deactivate an user' do
529 user = new_user 536 user = new_user
530 user.activate 537 user.activate