Backport pull request #1089 from rspec/fix-ruby-warnings

Fix warnings and deprecations notices

Author: cupakromer

Gemfile

@@ -27,7 +27,7 @@ gem 'sqlite3', '~> 1.3.6'
 
 # Capybara versions that support RSpec 3 only support RUBY_VERSION >= 1.9.3
 if RUBY_VERSION >= '1.9.3'
-  gem 'capybara', '2.2.0'
+  gem 'capybara', '~> 2.3.0'
 end
 
 if RUBY_VERSION < '1.9.2'

features/support/env.rb

@@ -1,8 +1,9 @@
 require 'aruba/cucumber'
 
 module ArubaExt
-  def run(cmd)
-    super(cmd =~ /^rspec/ ? "bin/#{cmd}" : cmd)
+  def run(cmd, timeout = nil)
+    exec_cmd = cmd =~ /^rspec/ ? "bin/#{cmd}" : cmd
+    super(exec_cmd, timeout)
   end
 end
 

rspec-rails.gemspec

@@ -40,6 +40,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rake',     '~> 10.0.0'
   s.add_development_dependency 'cucumber', '~> 1.3.5'
-  s.add_development_dependency 'aruba',    '~> 0.4.11'
+  s.add_development_dependency 'aruba',    '~> 0.5.4'
   s.add_development_dependency 'ammeter',  '1.0.0'
 end

spec/rspec/rails/matchers/route_to_spec.rb

@@ -109,9 +109,9 @@ def assert_recognizes(*)
   context "with should_not" do
     context "when assert_recognizes passes" do
       it "fails with custom message" do
-        expect do
+        expect{
           expect({:get => "path"}).not_to route_to("these" => "options")
-        end.to raise_error(/expected {:get=>"path"} not to route to {"these"=>"options"}/)
+        }.to raise_error(/expected \{:get=>"path"\} not to route to \{"these"=>"options"\}/)
       end
     end
 

spec/rspec/rails/minitest_lifecycle_adapter_spec.rb

@@ -12,7 +12,7 @@
       define_method(:after_teardown)  { invocations << :after_teardown }
     end
 
-    example = example_group.example("foo") { invocations << :example }
+    example_group.example("foo") { invocations << :example }
     example_group.run(NullObject.new)
 
     expect(invocations).to eq([

spec/support/shared_examples.rb

@@ -12,7 +12,7 @@ def define_group_in(path, group_definition)
       Dir.mktmpdir("rspec-rails-app-root") do |dir|
         Dir.chdir(dir) do
           path.mkpath
-          spec_file = File.open(file, "w") do |f|
+          File.open(file, "w") do |f|
             f.write("$_new_group = #{group_definition}")
           end