Update to ruby/spec@6cf8ebe

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67030 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

10 files changed, 14 insertions, 14 deletions

diff --git a/spec/ruby/core/string/chomp_spec.rb b/spec/ruby/core/string/chomp_spec.rb
index 3c20141ee7..d6ad710382 100644
--- a/spec/ruby/core/string/chomp_spec.rb
+++ b/spec/ruby/core/string/chomp_spec.rb
@@ -30,7 +30,7 @@ describe "String#chomp" do
       "abc\r\r".chomp.should == "abc\r"
     end
 
-    it "removes one trailing carrige return, newline pair" do
+    it "removes one trailing carriage return, newline pair" do
       "abc\r\n\r\n".chomp.should == "abc\r\n"
     end
 
@@ -111,7 +111,7 @@ describe "String#chomp" do
       "abc\r\r".chomp("\n").should == "abc\r"
     end
 
-    it "removes one trailing carrige return, newline pair" do
+    it "removes one trailing carriage return, newline pair" do
       "abc\r\n\r\n".chomp("\n").should == "abc\r\n"
     end
 
@@ -193,7 +193,7 @@ describe "String#chomp!" do
       "abc\r\r".chomp!.should == "abc\r"
     end
 
-    it "removes one trailing carrige return, newline pair" do
+    it "removes one trailing carriage return, newline pair" do
       "abc\r\n\r\n".chomp!.should == "abc\r\n"
     end
 
@@ -265,7 +265,7 @@ describe "String#chomp!" do
       "abc\r\r".chomp!("\n").should == "abc\r"
     end
 
-    it "removes one trailing carrige return, newline pair" do
+    it "removes one trailing carriage return, newline pair" do
       "abc\r\n\r\n".chomp!("\n").should == "abc\r\n"
     end
 
diff --git a/spec/ruby/core/string/chop_spec.rb b/spec/ruby/core/string/chop_spec.rb
index 57c037322d..033a11a95b 100644
--- a/spec/ruby/core/string/chop_spec.rb
+++ b/spec/ruby/core/string/chop_spec.rb
@@ -19,7 +19,7 @@ describe "String#chop" do
     "abc\r\n".chop.should == "abc"
   end
 
-  it "removes the carrige return, newline if they are the only characters" do
+  it "removes the carriage return, newline if they are the only characters" do
     "\r\n".chop.should == ""
   end
 
@@ -83,7 +83,7 @@ describe "String#chop!" do
     "abc\r\n".chop!.should == "abc"
   end
 
-  it "removes the carrige return, newline if they are the only characters" do
+  it "removes the carriage return, newline if they are the only characters" do
     "\r\n".chop!.should == ""
   end
 
diff --git a/spec/ruby/core/string/element_set_spec.rb b/spec/ruby/core/string/element_set_spec.rb
index 80ec5755c6..340bd2b9ca 100644
--- a/spec/ruby/core/string/element_set_spec.rb
+++ b/spec/ruby/core/string/element_set_spec.rb
@@ -36,7 +36,7 @@ describe "String#[]= with Fixnum index" do
     lambda { ""[-1] = "bam" }.should raise_error(IndexError)
   end
 
-  # Behaviour verfieid correct by matz in
+  # Behaviour is verified by matz in
   # http://redmine.ruby-lang.org/issues/show/1750
   it "allows assignment to the zero'th element of an empty String" do
     str = ""
diff --git a/spec/ruby/core/string/setbyte_spec.rb b/spec/ruby/core/string/setbyte_spec.rb
index f998e61622..3f2e03f8a8 100644
--- a/spec/ruby/core/string/setbyte_spec.rb
+++ b/spec/ruby/core/string/setbyte_spec.rb
@@ -54,7 +54,7 @@ describe "String#setbyte" do
     lambda { "?".setbyte(1, 97) }.should raise_error(IndexError)
   end
 
-  it "raises an IndexError if the nexgative index is greater magnitude than the String bytesize" do
+  it "raises an IndexError if the negative index is greater magnitude than the String bytesize" do
     lambda { "???".setbyte(-5, 97) }.should raise_error(IndexError)
   end
 
