rspec-rails 2.3.1 → 2.4.0

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

@@ -13,12 +13,10 @@ module RSpec::Rails
   #   => delegates to assert_redirected_to(destination)
   module RequestExampleGroup
     extend ActiveSupport::Concern
-    extend RSpec::Rails::ModuleInclusion
-
-    include RSpec::Rails::RailsExampleGroup
 
     include ActionDispatch::Integration::Runner
     include ActionDispatch::Assertions
+    include RSpec::Rails::RailsExampleGroup
     include RSpec::Rails::BrowserSimulators
 
     module InstanceMethods
@@ -62,7 +60,5 @@ module RSpec::Rails
         end
       end
     end
-
-    RSpec.configure &include_self_when_dir_matches('spec','requests')
   end
 end

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

@@ -3,11 +3,9 @@ require "action_dispatch/testing/assertions/routing"
 module RSpec::Rails
   module RoutingExampleGroup
     extend ActiveSupport::Concern
-    extend RSpec::Rails::ModuleInclusion
-
-    include RSpec::Rails::RailsExampleGroup
 
     include ActionDispatch::Assertions::RoutingAssertions
+    include RSpec::Rails::RailsExampleGroup
     include RSpec::Rails::Matchers::RoutingMatchers
 
     module InstanceMethods
@@ -27,7 +25,5 @@ module RSpec::Rails
         @routes = ::Rails.application.routes
       end
     end
-
-    RSpec.configure &include_self_when_dir_matches('spec','routing')
   end
 end

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

@@ -19,10 +19,9 @@ module RSpec::Rails
   #   end
   module ViewExampleGroup
     extend ActiveSupport::Concern
-    extend RSpec::Rails::ModuleInclusion
 
-    include RSpec::Rails::RailsExampleGroup
     include ActionView::TestCase::Behavior
+    include RSpec::Rails::RailsExampleGroup
     include RSpec::Rails::ViewAssigns
     include RSpec::Rails::Matchers::RenderTemplate
     include RSpec::Rails::BrowserSimulators
@@ -154,8 +153,6 @@ module RSpec::Rails
         controller.request.path_parameters["action"]     = _inferred_action unless _inferred_action =~ /^_/
       end
     end
-
-    RSpec.configure &include_self_when_dir_matches('spec','views')
   end
 end
 

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

@@ -3,13 +3,17 @@ module RSpec::Rails::Matchers
     extend RSpec::Matchers::DSL
 
     matcher :redirect_to do |destination|
-      match_unless_raises Test::Unit::AssertionFailedError do |_|
+      match_unless_raises ActiveSupport::TestCase::Assertion do |_|
         assert_redirected_to destination
       end
 
-      failure_message_for_should do
+      failure_message_for_should do |_|
         rescued_exception.message
       end
+
+      failure_message_for_should_not do |_|
+        "expected not to redirect to #{destination.inspect}, but did"
+      end
     end
   end
 end

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

@@ -3,7 +3,7 @@ module RSpec::Rails::Matchers
     extend RSpec::Matchers::DSL
 
     matcher :render_template do |options, message|
-      match_unless_raises Test::Unit::AssertionFailedError do |_|
+      match_unless_raises ActiveSupport::TestCase::Assertion do |_|
         options = options.to_s if Symbol === options
         assert_template options, message
       end
@@ -11,6 +11,10 @@ module RSpec::Rails::Matchers
       failure_message_for_should do
         rescued_exception.message
       end
+
+      failure_message_for_should_not do |_|
+        "expected not to render #{options.inspect}, but did"
+      end
     end
   end
 end

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

@@ -3,7 +3,7 @@ module RSpec::Rails::Matchers
     extend RSpec::Matchers::DSL
 
     matcher :route_to do |route_options|
-      match_unless_raises Test::Unit::AssertionFailedError do |path|
+      match_unless_raises ActiveSupport::TestCase::Assertion do |path|
         assertion_path = { :method => path.keys.first, :path => path.values.first }
         assert_recognizes(route_options, assertion_path)
       end

data/lib/rspec/rails/module_inclusion.rb

@@ -1,7 +1,24 @@
 module RSpec::Rails
   module ModuleInclusion
+    # Deprecated as of rspec-rails-2.4
+    # Will be removed from rspec-rails-3.0
+    #
+    # This was never intended to be a public API and is no longer needed
+    # 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')
         c.include self, :example_group => {
           :file_path => Regexp.compile(path_parts.join('[\\\/]'))
         }

data/lib/rspec/rails/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Rails # :nodoc:
     module Version # :nodoc:
-      STRING = '2.3.1'
+      STRING = '2.4.0'
     end
   end
 end

data/lib/rspec/rails/view_rendering.rb

@@ -1,18 +1,34 @@
 require 'action_view/testing/resolvers'
 
+RSpec.configure do |config|
+  config.add_setting :render_views, :default => false
+
+  # TODO - rspec-core needs a way to define a setting that works like this in
+  # one go
+  def config.render_views
+    settings[:render_views] = true
+  end
+
+  def config.render_views?
+    settings[:render_views]
+  end
+end
+
 module RSpec
   module Rails
     module ViewRendering
       extend ActiveSupport::Concern
 
