rspec-rails 2.0.0.beta.19 → 2.0.0.beta.20

data/lib/rspec/rails/example.rb

@@ -1,7 +1,8 @@
+require 'rspec/rails/example/rails_example_group'
 require 'rspec/rails/example/controller_example_group'
 require 'rspec/rails/example/request_example_group'
 require 'rspec/rails/example/helper_example_group'
 require 'rspec/rails/example/view_example_group'
 require 'rspec/rails/example/mailer_example_group'
 require 'rspec/rails/example/routing_example_group'
-require 'rspec/rails/example/model_example_group'
+require 'rspec/rails/example/model_example_group'

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

@@ -74,30 +74,43 @@ module RSpec::Rails
     extend ActiveSupport::Concern
     extend RSpec::Rails::ModuleInclusion
 
-    include RSpec::Rails::SetupAndTeardownAdapter
-    include RSpec::Rails::TestUnitAssertionAdapter
+    include RSpec::Rails::RailsExampleGroup
+
     include ActionController::TestCase::Behavior
     include RSpec::Rails::ViewRendering
-    include Webrat::Methods
-    include Webrat::Matchers
-    include RSpec::Matchers
     include RSpec::Rails::Matchers::RedirectTo
     include RSpec::Rails::Matchers::RenderTemplate
     include RSpec::Rails::Matchers::RoutingMatchers
+    include RSpec::Rails::BrowserSimulators
+
+    webrat do
+      include Webrat::Methods
+      include Webrat::Matchers
+    end
+
+    capybara do
+      include Capybara
+    end
+
+    # TODO (DC 7/31/2010) this is already included in RailsExampleGroup, but
+    # due to some load order dependency problem between Webrat::Matchers and
+    # RSpec::Matchers, combined with the fact that RailsExampleGroup extends
+    # ActiveSupport::Concern, while the matcher modules do not, this needs to
+    # be here as well. At least for now.
+    include RSpec::Matchers
 
     module ClassMethods
       def controller_class
         describes
       end
 
-      # Creates an anonymous subclass of ApplicationController and evals the
-      # +body+ in that context. Also sets up implicit routes for this
-      # controller, that are separate from those defined in
-      # <tt>config/routes.rb</tt>.
+      # Supports a simple DSL for specifying behaviour of
+      # ApplicationController.  Creates an anonymous subclass of
+      # ApplicationController and evals the +body+ in that context. Also sets
+      # up implicit routes for this controller, that are separate from those
+      # defined in <tt>config/routes.rb</tt>.
       #
-      # Supports a simple DSL for specifying behaviour of ApplicationController.
-      #
-      # == Example
+      # == Examples
       #
       #    describe ApplicationController do
       #      controller do
@@ -105,7 +118,7 @@ module RSpec::Rails
       #          raise ApplicationController::AccessDenied
       #        end
       #      end
-
+      #
       #      describe "handling AccessDenied exceptions" do
       #        it "redirects to the /401.html page" do
       #          get :index
@@ -113,15 +126,22 @@ module RSpec::Rails
       #        end
       #      end
       #    end
-      #   
+      #
+      # If you would like to spec a subclass of ApplicationController, call
+      # controller like so:
+      #
+      #    controller(ApplicationControllerSubclass) do
+      #      # ....
+      #    end
+      #
       # NOTICE: Due to Ruby 1.8 scoping rules in anoymous subclasses, constants
       # defined in +ApplicationController+ must be fully qualified (e.g.
       # ApplicationController::AccessDenied) in the block passed to the
       # +controller+ method. Any instance methods, filters, etc, that are
       # defined in +ApplicationController+, however, are accessible from within
       # the block.
-      def controller(&body)
-        metadata[:example_group][:describes] = Class.new(ApplicationController, &body)
+      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"

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

@@ -29,11 +29,15 @@ module RSpec::Rails
     extend ActiveSupport::Concern
     extend RSpec::Rails::ModuleInclusion
 
-    include RSpec::Rails::SetupAndTeardownAdapter
-    include RSpec::Rails::TestUnitAssertionAdapter
+    include RSpec::Rails::RailsExampleGroup
+
     include ActionView::TestCase::Behavior
     include RSpec::Rails::ViewAssigns
-    include Webrat::Matchers
+    include RSpec::Rails::BrowserSimulators
+
+    webrat do
+      include Webrat::Matchers
+    end
 
     module ClassMethods
       def determine_default_helper_class(ignore)
@@ -45,7 +49,7 @@ module RSpec::Rails
       # Returns an instance of ActionView::Base with the helper being specified
       # mixed in, along with any of the built-in rails helpers.
       def helper
