Merge pull request rspec#752 from rspec/new-deprecation-api

New deprecation api

Author: alindeman

Diff for: Rakefile

@@ -3,7 +3,7 @@ begin
   Bundler.setup
   Bundler::GemHelper.install_tasks
 rescue
-  raise "You need to install a bundle first. Try 'thor version:use 3.1.3'"
+  raise "You need to install a bundle first. Try 'thor version:use 3.2.13'"
 end
 
 require 'yaml'

Diff for: lib/generators/rspec/integration/integration_generator.rb

@@ -18,7 +18,7 @@ def generate_request_spec
 
       # @deprecated Use `--webrat` instead.
       def webrat?
-        RSpec.deprecate("the --webrat-matchers option", "--webrat") if options[:webrat_matchers]
+        RSpec.deprecate("the --webrat-matchers option", :replacement => "--webrat") if options[:webrat_matchers]
         options[:webrat] || options[:webrat_matchers]
       end
 

Diff for: lib/generators/rspec/scaffold/scaffold_generator.rb

@@ -48,7 +48,7 @@ def generate_routing_spec
 
         # @deprecated Use `--webrat` instead.
         def webrat?
-          RSpec.deprecate("--webrat-matchers", "--webrat") if options[:webrat_matchers]
+          RSpec.deprecate("--webrat-matchers", :replacement => "--webrat") if options[:webrat_matchers]
           options[:webrat] || options[:webrat_matchers]
         end
 

Diff for: lib/rspec/rails/example/view_example_group.rb

@@ -82,7 +82,7 @@ def params
 
       # @deprecated Use `view` instead.
       def template
-        RSpec.deprecate("template","view")
+        RSpec.deprecate("template", :replacement => "view")
         view
       end
 

Diff for: lib/rspec/rails/module_inclusion.rb

@@ -8,18 +8,8 @@ module ModuleInclusion
     # internally. As it happens, there are a few blog posts citing its use, so
     # I'm leaving it here, but deprecated.
     def include_self_when_dir_matches(*path_parts)
-        instead = <<-INSTEAD
-
-
-    RSpec.configure do |c|
-      c.include self, :example_group => {
-        :file_path => /#{path_parts.join('\/')}/
-      }
-    end
-
-INSTEAD
       lambda do |c|
-        RSpec.deprecate('include_self_when_dir_matches', instead, 'rails-3.0')
+        RSpec.deprecate('include_self_when_dir_matches')
         c.include self, :example_group => {
           :file_path => Regexp.compile(path_parts.join('[\\\/]'))
         }

Diff for: lib/rspec/rails/view_rendering.rb

@@ -41,7 +41,7 @@ def render_views(true_or_false=true)
 
         # @deprecated Use `render_views` instead.
         def integrate_views
-          RSpec.deprecate("integrate_views","render_views")
+          RSpec.deprecate("integrate_views", :replacement => "render_views")
           render_views
         end