Fixing requests tests.

diff --git a/app/models/user.rb b/app/models/user.rb
index 6975092..02bfabe 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -59,7 +59,7 @@ class User < ActiveRecord::Base
   before_validation :generate_password, :on => :create
 
   def generate_password
-    if self.force_random_password == true
+    if self.force_random_password
       self.password = self.password_confirmation = Devise.friendly_token.first(8)
     end
   end

diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml
index 1e8a44e..bd2e136 100644 (file)
--- a/app/views/admin/users/_form.html.haml
+++ b/app/views/admin/users/_form.html.haml
@@ -23,7 +23,7 @@
         -if f.object.new_record?
           .clearfix 
             = f.label :admin, :class => "checkbox" do
-              = f.check_box :force_random_password
+              = f.check_box :force_random_password, {}, true, nil
             %span Generate random password
         
         %div.password-fields