rspec-rails 2.13.0 → 2.13.1

data/lib/generators/rspec/install/templates/spec/spec_helper.rb.tt

@@ -6,9 +6,9 @@ require 'rspec/autorun'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
 
-<% if ::Rails.version >= '4' -%>
+<% if RSpec::Rails.rails_version_satisfied_by?('>= 4.0.0.beta1') -%>
 # Checks for pending migrations before tests are run.
 # If you are not using ActiveRecord, you can remove this line.
 ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration)

data/lib/generators/rspec/scaffold/scaffold_generator.rb

@@ -27,7 +27,7 @@ module Rspec
       end
 
       def generate_view_specs
-        return unless options[:view_specs]
+        return unless options[:view_specs] && options[:template_engine]
 
         copy_view :edit
         copy_view :index unless options[:singleton]

data/lib/generators/rspec/scaffold/templates/controller_spec.rb

@@ -23,17 +23,13 @@ describe <%= controller_class_name %>Controller do
 
   # This should return the minimal set of attributes required to create a valid
   # <%= class_name %>. As you add validations to <%= class_name %>, be sure to
-  # update the return value of this method accordingly.
-  def valid_attributes
-    <%= formatted_hash(example_valid_attributes) %>
-  end
+  # adjust the attributes here as well.
+  let(:valid_attributes) { <%= formatted_hash(example_valid_attributes) %> }
 
   # This should return the minimal set of values that should be in the session
   # in order to pass any filters (e.g. authentication) defined in
   # <%= controller_class_name %>Controller. Be sure to keep this updated too.
-  def valid_session
-    {}
-  end
+  let(:valid_session) { {} }
 
 <% unless options[:singleton] -%>
   describe "GET index" do
@@ -113,7 +109,7 @@ describe <%= controller_class_name %>Controller do
         # specifies that the <%= class_name %> created on the previous line
         # receives the :update_attributes message with whatever params are
         # submitted in the request.
-        <%- if Rails.version >= '4' -%>
+        <%- if RSpec::Rails.rails_version_satisfied_by?('>= 4.0.0.beta1') -%>
         <%= class_name %>.any_instance.should_receive(:update).with(<%= formatted_hash(example_params_for_update) %>)
         <%- else -%>
         <%= class_name %>.any_instance.should_receive(:update_attributes).with(<%= formatted_hash(example_params_for_update) %>)

data/lib/rspec/rails.rb

@@ -5,6 +5,7 @@ RSpec::configure do |c|
   c.backtrace_clean_patterns << /lib\/rspec\/rails/
 end
 
+require 'rspec/rails/rails_version'
 require 'rspec/rails/extensions'
 require 'rspec/rails/view_rendering'
 require 'rspec/rails/adapters'

data/lib/rspec/rails/adapters.rb

@@ -24,7 +24,8 @@ module RSpec
           end
 
           assertion_modules.each do |mod|
