rspec-rails 2.5.0 → 2.6.0

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

@@ -4,33 +4,33 @@ describe <%= controller_class_name %>Controller do
   describe "routing" do
 
 <% unless options[:singleton] -%>
-    it "recognizes and generates #index" do
-      { :get => "/<%= table_name %>" }.should route_to(:controller => "<%= table_name %>", :action => "index")
+    it "routes to #index" do
+      get("/<%= ns_table_name %>").should route_to("<%= ns_table_name %>#index")
     end
 
 <% end -%>
-    it "recognizes and generates #new" do
-      { :get => "/<%= table_name %>/new" }.should route_to(:controller => "<%= table_name %>", :action => "new")
+    it "routes to #new" do
+      get("/<%= ns_table_name %>/new").should route_to("<%= ns_table_name %>#new")
     end
 
-    it "recognizes and generates #show" do
-      { :get => "/<%= table_name %>/1" }.should route_to(:controller => "<%= table_name %>", :action => "show", :id => "1")
+    it "routes to #show" do
+      get("/<%= ns_table_name %>/1").should route_to("<%= ns_table_name %>#show", :id => "1")
     end
 
-    it "recognizes and generates #edit" do
-      { :get => "/<%= table_name %>/1/edit" }.should route_to(:controller => "<%= table_name %>", :action => "edit", :id => "1")
+    it "routes to #edit" do
+      get("/<%= ns_table_name %>/1/edit").should route_to("<%= ns_table_name %>#edit", :id => "1")
     end
 
-    it "recognizes and generates #create" do
-      { :post => "/<%= table_name %>" }.should route_to(:controller => "<%= table_name %>", :action => "create")
+    it "routes to #create" do
+      post("/<%= ns_table_name %>").should route_to("<%= ns_table_name %>#create")
     end
 
-    it "recognizes and generates #update" do
-      { :put => "/<%= table_name %>/1" }.should route_to(:controller => "<%= table_name %>", :action => "update", :id => "1")
+    it "routes to #update" do
+      put("/<%= ns_table_name %>/1").should route_to("<%= ns_table_name %>#update", :id => "1")
     end
 
-    it "recognizes and generates #destroy" do
-      { :delete => "/<%= table_name %>/1" }.should route_to(:controller => "<%= table_name %>", :action => "destroy", :id => "1")
+    it "routes to #destroy" do
+      delete("/<%= ns_table_name %>/1").should route_to("<%= ns_table_name %>#destroy", :id => "1")
     end
 
   end

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

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= table_name %>/show.html.<%= options[:template_engine] %>" do
+describe "<%= ns_table_name %>/show.html.<%= options[:template_engine] %>" do
   before(:each) do
