aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorBen Woosley <ben.woosley@gmail.com>2012-11-26 04:18:18 -0600
committerBen Woosley <ben.woosley@gmail.com>2012-11-26 17:50:57 -0600
commit8b104e2f0cb6e92604185f7a4934acad80142f2a (patch)
tree58ba66053164ef337799e182690f92312443848c /actionpack/test/controller
parentd23c761f5a514e10676aa3e0e1632946aaebcbf7 (diff)
downloadrails-8b104e2f0cb6e92604185f7a4934acad80142f2a.tar.gz
rails-8b104e2f0cb6e92604185f7a4934acad80142f2a.tar.bz2
rails-8b104e2f0cb6e92604185f7a4934acad80142f2a.zip
Use File.join to better integrate fixture_path in fixture_file_upload.
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/test_case_test.rb12
1 files changed, 12 insertions, 0 deletions
diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb
index 8990fc34d6..bdca1d4d77 100644
--- a/actionpack/test/controller/test_case_test.rb
+++ b/actionpack/test/controller/test_case_test.rb
@@ -818,6 +818,18 @@ XML
assert_equal '159528', @response.body
end
+ def test_fixture_file_upload_relative_to_fixture_path
+ TestCaseTest.stubs(:fixture_path).returns(FILES_DIR)
+ uploaded_file = fixture_file_upload("mona_lisa.jpg", "image/jpg")
+ assert_equal File.open("#{FILES_DIR}/mona_lisa.jpg", READ_PLAIN).read, uploaded_file.read
+ end
+
+ def test_fixture_file_upload_ignores_nil_fixture_path
+ TestCaseTest.stubs(:fixture_path).returns(nil)
+ uploaded_file = fixture_file_upload("#{FILES_DIR}/mona_lisa.jpg", "image/jpg")
+ assert_equal File.open("#{FILES_DIR}/mona_lisa.jpg", READ_PLAIN).read, uploaded_file.read
+ end
+
def test_action_dispatch_uploaded_file_upload
filename = 'mona_lisa.jpg'
path = "#{FILES_DIR}/#{filename}"