From 6bc742bc6d0dc6b1777d28484f4694af846bfb79 Mon Sep 17 00:00:00 2001 From: svn Date: Sun, 7 May 2017 12:05:36 +0000 Subject: [PATCH] * remove trailing spaces, append newline at EOF. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58596 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- spec/mspec/lib/mspec/matchers/be_false.rb | 2 +- spec/mspec/lib/mspec/matchers/be_nil.rb | 2 +- spec/mspec/lib/mspec/matchers/be_true.rb | 2 +- spec/mspec/lib/mspec/matchers/equal_element.rb | 2 +- spec/mspec/lib/mspec/matchers/have_class_variable.rb | 2 +- spec/mspec/lib/mspec/matchers/have_instance_variable.rb | 2 +- spec/mspec/spec/commands/fixtures/level2/three_spec.rb | 1 + spec/mspec/spec/commands/fixtures/one_spec.rb | 1 + spec/mspec/spec/commands/fixtures/three.rb | 1 + spec/mspec/spec/commands/fixtures/two_spec.rb | 1 + spec/mspec/spec/runner/formatters/unit_spec.rb | 2 +- spec/mspec/spec/utils/deprecate_spec.rb | 2 +- spec/rubyspec/command_line/fixtures/bad_syntax.rb | 2 +- spec/rubyspec/core/complex/negative_spec.rb | 2 +- spec/rubyspec/core/complex/positive_spec.rb | 2 +- spec/rubyspec/core/file/fixtures/do_not_remove | 1 + spec/rubyspec/core/module/fixtures/path2/load_path.rb | 1 + spec/rubyspec/core/string/encode_spec.rb | 2 +- spec/rubyspec/language/fixtures/super.rb | 2 +- spec/rubyspec/language/rescue_spec.rb | 8 ++++---- spec/rubyspec/language/super_spec.rb | 2 +- spec/rubyspec/language/undef_spec.rb | 2 +- spec/rubyspec/library/base64/urlsafe_decode64_spec.rb | 2 +- spec/rubyspec/library/net/ftp/fixtures/putbinaryfile | 2 +- spec/rubyspec/library/net/ftp/fixtures/puttextfile | 2 +- spec/rubyspec/library/socket/tcpsocket/setsockopt_spec.rb | 2 +- spec/rubyspec/library/thread/sizedqueue/max_spec.rb | 2 +- spec/rubyspec/optional/capi/ext/typed_data_spec.c | 2 +- spec/rubyspec/security/cve_2013_4164_spec.rb | 8 ++++---- spec/rubyspec/security/cve_2014_8080_spec.rb | 4 ++-- 30 files changed, 37 insertions(+), 31 deletions(-) diff --git a/spec/mspec/lib/mspec/matchers/be_false.rb b/spec/mspec/lib/mspec/matchers/be_false.rb index 0a6e8cfd63..33e371dad0 100644 --- a/spec/mspec/lib/mspec/matchers/be_false.rb +++ b/spec/mspec/lib/mspec/matchers/be_false.rb @@ -17,4 +17,4 @@ class Object def be_false BeFalseMatcher.new end -end \ No newline at end of file +end diff --git a/spec/mspec/lib/mspec/matchers/be_nil.rb b/spec/mspec/lib/mspec/matchers/be_nil.rb index ecea6feffa..c107ae109c 100644 --- a/spec/mspec/lib/mspec/matchers/be_nil.rb +++ b/spec/mspec/lib/mspec/matchers/be_nil.rb @@ -17,4 +17,4 @@ class Object def be_nil BeNilMatcher.new end -end \ No newline at end of file +end diff --git a/spec/mspec/lib/mspec/matchers/be_true.rb b/spec/mspec/lib/mspec/matchers/be_true.rb index de8e237d35..be107f45be 100644 --- a/spec/mspec/lib/mspec/matchers/be_true.rb +++ b/spec/mspec/lib/mspec/matchers/be_true.rb @@ -17,4 +17,4 @@ class Object def be_true BeTrueMatcher.new end -end \ No newline at end of file +end diff --git a/spec/mspec/lib/mspec/matchers/equal_element.rb b/spec/mspec/lib/mspec/matchers/equal_element.rb index 8d032fd088..428bbfc8b6 100644 --- a/spec/mspec/lib/mspec/matchers/equal_element.rb +++ b/spec/mspec/lib/mspec/matchers/equal_element.rb @@ -75,4 +75,4 @@ class Object def equal_element(*args) EqualElementMatcher.new(*args) end -end \ No newline at end of file +end diff --git a/spec/mspec/lib/mspec/matchers/have_class_variable.rb b/spec/mspec/lib/mspec/matchers/have_class_variable.rb index 45cd0b5ae1..2d1903e1a8 100644 --- a/spec/mspec/lib/mspec/matchers/have_class_variable.rb +++ b/spec/mspec/lib/mspec/matchers/have_class_variable.rb @@ -9,4 +9,4 @@ class Object def have_class_variable(variable) HaveClassVariableMatcher.new(variable) end -end \ No newline at end of file +end diff --git a/spec/mspec/lib/mspec/matchers/have_instance_variable.rb b/spec/mspec/lib/mspec/matchers/have_instance_variable.rb index e83eb9408c..f83c803a26 100644 --- a/spec/mspec/lib/mspec/matchers/have_instance_variable.rb +++ b/spec/mspec/lib/mspec/matchers/have_instance_variable.rb @@ -9,4 +9,4 @@ class Object def have_instance_variable(variable) HaveInstanceVariableMatcher.new(variable) end -end \ No newline at end of file +end diff --git a/spec/mspec/spec/commands/fixtures/level2/three_spec.rb b/spec/mspec/spec/commands/fixtures/level2/three_spec.rb index e69de29bb2..8b13789179 100644 --- a/spec/mspec/spec/commands/fixtures/level2/three_spec.rb +++ b/spec/mspec/spec/commands/fixtures/level2/three_spec.rb @@ -0,0 +1 @@ + diff --git a/spec/mspec/spec/commands/fixtures/one_spec.rb b/spec/mspec/spec/commands/fixtures/one_spec.rb index e69de29bb2..8b13789179 100644 --- a/spec/mspec/spec/commands/fixtures/one_spec.rb +++ b/spec/mspec/spec/commands/fixtures/one_spec.rb @@ -0,0 +1 @@ + diff --git a/spec/mspec/spec/commands/fixtures/three.rb b/spec/mspec/spec/commands/fixtures/three.rb index e69de29bb2..8b13789179 100644 --- a/spec/mspec/spec/commands/fixtures/three.rb +++ b/spec/mspec/spec/commands/fixtures/three.rb @@ -0,0 +1 @@ + diff --git a/spec/mspec/spec/commands/fixtures/two_spec.rb b/spec/mspec/spec/commands/fixtures/two_spec.rb index e69de29bb2..8b13789179 100644 --- a/spec/mspec/spec/commands/fixtures/two_spec.rb +++ b/spec/mspec/spec/commands/fixtures/two_spec.rb @@ -0,0 +1 @@ + diff --git a/spec/mspec/spec/runner/formatters/unit_spec.rb b/spec/mspec/spec/runner/formatters/unit_spec.rb index c8ba406f51..18167a32b8 100644 --- a/spec/mspec/spec/runner/formatters/unit_spec.rb +++ b/spec/mspec/spec/runner/formatters/unit_spec.rb @@ -65,7 +65,7 @@ Finished in 2.0 seconds 1) describe it ERROR -Exception: broken: +Exception: broken: path/to/some/file.rb:35:in method 1 example, 0 failures diff --git a/spec/mspec/spec/utils/deprecate_spec.rb b/spec/mspec/spec/utils/deprecate_spec.rb index 14e05c6f35..7fa60df26a 100644 --- a/spec/mspec/spec/utils/deprecate_spec.rb +++ b/spec/mspec/spec/utils/deprecate_spec.rb @@ -9,7 +9,7 @@ describe MSpec, "#deprecate" do warning.should start_with(<<-EOS.chomp) some_method is deprecated, use other_method instead. -from +from EOS warning.should include(__FILE__) warning.should include('8') diff --git a/spec/rubyspec/command_line/fixtures/bad_syntax.rb b/spec/rubyspec/command_line/fixtures/bad_syntax.rb index 595e616ddf..e7b8c7a357 100644 --- a/spec/rubyspec/command_line/fixtures/bad_syntax.rb +++ b/spec/rubyspec/command_line/fixtures/bad_syntax.rb @@ -1 +1 @@ -f { \ No newline at end of file +f { diff --git a/spec/rubyspec/core/complex/negative_spec.rb b/spec/rubyspec/core/complex/negative_spec.rb index 2016968efd..5b51933106 100644 --- a/spec/rubyspec/core/complex/negative_spec.rb +++ b/spec/rubyspec/core/complex/negative_spec.rb @@ -8,4 +8,4 @@ describe "Complex#negative?" do c.negative? }.should raise_error(NoMethodError) end -end \ No newline at end of file +end diff --git a/spec/rubyspec/core/complex/positive_spec.rb b/spec/rubyspec/core/complex/positive_spec.rb index 3171cbe9b2..88898d31cf 100644 --- a/spec/rubyspec/core/complex/positive_spec.rb +++ b/spec/rubyspec/core/complex/positive_spec.rb @@ -8,4 +8,4 @@ describe "Complex#positive?" do c.positive? }.should raise_error(NoMethodError) end -end \ No newline at end of file +end diff --git a/spec/rubyspec/core/file/fixtures/do_not_remove b/spec/rubyspec/core/file/fixtures/do_not_remove index e69de29bb2..8b13789179 100644 --- a/spec/rubyspec/core/file/fixtures/do_not_remove +++ b/spec/rubyspec/core/file/fixtures/do_not_remove @@ -0,0 +1 @@ + diff --git a/spec/rubyspec/core/module/fixtures/path2/load_path.rb b/spec/rubyspec/core/module/fixtures/path2/load_path.rb index e69de29bb2..8b13789179 100644 --- a/spec/rubyspec/core/module/fixtures/path2/load_path.rb +++ b/spec/rubyspec/core/module/fixtures/path2/load_path.rb @@ -0,0 +1 @@ + diff --git a/spec/rubyspec/core/string/encode_spec.rb b/spec/rubyspec/core/string/encode_spec.rb index 0ec592acd3..d051dd58c9 100644 --- a/spec/rubyspec/core/string/encode_spec.rb +++ b/spec/rubyspec/core/string/encode_spec.rb @@ -68,7 +68,7 @@ with_feature :encoding do str = "あ" str.force_encoding("ascii-8bit") encoded = str.encode("utf-8", "utf-8") - + encoded.should_not equal(str) encoded.encoding.should == Encoding::UTF_8 end diff --git a/spec/rubyspec/language/fixtures/super.rb b/spec/rubyspec/language/fixtures/super.rb index c7d47cc465..4e89d59bed 100644 --- a/spec/rubyspec/language/fixtures/super.rb +++ b/spec/rubyspec/language/fixtures/super.rb @@ -477,7 +477,7 @@ module Super end end end - + module KeywordArguments class A def foo(**args) diff --git a/spec/rubyspec/language/rescue_spec.rb b/spec/rubyspec/language/rescue_spec.rb index 3d45eb1917..66366cd1a0 100644 --- a/spec/rubyspec/language/rescue_spec.rb +++ b/spec/rubyspec/language/rescue_spec.rb @@ -232,7 +232,7 @@ describe "The rescue keyword" do end end.should raise_error(Exception) end - + it "uses === to compare against rescued classes" do rescuer = Class.new @@ -245,12 +245,12 @@ describe "The rescue keyword" do rescue rescuer rescued = :success rescue Exception - rescued = :failure + rescued = :failure end - + rescued.should == :success end - + it "only accepts Module or Class in rescue clauses" do rescuer = 42 lambda { diff --git a/spec/rubyspec/language/super_spec.rb b/spec/rubyspec/language/super_spec.rb index f7dc0d132c..fb7e089fb4 100644 --- a/spec/rubyspec/language/super_spec.rb +++ b/spec/rubyspec/language/super_spec.rb @@ -246,7 +246,7 @@ describe "The super keyword" do it "without explicit arguments that are '_' including any modifications" do Super::ZSuperWithUnderscores::B.new.m_modified(1, 2).should == [14, 2] end - + describe 'when using keyword arguments' do it 'passes any given keyword arguments to the parent' do b = Super::KeywordArguments::B.new diff --git a/spec/rubyspec/language/undef_spec.rb b/spec/rubyspec/language/undef_spec.rb index 45fe4e9043..5e15d2a254 100644 --- a/spec/rubyspec/language/undef_spec.rb +++ b/spec/rubyspec/language/undef_spec.rb @@ -29,7 +29,7 @@ describe "The undef keyword" do it "raises a NameError when passed a missing name" do Class.new do lambda { - undef not_exist + undef not_exist }.should raise_error(NameError) { |e| # a NameError and not a NoMethodError e.class.should == NameError diff --git a/spec/rubyspec/library/base64/urlsafe_decode64_spec.rb b/spec/rubyspec/library/base64/urlsafe_decode64_spec.rb index a3347db7d7..bea9a7cefb 100644 --- a/spec/rubyspec/library/base64/urlsafe_decode64_spec.rb +++ b/spec/rubyspec/library/base64/urlsafe_decode64_spec.rb @@ -10,7 +10,7 @@ describe "Base64#urlsafe_decode64" do it "uses '-' instead of '+'" do decoded = Base64.urlsafe_decode64('IkJlaW5nIGRpc2ludGVncmF0ZWQgbWFrZXMgbWUgdmUtcnkgYW4tZ3J5ISIgPGh1ZmYsIGh1ZmY-') - decoded.should == '"Being disintegrated makes me ve-ry an-gry!" ' + decoded.should == '"Being disintegrated makes me ve-ry an-gry!" ' end ruby_version_is ""..."2.3" do diff --git a/spec/rubyspec/library/net/ftp/fixtures/putbinaryfile b/spec/rubyspec/library/net/ftp/fixtures/putbinaryfile index eabb8fcedd..f3130c6e43 100644 --- a/spec/rubyspec/library/net/ftp/fixtures/putbinaryfile +++ b/spec/rubyspec/library/net/ftp/fixtures/putbinaryfile @@ -1,3 +1,3 @@ This is an example file which is going to be transmitted -using #putbinaryfile. \ No newline at end of file +using #putbinaryfile. diff --git a/spec/rubyspec/library/net/ftp/fixtures/puttextfile b/spec/rubyspec/library/net/ftp/fixtures/puttextfile index dce0d35f8d..b4f3b2b62d 100644 --- a/spec/rubyspec/library/net/ftp/fixtures/puttextfile +++ b/spec/rubyspec/library/net/ftp/fixtures/puttextfile @@ -1,3 +1,3 @@ This is an example file which is going to be transmitted -using #puttextfile. \ No newline at end of file +using #puttextfile. diff --git a/spec/rubyspec/library/socket/tcpsocket/setsockopt_spec.rb b/spec/rubyspec/library/socket/tcpsocket/setsockopt_spec.rb index e4d3da10d1..8eacc1275d 100644 --- a/spec/rubyspec/library/socket/tcpsocket/setsockopt_spec.rb +++ b/spec/rubyspec/library/socket/tcpsocket/setsockopt_spec.rb @@ -45,4 +45,4 @@ describe "TCPSocket#setsockopt" do end end end -end \ No newline at end of file +end diff --git a/spec/rubyspec/library/thread/sizedqueue/max_spec.rb b/spec/rubyspec/library/thread/sizedqueue/max_spec.rb index 337404d821..54cc6351bd 100644 --- a/spec/rubyspec/library/thread/sizedqueue/max_spec.rb +++ b/spec/rubyspec/library/thread/sizedqueue/max_spec.rb @@ -21,7 +21,7 @@ describe "Thread::SizedQueue#max=" do @sized_queue.max = 10 @sized_queue.max.should == 10 end - + it "does not remove items already in the queue beyond the maximum" do @sized_queue.enq 1 @sized_queue.enq 2 diff --git a/spec/rubyspec/optional/capi/ext/typed_data_spec.c b/spec/rubyspec/optional/capi/ext/typed_data_spec.c index 8436c527be..8c9a0708b4 100644 --- a/spec/rubyspec/optional/capi/ext/typed_data_spec.c +++ b/spec/rubyspec/optional/capi/ext/typed_data_spec.c @@ -154,7 +154,7 @@ VALUE sws_typed_change_struct(VALUE self, VALUE obj, VALUE new_val) { void Init_typed_data_spec(void) { VALUE cls; cls = rb_define_class("CApiAllocTypedSpecs", rb_cObject); - + #if defined(HAVE_RTYPEDDATA) && defined(HAVE_TYPEDDATA_WRAP_STRUCT) rb_define_alloc_func(cls, sdaf_alloc_typed_func); rb_define_method(cls, "typed_wrapped_data", sdaf_typed_get_struct, 0); diff --git a/spec/rubyspec/security/cve_2013_4164_spec.rb b/spec/rubyspec/security/cve_2013_4164_spec.rb index de5973b780..06b2bb0306 100644 --- a/spec/rubyspec/security/cve_2013_4164_spec.rb +++ b/spec/rubyspec/security/cve_2013_4164_spec.rb @@ -3,17 +3,17 @@ require File.expand_path('../../spec_helper', __FILE__) require 'json' describe "String#to_f" do - + it "resists CVE-2013-4164 by converting very long Strings to a Float" do "1.#{'1'*1000000}".to_f.should be_close(1.1111111111111112, TOLERANCE) end - + end describe "JSON.parse" do - + it "resists CVE-2013-4164 by converting very long Strings to a Float" do JSON.parse("[1.#{'1'*1000000}]").first.should be_close(1.1111111111111112, TOLERANCE) end - + end diff --git a/spec/rubyspec/security/cve_2014_8080_spec.rb b/spec/rubyspec/security/cve_2014_8080_spec.rb index ae87de2346..6453b0c317 100644 --- a/spec/rubyspec/security/cve_2014_8080_spec.rb +++ b/spec/rubyspec/security/cve_2014_8080_spec.rb @@ -3,7 +3,7 @@ require File.expand_path('../../spec_helper', __FILE__) require 'rexml/document' describe "REXML::Document.new" do - + it "resists CVE-2014-8080 by raising an exception when entity expansion has grown too large" do xml = < @@ -28,5 +28,5 @@ XML e.message.should =~ /entity expansion has grown too large/ } end - + end