From 9c0d8283ecc8b9b1960249f65f0b0e045cc58741 Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 25 Feb 2016 09:00:06 +0000 Subject: merge revision(s) 53299: [Backport #11870] fix common misspelling [ci skip] compile.c, cont.c, doc, man: fix common misspelling. [Bug #11870] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53925 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/net/http/test_http.rb | 6 +++--- test/openssl/test_config.rb | 2 +- test/rexml/test_core.rb | 2 +- test/webrick/test_httpserver.rb | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'test') diff --git a/test/net/http/test_http.rb b/test/net/http/test_http.rb index 033f369553..7d9c2b09d1 100644 --- a/test/net/http/test_http.rb +++ b/test/net/http/test_http.rb @@ -140,12 +140,12 @@ class TestNetHTTP < Test::Unit::TestCase def test_proxy_port clean_http_proxy_env do - http = Net::HTTP.new 'exmaple', nil, 'proxy.example' + http = Net::HTTP.new 'example', nil, 'proxy.example' assert_equal 'proxy.example', http.proxy_address assert_equal 80, http.proxy_port - http = Net::HTTP.new 'exmaple', nil, 'proxy.example', 8000 + http = Net::HTTP.new 'example', nil, 'proxy.example', 8000 assert_equal 8000, http.proxy_port - http = Net::HTTP.new 'exmaple', nil + http = Net::HTTP.new 'example', nil assert_equal nil, http.proxy_port end end diff --git a/test/openssl/test_config.rb b/test/openssl/test_config.rb index 1cd3cb6391..9c700b64ec 100644 --- a/test/openssl/test_config.rb +++ b/test/openssl/test_config.rb @@ -167,7 +167,7 @@ __EOC__ end def test_value - # supress deprecation warnings + # suppress deprecation warnings OpenSSL::TestUtils.silent do assert_equal('CA_default', @it.value('ca', 'default_ca')) assert_equal(nil, @it.value('ca', 'no such key')) diff --git a/test/rexml/test_core.rb b/test/rexml/test_core.rb index 7040ad60bf..81fe3d9b74 100644 --- a/test/rexml/test_core.rb +++ b/test/rexml/test_core.rb @@ -616,7 +616,7 @@ class Tester < Test::Unit::TestCase def test_stream c = Listener.new Document.parse_stream( File.new(fixture_path("documentation.xml")), c ) - assert(c.ts, "Stream parsing apparantly didn't parse the whole file") + assert(c.ts, "Stream parsing apparently didn't parse the whole file") assert(c.te, "Stream parsing dropped end tag for documentation") Document.parse_stream(" ", c) diff --git a/test/webrick/test_httpserver.rb b/test/webrick/test_httpserver.rb index ffebf7e843..ed5f6b628c 100644 --- a/test/webrick/test_httpserver.rb +++ b/test/webrick/test_httpserver.rb @@ -344,7 +344,7 @@ class TestWEBrickHTTPServer < Test::Unit::TestCase http.request(req){|res| assert_equal("foo", res.body) } end rescue Timeout::Error - flunk('corrupted reponse') + flunk('corrupted response') end } end -- cgit v1.2.3