Update to ruby/spec@7f22a0b

15 files changed, 93 insertions, 38 deletions

diff --git a/spec/ruby/library/fiber/resume_spec.rb b/spec/ruby/library/fiber/resume_spec.rb
index 39d14bdda0..8b7c104a6f 100644
--- a/spec/ruby/library/fiber/resume_spec.rb
+++ b/spec/ruby/library/fiber/resume_spec.rb
@@ -10,6 +10,12 @@ describe "Fiber#resume" do
       fiber2.resume
       -> { fiber2.resume }.should raise_error(FiberError)
     end
+
+    it "raises a FiberError if the Fiber attempts to resume a resuming fiber" do
+      root_fiber = Fiber.current
+      fiber1 = Fiber.new { root_fiber.resume }
+      -> { fiber1.resume }.should raise_error(FiberError, /double resume/)
+    end
   end
 
   ruby_version_is '3.0' do
@@ -19,5 +25,11 @@ describe "Fiber#resume" do
       fiber2.resume.should == 10
       fiber2.resume.should == 20
     end
+
+    it "raises a FiberError if the Fiber attempts to resume a resuming fiber" do
+      root_fiber = Fiber.current
+      fiber1 = Fiber.new { root_fiber.resume }
+      -> { fiber1.resume }.should raise_error(FiberError, /attempt to resume a resuming fiber/)
+    end
   end
 end
diff --git a/spec/ruby/library/rexml/element/each_element_with_attribute_spec.rb b/spec/ruby/library/rexml/element/each_element_with_attribute_spec.rb
index f2d779e577..dcc6dbbf17 100644
--- a/spec/ruby/library/rexml/element/each_element_with_attribute_spec.rb
+++ b/spec/ruby/library/rexml/element/each_element_with_attribute_spec.rb
@@ -12,23 +12,23 @@ ruby_version_is ''...'3.0' do
       @son.attributes["name"] = "Fred"
       @document.root << @father
       @document.root << @son
-      @childs = []
+      @children = []
     end
 
-    it "returns childs with attribute" do
-      @document.each_element_with_attribute("name") { |elem| @childs << elem }
-      @childs[0].should == @father
-      @childs[1].should == @son
+    it "returns children with attribute" do
+      @document.each_element_with_attribute("name") { |elem| @children << elem }
+      @children[0].should == @father
+      @children[1].should == @son
     end
 
     it "takes attribute value as second argument" do
       @document.each_element_with_attribute("name", "Fred"){ |elem| elem.should == @son }
     end
 
-    it "takes max number of childs as third argument" do
-      @document.each_element_with_attribute("name", nil, 1) { |elem| @childs << elem }
-      @childs.size.should == 1
-      @childs[0].should == @father
+    it "takes max number of children as third argument" do
+      @document.each_element_with_attribute("name", nil, 1) { |elem| @children << elem }
+      @children.size.should == 1
+      @children[0].should == @father
     end
 
     it "takes XPath filter as fourth argument" do
diff --git a/spec/ruby/library/rexml/element/each_element_with_text_spec.rb b/spec/ruby/library/rexml/element/each_element_with_text_spec.rb
index 8f9d062c99..a4a200d237 100644
--- a/spec/ruby/library/rexml/element/each_element_with_text_spec.rb
+++ b/spec/ruby/library/rexml/element/each_element_with_text_spec.rb
@@ -16,10 +16,10 @@ ruby_version_is ''...'3.0' do
       @document.root << @joe
       @document.root << @fred
       @document.root << @another
-      @childs = []
+      @children = []
     end
 
-    it "returns childs with text" do
+    it "returns children with text" do
       @document.each_element_with_text("Joe"){|c| c.should == @joe}
     end
 
diff --git a/spec/ruby/library/rexml/element/has_text_spec.rb b/spec/ruby/library/rexml/element/has_text_spec.rb
index de19fe0763..206c167ae6 100644
--- a/spec/ruby/library/rexml/element/has_text_spec.rb
+++ b/spec/ruby/library/rexml/element/has_text_spec.rb
@@ -11,7 +11,7 @@ ruby_version_is ''...'3.0' do
       e.has_text?.should be_true
     end
 
-    it "returns false if it has no Text childs" do
+    it "returns false if it has no Text children" do
       e = REXML::Element.new("Person")
       e.has_text?.should be_false
     end