-        _view
+        _view.tap {|v| v.assign(_assigns)}
       end
 
     private

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

@@ -4,9 +4,18 @@ if defined?(ActionMailer)
       extend ActiveSupport::Concern
       extend RSpec::Rails::ModuleInclusion
 
+      include RSpec::Rails::RailsExampleGroup
+
       include ActionMailer::TestCase::Behavior
-      include Webrat::Matchers
-      include RSpec::Matchers
+      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/model_example_group.rb

@@ -3,7 +3,7 @@ module RSpec::Rails
     extend ActiveSupport::Concern
     extend RSpec::Rails::ModuleInclusion
 
-    include RSpec::Matchers
+    include RSpec::Rails::RailsExampleGroup
 
     included do
       metadata[:type] = :model

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

@@ -0,0 +1,11 @@
+module RSpec
+  module Rails
+    module RailsExampleGroup
+      extend ActiveSupport::Concern
+
+      include RSpec::Rails::SetupAndTeardownAdapter
+      include RSpec::Rails::TestUnitAssertionAdapter
+      include RSpec::Matchers
+    end
+  end
+end

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

@@ -15,12 +15,21 @@ module RSpec::Rails
     extend ActiveSupport::Concern
     extend RSpec::Rails::ModuleInclusion
 
+    include RSpec::Rails::RailsExampleGroup
+
     include ActionDispatch::Integration::Runner
-    include RSpec::Rails::TestUnitAssertionAdapter
     include ActionDispatch::Assertions
-    include Webrat::Matchers
-    include Webrat::Methods
-    include RSpec::Matchers
+    include RSpec::Rails::BrowserSimulators
+
+    webrat do
+      include Webrat::Matchers
+      include Webrat::Methods
+    end
+
+    capybara do
+      include Capybara
+    end
+
     include RSpec::Rails::Matchers::RedirectTo
     include RSpec::Rails::Matchers::RenderTemplate
     include ActionController::TemplateAssertions
@@ -42,8 +51,10 @@ module RSpec::Rails
         @router = ::Rails.application.routes
       end
 
-      Webrat.configure do |config|
-        config.mode = :rack
+      webrat do
+        Webrat.configure do |config|
+          config.mode = :rack
+        end
       end
     end
 

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

@@ -5,12 +5,17 @@ module RSpec::Rails
     extend ActiveSupport::Concern
     extend RSpec::Rails::ModuleInclusion
 
-    include RSpec::Rails::TestUnitAssertionAdapter
+    include RSpec::Rails::RailsExampleGroup
+
     include ActionDispatch::Assertions::RoutingAssertions
     include RSpec::Rails::Matchers::RoutingMatchers
 
     module InstanceMethods
       attr_reader :routes
+
+      def method_missing(m, *args, &block)
+        routes.url_helpers.respond_to?(m) ? routes.url_helpers.send(m, *args) : super
+      end
     end
 
     included do

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

@@ -21,12 +21,15 @@ module RSpec::Rails
     extend ActiveSupport::Concern
     extend RSpec::Rails::ModuleInclusion
 
-    include RSpec::Rails::SetupAndTeardownAdapter
-    include RSpec::Rails::TestUnitAssertionAdapter
+    include RSpec::Rails::RailsExampleGroup
     include ActionView::TestCase::Behavior
     include RSpec::Rails::ViewAssigns
-    include Webrat::Matchers
     include RSpec::Rails::Matchers::RenderTemplate
+    include RSpec::Rails::BrowserSimulators
+
+    webrat do
+      include Webrat::Matchers
+    end
 
     module ClassMethods
       def _default_helper
@@ -63,12 +66,6 @@ module RSpec::Rails
       #     end
       #   end
       def render(options={}, local_assigns={}, &block)
-        # TODO - this is a temporary hack to achieve behaviour that is in rails edge
-        # as of http://github.com/rails/rails/commit/0e0df4b0c5df7fdd1daa5653c255c4737f5526fc,
-        # but is not part of the rails-3.0.0.beta4 release. This line can be removed as
-        # soon as either rails 3 beta5 or rc is released.
-        _assigns.each { |key, value| view.instance_variable_set("@#{key}", value) }
-
         options = {:template => _default_file_to_render} if Hash === options and options.empty?
         super(options, local_assigns, &block)
       end
@@ -114,8 +111,16 @@ module RSpec::Rails
         example.example_group.top_level_description
       end
 
+      def _path_parts
+        _default_file_to_render.split("/")
+      end
+
       def _controller_path
-        _default_file_to_render.split("/")[0..-2].join("/")
+        _path_parts[0..-2].join("/")
+      end
+
+      def _inferred_action
+        _path_parts.last.split(".").first
       end
 
       def _include_controller_helpers
@@ -133,13 +138,12 @@ module RSpec::Rails
       before do
         _include_controller_helpers
         controller.controller_path = _controller_path
-        # this won't be necessary if/when
-        # https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/4903
-        # is accepted and released
-        @request ||= controller.request
+        controller.request.path_parameters["controller"] = _controller_path
+        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/be_a_new.rb

@@ -1,5 +1,40 @@
 RSpec::Matchers.define :be_a_new do |model_klass|
   match do |actual|
-    model_klass === actual && actual.new_record?
+    actual.is_a?(model_klass) && actual.new_record? && attributes_match?(actual)
+  end
+
+  chain :with do |expected_attributes|
+    attributes.merge!(expected_attributes)
+  end
+
+  failure_message_for_should do |actual|
+    [].tap do |message|
+      unless actual.is_a?(model_klass) && actual.new_record? 
+        message << "expected #{actual.inspect} to be a new #{model_klass.inspect}"
+      end
+      unless attributes_match?(actual)
+        if unmatched_attributes.size > 1
+          message << "attributes #{unmatched_attributes.inspect} were not set on #{actual.inspect}"
+        else
+          message << "attribute #{unmatched_attributes.inspect} was not set on #{actual.inspect}"
+        end
+      end
+    end.join(' and ')
+  end
+
+  def attributes
+    @attributes ||= {}
+  end
+
+  def attributes_match?(actual)
+    attributes.stringify_keys.all? do |key, value|
+      actual.attributes[key].eql?(value)
+    end
+  end
+
+  def unmatched_attributes
+    attributes.stringify_keys.reject do |key, value|
+      actual.attributes[key].eql?(value)
+    end
   end
 end

data/lib/rspec/rails/mocks.rb

@@ -47,7 +47,7 @@ module RSpec
             end)
           end
         else
-          model_class = string_or_model_class 
+          model_class = string_or_model_class
         end
 
         unless model_class.kind_of? ActiveModel::Naming
@@ -98,16 +98,16 @@ EOM
         yield m if block_given?
         m
       end
-      
+
       module ModelStubber
         def connection
-          raise Spec::Rails::IllegalDataAccessException.new("stubbed models are not allowed to access the database")
+          raise RSpec::Rails::IllegalDataAccessException.new("stubbed models are not allowed to access the database")
         end
         def new_record?
-          id.nil?
+          __send__(self.class.primary_key).nil?
         end
         def as_new_record
-          self.id = nil
+          self.__send__("#{self.class.primary_key}=", nil)
           self
         end
       end
@@ -153,15 +153,16 @@ EOM
       #     person.first_name = "David"
       #   end
       def stub_model(model_class, stubs={})
-        stubs = {:id => next_id}.merge(stubs)
+        primary_key = model_class.primary_key.to_sym
+        stubs = {primary_key => next_id}.merge(stubs)
         model_class.new.tap do |m|
-          m.id = stubs.delete(:id)
+          m.__send__("#{primary_key}=", stubs.delete(primary_key))
           m.extend ModelStubber
           m.stub(stubs)
           yield m if block_given?
         end
       end
-      
+
     private
 
       @@model_id = 1000

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

@@ -18,6 +18,13 @@ 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-'
+  end
+
   task :statsetup do
     require 'rails/code_statistics'
     ::STATS_DIRECTORIES << %w(Model\ specs spec/models) if File.exist?('spec/models')

data/lib/rspec/rails/view_rendering.rb

@@ -20,6 +20,12 @@ module RSpec
         end
       end
 
+      module InstanceMethods
+        def render_views?
+          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
@@ -46,14 +52,14 @@ module RSpec
 
       included do
         before do
-          unless self.class.render_views?
+          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)
           end
         end
 
         after do
-          unless self.class.render_views?
+          unless render_views?
             @controller.class.view_paths = @_path_set_delegator_resolver.path_set
           end
         end

data/rspec-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "2.0.0.beta.19"
+  s.version = "2.0.0.beta.20"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Chelimsky", "Chad Humphries"]
-  s.date = %q{2010-07-25}
+  s.date = %q{2010-08-24}
   s.description = %q{RSpec-2 for Rails-3}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
     ".document",
      ".gitignore",
      "Gemfile",
+     "Gotchas.markdown",
      "README.markdown",
      "Rakefile",
      "Upgrade.markdown",
@@ -30,13 +31,20 @@ Gem::Specification.new do |s|
      "features/controller_specs/isolation_from_views.feature",
      "features/controller_specs/readers.feature",
      "features/controller_specs/render_views.feature",
