jro_apps/redmine Commit - r8128:ad25e3807d2d

Make sure that tests restore the attachments path to the tmp dir so that fixture files don't get deleted....

Jean-Philippe Lang -

r8128:ad25e3807d2d

parent child

Context file:

r8128:ad25e3807d2d

test/functional/attachments_controller_test.rb +5 -1

                 @controller = AttachmentsController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
-                Attachment.storage_path = "#{Rails.root}/test/fixtures/files"
                 User.current = nil
+                set_fixtures_attachments_directory
+              end
+              def teardown
+                set_tmp_attachments_directory
               end
               def test_show_diff

test/integration/api_test/attachments_test.rb +5 -1

               def setup
                 Setting.rest_api_enabled = '1'
-                Attachment.storage_path = "#{Rails.root}/test/fixtures/files"
+                set_fixtures_attachments_directory
+              end
+              def teardown
+                set_tmp_attachments_directory
               end
               context "/attachments/:id" do

test/test_helper.rb +4 0

                 Attachment.storage_path = "#{Rails.root}/tmp/test/attachments"
               end
+              def set_fixtures_attachments_directory
+                Attachment.storage_path = "#{Rails.root}/test/fixtures/files"
+              end
               def with_settings(options, &block)
                 saved_settings = options.keys.inject({}) {|h, k| h[k] = Setting[k].is_a?(Symbol) ? Setting[k] : Setting[k].dup; h}
                 options.each {|k, v| Setting[k] = v}

test/unit/attachment_test.rb +1 -1

               end
               def test_latest_attach
-                Attachment.storage_path = "#{Rails.root}/test/fixtures/files"
+                set_fixtures_attachments_directory
                 a1 = Attachment.find(16)
                 assert_equal "testfile.png", a1.filename
                 assert a1.readable?

test/unit/helpers/application_helper_test.rb +1 -1

               end
               def test_attached_images_should_read_later
-                Attachment.storage_path = "#{Rails.root}/test/fixtures/files"
+                set_fixtures_attachments_directory
                 a1 = Attachment.find(16)
                 assert_equal "testfile.png", a1.filename
                 assert a1.readable?

test/unit/lib/redmine/export/pdf_test.rb +1 -1

               end
               def test_attach
-                Attachment.storage_path = "#{Rails.root}/test/fixtures/files"
+                set_fixtures_attachments_directory
                 str2 = "\x83e\x83X\x83g"
                 str2.force_encoding("ASCII-8BIT") if str2.respond_to?(:force_encoding)

test/unit/project_test.rb +1 0

               def setup
                 @ecookbook = Project.find(1)
                 @ecookbook_sub1 = Project.find(3)
+                set_tmp_attachments_directory
                 User.current = nil
               end

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