comparison test/.svn/text-base/test_helper.rb.svn-base @ 120:cd2282d2aa55 cannam

Merge from the default branch. Note that this is not a valid SVN repository any more (use default, redmine-1.1 etc for SVN updates).
author Chris Cannam
date Thu, 13 Jan 2011 14:33:08 +0000
parents af80e5618e9b 8661b858af72
children 753f1380d6bc
comparison
equal deleted inserted replaced
118:b859cc0c4fa1 120:cd2282d2aa55
57 post "/login", :username => login, :password => password 57 post "/login", :username => login, :password => password
58 assert_equal login, User.find(session[:user_id]).login 58 assert_equal login, User.find(session[:user_id]).login
59 end 59 end
60 60
61 def uploaded_test_file(name, mime) 61 def uploaded_test_file(name, mime)
62 ActionController::TestUploadedFile.new(ActiveSupport::TestCase.fixture_path + "/files/#{name}", mime) 62 ActionController::TestUploadedFile.new(ActiveSupport::TestCase.fixture_path + "/files/#{name}", mime, true)
63 end 63 end
64 64
65 # Mock out a file 65 # Mock out a file
66 def self.mock_file 66 def self.mock_file
67 file = 'a_file.png' 67 file = 'a_file.png'