1 files changed, 8 insertions, 4 deletions
diff --git a/spec/ruby/library/yaml/shared/load.rb b/spec/ruby/library/yaml/shared/load.rb
index bd55332fe5..7e5669f2d0 100644
--- a/spec/ruby/library/yaml/shared/load.rb
+++ b/spec/ruby/library/yaml/shared/load.rb
@@ -60,7 +60,7 @@ describe :yaml_load_safe, shared: true do
     else
       error = ArgumentError
     end
-    -> { YAML.send(@method, "key1: value\ninvalid_key") }.should raise_error(error)
+    -> { YAML.send(@method, "key1: value\ninvalid_key") }.should.raise(error)
   end
 
   it "accepts symbols" do
@@ -117,13 +117,17 @@ describe :yaml_load_unsafe, shared: true do
       ].should be_computed_by(:usec)
     end
 
-    it "rounds values smaller than 1 usec to 0 " do
+    it "rounds values smaller than 1 usec to 0" do
       YAML.send(@method, "2011-03-22t23:32:11.000000342222+01:00").usec.should == 0
     end
   end
 
   it "loads an OpenStruct" do
-    require "ostruct"
+    begin
+      require "ostruct"
+    rescue LoadError
+      skip "OpenStruct is not available"
+    end
     os = OpenStruct.new("age" => 20, "name" => "John")
     loaded = YAML.send(@method, "--- !ruby/object:OpenStruct\ntable:\n  :age: 20\n  :name: John\n")
     loaded.should == os
@@ -133,6 +137,6 @@ describe :yaml_load_unsafe, shared: true do
     loaded = YAML.send(@method, "--- !ruby/object:File {}\n")
     -> {
       loaded.read(1)
-    }.should raise_error(IOError)
+    }.should.raise(IOError)
   end
 end