Refactoring "perform" method on CreateUser task and "signup" method on AccountController

Signed-off-by: André Bernardes <andrebsguedes@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

Refactoring "perform" method on CreateUser task and "signup" method on AccountController
Signed-off-by: André Bernardes <andrebsguedes@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
tallys · Tallys Martins
1 parent d9a22bdf
Showing 3 changed files with 18 additions and 13 deletions Show diff stats
app/controllers/public/account_controller.rb
app/models/create_user.rb
features/signup.feature
@@ -87,7 +87,7 @@ class AccountController &lt; ApplicationController
       @person.environment = @user.environment
       unless @user.environment.enabled?('admin_must_approve_new_users')
         if request.post?
-          @person.update_attributes(params[:profile_data])
+          @person.attributes = params[:profile_data]
           if may_be_a_bot
             set_signup_start_time_for_now
             @block_bot = true
@@ -26,17 +26,12 @@ class CreateUser &lt; Task
   end
   def perform
-    user = User.new
-    person = Person.new(person_data)
+    user = User.new(user_data)
+    user.person = Person.new(person_data)
     author_name = user.name
-    user_data = self.data.reject do |key, value|
-      ! DATA_FIELDS.include?(key.to_s)
-    end
-    person.update_attributes(@person)
-    user.update_attributes(user_data)
     user.environment = self.environment
-    person.environment = user.environment
-    user.save!
+    user.person.environment = user.environment
+    user.signup!
   end
   def title
@@ -69,4 +64,14 @@ class CreateUser &lt; Task
   def target_notification_message
     _("User \"%{user}\" just requested to register. You have to approve or reject it through the \"Pending Validations\" section in your control panel.\n") % { :user => self.name }
   end
+
+  protected
+ 
+  def user_data
+     user_data = self.data.reject do |key, value|
+      !DATA_FIELDS.include?(key.to_s)
+    end
+ 
+    user_data
+  end
 end
 \ No newline at end of file
@@ -312,8 +312,8 @@ Feature: signup
     And feature "skip_new_user_email_confirmation" is enabled on environment
     And I go to /account/signup
     And I fill in "Username" with "teste"
-    And I fill in "Password" with "1234"
-    And I fill in "Password confirmation" with "1234"
+    And I fill in "Password" with "123456"
+    And I fill in "Password confirmation" with "123456"
     And I fill in "e-Mail" with "teste@teste.com"
     And I fill in "Full name" with "Teste da Silva"
     And I press "Create my account"
@@ -325,7 +325,7 @@ Feature: signup
     And I follow "Logout"
     And I follow "Login"
     And I fill in "Username / Email" with "teste"
-    And I fill in "Password" with "1234"
+    And I fill in "Password" with "123456"
     And I press "Log in"
     Then I should see "teste"
	@@ -87,7 +87,7 @@ class AccountController < ApplicationController		@@ -87,7 +87,7 @@ class AccountController < ApplicationController
87	@person.environment = @user.environment	87	@person.environment = @user.environment
88	unless @user.environment.enabled?('admin_must_approve_new_users')	88	unless @user.environment.enabled?('admin_must_approve_new_users')
89	if request.post?	89	if request.post?
90	- @person.update_attributes(params[:profile_data])	90	+ @person.attributes = params[:profile_data]
91	if may_be_a_bot	91	if may_be_a_bot
92	set_signup_start_time_for_now	92	set_signup_start_time_for_now
93	@block_bot = true	93	@block_bot = true