+      attr_accessor :controller
+
       module ClassMethods
         def metadata_for_rspec_rails
           metadata[:rspec_rails] ||= {}
         end
 
         # See RSpec::Rails::ControllerExampleGroup
-        def render_views
-          metadata_for_rspec_rails[:render_views] = true
+        def render_views(true_or_false=true)
+          metadata_for_rspec_rails[:render_views] = true_or_false
         end
 
         def integrate_views
@@ -21,13 +37,13 @@ module RSpec
         end
 
         def render_views?
-          !!metadata_for_rspec_rails[:render_views]
+          metadata_for_rspec_rails[:render_views] || RSpec.configuration.render_views?
         end
       end
 
       module InstanceMethods
         def render_views?
-          self.class.render_views? || !@controller.class.respond_to?(:view_paths)
+          self.class.render_views? || !controller.class.respond_to?(:view_paths)
         end
       end
 
@@ -58,14 +74,14 @@ module RSpec
       included do
         before do
           unless render_views?
-            @_path_set_delegator_resolver = PathSetDelegatorResolver.new(@controller.class.view_paths)
-            @controller.class.view_paths = ::ActionView::PathSet.new.push(@_path_set_delegator_resolver)
+            @_path_set_delegator_resolver = PathSetDelegatorResolver.new(controller.class.view_paths)
+            controller.class.view_paths = ::ActionView::PathSet.new.push(@_path_set_delegator_resolver)
           end
         end
 
         after do
           unless render_views?
-            @controller.class.view_paths = @_path_set_delegator_resolver.path_set
+            controller.class.view_paths = @_path_set_delegator_resolver.path_set
           end
         end
       end

data/spec/rspec/rails/configuration_spec.rb

@@ -0,0 +1,26 @@
+require "spec_helper"
+
+describe "configuration" do
+  before do
+    @orig_render_views = RSpec.configuration.render_views?
+  end
+
+  after do
+    RSpec.configuration.render_views = @orig_render_views
+  end
+
+  describe "#render_views?" do
+    it "is false by default" do
+      RSpec.configuration.render_views?.should be_false
+    end
+  end
+
+  describe "#render_views" do
+    it "sets render_views? to return true" do
+      RSpec.configuration.render_views = false
+      RSpec.configuration.render_views
+
+      RSpec.configuration.render_views?.should be_true
+    end
+  end
+end

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

@@ -30,6 +30,24 @@ module RSpec::Rails
         helper_spec.stub(:_view) { av_tc_b_view }
         helper_spec.helper.should eq(av_tc_b_view)
       end
+
+      before do
+        Object.const_set(:ApplicationHelper, Module.new)
+      end
+
+      after do
+        Object.__send__(:remove_const, :ApplicationHelper)
+      end
+
+      it "includes ApplicationHelper" do
+        group = RSpec::Core::ExampleGroup.describe do
+          include HelperExampleGroup
+          def _view
+            ActionView::Base.new
+          end
+        end
+        group.new.helper.should be_kind_of(ApplicationHelper)
+      end
     end
   end
 

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

@@ -3,7 +3,9 @@ require "spec_helper"
 module RSpec::Rails
   describe RequestExampleGroup do
     it { should be_included_in_files_in('./spec/requests/') }
+    it { should be_included_in_files_in('./spec/integration/') }
     it { should be_included_in_files_in('.\\spec\\requests\\') }
+    it { should be_included_in_files_in('.\\spec\\integration\\') }
 
     it "adds :type => :request to the metadata" do
       group = RSpec::Core::ExampleGroup.describe do

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

@@ -0,0 +1,41 @@
+require "spec_helper"
+
+describe "be_routable" do
+  include RSpec::Rails::Matchers::RoutingMatchers
+  attr_reader :routes
+
+  before { @routes = double("routes") }
+
+  context "with should" do
+    it "passes if routes recognize the path" do
+      routes.stub(:recognize_path) { {} }
+      expect do
+        {:get => "/a/path"}.should be_routable
+      end.to_not raise_error
+    end
+
+    it "fails if routes do not recognize the path" do
+      routes.stub(:recognize_path) { raise ActionController::RoutingError.new('ignore') }
+      expect do
+        {:get => "/a/path"}.should be_routable
+      end.to raise_error(/expected \{:get=>"\/a\/path"\} to be routable/)
+    end
+  end
+
+  context "with should_not" do
+
+    it "passes if routes do not recognize the path" do
+      routes.stub(:recognize_path) { raise ActionController::RoutingError.new('ignore') }
+      expect do
+        {:get => "/a/path"}.should_not be_routable
+      end.to_not raise_error
+    end
+
+    it "fails if routes recognize the path" do
+      routes.stub(:recognize_path) { {:controller => "foo"} }
+      expect do
+        {:get => "/a/path"}.should_not be_routable
+      end.to raise_error(/expected \{:get=>"\/a\/path"\} not to be routable, but it routes to \{:controller=>"foo"\}/)
+    end
+  end
+end

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

