aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-11-07 11:27:27 +0000
committertenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-11-07 11:27:27 +0000
commit8ff37e390195f401d82cc8cfb607a3b2ddcba1ed (patch)
tree772a4b907d4db226942f2ce41c003526d721196c
parenta27349a4cb97f6db907388d5013100493f5dec73 (diff)
downloadruby-8ff37e390195f401d82cc8cfb607a3b2ddcba1ed.tar.gz
* test/psych/test_yamlstore.rb: make test case inherit from MiniTest,
load psych/helper so that psych is loaded. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33654 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/psych/test_yamlstore.rb7
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e0d9d70033..a61c9d7df0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov 7 20:26:37 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * test/psych/test_yamlstore.rb: make test case inherit from MiniTest,
+ load psych/helper so that psych is loaded.
+
Mon Nov 7 20:18:29 2011 Aaron Patterson <aaron@tenderlovemaking.com>
* test/psych/test_yamldbm.rb: Test case should inherit from MiniTest,
diff --git a/test/psych/test_yamlstore.rb b/test/psych/test_yamlstore.rb
index c31b33f5ed..5d6fcb79b2 100644
--- a/test/psych/test_yamlstore.rb
+++ b/test/psych/test_yamlstore.rb
@@ -1,12 +1,11 @@
-require 'test/unit'
-require 'psych'
+require 'psych/helper'
require 'yaml/store'
require 'tmpdir'
module Psych
Psych::Store = YAML::Store unless defined?(Psych::Store)
- class YAMLStoreTest < Test::Unit::TestCase
+ class YAMLStoreTest < TestCase
def setup
@engine, YAML::ENGINE.yamler = YAML::ENGINE.yamler, 'psych'
@dir = Dir.mktmpdir("rubytest-file")
@@ -78,7 +77,7 @@ module Psych
end
def test_writing_inside_readonly_transaction_raises_error
- assert_raise(PStore::Error) do
+ assert_raises(PStore::Error) do
@yamlstore.transaction(true) do
@yamlstore[:foo] = "bar"
end