noosfero | 3 new commits pushed to repository

[Bráulio Bhavamitra]

Bráulio Bhavamitra pushed to refs/heads/master at <a href="https://gitlab.com/noosfero/noosfero">Noosfero / noosfero</a>

Commits:
<a href="https://gitlab.com/noosfero/noosfero/commit/9ba92dccb042b167ec08c8da51cb0d6c94887d3d">9ba92dcc</a> by Victor Costa
New config to define when user activation check will perform

- - - - -
<a href="https://gitlab.com/noosfero/noosfero/commit/783b069278b89e21733252e78081b88908204631">783b0692</a> by Victor Costa
Fix class name of user activation test

- - - - -
<a href="https://gitlab.com/noosfero/noosfero/commit/9d1bd7a8d4170623632ea272cde3150822aaadfd">9d1bd7a8</a> by Bráulio Bhavamitra
Merge branch 'custom_activation_check_time' into 'master'

New configuration to define when user activation check will perform

See merge request !455

- - - - -


Changes:

=====================================
app/models/user.rb
=====================================
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -363,6 +363,6 @@ class User < ActiveRecord::Base
 
     def delay_activation_check
       return if person.is_template?
-      Delayed::Job.enqueue(UserActivationJob.new(self.id), {:priority => 0, :run_at => 72.hours.from_now})
+      Delayed::Job.enqueue(UserActivationJob.new(self.id), {:priority => 0, :run_at => (NOOSFERO_CONF['hours_until_user_activation_check'] || 72).hours.from_now})
     end
 end

=====================================
config/noosfero.yml.dist
=====================================
--- a/config/noosfero.yml.dist
+++ b/config/noosfero.yml.dist
@@ -9,6 +9,7 @@ development:
   googlemaps_initial_zoom: 4
   exception_recipients: [admin at example.com]
   max_upload_size: 5MB
+  hours_until_user_activation_check: 72
 
 test:
 

=====================================
test/unit/user_activation_job_test.rb
=====================================
--- a/test/unit/user_activation_job_test.rb
+++ b/test/unit/user_activation_job_test.rb
@@ -1,6 +1,6 @@
 require_relative "../test_helper"
 
-class NotifyActivityToProfilesJobTest < ActiveSupport::TestCase
+class UserActivationJobTest < ActiveSupport::TestCase
 
   should 'create job on user creation' do
     user = new_user :login => 'test1'

=====================================
test/unit/user_test.rb
=====================================
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -526,9 +526,19 @@ class UserTest < ActiveSupport::TestCase
     assert user.activated?
   end
 
-  should 'delay activation check' do
+  should 'delay activation check with default time' do
     user = new_user
-    assert_match /UserActivationJob/, Delayed::Job.last.handler
+    job = Delayed::Job.last
+    assert_match /UserActivationJob/, job.handler
+    assert_equal 72, ((job.run_at - user.created_at)/1.hour).round
+  end
+
+  should 'delay activation check with custom time' do
+    NOOSFERO_CONF.stubs(:[]).with('hours_until_user_activation_check').returns(240)
+    user = new_user
+    job = Delayed::Job.last
+    assert_match /UserActivationJob/, job.handler
+    assert_equal 240, ((job.run_at - user.created_at)/1.hour).round
   end
 
   should 'not create job to check activation to template users' do

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150222/9b9a2d67/attachment-0001.html>