diff --git a/spec/ruby/library/rexml/node/parent_spec.rb b/spec/ruby/library/rexml/node/parent_spec.rb
index 07425e8f36..43c3a747e0 100644
--- a/spec/ruby/library/rexml/node/parent_spec.rb
+++ b/spec/ruby/library/rexml/node/parent_spec.rb
@@ -14,7 +14,7 @@ ruby_version_is ''...'3.0' do
       e.should.parent?
     end
 
-    # This includes attributes, CDatas and declarations.
+    # This includes attributes, CData and declarations.
     it "returns false for Texts" do
       e = REXML::Text.new("foo")
       e.should_not.parent?
diff --git a/spec/ruby/library/rexml/shared/elements_to_a.rb b/spec/ruby/library/rexml/shared/elements_to_a.rb
index 388250d8b3..b7169f0b2e 100644
--- a/spec/ruby/library/rexml/shared/elements_to_a.rb
+++ b/spec/ruby/library/rexml/shared/elements_to_a.rb
@@ -19,7 +19,7 @@ describe :rexml_elements_to_a, shared: true do
   # always needs the first param (even if it's nil).
   # A patch was submitted:
   # http://rubyforge.org/tracker/index.php?func=detail&aid=19354&group_id=426&atid=1698
-  it "returns all childs if xpath is nil" do
+  it "returns all children if xpath is nil" do
     @e.elements.send(@method).should == [@first, @second]
   end
 
diff --git a/spec/ruby/library/stringio/ungetbyte_spec.rb b/spec/ruby/library/stringio/ungetbyte_spec.rb
index 2f082acbf6..87b27b837e 100644
--- a/spec/ruby/library/stringio/ungetbyte_spec.rb
+++ b/spec/ruby/library/stringio/ungetbyte_spec.rb
@@ -12,7 +12,7 @@ describe "StringIO#ungetbyte" do
     io.string.should == 'Shis is a simple string.'
   end
 
-  it "ungets a single byte from a string in the middle of a multibyte characte" do
+  it "ungets a single byte from a string in the middle of a multibyte character" do
     str = "\u01a9"
     io = StringIO.new(str)
     b = io.getbyte
diff --git a/spec/ruby/library/stringscanner/check_until_spec.rb b/spec/ruby/library/stringscanner/check_until_spec.rb
index e92ae5a2e9..ad222fd76b 100644
--- a/spec/ruby/library/stringscanner/check_until_spec.rb
+++ b/spec/ruby/library/stringscanner/check_until_spec.rb
@@ -12,4 +12,10 @@ describe "StringScanner#check_until" do
     @s.matched.should == "a"
     @s.check_until(/test/).should == "This is a test"
   end
+
+  it "raises TypeError if given a String" do
+    -> {
+      @s.check_until('T')
+    }.should raise_error(TypeError, 'wrong argument type String (expected Regexp)')
+  end
 end
diff --git a/spec/ruby/library/stringscanner/exist_spec.rb b/spec/ruby/library/stringscanner/exist_spec.rb
index beafadc07b..ff860a0d3e 100644
--- a/spec/ruby/library/stringscanner/exist_spec.rb
+++ b/spec/ruby/library/stringscanner/exist_spec.rb
@@ -21,4 +21,10 @@ describe "StringScanner#exist?" do
     @s.scan(/This is/)
     @s.exist?(/i/).should == nil
   end
+
+  it "raises TypeError if given a String" do
+    -> {
+      @s.exist?('T')
+    }.should raise_error(TypeError, 'wrong argument type String (expected Regexp)')
+  end
 end
diff --git a/spec/ruby/library/stringscanner/matched_size_spec.rb b/spec/ruby/library/stringscanner/matched_size_spec.rb
index a36bd3aafe..d9c338a07e 100644
--- a/spec/ruby/library/stringscanner/matched_size_spec.rb
+++ b/spec/ruby/library/stringscanner/matched_size_spec.rb
@@ -1,7 +1,24 @@
 require_relative '../../spec_helper'
-require_relative 'shared/matched_size'
 require 'strscan'
 
 describe "StringScanner#matched_size" do
