jro_apps/redmine Commit - r3908:7443f2a3105a

Merged r4010 from trunk....

Eric Davis -

r3908:7443f2a3105a

parent child

Context file:

r3908:7443f2a3105a

test/exemplars/attachment_exemplar.rb +1 -1

               end
               def self.generate_file
-                @file = mock_file
+                @file = ActiveSupport::TestCase.mock_file
               end
             end

test/test_helper.rb +6 -2

               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')
                 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")

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages