rspec-rails 2.0.0.beta.22 → 2.6.0

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.0.0.beta.22'
+      STRING = '2.6.0'
     end
   end
 end

data/lib/rspec/rails/view_assigns.rb

@@ -13,16 +13,35 @@ module RSpec
           _encapsulated_assigns[key] = value
         end
 
-      private
-
-        def _encapsulated_assigns
-          @_encapsulated_assigns ||= {}
+        def view_assigns
+          begin
+            # TODO: _assigns was deprecated in favor of view_assigns after
+            # Rails-3.0.0 was released. Since we are not able to predict when
+            # the _assigns/view_assigns patch will be released (I thought it
+            # would have been in 3.0.1, but 3.0.1 bypassed this change for a
+            # security fix), this bit ensures that we do the right thing without
+            # knowing anything about the Rails version we are dealing with.
+            #
+            # Once that change _is_ released, this can be changed to something
+            # that checks for the Rails version when the module is being
+            # interpreted, as it was before commit dd0095.
+            super.merge(_encapsulated_assigns)
+          rescue
+            _assigns
+          end
         end
 
         def _assigns
           super.merge(_encapsulated_assigns)
         end
+
+      private
+
+        def _encapsulated_assigns
+          @_encapsulated_assigns ||= {}
+        end
       end
+
     end
   end
 end

data/lib/rspec/rails/view_rendering.rb

@@ -1,42 +1,63 @@
 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] ||= {}
+          metadata[:rspec_rails] = metadata[:rspec_rails] ? metadata[:rspec_rails].dup : {}
         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
+          RSpec.deprecate("integrate_views","render_views")
+          render_views
         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
 
       # 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,
@@ -50,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

@@ -1,14 +1,10 @@
-module RSpec
-  module Rails
-    class << self
-      def using_active_record?
-        ::Rails.configuration.generators.options[:rails][:orm] == :active_record
-      end
-    end
-  end
+require 'rspec/core'
+
+RSpec::configure do |c|
+  c.backtrace_clean_patterns << /vendor\//
+  c.backtrace_clean_patterns << /lib\/rspec\/rails/
 end
 
-require 'rspec/core'
 require 'rspec/rails/extensions'
 require 'rspec/rails/view_rendering'
 require 'rspec/rails/adapters'
@@ -16,5 +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/lib/rspec-rails.rb

@@ -1,8 +1,10 @@
 module RSpec
   module Rails
     class Railtie < ::Rails::Railtie
-      config.generators.integration_tool :rspec
-      config.generators.test_framework   :rspec
+      # Rails-3.0.1 requires config.app_generators instead of 3.0.0's config.generators
+      generators = config.respond_to?(:app_generators) ? config.app_generators : config.generators
+      generators.integration_tool :rspec
+      generators.test_framework   :rspec
 
       rake_tasks do
         load "rspec/rails/tasks/rspec.rake"

data/rspec-rails.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name        = "rspec-rails"
   s.version     = RSpec::Rails::Version::STRING
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["David Chelimsky", "Chad Humphries"]
-  s.email       = "dchelimsky@gmail.com;chad.humphries@gmail.com"
+  s.authors     = ["David Chelimsky"]
+  s.email       = "dchelimsky@gmail.com"
   s.homepage    = "http://github.com/rspec/rspec-rails"
   s.summary     = "rspec-rails-#{RSpec::Rails::Version::STRING}"
   s.description = "RSpec-2 for Rails-3"
@@ -18,45 +18,17 @@ Gem::Specification.new do |s|
   s.files            = `git ls-files`.split("\n")
   s.test_files       = `git ls-files -- {spec,features}/*`.split("\n")
   s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.extra_rdoc_files = [ "README.markdown" ]
+  s.extra_rdoc_files = [ "README.md" ]
   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.beta.4.
-
-  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.
-
-  Previous versions of rspec-rails-2.0.0.beta 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 "rspec", RSpec::Rails::Version::STRING
+  s.add_runtime_dependency(%q<activesupport>, ["~> 3.0"])
+  s.add_runtime_dependency(%q<actionpack>, ["~> 3.0"])
+  s.add_runtime_dependency(%q<railties>, ["~> 3.0"])
+  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

@@ -2,24 +2,35 @@ require "spec_helper"
 require "autotest/rails_rspec2"
 
 describe Autotest::RailsRspec2 do
-  before(:each) do
-    rails_rspec2_autotest = Autotest::RailsRspec2.new
-    @re = rails_rspec2_autotest.exceptions
-  end
 
-  it "should match './log/test.log'" do
-    @re.should match('./log/test.log')
-  end
+  let(:rails_rspec2_autotest) { Autotest::RailsRspec2.new }
 
-  it "should match 'log/test.log'" do
-    @re.should match('log/test.log')
-  end
+  describe 'exceptions' do
+    let(:exceptions_regexp) { rails_rspec2_autotest.exceptions }
+
+    it "should match './log/test.log'" do
+      exceptions_regexp.should match('./log/test.log')
+    end
 
-  it "should not match './spec/models/user_spec.rb'" do
-    @re.should_not match('./spec/models/user_spec.rb')
+    it "should match 'log/test.log'" do
+      exceptions_regexp.should match('log/test.log')
+    end
+
+    it "should not match './spec/models/user_spec.rb'" do
+      exceptions_regexp.should_not match('./spec/models/user_spec.rb')
+    end
+
+    it "should not match 'spec/models/user_spec.rb'" do
+      exceptions_regexp.should_not match('spec/models/user_spec.rb')
+    end
   end
 
-  it "should not match 'spec/models/user_spec.rb'" do
-    @re.should_not match('spec/models/user_spec.rb')
+  describe 'mappings' do
+    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/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/deprecations_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe "rspec-rails-2 deprecations" do
+  context "controller specs" do
+    describe "::integrate_views" do
+      let(:group) do
+        RSpec::Core::ExampleGroup.describe do
+          include RSpec::Rails::ControllerExampleGroup
+        end
+      end
+
+      it "is deprecated" do
+        RSpec.should_receive(:deprecate)
+        group.integrate_views
+      end
+    end
+  end
+end

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

@@ -5,18 +5,60 @@ module RSpec::Rails
     it { should be_included_in_files_in('./spec/controllers/') }
     it { should be_included_in_files_in('.\\spec\\controllers\\') }
 
-    it "includes routing matchers" do
-      group = RSpec::Core::ExampleGroup.describe do
+    let(:group) do
+      RSpec::Core::ExampleGroup.describe do
         include ControllerExampleGroup
       end
+    end
+
+    it "includes routing matchers" do
       group.included_modules.should include(RSpec::Rails::Matchers::RoutingMatchers)
     end
 
     it "adds :type => :controller to the metadata" do
-      group = RSpec::Core::ExampleGroup.describe do
-        include ControllerExampleGroup
-      end
       group.metadata[:type].should eq(:controller)
     end
+
+    context "with implicit subject" do
+      it "uses the controller as the subject" do
+        controller = double('controller')
+        example = group.new
+        example.stub(:controller => controller)
+        example.subject.should == controller
+      end
+    end
+
+    describe "with explicit subject" do
+      it "should use the specified subject instead of the controller" do
+        group.subject { 'explicit' }
+        example = group.new
+        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/example/helper_example_group_spec.rb

@@ -24,12 +24,30 @@ module RSpec::Rails
     describe "#helper" do
       it "returns the instance of AV::Base provided by AV::TC::Behavior" do
         helper_spec = Object.new.extend HelperExampleGroup::InstanceMethods
-        helper_spec.should_receive(:_assigns)
+        helper_spec.should_receive(:view_assigns)
         av_tc_b_view = double('_view')
         av_tc_b_view.should_receive(:assign)
         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/extensions/active_model/errors_on_spec.rb

@@ -0,0 +1,23 @@
+require "spec_helper"
+
+describe "errors_on" do
+  let(:klass) do
+    Class.new do
+      include ActiveModel::Validations
+    end
+  end
+
+  it "calls valid?" do
+    model = klass.new
+    model.should_receive(:valid?)
+    model.errors_on(:foo)
+  end
+
+  it "returns the errors on that attribute" do
+    model = klass.new
+    model.stub(:errors) do
+      { :foo => ['a', 'b'] }
+    end
+    model.errors_on(:foo).should eq(['a','b'])
+  end
+end

data/spec/rspec/rails/extensions/active_record/records_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "records" do
+  it "delegates to find(:all)" do
+    klass = Class.new(ActiveRecord::Base)
+    klass.should_receive(:find).with(:all)
+    klass.records
+  end
+end

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

@@ -0,0 +1,17 @@
+require "spec_helper"
+
+describe "be_new_record" do
+  context "un-persisted record" do
+    it "passes" do
+      record = double('record', :persisted? => false)
+      record.should be_new_record
+    end
+  end
+
+  context "persisted record" do
+    it "fails" do
+      record = double('record', :persisted? => true)
+      record.should_not be_new_record
+    end
+  end
+end

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