0
@@ -10,21 +10,21 @@
0
   end
0
   
0
   def password_reminder(person)
0
-    from         "Password reminder <password-reminder@#{server}>"
0
+    from         "Password reminder <password-reminder@#{domain}>"
0
     recipients   person.email
0
     subject      formatted_subject("Password reminder")
0
     body         "domain" => server, "person" => person
0
   end
0
   
0
   def message_notification(message)
0
-    from         "Message notification <message@#{server}>"
0
+    from         "Message notification <message@#{domain}>"
0
     recipients   message.recipient.email
0
     subject      formatted_subject("New message")
0
     body         "domain" => server, "message" => message
0
   end
0
   
0
   def connection_request(connection)
0
-    from         "Contact request <connection@#{server}>"
0
+    from         "Contact request <connection@#{domain}>"
0
     recipients   connection.contact.email
0
     subject      formatted_subject("New contact request")
0
     body         "domain" => server,
0
@@ -34,7 +34,7 @@
0
   end
0
   
0
   def blog_comment_notification(comment)
0
-    from         "Comment notification <comment@#{server}>"
0
+    from         "Comment notification <comment@#{domain}>"
0
     recipients   comment.commented_person.email
0
     subject      formatted_subject("New blog comment")
0
     body         "domain" => server, "comment" => comment,
0
@@ -45,7 +45,7 @@
0
   end
0
   
0
   def wall_comment_notification(comment)
0
-    from         "Comment notification <comment@#{server}>"
0
+    from         "Comment notification <comment@#{domain}>"
0
     recipients   comment.commented_person.email
0
     subject      formatted_subject("New wall comment")
0
     body         "domain" => server, "comment" => comment,
0
@@ -55,7 +55,7 @@
0
   end
0
   
0
   def email_verification(ev)
0
-    from         "Email verification <email@#{server}>"
0
+    from         "Email verification <email@#{domain}>"
0
     recipients   ev.person.email
0
     subject      formatted_subject("Email verification")
0
     body         "server_name" => server,

0
@@ -5,6 +5,7 @@
0
   before(:each) do
0
     @preferences = preferences(:one)
0
     @server = @preferences.server_name
0
+    @domain = @preferences.domain
0
   end
0
   
0
   describe "password reminder" do
0
@@ -14,7 +15,7 @@
0
      end
0
    
0
      it "should have the right sender" do
0
-       @email.from.first.should == "password-reminder@#{@server}"
0
+       @email.from.first.should == "password-reminder@#{@domain}"
0
      end
0
    
0
      it "should have the right recipient" do
0
@@ -33,7 +34,7 @@
0
      end
0
    
0
      it "should have the right sender" do
0
-       @email.from.first.should == "message@#{@server}"
0
+       @email.from.first.should == "message@#{@domain}"
0
      end
0
    
0
      it "should have the right recipient" do
0
@@ -133,7 +134,7 @@
0
      end
0
      
0
      it "should have a link to the recipient's preferences" do
0
-       prefs_url = "#{@server}/people/#{@recipient.to_param}/edit"
0
+       prefs_url = "http://#{@server}/people/#{@recipient.to_param}/edit"
0
        @email.body.should =~ /#{prefs_url}/
0
      end
0
    end