-            mod.instance_methods.each do |method|
+            mod.public_instance_methods.each do |method|
+              next if method == :method_missing || method == "method_missing"
               class_eval <<-EOM, __FILE__, __LINE__ + 1
                 def #{method}(*args, &block)
                   assertion_instance.send(:#{method}, *args, &block)
@@ -36,6 +37,34 @@ module RSpec
       end
     end
 
+    # MiniTest::Unit::LifecycleHooks
+    module MiniTestLifecycleAdapter
+      extend ActiveSupport::Concern
+
+      included do |group|
+        group.before { after_setup }
+        group.after  { before_teardown }
+
+        group.around do |example|
+          before_setup
+          example.run
+          after_teardown
+        end
+      end
+
+      def before_setup
+      end
+
+      def after_setup
+      end
+
+      def before_teardown
+      end
+
+      def after_teardown
+      end
+    end
+
     module SetupAndTeardownAdapter
       extend ActiveSupport::Concern
 

data/lib/rspec/rails/example/controller_example_group.rb

@@ -11,6 +11,7 @@ module RSpec::Rails
     include RSpec::Rails::Matchers::RedirectTo
     include RSpec::Rails::Matchers::RenderTemplate
     include RSpec::Rails::Matchers::RoutingMatchers
+    include RSpec::Rails::AssertionDelegator.new(ActionDispatch::Assertions::RoutingAssertions)
 
     module ClassMethods
       # @private
@@ -64,18 +65,43 @@ module RSpec::Rails
         metadata[:example_group][:described_class].class_eval(&body)
 
         before do
-          @orig_routes, @routes = @routes, ActionDispatch::Routing::RouteSet.new
-          @routes.draw { resources :anonymous }
+          @orig_routes = self.routes
+          self.routes  = ActionDispatch::Routing::RouteSet.new.tap { |r|
+            r.draw { resources :anonymous }
+          }
         end
 
         after do
-          @routes, @orig_routes = @orig_routes, nil
+          self.routes  = @orig_routes
+          @orig_routes = nil
+        end
+      end
+
+      # Specifies the routeset that will be used for the example group. This
+      # is most useful when testing Rails engines.
+      #
+      # @example
+      #
+      #     describe MyEngine::PostsController do
+      #       routes { MyEngine::Engine.routes }
+      #
+      #       # ...
+      #     end
+      def routes(&blk)
+        before do
+          self.routes = blk.call
         end
       end
     end
 
     attr_reader :controller, :routes
 
+    # @api private
+    def routes=(routes)
+      @routes = routes
+      assertion_instance.instance_variable_set(:@routes, routes)
+    end
+
     module BypassRescue
       def rescue_with_handler(exception)
         raise exception
@@ -107,7 +133,9 @@ module RSpec::Rails
     # If method is a named_route, delegates to the RouteSet associated with
     # this controller.
     def method_missing(method, *args, &block)
-      if @orig_routes && @orig_routes.named_routes.helpers.include?(method)
+      if @routes && @routes.named_routes.helpers.include?(method)
+        controller.send(method, *args, &block)
+      elsif @orig_routes && @orig_routes.named_routes.helpers.include?(method)
         controller.send(method, *args, &block)
       else
         super
@@ -120,8 +148,17 @@ module RSpec::Rails
       metadata[:type] = :controller
 
       before do
-        @routes = ::Rails.application.routes
-        ActionController::Base.allow_forgery_protection = false
+        self.routes = ::Rails.application.routes
+      end
+
+      around do |ex|
+        previous_allow_forgery_protection_value = ActionController::Base.allow_forgery_protection
+        begin
+          ActionController::Base.allow_forgery_protection = false
+          ex.call
+        ensure
+          ActionController::Base.allow_forgery_protection = previous_allow_forgery_protection_value
+        end
       end
     end
   end

data/lib/rspec/rails/example/rails_example_group.rb

@@ -1,12 +1,14 @@
 # Temporary workaround to resolve circular dependency between rspec-rails' spec
 # suite and ammeter.
 require 'rspec/rails/matchers'
+require 'rspec/rails/rails_version'
 
 module RSpec
   module Rails
     module RailsExampleGroup
       extend ActiveSupport::Concern
       include RSpec::Rails::SetupAndTeardownAdapter
+      include RSpec::Rails::MiniTestLifecycleAdapter if RSpec::Rails.rails_version_satisfied_by?('>= 4.0.0.beta1')
       include RSpec::Rails::TestUnitAssertionAdapter
       include RSpec::Rails::Matchers
     end

data/lib/rspec/rails/example/routing_example_group.rb

@@ -8,17 +8,43 @@ module RSpec::Rails
     include RSpec::Rails::Matchers::RoutingMatchers::RouteHelpers
     include RSpec::Rails::AssertionDelegator.new(ActionDispatch::Assertions::RoutingAssertions)
 
+    module ClassMethods
+      # Specifies the routeset that will be used for the example group. This
+      # is most useful when testing Rails engines.
+      #
+      # @example
+      #
+      #     describe MyEngine::PostsController do
+      #       routes { MyEngine::Engine.routes }
+      #
+      #       it "routes posts#index" do
+      #         expect(:get => "/posts").to
+      #           route_to(:controller => "my_engine/posts", :action => "index")
+      #       end
+      #     end
+      def routes(&blk)
+        before do
+          self.routes = blk.call
+        end
+      end
+    end
+
     included do
       metadata[:type] = :routing
 
       before do
-        @routes = ::Rails.application.routes
-        assertion_instance.instance_variable_set(:@routes, @routes)
+        self.routes = ::Rails.application.routes
       end
     end
 
     attr_reader :routes
 
+    # @api private
+    def routes=(routes)
+      @routes = routes
+      assertion_instance.instance_variable_set(:@routes, routes)
+    end
+
     private
 
     def method_missing(m, *args, &block)

data/lib/rspec/rails/example/view_example_group.rb

@@ -107,7 +107,7 @@ module RSpec::Rails
       end
 
       def _default_render_options
-        if ::Rails.version >= "3.2"
+        if RSpec::Rails.rails_version_satisfied_by?('>= 3.2')
           # pluck the handler, format, and locale out of, eg, posts/index.de.html.haml
           template, *components   = _default_file_to_render.split('.')
           handler, format, locale = *components.reverse

data/lib/rspec/rails/fixture_support.rb

@@ -4,6 +4,7 @@ module RSpec
       module FixtureSupport
         extend ActiveSupport::Concern
         include RSpec::Rails::SetupAndTeardownAdapter
+        include RSpec::Rails::MiniTestLifecycleAdapter if RSpec::Rails.rails_version_satisfied_by?('>= 4.0.0.beta1')
         include RSpec::Rails::TestUnitAssertionAdapter
         include ActiveRecord::TestFixtures
 

data/lib/rspec/rails/matchers/routing_matchers.rb

@@ -97,7 +97,7 @@ module RSpec::Rails::Matchers
     end
 
     module RouteHelpers
-      %w(get post put delete options head).each do |method|
+      %w(get post put patch delete options head).each do |method|
         define_method method do |path|
           { method.to_sym => path }
         end

data/lib/rspec/rails/mocks.rb

@@ -96,7 +96,7 @@ EOM
                                     :valid? => true,
                                     :blank? => false)
 