+     "features/helper_specs/helper_spec.feature",
      "features/mailer_specs/url_helpers.feature",
      "features/matchers/be_routable_matcher.feature",
      "features/matchers/new_record_matcher.feature",
+     "features/matchers/redirect_to_matcher.feature",
+     "features/matchers/render_template_matcher.feature",
+     "features/mocks/mock_model.feature",
+     "features/mocks/stub_model.feature",
      "features/model_specs/errors_on.feature",
      "features/model_specs/transactional_examples.feature",
+     "features/routing_specs/access_to_named_routes.feature",
      "features/step_definitions/model_steps.rb",
      "features/support/env.rb",
+     "features/view_specs/inferred_controller_path.feature",
      "features/view_specs/view_spec.feature",
      "lib/autotest/rails_rspec2.rb",
      "lib/generators/rspec.rb",
@@ -71,11 +79,13 @@ Gem::Specification.new do |s|
      "lib/rspec-rails.rb",
      "lib/rspec/rails.rb",
      "lib/rspec/rails/adapters.rb",
+     "lib/rspec/rails/browser_simulators.rb",
      "lib/rspec/rails/example.rb",
      "lib/rspec/rails/example/controller_example_group.rb",
      "lib/rspec/rails/example/helper_example_group.rb",
      "lib/rspec/rails/example/mailer_example_group.rb",
      "lib/rspec/rails/example/model_example_group.rb",
+     "lib/rspec/rails/example/rails_example_group.rb",
      "lib/rspec/rails/example/request_example_group.rb",
      "lib/rspec/rails/example/routing_example_group.rb",
      "lib/rspec/rails/example/view_example_group.rb",
@@ -90,13 +100,12 @@ Gem::Specification.new do |s|
      "lib/rspec/rails/matchers/routing_matchers.rb",
      "lib/rspec/rails/mocks.rb",
      "lib/rspec/rails/module_inclusion.rb",
-     "lib/rspec/rails/monkey.rb",
-     "lib/rspec/rails/monkey/action_mailer/test_case.rb",
      "lib/rspec/rails/tasks/rspec.rake",
      "lib/rspec/rails/version.rb",
      "lib/rspec/rails/view_assigns.rb",
      "lib/rspec/rails/view_rendering.rb",
      "rspec-rails.gemspec",
+     "spec/rspec/rails/assertion_adapter_spec.rb",
      "spec/rspec/rails/example/controller_example_group_spec.rb",
      "spec/rspec/rails/example/helper_example_group_spec.rb",
      "spec/rspec/rails/example/mailer_example_group_spec.rb",
@@ -123,7 +132,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/rspec/rspec-rails}
   s.post_install_message = %q{**************************************************
 
-  Thank you for installing rspec-rails-2.0.0.beta.19!
+  Thank you for installing rspec-rails-2.0.0.beta.20!
 
   This version of rspec-rails only works with versions of rails >= 3.0.0.beta.4.
 
@@ -133,7 +142,7 @@ Gem::Specification.new do |s|
   can access its generators and rake tasks.
 
     group :development, :test do
-      gem "rspec-rails", ">= 2.0.0.beta.19"
+      gem "rspec-rails", ">= 2.0.0.beta.20"
     end
 
   Be sure to run the following command in each of your Rails apps if you're
@@ -159,9 +168,10 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{rspec-rails-2.0.0.beta.19}
+  s.summary = %q{rspec-rails-2.0.0.beta.20}
   s.test_files = [
-    "spec/rspec/rails/example/controller_example_group_spec.rb",
+    "spec/rspec/rails/assertion_adapter_spec.rb",
+     "spec/rspec/rails/example/controller_example_group_spec.rb",
      "spec/rspec/rails/example/helper_example_group_spec.rb",
      "spec/rspec/rails/example/mailer_example_group_spec.rb",
      "spec/rspec/rails/example/model_example_group_spec.rb",
@@ -186,15 +196,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rspec>, ["= 2.0.0.beta.19"])
-      s.add_runtime_dependency(%q<webrat>, [">= 0.7.2.beta.1"])
+      s.add_runtime_dependency(%q<rspec>, ["= 2.0.0.beta.20"])
     else
-      s.add_dependency(%q<rspec>, ["= 2.0.0.beta.19"])
-      s.add_dependency(%q<webrat>, [">= 0.7.2.beta.1"])
+      s.add_dependency(%q<rspec>, ["= 2.0.0.beta.20"])
     end
   else
-    s.add_dependency(%q<rspec>, ["= 2.0.0.beta.19"])
-    s.add_dependency(%q<webrat>, [">= 0.7.2.beta.1"])
+    s.add_dependency(%q<rspec>, ["= 2.0.0.beta.20"])
   end
 end