@@ -1,20 +1,79 @@
 require "spec_helper"
-require "action_controller/test_case"
+require "active_support/test_case"
 
 describe "redirect_to" do
   include RSpec::Rails::Matchers::RedirectTo
 
+  let(:response) { ActionController::TestResponse.new }
+
   it "delegates to assert_redirected_to" do
     self.should_receive(:assert_redirected_to).with("destination")
     "response".should redirect_to("destination")
   end
 
-  it "uses failure message from assert_redirected_to" do
-    self.stub!(:assert_redirected_to).and_raise(
-      Test::Unit::AssertionFailedError.new("this message"))
-    response = ActionController::TestResponse.new
-    expect do
-      response.should redirect_to("destination")
-    end.to raise_error("this message")
+  context "with should" do
+    context "when assert_redirected_to passes" do
+      it "passes" do
+        self.stub!(:assert_redirected_to)
+        expect do
+          response.should redirect_to("destination")
+        end.to_not raise_exception
+      end
+    end
+
+    context "when assert_redirected_to fails" do
+      it "uses failure message from assert_redirected_to" do
+        self.stub!(:assert_redirected_to) do
+          raise ActiveSupport::TestCase::Assertion.new("this message")
+        end
+        expect do
+          response.should redirect_to("destination")
+        end.to raise_error("this message")
+      end
+    end
+
+    context "when fails due to some other exception" do
+      it "raises that exception" do
+        self.stub!(:assert_redirected_to) do
+          raise "oops"
+        end
+        expect do
+          response.should redirect_to("destination")
+        end.to raise_exception("oops")
+      end
+    end
+  end
+
+  context "with should_not" do
+    context "when assert_redirected_to fails" do
+      it "passes" do
+        self.stub!(:assert_redirected_to) do
+          raise ActiveSupport::TestCase::Assertion.new("this message")
+        end
+        expect do
+          response.should_not redirect_to("destination")
+        end.to_not raise_exception
+      end
+    end
+
+    context "when assert_redirected_to passes" do
+      it "fails with custom failure message" do
+        self.stub!(:assert_redirected_to)
+        expect do
+          response.should_not redirect_to("destination")
+        end.to raise_error(/expected not to redirect to \"destination\", but did/)
+      end
+    end
+
+    context "when fails due to some other exception" do
+      it "raises that exception" do
+        self.stub!(:assert_redirected_to) do
+          raise "oops"
+        end
+        expect do
+          response.should_not redirect_to("destination")
+        end.to raise_exception("oops")
+      end
+    end
   end
 end

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

@@ -2,15 +2,7 @@ require "spec_helper"
 
 describe "render_template" do
   include RSpec::Rails::Matchers::RenderTemplate
-
-  it "uses failure message from render_template" do
-    self.stub!(:assert_template).and_raise(
-      Test::Unit::AssertionFailedError.new("this message"))
-    response = ActionController::TestResponse.new
-    expect do
-      response.should render_template("destination")
-    end.to raise_error("this message")
-  end
+  let(:response) { ActionController::TestResponse.new }
 
   context "given a hash" do
     it "delegates to assert_template" do
@@ -32,5 +24,70 @@ describe "render_template" do
       "response".should render_template(:template_name, "this message")
     end
   end
-end
 
+  context "with should" do
+    context "when assert_template passes" do
+      it "passes" do
+        self.stub!(:assert_template)
+        expect do
+          response.should render_template("template_name")
+        end.to_not raise_exception
+      end
+    end
+
+    context "when assert_template fails" do
+      it "uses failure message from assert_template" do
+        self.stub!(:assert_template) do
+          raise ActiveSupport::TestCase::Assertion.new("this message")
+        end
+        expect do
+          response.should render_template("template_name")
+        end.to raise_error("this message")
+      end
+    end
+
+    context "when fails due to some other exception" do
+      it "raises that exception" do
+        self.stub!(:assert_template) do
+          raise "oops"
+        end
+        expect do
+          response.should render_template("template_name")
+        end.to raise_exception("oops")
+      end
+    end
+  end
+
+  context "with should_not" do
+    context "when assert_template fails" do
+      it "passes" do
+        self.stub!(:assert_template) do
+          raise ActiveSupport::TestCase::Assertion.new("this message")
+        end
+        expect do
+          response.should_not render_template("template_name")
+        end.to_not raise_exception
+      end
+    end
+
+    context "when assert_template passes" do
+      it "fails with custom failure message" do
+        self.stub!(:assert_template)
+        expect do
+          response.should_not render_template("template_name")
+        end.to raise_error(/expected not to render \"template_name\", but did/)
+      end
+    end
+
+    context "when fails due to some other exception" do
+      it "raises that exception" do
+        self.stub!(:assert_template) do
+          raise "oops"
+        end
+        expect do
+          response.should_not render_template("template_name")
+        end.to raise_exception("oops")
+      end
+    end
+  end
+end