-        mock("#{model_class.name}_#{stubs[:id]}", stubs).tap do |m|
+        double("#{model_class.name}_#{stubs[:id]}", stubs).tap do |m|
           m.singleton_class.class_eval do
             include ActiveModelInstanceMethods
             include ActiveRecordInstanceMethods if defined?(ActiveRecord)

data/lib/rspec/rails/rails_version.rb

@@ -0,0 +1,17 @@
+module RSpec
+  module Rails
+    # @api private
+    def self.rails_version_satisfied_by?(requirement)
+      Gem::Requirement.new(requirement).satisfied_by?(rails_version)
+    end
+
+    # @api private
+    def self.rails_version
+      @rails_version ||= if ::Rails.version.is_a?(Gem::Version)
+                           ::Rails.version
+                         else
+                           Gem::Version.new(::Rails.version.to_s)
+                         end
+    end
+  end
+end

data/lib/rspec/rails/tasks/rspec.rake

@@ -25,11 +25,14 @@ namespace :spec do
     end
   end
 
-  desc "Run all specs with rcov"
-  RSpec::Core::RakeTask.new(:rcov => spec_prereq) do |t|
-    t.rcov = true
-    t.pattern = "./spec/**/*_spec.rb"
-    t.rcov_opts = '--exclude /gems/,/Library/,/usr/,lib/tasks,.bundle,config,/lib/rspec/,/lib/rspec-,spec'
+  # RCov task only enabled for Ruby 1.8
+  if RUBY_VERSION < '1.9'
+    desc "Run all specs with rcov"
+    RSpec::Core::RakeTask.new(:rcov => spec_prereq) do |t|
+      t.rcov = true
+      t.pattern = "./spec/**/*_spec.rb"
+      t.rcov_opts = '--exclude /gems/,/Library/,/usr/,lib/tasks,.bundle,config,/lib/rspec/,/lib/rspec-,spec'
+    end
   end
 
   task :statsetup do
@@ -42,4 +45,3 @@ namespace :spec do
     end
   end
 end
-

data/lib/rspec/rails/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Rails
     module Version
-      STRING = '2.13.0'
+      STRING = '2.13.1'
     end
   end
 end

data/spec/generators/rspec/controller/controller_generator_spec.rb