-    @<%= file_name %> = assign(:<%= file_name %>, stub_model(<%= class_name %><%= output_attributes.empty? ? '))' : ',' %>
+    @<%= ns_file_name %> = assign(:<%= ns_file_name %>, stub_model(<%= class_name %><%= output_attributes.empty? ? '))' : ',' %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>
       :<%= attribute.name %> => <%= value_for(attribute) %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
 <% end -%>

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

@@ -82,16 +82,6 @@ module RSpec::Rails
     include RSpec::Rails::Matchers::RedirectTo
     include RSpec::Rails::Matchers::RenderTemplate
     include RSpec::Rails::Matchers::RoutingMatchers
-    include RSpec::Rails::BrowserSimulators
-
-    webrat do
-      include Webrat::Matchers
-      include Webrat::Methods
-    end
-
-    capybara do
-      include Capybara
-    end
 
     module ClassMethods
       def controller_class
@@ -135,11 +125,9 @@ module RSpec::Rails
       # defined in +ApplicationController+, however, are accessible from within
       # the block.
       def controller(base_class = ApplicationController, &body)
-        metadata[:example_group][:describes] = Class.new(base_class, &body)
-        metadata[:example_group][:describes].singleton_class.class_eval do
-          def name
-            "StubResourcesController"
-          end
+        base_class.dup.tap do |new_base|
+          def new_base.name; "StubResourcesController"; end
+          metadata[:example_group][:describes] = Class.new(new_base, &body)
         end
 
         before do
@@ -148,13 +136,21 @@ module RSpec::Rails
         end
 
         after do
-          @routes = @orig_routes
+          @routes, @orig_routes = @orig_routes, nil
         end
       end
     end
 
     module InstanceMethods
       attr_reader :controller, :routes
+
+      def method_missing(method, *args, &block)
+        if @orig_routes && @orig_routes.named_routes.helpers.include?(method)
+          controller.send(method, *args, &block)
+        else
+          super
+        end
+      end
     end
 
     included do
@@ -166,12 +162,6 @@ module RSpec::Rails
         @routes = ::Rails.application.routes
         ActionController::Base.allow_forgery_protection = false
       end
-
-      webrat do
-        before do
-          Webrat.configure {|c| c.mode = :rails}
-        end
-      end
     end
   end
 end

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

@@ -30,11 +30,6 @@ module RSpec::Rails
     include RSpec::Rails::RailsExampleGroup
     include ActionView::TestCase::Behavior
     include RSpec::Rails::ViewAssigns
-    include RSpec::Rails::BrowserSimulators
-
-    webrat do
-      include Webrat::Matchers
-    end
 
     module ClassMethods
       def determine_default_helper_class(ignore)

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

@@ -4,15 +4,6 @@ if defined?(ActionMailer)
       extend ActiveSupport::Concern
       include RSpec::Rails::RailsExampleGroup
       include ActionMailer::TestCase::Behavior
-      include RSpec::Rails::BrowserSimulators
-
-      webrat do
-        include Webrat::Matchers
-      end
-
-      capybara do
-        include Capybara
-      end
 
       included do
         metadata[:type] = :mailer

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

@@ -16,7 +16,6 @@ module RSpec::Rails
     include RSpec::Rails::RailsExampleGroup
     include ActionDispatch::Integration::Runner
     include ActionDispatch::Assertions
-    include RSpec::Rails::BrowserSimulators
 
     module InstanceMethods
       def app
@@ -24,22 +23,6 @@ module RSpec::Rails
       end
     end
 
-    webrat do
-      include Webrat::Matchers
-      include Webrat::Methods
-
-      module InstanceMethods
-
-        def last_response
-          @response
-        end
-      end
-    end
-
-    capybara do
-      include Capybara
-    end
-
     include RSpec::Rails::Matchers::RedirectTo
     include RSpec::Rails::Matchers::RenderTemplate
     include ActionController::TemplateAssertions
@@ -50,14 +33,6 @@ module RSpec::Rails
       before do
         @routes = ::Rails.application.routes
       end
-
-      webrat do
-        before do
-          Webrat.configure do |c|
-            c.mode = :rack
-          end
-        end
-      end
     end
   end
 end

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

@@ -6,6 +6,7 @@ module RSpec::Rails
     include RSpec::Rails::RailsExampleGroup
     include ActionDispatch::Assertions::RoutingAssertions
     include RSpec::Rails::Matchers::RoutingMatchers
+    include RSpec::Rails::Matchers::RoutingMatchers::RouteHelpers
 
     module InstanceMethods
       attr_reader :routes

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

@@ -23,11 +23,6 @@ module RSpec::Rails
     include ActionView::TestCase::Behavior
     include RSpec::Rails::ViewAssigns
     include RSpec::Rails::Matchers::RenderTemplate
-    include RSpec::Rails::BrowserSimulators
-
-    webrat do
-      include Webrat::Matchers
-    end
 
     module ClassMethods
       def _default_helper
@@ -147,7 +142,13 @@ module RSpec::Rails
 
       before do
         _include_controller_helpers
-        controller.controller_path = _controller_path
+        if view.lookup_context.respond_to?(:prefixes)
+          # rails 3.1
+          view.lookup_context.prefixes << _controller_path
+        else
+          # rails 3.0
+          controller.controller_path = _controller_path
+        end
         controller.request.path_parameters["controller"] = _controller_path
         controller.request.path_parameters["action"]     = _inferred_action unless _inferred_action =~ /^_/
       end

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

@@ -2,10 +2,21 @@ module RSpec::Rails::Matchers
   module RoutingMatchers
     extend RSpec::Matchers::DSL
 
-    matcher :route_to do |route_options|
+    matcher :route_to do |*route_options|
       match_unless_raises ActiveSupport::TestCase::Assertion do |path|
         assertion_path = { :method => path.keys.first, :path => path.values.first }
-        assert_recognizes(route_options, assertion_path)
+
+        path, options = *route_options
+
+        if path.is_a?(String)
+          controller, action = path.split("#")
+          options ||= {}
+          options.merge!(:controller => controller, :action => action)
+        else
+          options = path
+        end
+
+        assert_recognizes(options, assertion_path)
       end
 
       failure_message_for_should do
@@ -24,5 +35,15 @@ module RSpec::Rails::Matchers
         "expected #{path.inspect} not to be routable, but it routes to #{@routing_options.inspect}"
       end
     end
+
+    module RouteHelpers
+
+      %w(get post put delete options head).each do |method|
+        define_method method do |path|
+          { method.to_sym => path }
+        end
+      end
+
+    end
   end
 end

data/lib/rspec/rails/mocks.rb

@@ -1,3 +1,6 @@
+require 'active_support/core_ext'
+require 'active_model'
+
 module RSpec
   module Rails
 

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

@@ -41,7 +41,7 @@ namespace :spec do
     ::CodeStatistics::TEST_TYPES << "Controller specs" if File.exist?('spec/controllers')
     ::CodeStatistics::TEST_TYPES << "Helper specs" if File.exist?('spec/helpers')
     ::CodeStatistics::TEST_TYPES << "Library specs" if File.exist?('spec/lib')
-    ::CodeStatistics::TEST_TYPES << "Mailer specs" if File.exist?('spec/mailer')
+    ::CodeStatistics::TEST_TYPES << "Mailer specs" if File.exist?('spec/mailers')
     ::CodeStatistics::TEST_TYPES << "Routing specs" if File.exist?('spec/routing')
     ::CodeStatistics::TEST_TYPES << "Request specs" if File.exist?('spec/requests')
   end

data/lib/rspec/rails/vendor/capybara.rb

@@ -0,0 +1,29 @@
+begin
+  require 'capybara/rspec'
+rescue LoadError
+end
+
+begin
+  require 'capybara/rails'
+rescue LoadError
+end
+
+RSpec.configure do |c|
+  if defined?(Capybara::RSpecMatchers)
+    c.include Capybara::RSpecMatchers, :type => :view
+    c.include Capybara::RSpecMatchers, :type => :helper
+    c.include Capybara::RSpecMatchers, :type => :mailer
+    c.include Capybara::RSpecMatchers, :type => :controller
+  end
+
+  if defined?(Capybara::DSL)
+    c.include Capybara::DSL, :type => :controller
+  end
+
+  unless defined?(Capybara::RSpecMatchers) || defined?(Capybara::DSL)
+    if defined?(Capybara)
+      c.include Capybara, :type => :request
+      c.include Capybara, :type => :controller
+    end
+  end
+end

data/lib/rspec/rails/vendor/webrat.rb

@@ -0,0 +1,33 @@
+begin
+  require 'webrat'
+rescue LoadError
+end
+
+RSpec.configure do |c|
+  if defined?(Webrat)
+    c.include Webrat::Matchers, :type => :request
+    c.include Webrat::Matchers, :type => :controller
+    c.include Webrat::Matchers, :type => :view
+    c.include Webrat::Matchers, :type => :helper
+    c.include Webrat::Matchers, :type => :mailer
+
+    c.include Webrat::Methods,  :type => :request
+    c.include Webrat::Methods,  :type => :controller
+
+    module RequestInstanceMethods
+      def last_response
+        @response
+      end
+    end
+
+    c.include RequestInstanceMethods, :type => :request
+
+    c.before :type => :controller do
+      Webrat.configure {|c| c.mode = :rails}
+    end
+
+    c.before :type => :request do
+      Webrat.configure {|c| c.mode = :rack}
+    end
+  end
+end

data/lib/rspec/rails/version.rb

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

data/lib/rspec/rails/view_rendering.rb

@@ -49,15 +49,15 @@ module RSpec
 
       # Delegates find_all to the submitted path set and then returns templates
       # with modified source
-      class PathSetDelegatorResolver < ::ActionView::Resolver
-        attr_reader :path_set
+      class EmptyTemplatePathSetDecorator < ::ActionView::Resolver
+        attr_reader :original_path_set
 
-        def initialize(path_set)
-          @path_set = path_set
+        def initialize(original_path_set)
+          @original_path_set = original_path_set
         end
 
         def find_all(*args)
-          path_set.find_all(*args).collect do |template|
+          original_path_set.find_all(*args).collect do |template|
             ::ActionView::Template.new(
               "",
               template.identifier,
@@ -71,17 +71,33 @@ module RSpec
         end
       end
 
+      module EmptyTemplates
+        def prepend_view_path(new_path)
+          lookup_context.view_paths.unshift(*_path_decorator(new_path))
+        end
+
+        def append_view_path(new_path)
+          lookup_context.view_paths.push(*_path_decorator(new_path))
+        end
+
+        private
+        def _path_decorator(path)
+          EmptyTemplatePathSetDecorator.new(::ActionView::Base::process_view_paths(path))
+        end
+      end
+
       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)
+            @_empty_view_path_set_delegator = EmptyTemplatePathSetDecorator.new(controller.class.view_paths)
+            controller.class.view_paths = ::ActionView::PathSet.new.push(@_empty_view_path_set_delegator)
+            controller.extend(EmptyTemplates)
           end
         end
 
         after do
           unless render_views?
-            controller.class.view_paths = @_path_set_delegator_resolver.path_set
+            controller.class.view_paths = @_empty_view_path_set_delegator.original_path_set
           end
         end
       end

data/lib/rspec/rails.rb

@@ -12,6 +12,6 @@ require 'rspec/rails/matchers'
 require 'rspec/rails/fixture_support'
 require 'rspec/rails/mocks'
 require 'rspec/rails/module_inclusion'
-require 'rspec/rails/browser_simulators'
 require 'rspec/rails/example'
-
+require 'rspec/rails/vendor/capybara'
+require 'rspec/rails/vendor/webrat'

data/rspec-rails.gemspec

@@ -22,44 +22,13 @@ Gem::Specification.new do |s|
   s.rdoc_options     = ["--charset=UTF-8"]
   s.require_path     = "lib"
 
-  s.post_install_message = %Q{**************************************************
-
-  Thank you for installing #{s.summary}!
-
-  This version of rspec-rails only works with versions of rails >= 3.0.0
-
-  To configure your app to use rspec-rails, add a declaration to your Gemfile.
-  If you are using Bundler's grouping feature in your Gemfile, be sure to include
-  rspec-rails in the :development group as well as the :test group so that you
-  can access its generators and rake tasks.
-
-    group :development, :test do
-      gem "rspec-rails", ">= #{RSpec::Rails::Version::STRING}"
-    end
-
-  Be sure to run the following command in each of your Rails apps if you're
-  upgrading:
-
-    script/rails generate rspec:install
-
-  Even if you've run it before, this ensures that you have the latest updates
-  to spec/spec_helper.rb and any other support files.
-
-  Beta versions of rspec-rails-2 installed files that are no longer being used,
-  so please remove these files if you have them:
-
-    lib/tasks/rspec.rake
-    config/initializers/rspec_generator.rb
-
-  Lastly, be sure to look at Upgrade.markdown to see what might have changed
-  since the last release.
-
-**************************************************
-}
-
   s.add_runtime_dependency(%q<activesupport>, ["~> 3.0"])
   s.add_runtime_dependency(%q<actionpack>, ["~> 3.0"])
   s.add_runtime_dependency(%q<railties>, ["~> 3.0"])
-  s.add_runtime_dependency "rspec", "~> #{RSpec::Rails::Version::STRING.split('.')[0..1].concat(['0']).join('.')}"
+  if RSpec::Rails::Version::STRING =~ /[a-zA-Z]+/
+    s.add_runtime_dependency "rspec", "= #{RSpec::Rails::Version::STRING}"
+  else
+    s.add_runtime_dependency "rspec", "~> #{RSpec::Rails::Version::STRING.split('.')[0..1].concat(['0']).join('.')}"
+  end
 end
 

data/spec/autotest/rails_rspec2_spec.rb

@@ -26,16 +26,11 @@ describe Autotest::RailsRspec2 do
   end
 
   describe 'mappings' do
-    before do
-      rails_rspec2_autotest.find_order = %w(
-        spec/models/user_spec.rb
-        spec/support/blueprints.rb
-      )
-    end
-
     it 'runs model specs when support files change' do
+      rails_rspec2_autotest.find_order = %w(spec/models/user_spec.rb spec/support/blueprints.rb)
       rails_rspec2_autotest.test_files_for('spec/support/blueprints.rb').should(
         include('spec/models/user_spec.rb'))
     end
   end
+
 end

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

@@ -35,5 +35,30 @@ module RSpec::Rails
         example.subject.should == 'explicit'
       end
     end
+
+    describe "with anonymous controller" do
+      before do
+        group.class_eval do
+          controller(Class.new) { }
+        end
+      end
+
+      it "delegates named route helpers to the underlying controller" do
+        controller = double('controller')
+        controller.stub(:foos_url).and_return('http://test.host/foos')
+
+        example = group.new
+        example.stub(:controller => controller)
+
+        # As in the routing example spec, this is pretty invasive, but not sure
+        # how to do it any other way as the correct operation relies on before
+        # hooks
+        routes = ActionDispatch::Routing::RouteSet.new
+        routes.draw { resources :foos }
+        example.instance_variable_set(:@orig_routes, routes)
+
+        example.foos_url.should eq('http://test.host/foos')
+      end
+    end
   end
 end

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

@@ -2,12 +2,27 @@ require "spec_helper"
 
 describe "route_to" do
   include RSpec::Rails::Matchers::RoutingMatchers
+  include RSpec::Rails::Matchers::RoutingMatchers::RouteHelpers
 
   it "delegates to assert_recognizes" do
     self.should_receive(:assert_recognizes).with({ "these" => "options" }, { :method=> :get, :path=>"path" })
     {:get => "path"}.should route_to("these" => "options")
   end
 
+  context "with shortcut syntax" do
+
+    it "routes with extra options" do
+      self.should_receive(:assert_recognizes).with({ :controller => "controller", :action => "action", :extra => "options"}, { :method=> :get, :path=>"path" })
+      get("path").should route_to("controller#action", :extra => "options")
+    end
+
+    it "routes without extra options" do
+      self.should_receive(:assert_recognizes).with({ :controller => "controller", :action => "action"}, { :method=> :get, :path=>"path" })
+      get("path").should route_to("controller#action")
+    end
+
+  end
+
   context "with should" do
     context "when assert_recognizes passes" do
       it "passes" do

data/spec/rspec/rails/mocks/ar_classes.rb

@@ -1,7 +1,10 @@
+ActiveRecord::Base.establish_connection(
+  :adapter => 'sqlite3',
+  :database => ':memory:'
+)
+
 module Connections
   def self.extended(host)
-    host.establish_connection :adapter => 'sqlite3',
-                              :database => ':memory:'
 
     host.connection.execute <<-eosql
       CREATE TABLE #{host.table_name} (

data/spec/rspec/rails/view_rendering_spec.rb

@@ -2,12 +2,6 @@ require "spec_helper"
 
 module RSpec::Rails
   describe ViewRendering do
-    let(:controller) do
-      double("controller").tap do |controller|
-        controller.stub_chain("class.respond_to?").and_return(true)
-      end
-    end
-
     let(:group) do
       RSpec::Core::ExampleGroup.describe do
         def controller

data/spec/spec_helper.rb

@@ -9,35 +9,13 @@ require 'rspec/rails'
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
-# TODO - most of this is borrowed from rspec-core's spec_helper - should
-# be extracted to something we can use here
-def in_editor?
-  ENV.has_key?('TM_MODE') || ENV.has_key?('EMACS') || ENV.has_key?('VIM')
-end
-
 class RSpec::Core::ExampleGroup
   def self.run_all(reporter=nil)
     run(reporter || RSpec::Mocks::Mock.new('reporter').as_null_object)
   end
 end
 
-module MatchesForRSpecRailsSpecs
-  extend RSpec::Matchers::DSL
-
-  matcher :be_included_in_files_in do |path|
-    match do |mod|
-      stub_metadata(
-        :example_group => {:file_path => "#{path}whatever_spec.rb:15"}
-      )
-      group = RSpec::Core::ExampleGroup.describe
-      group.included_modules.include?(mod)
-    end
-  end
-end
-
 RSpec.configure do |c|
-  c.include MatchesForRSpecRailsSpecs
-  c.color_enabled = !in_editor?
   c.before(:each) do
     @real_world = RSpec.world
     RSpec.instance_variable_set(:@world, RSpec::Core::World.new)

data/spec/support/matchers.rb

@@ -0,0 +1,9 @@
+RSpec::Matchers::define :be_included_in_files_in do |path|
+  match do |mod|
+    stub_metadata(
+      :example_group => {:file_path => "#{path}whatever_spec.rb:15"}
+    )
+    group = RSpec::Core::ExampleGroup.describe
+    group.included_modules.include?(mod)
+  end
+end

data/templates/generate_stuff.rb

@@ -5,9 +5,17 @@ generate('integration_test widgets')
 generate('mailer Notifications signup')
 generate('model thing name:string')
 generate('helper things')
-generate('scaffold widget name:string category:string instock:boolean')
+generate('scaffold widget name:string category:string instock:boolean --force')
 generate('observer widget')
 generate('scaffold gadget') # scaffold with no attributes
+generate('scaffold admin/accounts name:string') # scaffold with nested resource
+
+generate('controller things custom_action')
+template_code= <<-TEMPLATE
+  <% raise 'Error from custom_action because we should never render this template....derp derp derp' %>
+TEMPLATE
+
+file "app/views/things/custom_action.html.erb", template_code, {:force=>true}
 
 run('rake db:migrate')
 run('rake db:test:prepare')