0
@@ -42,13 +42,11 @@ class PeopleController < ApplicationController
0
     cookies.delete :auth_token
0
     @person = Person.new(params[:person])
0
     respond_to do |format|
0
+      @person.deactivated = true if global_prefs.email_verifications?
0
       if @person.save
0
         self.current_person = @person
0
         if global_prefs.email_verifications?
0
-          # TODO: move some of this into models.
0
-          @person.deactivated = true; @person.save!
0
-          @verification = EmailVerification.create(:person => @person)
0
-          @person.email_verifications << @verification
0
+          @person.email_verifications.create
0
           flash[:notice] = %(Thanks for signing up! A verification email has 
0
                              been sent to #{@person.email}.)
0
           format.html { redirect_to(home_url) }

0
@@ -116,7 +116,7 @@ describe PeopleController do
0
         it "should verify a person" do
0
           person = create_person
0
           person.should be_deactivated
0
-          verification = assigns(:verification)
0
+          verification = assigns(:person).email_verifications.last
0
           get :verify, :id => verification.code
0
           person.reload.should be_active
0
           response.should redirect_to(person_path(person))
0
@@ -125,7 +125,7 @@ describe PeopleController do
0
         it "should verify a person even if they're logged in" do
0
           person = create_person
0
           login_as(person)
0
-          verification = assigns(:verification)
0
+          verification = person.email_verifications.last
0
           get :verify, :id => verification.code
0
           person.reload.should be_active
0
           response.should redirect_to(person_path(person))