Fix resend activation code for users

Victor Costa
1 parent 6cee467c
Showing 4 changed files with 18 additions and 2 deletions Show diff stats
app/models/user.rb
lib/noosfero/api/session.rb
test/unit/api/session_test.rb
test/unit/user_test.rb
@@ -425,7 +425,7 @@ class User &lt; ActiveRecord::Base
  
   def resend_activation_code
     return if self.activated?
-    self.make_activation_code
+    update_attribute(:activation_code, make_activation_code)
     self.deliver_activation_code
   end
  
@@ -144,6 +144,7 @@ module Noosfero
         requestors.each do |requestor|
           requestor.user.resend_activation_code
         end
+        present requestors.map(&:user), :with => Entities::UserLogin
       end
  
       params do
@@ -218,7 +218,22 @@ class SessionTest &lt; ActiveSupport::TestCase
       post "/api/v1/resend_activation_code?#{params.to_query}"
       process_delayed_job_queue
     end
+    json = JSON.parse(last_response.body)
+    assert !json['users'].first['activated']
     assert_equal user.email, ActionMailer::Base.deliveries.last['to'].to_s
   end
  
+  should 'not resend activation code for an active user' do
+    user = create_user
+    params = {:value => user.login}
+    user.activate
+    Delayed::Job.destroy_all
+    assert_no_difference 'ActionMailer::Base.deliveries.size' do
+      post "/api/v1/resend_activation_code?#{params.to_query}"
+      process_delayed_job_queue
+    end
+    json = JSON.parse(last_response.body)
+    assert json['users'].first['activated']
+  end
+
 end
@@ -764,7 +764,7 @@ class UserTest &lt; ActiveSupport::TestCase
       user.resend_activation_code
       process_delayed_job_queue
     end
-    assert_not_equal activation_code, user.activation_code
+    assert_not_equal activation_code, user.reload.activation_code
     assert_equal 'pending@activation.com', ActionMailer::Base.deliveries.last['to'].to_s
   end
...	...	@@ -425,7 +425,7 @@ class User < ActiveRecord::Base
425	425
426	426	def resend_activation_code
427	427	return if self.activated?
428		- self.make_activation_code
	428	+ update_attribute(:activation_code, make_activation_code)
429	429	self.deliver_activation_code
430	430	end
431	431
...	...
...	...	@@ -144,6 +144,7 @@ module Noosfero
144	144	requestors.each do \|requestor\|
145	145	requestor.user.resend_activation_code
146	146	end
	147	+ present requestors.map(&:user), :with => Entities::UserLogin
147	148	end
148	149
149	150	params do
...	...
...	...	@@ -218,7 +218,22 @@ class SessionTest < ActiveSupport::TestCase
218	218	post "/api/v1/resend_activation_code?#{params.to_query}"
219	219	process_delayed_job_queue
220	220	end
	221	+ json = JSON.parse(last_response.body)
	222	+ assert !json['users'].first['activated']
221	223	assert_equal user.email, ActionMailer::Base.deliveries.last['to'].to_s
222	224	end
223	225
	226	+ should 'not resend activation code for an active user' do
	227	+ user = create_user
	228	+ params = {:value => user.login}
	229	+ user.activate
	230	+ Delayed::Job.destroy_all
	231	+ assert_no_difference 'ActionMailer::Base.deliveries.size' do
	232	+ post "/api/v1/resend_activation_code?#{params.to_query}"
	233	+ process_delayed_job_queue
	234	+ end
	235	+ json = JSON.parse(last_response.body)
	236	+ assert json['users'].first['activated']
	237	+ end
	238	+
224	239	end
...	...
...	...	@@ -764,7 +764,7 @@ class UserTest < ActiveSupport::TestCase
764	764	user.resend_activation_code
765	765	process_delayed_job_queue
766	766	end
767		- assert_not_equal activation_code, user.activation_code
	767	+ assert_not_equal activation_code, user.reload.activation_code
768	768	assert_equal 'pending@activation.com', ActionMailer::Base.deliveries.last['to'].to_s
769	769	end
770	770
...	...