diff test/test_helper.rb @ 14:1d32c0a0efbf

* Update to SVN trunk (revisions 3892-4040)

--- a/test/test_helper.rb	Wed Jul 28 12:47:17 2010 +0100
+++ b/test/test_helper.rb	Wed Aug 25 16:30:24 2010 +0100
@@ -63,7 +63,7 @@
   end
 
   # Mock out a file
-  def mock_file
+  def self.mock_file
     file = 'a_file.png'
     file.stubs(:size).returns(32)
     file.stubs(:original_filename).returns('a_file.png')
@@ -71,7 +71,11 @@
     file.stubs(:read).returns(false)
     file
   end
-  
+
+  def mock_file
+    self.class.mock_file
+  end
+
   # Use a temporary directory for attachment related tests
   def set_tmp_attachments_directory
     Dir.mkdir "#{RAILS_ROOT}/tmp/test" unless File.directory?("#{RAILS_ROOT}/tmp/test")
@@ -86,6 +90,12 @@
     saved_settings.each {|k, v| Setting[k] = v}
   end
 
+  def change_user_password(login, new_password)
+    user = User.first(:conditions => {:login => login})
+    user.password, user.password_confirmation = new_password, new_password
+    user.save!
+  end
+
   def self.ldap_configured?
     @test_ldap = Net::LDAP.new(:host => '127.0.0.1', :port => 389)
     return @test_ldap.bind
@@ -162,4 +172,13 @@
       end
     end
   end
+
+  def self.should_create_a_new_user(&block)
+    should "create a new user" do
+      user = instance_eval &block
+      assert user
+      assert_kind_of User, user
+      assert !user.new_record?
+    end
+  end
 end