diff --git a/spec/ruby/core/string/shared/codepoints.rb b/spec/ruby/core/string/shared/codepoints.rb
index 68f82b4468..589d2ee1d0 100644
--- a/spec/ruby/core/string/shared/codepoints.rb
+++ b/spec/ruby/core/string/shared/codepoints.rb
@@ -48,7 +48,7 @@ describe :string_codepoints, shared: true do
     s.should == s2
   end
 
-  it "is synonymous with #bytes for Strings which are single-byte optimisable" do
+  it "is synonymous with #bytes for Strings which are single-byte optimizable" do
     s = "(){}".encode('ascii')
     s.ascii_only?.should be_true
     s.send(@method).to_a.should == s.bytes.to_a
diff --git a/spec/ruby/core/string/shared/concat.rb b/spec/ruby/core/string/shared/concat.rb
index d7b9cdfec3..bc38ba9a8b 100644
--- a/spec/ruby/core/string/shared/concat.rb
+++ b/spec/ruby/core/string/shared/concat.rb
@@ -50,7 +50,7 @@ describe :string_concat, shared: true do
   end
 
   describe "with Integer" do
-    it "concatencates the argument interpreted as a codepoint" do
+    it "concatenates the argument interpreted as a codepoint" do
       b = "".send(@method, 33)
       b.should == "!"
 
diff --git a/spec/ruby/core/string/shared/equal_value.rb b/spec/ruby/core/string/shared/equal_value.rb
index d797cb1483..fccafb5821 100644
--- a/spec/ruby/core/string/shared/equal_value.rb
+++ b/spec/ruby/core/string/shared/equal_value.rb
@@ -17,7 +17,7 @@ describe :string_equal_value, shared: true do
     # not call it.
     obj.stub!(:to_str)
 
-    # Don't use @method for :== in `obj.should_recerive(:==)`
+    # Don't use @method for :== in `obj.should_receive(:==)`
     obj.should_receive(:==).and_return(true)
 
     'hello'.send(@method, obj).should be_true
diff --git a/spec/ruby/core/string/to_r_spec.rb b/spec/ruby/core/string/to_r_spec.rb
index 9f174a2f55..7e1d635d3b 100644
--- a/spec/ruby/core/string/to_r_spec.rb
+++ b/spec/ruby/core/string/to_r_spec.rb
@@ -29,7 +29,7 @@ describe "String#to_r" do
     "a1765, ".to_r.should_not == Rational(1765, 1)
   end
 
-  it "treats leading hypens as minus signs" do
+  it "treats leading hyphen as minus signs" do
     "-20".to_r.should == Rational(-20, 1)
   end
 
diff --git a/spec/ruby/core/string/unpack/c_spec.rb b/spec/ruby/core/string/unpack/c_spec.rb
index 82c0f8616d..bdcbd87663 100644
--- a/spec/ruby/core/string/unpack/c_spec.rb
+++ b/spec/ruby/core/string/unpack/c_spec.rb
@@ -20,7 +20,7 @@ describe :string_unpack_8bit, shared: true do
     "abc".unpack(unpack_format('*')).should == [97, 98, 99]
   end
 
-  it "decodes the remaining bytes when passed the '*' modifer after another directive" do
+  it "decodes the remaining bytes when passed the '*' modifier after another directive" do
     "abc".unpack(unpack_format()+unpack_format('*')).should == [97, 98, 99]
   end
 
diff --git a/spec/ruby/core/string/upto_spec.rb b/spec/ruby/core/string/upto_spec.rb
index d2f1121360..3748a6fdeb 100644
--- a/spec/ruby/core/string/upto_spec.rb
+++ b/spec/ruby/core/string/upto_spec.rb
@@ -8,7 +8,7 @@ describe "String#upto" do
     a.should == ["*+", "*,", "*-", "*.", "*/", "*0", "*1", "*2", "*3"]
   end
 
-  it "calls the block once even when start eqals stop" do
+  it "calls the block once even when start equals stop" do
     a = []
     "abc".upto("abc") { |s| a << s }
     a.should == ["abc"]