aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2015-01-28 08:56:40 +0100
committerYves Senn <yves.senn@gmail.com>2015-01-28 08:58:16 +0100
commit71a84206ab4d3488ac0d522a7375efc67301aae5 (patch)
tree9dea31850c699f74aa2c9f794f30a5f53c6dc7f2 /activesupport/test
parent36082a62048248c27cdd513c943ee94b716bd7f8 (diff)
parentb3c23f117695b3089c03b7c0d78781c176b2c418 (diff)
downloadrails-71a84206ab4d3488ac0d522a7375efc67301aae5.tar.gz
rails-71a84206ab4d3488ac0d522a7375efc67301aae5.tar.bz2
rails-71a84206ab4d3488ac0d522a7375efc67301aae5.zip
Merge pull request #18709 from ianks/atomic-write
Return value of yielded block in File.atomic_write
Diffstat (limited to 'activesupport/test')
-rw-r--r--activesupport/test/core_ext/file_test.rb10
1 files changed, 10 insertions, 0 deletions
diff --git a/activesupport/test/core_ext/file_test.rb b/activesupport/test/core_ext/file_test.rb
index 2c04e9687c..cde0132b97 100644
--- a/activesupport/test/core_ext/file_test.rb
+++ b/activesupport/test/core_ext/file_test.rb
@@ -57,6 +57,16 @@ class AtomicWriteTest < ActiveSupport::TestCase
File.unlink(file_name) rescue nil
end
+ def test_atomic_write_returns_result_from_yielded_block
+ block_return_value = File.atomic_write(file_name, Dir.pwd) do |file|
+ "Hello world!"
+ end
+
+ assert_equal "Hello world!", block_return_value
+ ensure
+ File.unlink(file_name) rescue nil
+ end
+
private
def file_name
"atomic.file"