@@ -50,6 +50,17 @@ describe Rspec::Generators::ControllerGenerator do
           it { should_not exist }
         end
       end
+
+      describe 'with --no-template-engine' do
+        before do
+          run_generator %w(posts index --no-template-engine)
+        end
+
+        describe 'index.html.erb' do
+          subject { file('spec/views/posts/index.html._spec.rb') }
+          it { should_not exist }
+        end
+      end
     end
 
     describe 'are generated' do

data/spec/generators/rspec/install/install_generator_spec.rb

@@ -16,7 +16,7 @@ describe Rspec::Generators::InstallGenerator do
     File.read( file('spec/spec_helper.rb') ).should =~ /^require 'rspec\/autorun'$/m
   end
 
-  if ::Rails.version >= '4'
+  if RSpec::Rails.rails_version_satisfied_by?('>= 4.0.0.beta1')
     it "generates spec/spec_helper.rb with a check for pending migrations" do
       run_generator
       File.read( file('spec/spec_helper.rb') ).should =~ /ActiveRecord::Migration\.check_pending!/m

data/spec/generators/rspec/scaffold/scaffold_generator_spec.rb

@@ -72,6 +72,29 @@ describe Rspec::Generators::ScaffoldGenerator do
       end
     end
 
+    describe 'with --no-template-engine' do
+      before { run_generator %w(posts --no-template-engine) }
+      describe 'edit' do
+        subject { file("spec/views/posts/edit.html._spec.rb") }
+        it { should_not exist }
+      end
+
+      describe 'index' do
+        subject { file("spec/views/posts/index.html._spec.rb") }
+        it { should_not exist }
+      end
+
+      describe 'new' do
+        subject { file("spec/views/posts/new.html._spec.rb") }
+        it { should_not exist }
+      end
+
+      describe 'show' do
+        subject { file("spec/views/posts/show.html._spec.rb") }
+        it { should_not exist }
+      end
+    end
+
     describe 'with --no-view-specs' do
       before { run_generator %w(posts --no-view-specs) }
 

data/spec/rspec/rails/assertion_delegator_spec.rb

@@ -27,4 +27,17 @@ describe RSpec::Rails::AssertionDelegator do
     expect(klass.new).to have_thing(:a)
     expect(klass.new).not_to have_thing(:b)
   end
+
+  it "does not delegate method_missing" do
+    assertions = Module.new {
+      def method_missing(method, *args)
+      end
+    }
+
+    klass = Class.new {
+      include RSpec::Rails::AssertionDelegator.new(assertions)
+    }
+
+    expect { klass.new.abc123 }.to raise_error(NoMethodError)
+  end
 end

data/spec/rspec/rails/example/view_example_group_spec.rb

@@ -118,7 +118,7 @@ module RSpec::Rails
           view_spec.stub(:_default_file_to_render) { "widgets/new.en.html.erb" }
           view_spec.render
 
-          if ::Rails.version >= "3.2"
+          if RSpec::Rails.rails_version_satisfied_by?('>= 3.2')
             view_spec.received.first.should == [{:template => "widgets/new", :locales=>['en'], :formats=>['html'], :handlers=>['erb']}, {}, nil]
           else
             view_spec.received.first.should == [{:template => "widgets/new.en.html.erb"}, {}, nil]

data/spec/rspec/rails/matchers/have_rendered_spec.rb

@@ -29,7 +29,7 @@ require "spec_helper"
     context "with should" do
       context "when assert_template passes" do
         it "passes" do
-          self.stub!(:assert_template)
+          def assert_template(*); end
           expect do
             expect(response).to send(template_expectation, "template_name")
           end.to_not raise_exception
@@ -38,7 +38,7 @@ require "spec_helper"
 
       context "when assert_template fails" do
         it "uses failure message from assert_template" do
-          self.stub!(:assert_template) do
+          def assert_template(*)
             raise ActiveSupport::TestCase::Assertion.new("this message")
           end
           expect do
@@ -49,7 +49,7 @@ require "spec_helper"
 
       context "when fails due to some other exception" do
         it "raises that exception" do
-          self.stub!(:assert_template) do
+          def assert_template(*)
             raise "oops"
           end
           expect do