0
@@ -40,12 +40,10 @@ class User < ActiveRecord::Base
0
   validates_presence_of     :login, :email, :password_hash
0
   validates_uniqueness_of   :login, :case_sensitive => false
0
   validates_length_of       :login, :maximum => 25
0
+  validates_format_of       :email, :on => :create, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
0
   validates_confirmation_of :password, :on => :create
0
   validates_confirmation_of :password, :on => :update, :allow_blank => true
0
   
0
-  validates_format_of       :email, :on => :create,
0
-                            :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
0
-  
0
   before_create :set_defaults
0
   
0
   composed_of :tz, :class_name => 'TZInfo::Timezone', :mapping => %w( time_zone time_zone )

0
@@ -171,6 +171,13 @@ class UsersControllerTest < Test::Unit::TestCase
0
     assert_template "new" 
0
     assert_equal num_users, User.count
0
   end
0
+  
0
+  def test_should_not_create_user_without_valid_email
0
+    num_users = User.count
0
+    post :create, :user => {:login => 'test', :email => 'not_valid', :password => 'test'}
0
+    assert_template "new" 
0
+    assert_equal num_users, User.count
0
+  end
0
 
0
   def test_should_not_create_user_without_password_confirmation
0
     num_users = User.count