Deprecate #setup, #teardown in specs; use #before, #after.

spec/README

@@ -17,7 +17,6 @@ spec
  |    +-- breakpoint
  |    +-- bytearray
  |    +-- ...
- |-- data
  |-- kernel
  |-- language
  |-- library
@@ -40,8 +39,9 @@ spec
  |                + -- ...
  |                + -- time
  |                + -- yaml
- +-- subtend
-       +-- ext
+ |-- subtend
+ |     +-- ext
+ +-- tags
 
 The specs for the reference implementation of the Ruby language (MRI) are
 under @spec/ruby@. Presently, these are mostly focused on version 1.8.x and

spec/ruby/1.8/core/string/each_line_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes.rb'
-require File.dirname(__FILE__) + '/shared/each.rb'
+require File.dirname(__FILE__) + '/fixtures/classes'
+require File.dirname(__FILE__) + '/shared/each'
 
 describe "String#each_line" do
   it_behaves_like(:string_each, :each_line)

spec/ruby/1.8/core/string/each_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes.rb'
-require File.dirname(__FILE__) + '/shared/each.rb'
+require File.dirname(__FILE__) + '/fixtures/classes'
+require File.dirname(__FILE__) + '/shared/each'
 
 describe "String#each" do
   it_behaves_like(:string_each, :each)

spec/ruby/1.8/core/thread/key_spec.rb

@@ -2,7 +2,7 @@
 require File.dirname(__FILE__) + '/fixtures/classes'
 
 describe "Thread#key?" do
-  setup do
+  before :each do
     @th = Thread.new do
       Thread.current[:oliver] = "a"      
     end

spec/ruby/1.8/library/erb/filename_spec.rb

@@ -3,7 +3,7 @@
 
 describe "ERB#filename" do
   # TODO: why does this fail on rubinius?
-  it "raises is reported when error raised" do
+  it "raises an exception if there are errors processing content" do
     filename = 'foobar.rhtml'
     erb = ERB.new('<% if true %>')   # will raise SyntaxError
     erb.filename = filename
@@ -29,7 +29,7 @@
   end
 
   # TODO: why does this fail on rubinius?
-  it "use '(erb)' as filename when filename is not set" do
+  it "uses '(erb)' as filename when filename is not set" do
     erb = ERB.new('<% if true %>')   # will raise SyntaxError
     lambda {
       begin
@@ -52,4 +52,3 @@
     end
   end
 end
-fails:ERB#filename uses '(erb)' as filename when filename is not set

spec/subtend/array_spec.rb

@@ -5,7 +5,7 @@
 require File.dirname(__FILE__) + '/ext/subtend_array'
 
 describe "SubtendArray" do
-  setup do
+  before :each do
     @s = SubtendArray.new
   end
 

spec/subtend/class_spec.rb

@@ -19,7 +19,7 @@ def initialize(v)
 end
 
 describe "SubtendClass" do
-  setup do
+  before :each do
     @s = SubtendClass.new
   end
 

spec/subtend/define_method_vis_spec.rb

@@ -18,7 +18,7 @@ def test_s
 end
 
 describe "SubtendMethodVisModule" do
-  setup do
+  before :each do
     @c = SubtendMethodVisModuleTest.new
   end
 
@@ -39,7 +39,7 @@ def test_s
 end
 
 describe "SubtendMethodVis" do
-  setup do
+  before :each do
     @c = SubtendMethodVis.new
   end
 

spec/subtend/exception_spec.rb

@@ -5,7 +5,7 @@
 require File.dirname(__FILE__) + '/ext/subtend_exception'
 
 describe "SubtendRaiser" do
-  setup do
+  before :each do
     @s = SubtendRaiser.new
   end
 

spec/subtend/float_spec.rb

@@ -5,7 +5,7 @@
 require File.dirname(__FILE__) + '/ext/subtend_float'
 
 describe "SubtendFloat" do
-  setup do
+  before :each do
     @f = SubtendFloat.new
   end
 

spec/subtend/hash_spec.rb

@@ -5,7 +5,7 @@
 require File.dirname(__FILE__) + '/ext/subtend_hash'
 
 describe "SubtendHash" do
-  setup do
+  before :each do
     @s = SubtendHash.new
   end
 

spec/subtend/module_spec.rb

@@ -10,7 +10,7 @@ module SubtendModuleTest
     BAR = 7
   end
 
-  setup do
+  before :each do
     @m = SubtendModule.new
   end
 

spec/subtend/object_spec.rb

@@ -6,7 +6,7 @@
 
 describe "SubtendObject" do
 
-  setup do
+  before do
     @o = SubtendObject.new
   end
 

spec/subtend/string_spec.rb

@@ -5,7 +5,7 @@
 require File.dirname(__FILE__) + '/ext/subtend_string'
 
 describe "SubtendString" do
-  setup do
+  before :each do
     @s = SubtendString.new
   end
 

spec/subtend/wrapped_struct_spec.rb

@@ -5,7 +5,7 @@
 require File.dirname(__FILE__) + '/ext/subtend_wrapped_struct'
 
 describe "SubtendWrappedStruct" do
-  setup do
+  before :each do
     @s = SubtendWrappedStruct.new
   end
 

spec/tags/ruby/1.8/core/kernel/load_tags.txt

@@ -1 +1 @@
-Kernel#load allows wrapping the code in the file in an anonymous module
+fails:Kernel#load allows wrapping the code in the file in an anonymous module