-  it_behaves_like :strscan_matched_size, :matched_size
+  before :each do
+    @s = StringScanner.new("This is a test")
+  end
+
+  it "returns the size of the most recent match" do
+    @s.check(/This/)
+    @s.matched_size.should == 4
+    @s.matched_size.should == 4
+    @s.scan(//)
+    @s.matched_size.should == 0
+  end
+
+  it "returns nil if there was no recent match" do
+    @s.matched_size.should == nil
+    @s.check(/\d+/)
+    @s.matched_size.should == nil
+    @s.terminate
+    @s.matched_size.should == nil
+  end
 end
diff --git a/spec/ruby/library/stringscanner/scan_until_spec.rb b/spec/ruby/library/stringscanner/scan_until_spec.rb
index 94239db50e..6b7782572d 100644
--- a/spec/ruby/library/stringscanner/scan_until_spec.rb
+++ b/spec/ruby/library/stringscanner/scan_until_spec.rb
@@ -20,4 +20,10 @@ describe "StringScanner#scan_until" do
     @s.scan(/T/)
     @s.scan_until(/^h/).should == "h"
   end
+
+  it "raises TypeError if given a String" do
+    -> {
+      @s.scan_until('T')
+    }.should raise_error(TypeError, 'wrong argument type String (expected Regexp)')
+  end
 end
diff --git a/spec/ruby/library/stringscanner/search_full_spec.rb b/spec/ruby/library/stringscanner/search_full_spec.rb
index da9067e012..7d2a714fa5 100644
--- a/spec/ruby/library/stringscanner/search_full_spec.rb
+++ b/spec/ruby/library/stringscanner/search_full_spec.rb
@@ -27,4 +27,10 @@ describe "StringScanner#search_full" do
     @s.search_full(/This/, true, true).should == "This"
     @s.pos.should == 4
   end
+
+  it "raises TypeError if given a String" do
+    -> {
+      @s.search_full('T', true, true)
+    }.should raise_error(TypeError, 'wrong argument type String (expected Regexp)')
+  end
 end
diff --git a/spec/ruby/library/stringscanner/shared/matched_size.rb b/spec/ruby/library/stringscanner/shared/matched_size.rb
deleted file mode 100644
index 92174733f7..0000000000
--- a/spec/ruby/library/stringscanner/shared/matched_size.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-describe :strscan_matched_size, shared: true do
-  before :each do
-    @s = StringScanner.new("This is a test")
-  end
-
-  it "returns the size of the most recent match" do
-    @s.check(/This/)
-    @s.send(@method).should == 4
-    @s.send(@method).should == 4
-    @s.scan(//)
-    @s.send(@method).should == 0
-  end
-
-  it "returns nil if there was no recent match" do
-    @s.send(@method).should == nil
-    @s.check(/\d+/)
-    @s.send(@method).should == nil
-    @s.terminate
-    @s.send(@method).should == nil
-  end
-end
diff --git a/spec/ruby/library/stringscanner/size_spec.rb b/spec/ruby/library/stringscanner/size_spec.rb
new file mode 100644
index 0000000000..3e475489e3
--- /dev/null
+++ b/spec/ruby/library/stringscanner/size_spec.rb
@@ -0,0 +1,17 @@
+require_relative '../../spec_helper'
+require 'strscan'
+
+describe "StringScanner#size" do
+  before :each do
+    @s = StringScanner.new("This is a test")
+  end
+
+  it "returns the number of captures groups of the last match" do
+    @s.scan(/(.)(.)(.)/)
+    @s.size.should == 4
+  end
+
+  it "returns nil if there is no last match" do
+    @s.size.should == nil
+  end
+end
diff --git a/spec/ruby/library/stringscanner/skip_until_spec.rb b/spec/ruby/library/stringscanner/skip_until_spec.rb
index 73eb91b8ad..7b56f13e4f 100644
--- a/spec/ruby/library/stringscanner/skip_until_spec.rb
+++ b/spec/ruby/library/stringscanner/skip_until_spec.rb
@@ -15,4 +15,10 @@ describe "StringScanner#skip_until" do
   it "returns nil if no match was found" do
     @s.skip_until(/d+/).should == nil
   end
+
+  it "raises TypeError if given a String" do
+    -> {
+      @s.skip_until('T')
+    }.should raise_error(TypeError, 'wrong argument type String (expected Regexp)')
+  end
 end