more warning reduction

Author: dchelimsky

spec/rspec/core/example_spec.rb

@@ -200,14 +200,15 @@ def assert(val)
           after(:each)  { @after_each = :after_each }
           after(:all)   { @after_all  = :after_all }
         end
-        example = group.example("does something") do
-          @in_example = :in_example
+        group.example("does something") do
+          @before_all.should eq :before_all
+          @before_each.should eq :before_each
         end
-        example_group_instance = group.new
-        example.run(example_group_instance, double('reporter').as_null_object)
-
-        %w[@before_all @before_each @after_each @after_all].each do |ivar|
-          example_group_instance.instance_variable_get(ivar).should be_nil
+        group.run(double.as_null_object).should be_true
+        group.new do |example|
+          %w[@before_all @before_each @after_each @after_all].each do |ivar|
+            example.instance_variable_get(ivar).should be_nil
+          end
         end
       end
 

spec/rspec/core/formatters/html_formatter_spec.rb

@@ -22,7 +22,7 @@ module Formatters
           err, out = StringIO.new, StringIO.new
           command_line = RSpec::Core::CommandLine.new(options)
           command_line.run(err, out)
-          out.string.gsub /\d+\.\d+ seconds/, 'x seconds'
+          out.string.gsub(/\d+\.\d+ seconds/, 'x seconds')
         end
 
         let(:expected_html) do
@@ -65,13 +65,13 @@ def extract_backtrace_from(doc)
             expected_backtraces = extract_backtrace_from(expected_doc)
             expected_doc.search("div.backtrace").remove
 
-            actual_doc.inner_html.should == expected_doc.inner_html
+            actual_doc.inner_html.should eq(expected_doc.inner_html)
 
             expected_backtraces.each_with_index do |expected_line, i|
               expected_path, expected_line_number, expected_suffix = expected_line.split(':')
               actual_path, actual_line_number, actual_suffix = actual_backtraces[i].split(':')
-              File.expand_path(actual_path).should == File.expand_path(expected_path)
-              actual_line_number.should == expected_line_number
+              File.expand_path(actual_path).should eq(File.expand_path(expected_path))
+              actual_line_number.should eq(expected_line_number)
             end
           end
         end

spec/rspec/core/formatters/text_mate_formatter_spec.rb

@@ -22,7 +22,7 @@ module Formatters
           err, out = StringIO.new, StringIO.new
           command_line = RSpec::Core::CommandLine.new(options)
           command_line.run(err, out)
-          out.string.gsub /\d+\.\d+ seconds/, 'x seconds'
+          out.string.gsub(/\d+\.\d+ seconds/, 'x seconds')
 
         end
 
@@ -58,7 +58,7 @@ module Formatters
             expected_doc = Nokogiri::HTML(expected_html)
             expected_doc.search("div.backtrace").remove
 
-            actual_doc.inner_html.should == expected_doc.inner_html
+            actual_doc.inner_html.should eq(expected_doc.inner_html)
 
             backtrace_lines.each do |backtrace_line|
               backtrace_line['href'].should include("txmt://open?url=")

spec/rspec/core/hooks_filtering_spec.rb

@@ -15,13 +15,13 @@ module RSpec::Core
         group = ExampleGroup.describe
         group.example("example") {}
         group.run
-        filters.should == [
+        filters.should eq([
           "before all in config",
           "around each in config",
           "before each in config",
           "after each in config",
           "after all in config"
-        ]
+        ])
       end
     end
 
@@ -38,11 +38,11 @@ module RSpec::Core
           group = ExampleGroup.describe(:match => true)
           group.example("example") {}
           group.run
-          filters.should == [
+          filters.should eq([
             "around each in config",
             "before each in config",
             "after each in config"
-          ]
+          ])
         end
       end
 
@@ -58,13 +58,13 @@ module RSpec::Core
         group = ExampleGroup.describe(:match => true)
         group.example("example") {}
         group.run
-        filters.should == [
+        filters.should eq([
           "before all in config",
           "around each in config",
           "before each in config",
           "after each in config",
           "after all in config"
-        ]
+        ])
       end
 
       it "runs before|after :all hooks on matching nested example groups" do
@@ -85,8 +85,8 @@ module RSpec::Core
         group.run
 
         example_1_filters.should be_empty
-        example_2_filters.should == [:before_all]
-        filters.should == [:before_all, :after_all]
+        example_2_filters.should eq([:before_all])
+        filters.should eq([:before_all, :after_all])
       end
 
       it "runs before|after :all hooks only on the highest level group that matches the filter" do
@@ -109,11 +109,11 @@ module RSpec::Core
         end
         group.run
 
-        example_1_filters.should == [:before_all]
-        example_2_filters.should == [:before_all]
-        example_3_filters.should == [:before_all]
+        example_1_filters.should eq [:before_all]
+        example_2_filters.should eq [:before_all]
+        example_3_filters.should eq [:before_all]
 
-        filters.should == [:before_all, :after_all]
+        filters.should eq [:before_all, :after_all]
       end
 
       it "should not be ran if the filter doesn't match the example group's filter" do
@@ -128,7 +128,7 @@ module RSpec::Core
         group = ExampleGroup.describe(:match => true)
         group.example("example") {}
         group.run
-        filters.should == []
+        filters.should eq []
       end
 
       context "when the hook filters apply to individual examples instead of example groups" do
@@ -164,7 +164,7 @@ def filters
           let(:example_metadata) { { :foo => :bar } }
 
           it "runs the `:each` hooks" do
-            each_filters.should == [
+            each_filters.should eq [
               'around each in config',
               'before each in config',
               'after each in config'
@@ -199,7 +199,7 @@ def filters
         group = ExampleGroup.describe(:one => 1, :two => 2, :three => 3)
         group.example("example") {}
         group.run
-        filters.should == [
+        filters.should eq [
           "before all in config",
           "around each in config",
           "before each in config",
@@ -220,7 +220,7 @@ def filters
         group = ExampleGroup.describe(:one => 1, :two => 2, :three => 3)
         group.example("example") {}
         group.run
-        filters.should == []
+        filters.should eq []
       end
     end
   end