diff options
author | Benoit Daloze <eregontp@gmail.com> | 2019-07-27 12:40:09 +0200 |
---|---|---|
committer | Benoit Daloze <eregontp@gmail.com> | 2019-07-27 12:40:09 +0200 |
commit | 5c276e1cc91c5ab2a41fbf7827af2fed914a2bc0 (patch) | |
tree | 05b5c68c8b2a00224d4646ea3b26ce3877efaadd /spec/ruby/core/marshal | |
parent | a06301b103371b0b7da8eaca26ba744961769f99 (diff) | |
download | ruby-5c276e1cc91c5ab2a41fbf7827af2fed914a2bc0.tar.gz |
Update to ruby/spec@875a09e
Diffstat (limited to 'spec/ruby/core/marshal')
-rw-r--r-- | spec/ruby/core/marshal/dump_spec.rb | 36 | ||||
-rw-r--r-- | spec/ruby/core/marshal/shared/load.rb | 32 |
2 files changed, 34 insertions, 34 deletions
diff --git a/spec/ruby/core/marshal/dump_spec.rb b/spec/ruby/core/marshal/dump_spec.rb index 53a0b3197d..700f090a2f 100644 --- a/spec/ruby/core/marshal/dump_spec.rb +++ b/spec/ruby/core/marshal/dump_spec.rb @@ -99,7 +99,7 @@ describe "Marshal.dump" do it "raises a TypeError if _dump returns a non-string" do m = mock("marshaled") m.should_receive(:_dump).and_return(0) - lambda { Marshal.dump(m) }.should raise_error(TypeError) + -> { Marshal.dump(m) }.should raise_error(TypeError) end it "favors marshal_dump over _dump" do @@ -124,11 +124,11 @@ describe "Marshal.dump" do end it "raises TypeError with an anonymous Class" do - lambda { Marshal.dump(Class.new) }.should raise_error(TypeError) + -> { Marshal.dump(Class.new) }.should raise_error(TypeError) end it "raises TypeError with a singleton Class" do - lambda { Marshal.dump(class << self; self end) }.should raise_error(TypeError) + -> { Marshal.dump(class << self; self end) }.should raise_error(TypeError) end end @@ -138,7 +138,7 @@ describe "Marshal.dump" do end it "raises TypeError with an anonymous Module" do - lambda { Marshal.dump(Module.new) }.should raise_error(TypeError) + -> { Marshal.dump(Module.new) }.should raise_error(TypeError) end end @@ -308,7 +308,7 @@ describe "Marshal.dump" do end it "raises a TypeError with hash having default proc" do - lambda { Marshal.dump(Hash.new {}) }.should raise_error(TypeError) + -> { Marshal.dump(Hash.new {}) }.should raise_error(TypeError) end it "dumps a Hash with instance variables" do @@ -387,7 +387,7 @@ describe "Marshal.dump" do it "raises if an Object has a singleton class and singleton methods" do obj = Object.new def obj.foo; end - lambda { + -> { Marshal.dump(obj) }.should raise_error(TypeError, "singleton can't be dumped") end @@ -509,10 +509,10 @@ describe "Marshal.dump" do it "raises an ArgumentError when the recursion limit is exceeded" do h = {'one' => {'two' => {'three' => 0}}} - lambda { Marshal.dump(h, 3) }.should raise_error(ArgumentError) - lambda { Marshal.dump([h], 4) }.should raise_error(ArgumentError) - lambda { Marshal.dump([], 0) }.should raise_error(ArgumentError) - lambda { Marshal.dump([[[]]], 1) }.should raise_error(ArgumentError) + -> { Marshal.dump(h, 3) }.should raise_error(ArgumentError) + -> { Marshal.dump([h], 4) }.should raise_error(ArgumentError) + -> { Marshal.dump([], 0) }.should raise_error(ArgumentError) + -> { Marshal.dump([[[]]], 1) }.should raise_error(ArgumentError) end it "ignores the recursion limit if the limit is negative" do @@ -535,7 +535,7 @@ describe "Marshal.dump" do it "raises an Error when the IO-Object does not respond to #write" do obj = mock('test') - lambda { Marshal.dump("test", obj) }.should raise_error(TypeError) + -> { Marshal.dump("test", obj) }.should raise_error(TypeError) end @@ -554,31 +554,31 @@ describe "Marshal.dump" do it "should raise an error" do require "stringio" - lambda { Marshal.dump(StringIO.new) }.should raise_error(TypeError) + -> { Marshal.dump(StringIO.new) }.should raise_error(TypeError) end end it "raises a TypeError if marshalling a Method instance" do - lambda { Marshal.dump(Marshal.method(:dump)) }.should raise_error(TypeError) + -> { Marshal.dump(Marshal.method(:dump)) }.should raise_error(TypeError) end it "raises a TypeError if marshalling a Proc" do - lambda { Marshal.dump(proc {}) }.should raise_error(TypeError) + -> { Marshal.dump(proc {}) }.should raise_error(TypeError) end it "raises a TypeError if dumping a IO/File instance" do - lambda { Marshal.dump(STDIN) }.should raise_error(TypeError) - lambda { File.open(__FILE__) { |f| Marshal.dump(f) } }.should raise_error(TypeError) + -> { Marshal.dump(STDIN) }.should raise_error(TypeError) + -> { File.open(__FILE__) { |f| Marshal.dump(f) } }.should raise_error(TypeError) end it "raises a TypeError if dumping a MatchData instance" do - lambda { Marshal.dump(/(.)/.match("foo")) }.should raise_error(TypeError) + -> { Marshal.dump(/(.)/.match("foo")) }.should raise_error(TypeError) end it "raises a TypeError if dumping a Mutex instance" do m = Mutex.new - lambda { Marshal.dump(m) }.should raise_error(TypeError) + -> { Marshal.dump(m) }.should raise_error(TypeError) end it "returns an untainted string if object is untainted" do diff --git a/spec/ruby/core/marshal/shared/load.rb b/spec/ruby/core/marshal/shared/load.rb index cb041ec25c..f92d49c68c 100644 --- a/spec/ruby/core/marshal/shared/load.rb +++ b/spec/ruby/core/marshal/shared/load.rb @@ -9,7 +9,7 @@ describe :marshal_load, shared: true do it "raises an ArgumentError when the dumped data is truncated" do obj = {first: 1, second: 2, third: 3} - lambda { Marshal.send(@method, Marshal.dump(obj)[0, 5]) }.should raise_error(ArgumentError) + -> { Marshal.send(@method, Marshal.dump(obj)[0, 5]) }.should raise_error(ArgumentError) end it "raises an ArgumentError when the dumped class is missing" do @@ -17,7 +17,7 @@ describe :marshal_load, shared: true do kaboom = Marshal.dump(KaBoom.new) Object.send(:remove_const, :KaBoom) - lambda { Marshal.send(@method, kaboom) }.should raise_error(ArgumentError) + -> { Marshal.send(@method, kaboom) }.should raise_error(ArgumentError) end describe "when called with a proc" do @@ -162,20 +162,20 @@ describe :marshal_load, shared: true do marshal_data[0] = (Marshal::MAJOR_VERSION).chr marshal_data[1] = (Marshal::MINOR_VERSION + 1).chr - lambda { Marshal.send(@method, marshal_data) }.should raise_error(TypeError) + -> { Marshal.send(@method, marshal_data) }.should raise_error(TypeError) marshal_data = '\xff\xff' marshal_data[0] = (Marshal::MAJOR_VERSION - 1).chr marshal_data[1] = (Marshal::MINOR_VERSION).chr - lambda { Marshal.send(@method, marshal_data) }.should raise_error(TypeError) + -> { Marshal.send(@method, marshal_data) }.should raise_error(TypeError) end it "raises EOFError on loading an empty file" do temp_file = tmp("marshal.rubyspec.tmp.#{Process.pid}") file = File.new(temp_file, "w+") begin - lambda { Marshal.send(@method, file) }.should raise_error(EOFError) + -> { Marshal.send(@method, file) }.should raise_error(EOFError) ensure file.close rm_r temp_file @@ -567,7 +567,7 @@ describe :marshal_load, shared: true do end it "raises ArgumentError if the object from an 'o' stream is not dumpable as 'o' type user class" do - lambda do + -> do Marshal.send(@method, "\x04\bo:\tFile\001\001:\001\005@path\"\x10/etc/passwd") end.should raise_error(ArgumentError) end @@ -598,10 +598,10 @@ describe :marshal_load, shared: true do data = Marshal.dump(MarshalSpec::SwappedClass.new) MarshalSpec.set_swapped_class(Class.new(Array)) - lambda { Marshal.send(@method, data) }.should raise_error(ArgumentError) + -> { Marshal.send(@method, data) }.should raise_error(ArgumentError) MarshalSpec.set_swapped_class(Class.new) - lambda { Marshal.send(@method, data) }.should raise_error(ArgumentError) + -> { Marshal.send(@method, data) }.should raise_error(ArgumentError) end end end @@ -702,7 +702,7 @@ describe :marshal_load, shared: true do "\004\bi\004\0", "\004\bi\004\0\0", "\004\bi\004\0\0\0"].each do |invalid| - lambda { Marshal.send(@method, invalid) }.should raise_error(ArgumentError) + -> { Marshal.send(@method, invalid) }.should raise_error(ArgumentError) end end @@ -799,11 +799,11 @@ describe :marshal_load, shared: true do end it "raises ArgumentError if given the name of a non-Module" do - lambda { Marshal.send(@method, "\x04\bc\vKernel") }.should raise_error(ArgumentError) + -> { Marshal.send(@method, "\x04\bc\vKernel") }.should raise_error(ArgumentError) end it "raises ArgumentError if given a nonexistent class" do - lambda { Marshal.send(@method, "\x04\bc\vStrung") }.should raise_error(ArgumentError) + -> { Marshal.send(@method, "\x04\bc\vStrung") }.should raise_error(ArgumentError) end end @@ -813,7 +813,7 @@ describe :marshal_load, shared: true do end it "raises ArgumentError if given the name of a non-Class" do - lambda { Marshal.send(@method, "\x04\bm\vString") }.should raise_error(ArgumentError) + -> { Marshal.send(@method, "\x04\bm\vString") }.should raise_error(ArgumentError) end it "loads an old module" do @@ -852,13 +852,13 @@ describe :marshal_load, shared: true do data = "\x04\bd:\x1AUnloadableDumpableDirI\"\x06.\x06:\x06ET" - lambda { Marshal.send(@method, data) }.should raise_error(TypeError) + -> { Marshal.send(@method, data) }.should raise_error(TypeError) end it "raises ArgumentError when the local class is a regular object" do data = "\004\bd:\020UserDefined\0" - lambda { Marshal.send(@method, data) }.should raise_error(ArgumentError) + -> { Marshal.send(@method, data) }.should raise_error(ArgumentError) end end @@ -871,7 +871,7 @@ describe :marshal_load, shared: true do it "raises an ArgumentError" do message = "undefined class/module NamespaceTest::SameName" - lambda { Marshal.send(@method, @data) }.should raise_error(ArgumentError, message) + -> { Marshal.send(@method, @data) }.should raise_error(ArgumentError, message) end end @@ -880,6 +880,6 @@ describe :marshal_load, shared: true do @data = Marshal.dump(NamespaceTest::KaBoom.new) NamespaceTest.send(:remove_const, :KaBoom) - lambda { Marshal.send(@method, @data) }.should raise_error(ArgumentError, /NamespaceTest::KaBoom/) + -> { Marshal.send(@method, @data) }.should raise_error(ArgumentError, /NamespaceTest::KaBoom/) end end |