rspec-rails 2.1.0 → 2.2.0

data/Gemfile

@@ -7,10 +7,11 @@ gem 'rails', :path => File.expand_path("../vendor/rails", __FILE__)
   gem lib, :path => File.expand_path("../../#{lib}", __FILE__)
 end
 
-gem "cucumber", "0.8.5"
+gem "cucumber", "0.9.4"
 gem "aruba", "0.2.2"
 gem 'webrat', "0.7.2"
 gem 'sqlite3-ruby', :require => 'sqlite3'
+gem 'relish'
 
 gem 'autotest'
 

data/History.md

@@ -1,5 +1,20 @@
 ## rspec-rails-2 release history (incomplete)
 
+### 2.2.0 / 2010-11-28
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.1.0...v2.2.0)
+
+* Enhancements
+  * Added stub_template in view specs
+
+* Bug fixes
+  * Properly include helpers in views (Jonathan del Strother)
+  * Fix bug in which method missing led to a stack overflow
+  * Fix stack overflow in request specs with open_session
+  * Fix stack overflow in any spec when method_missing was invoked
+  * Add gem dependency on rails ~> 3.0.0 (ensures bundler won't install
+    rspec-rails-2 with rails-2 apps).
+
 ### 2.1.0 / 2010-11-07
 
 [full changelog](http://github.com/rspec/rspec-rails/compare/v2.0.1...v2.1.0)
@@ -26,47 +41,16 @@
 
 ### 2.0.0 / 2010-10-10
 
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.0.0.rc...v2.0.0)
-
-* Changes
-  * route_to matcher delegates to assert_recognizes instead of assert_routing
-  * update generators to use as_new_record instead of :new_record => true
-
-### 2.0.0.rc / 2010-10-05
-
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.0.0.beta.22...v2.0.0.rc)
+[full changelog](https://github.com/rspec/rspec-rails/compare/ea6bdef...v2.0.0)
 
 * Enhancements
-  * add --webrat-matchers flag to scaffold generator (for view specs)
-  * separate ActiveModel and ActiveRecord APIs in mock_model and stub_model
   * ControllerExampleGroup uses controller as the implicit subject by default (Paul Rosania)
-
-### 2.0.0.beta.22 / 2010-09-12
-
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.0.0.beta.20...v2.0.0.beta.22)
-
-* Enhancements
   * autotest mapping improvements (Andreas Neuhaus)
-
-* Bug fixes
-  * delegate flunk to assertion delegate
-
-### 2.0.0.beta.20 / 2010-08-24
-
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.0.0.beta.19...v2.0.0.beta.20)
-
-* Enhancements
-  * infer controller and action path_params in view specs
   * more cucumber features (Justin Ko)
   * clean up spec helper (Andre Arko)
-  * render views in controller specs if controller class is not
-    ActionController::Base
-  * routing specs can access named routes
   * add assign(name, value) to helper specs (Justin Ko)
   * stub_model supports primary keys other than id (Justin Ko)
-  * encapsulate Test::Unit and/or MiniTest assertions in a separate object
   * support choice between Webrat/Capybara (Justin Ko)
-    * removed hard dependency on Webrat
   * support specs for 'abstract' subclasses of ActionController::Base (Mike Gehard)
   * be_a_new matcher supports args (Justin Ko)
 

data/License.txt

@@ -0,0 +1,23 @@
+(The MIT License)
+
+Copyright (c) 2009 David Chelimsky
+Copyright (c) 2005 The RSpec Development Team
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/{README.markdown → README.md}

@@ -6,8 +6,16 @@ NOTE: rspec-2 does _not_ support rails-2. Use rspec-rails-1.3.x for rails-2.
 
 ## Documentation
 
-* [Cucumber features](http://relishapp.com/rspec/rspec-rails/v/2-0)
-* [RDoc](http://rubydoc.info/gems/rspec-rails/2.0.1/frames)
+The [Cucumber features](http://relishapp.com/rspec/rspec-rails/v/2-1) are the
+most comprehensive and up-to-date docs for end-users.
+
+The [RDoc](http://rubydoc.info/gems/rspec-rails/2.1/frames) provides additional
+information for contributors and/or extenders.
+
+All of the documentation is open source and a work in progress. If you find it
+lacking or confusing, you can help improve it by submitting requests and
+patches to the [rspec-rails issue
+tracker](https://github.com/rspec/rspec-rails/issues).
 
 ## Install
 
@@ -187,6 +195,11 @@ This means that most of the time you don't need to set these values. When
 spec'ing a partial that is included across different controllers, you _may_
 need to override these values before rendering the view.
 
+To provide a layout for the render, you'll need to specify _both_ the template
+and the layout explicitly.  For example:
+
+    render :template => "events/show", :layout => "layouts/application"
+
 ## `assign(key, val)`
 
 Use this to assign values to instance variables in the view:

data/Rakefile

@@ -108,7 +108,7 @@ end
 desc "Push cukes to relishapp using the relish-client-gem"
 task :relish, :version do |t, args|
   raise "rake relish[VERSION]" unless args[:version]
-  sh "bundle exec relish --organization rspec --project rspec-rails -v #{args[:version]} push"
+  sh "relish push --organization rspec --project rspec-rails -v #{args[:version]}"
 end
 
 task :default => [:spec, "clobber:app", "generate:app", "generate:stuff", :smoke, :cucumber]

data/Upgrade.markdown

@@ -22,17 +22,27 @@ trade-off.
 
 ## View specs
 
+### view.should render_template
+
 Rails changed the way it renders partials, so to set an expectation that a
-partial gets rendered:
+partial gets rendered, you need 
 
     render
     view.should render_template(:partial => "widget/_row")
 
-## as_new_record
+### stub_template
+
+Introduced in rspec-rails-2.2, simulates the presence of view templates on the
+file system. This supports isolation from partials rendered by the vew template
+that is the subject of a view example:
+
+    stub_template "widgets/_widget.html.erb" => "This Content"
+
+### as_new_record
 
 Earlier versions of the view generators generated stub_model with `:new_record?
-=> true`. As of rspec-rails-2.0.0.rc, that is no longer recognized, so you need
-to change this:
+=> true`. That is no longer recognized in rspec-rails-2, so you need to change
+this:
   
     stub_model(Widget, :new_record? => true)
 

data/features/view_specs/stub_template.feature

@@ -0,0 +1,51 @@
+Feature: stub template
+
+  In order to isolate view specs from the partials rendered by the primary
+  view, rspec-rails (since 2.2) provides the stub_template method.
+
+  Scenario: stub template that does not exist
+    Given a file named "spec/views/gadgets/list.html.erb_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe "gadgets/list.html.erb" do
+        it "renders the gadget partial for each gadget" do
+          assign(:gadgets, [
+            mock_model(Gadget, :id => 1, :name => "First"),
+            mock_model(Gadget, :id => 2, :name => "Second")
+          ])
+          stub_template "gadgets/_gadget.html.erb" => "<%= gadget.name %><br/>"
+          render
+          rendered.should =~ /First/
+          rendered.should =~ /Second/
+        end
+      end
+      """
+
+    And a file named "app/views/gadgets/list.html.erb" with:
+      """
+      <%= render :partial => "gadget", :collection => @gadgets %>
+      """
+    When I run "rspec spec/views/gadgets/list.html.erb_spec.rb"
+    Then the output should contain "1 example, 0 failures"
+
+  Scenario: stub template that exists
+    Given a file named "spec/views/gadgets/edit.html.erb_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe "gadgets/edit.html.erb" do
+        before(:each) do
+          @gadget = assign(:gadget, stub_model(Gadget))
+        end
+
+        it "renders the form partial" do
+          stub_template "gadgets/_form.html.erb" => "This content"
+          render
+          rendered.should =~ /This content/
+        end
+      end
+      """
+    When I run "rspec spec/views/gadgets/edit.html.erb_spec.rb"
+    Then the output should contain "1 example, 0 failures"
+

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

@@ -3,12 +3,11 @@ require 'spec_helper'
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "<%= table_name %>/edit.html.<%= options[:template_engine] %>" do
   before(:each) do
-    @<%= file_name %> = assign(:<%= file_name %>, stub_model(<%= class_name %>,
-      :new_record? => false<%= output_attributes.empty? ? '' : ',' %>
+    @<%= file_name %> = assign(:<%= file_name %>, stub_model(<%= class_name %><%= output_attributes.empty? ? '))' : ',' %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>
       :<%= attribute.name %> => <%= attribute.default.inspect %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
 <% end -%>
-    ))
+<%= output_attributes.empty? ? "" : "    ))\n" -%>
   end
 
   it "renders the edit <%= file_name %> form" do

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

@@ -84,21 +84,14 @@ module RSpec::Rails
     include RSpec::Rails::BrowserSimulators
 
     webrat do
-      include Webrat::Methods
       include Webrat::Matchers
+      include Webrat::Methods
     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

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

@@ -5,7 +5,6 @@ module RSpec
 
       include RSpec::Rails::SetupAndTeardownAdapter
       include RSpec::Rails::TestUnitAssertionAdapter
-      include RSpec::Matchers
     end
   end
 end

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

@@ -24,6 +24,10 @@ module RSpec::Rails
     webrat do
       include Webrat::Matchers
       include Webrat::Methods
+
+      def app
+        ::Rails.application
+      end
     end
 
     capybara do
@@ -34,28 +38,12 @@ module RSpec::Rails
     include RSpec::Rails::Matchers::RenderTemplate
     include ActionController::TemplateAssertions
 
-    module InstanceMethods
-      def app
-        ::Rails.application
-      end
-
-      def last_response
-        response
-      end
-    end
-
     included do
       metadata[:type] = :request
 
       before do
         @router = ::Rails.application.routes
       end
-
-      webrat do
-        Webrat.configure do |config|
-          config.mode = :rack
-        end
-      end
     end
 
     RSpec.configure &include_self_when_dir_matches('spec','requests')

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

@@ -13,6 +13,8 @@ module RSpec::Rails
     module InstanceMethods
       attr_reader :routes
 
+      private
+
       def method_missing(m, *args, &block)
         routes.url_helpers.respond_to?(m) ? routes.url_helpers.send(m, *args) : super
       end

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

@@ -33,7 +33,7 @@ module RSpec::Rails
 
     module ClassMethods
       def _default_helper
-        base = metadata[:behaviour][:description].split('/').first
+        base = metadata[:example_group][:description].split('/').first
         (base.camelize + 'Helper').constantize if base
       rescue NameError
         nil
@@ -85,6 +85,18 @@ module RSpec::Rails
         _view
       end
 
+      # Simulates the presence of a template on the file system by adding a
+      # Rails' FixtureResolver to the front of the view_paths list. Designed to
+      # help isolate view examples from partials rendered by the view template
+      # that is the subject of the example.
+      #
+      # == Example
+      #
+      #   stub_template("widgets/_widget.html.erb" => "This content.")
+      def stub_template(hash)
+        view.view_paths.unshift(ActionView::FixtureResolver.new(hash))
+      end
+
       # Provides access to the params hash that will be available within the
       # view:
       #

data/lib/rspec/rails/mocks.rb

@@ -28,11 +28,19 @@ module RSpec
         end
       end
 
-      # Creates a mock object instance for a +string_or_model_class+ with
-      # common methods stubbed out. Additional methods may be easily stubbed
-      # (via add_stubs) if +stubs+ is passed.
+      # Creates a test double representing +string_or_model_class+ with common
+      # ActiveModel methods stubbed out. Additional methods may be easily
+      # stubbed (via add_stubs) if +stubs+ is passed. This is most useful for
+      # impersonating models that don't exist yet.
       #
-      # +model_class+ can be any of:
+      # NOTE that only ActiveModel's methods, plus <tt>new_record?</tt>, are
+      # stubbed out implicitly.  <tt>new_record?</tt> returns the inverse of
+      # <tt>persisted?</tt>, and is present only for compatibility with
+      # extension frameworks that have yet to update themselves to the
+      # ActiveModel API (which declares <tt>persisted?</tt>, not
+      # <tt>new_record?</tt>).
+      #
+      # +string_or_model_class+ can be any of:
       #
       #   * A String representing a Class that does not exist
       #   * A String representing a Class that extends ActiveModel::Naming
@@ -145,25 +153,17 @@ EOM
       # assigned as a stub return value using RSpec's mocking/stubbing
       # framework.
       #
-      # <tt>new_record?</tt> is overridden to return the result of id.nil?
-      # This means that by default new_record? will return false. If  you want
+      # <tt>persisted?</tt> is overridden to return the result of !id.nil?
+      # This means that by default persisted? will return true. If  you want
       # the object to behave as a new record, sending it +as_new_record+ will
       # set the id to nil. You can also explicitly set :id => nil, in which
-      # case new_record? will return true, but using +as_new_record+ makes the
+      # case persisted? will return false, but using +as_new_record+ makes the
       # example a bit more descriptive.
       #
       # While you can use stub_model in any example (model, view, controller,
       # helper), it is especially useful in view examples, which are
       # inherently more state-based than interaction-based.
       #
-      # == Database Independence
-      #
-      # +stub_model+ does not make your examples entirely
-      # database-independent. It does not stop the model class itself from
-      # loading up its columns from the database. It just prevents data access
-      # from the object itself. To completely decouple from the database, take
-      # a look at libraries like unit_record or NullDB.
-      #
       # == Examples
       #
       #   stub_model(Person)

data/lib/rspec/rails/version.rb

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

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,7 +18,7 @@ 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"
 
@@ -57,6 +57,7 @@ Gem::Specification.new do |s|
 **************************************************
 }
 
-  s.add_runtime_dependency "rspec", "~> 2.1.0"
+  s.add_runtime_dependency "rails", "~> 3.0.0"
+  s.add_runtime_dependency "rspec", "~> #{RSpec::Rails::Version::STRING.split('.')[0..1].join('.')}"
 end
 

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

@@ -15,7 +15,7 @@ module RSpec::Rails
     describe 'automatic inclusion of helpers' do
       module ::ThingsHelper; end
 
-      pending 'includes the helper with the same name' do
+      it 'includes the helper with the same name' do
         group = RSpec::Core::ExampleGroup.describe 'things/show.html.erb'
         group.should_receive(:helper).with(ThingsHelper)
         group.class_eval do

metadata

@@ -4,49 +4,63 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
-  - 1
+  - 2
   - 0
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors: 
 - David Chelimsky
-- Chad Humphries
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-11-07 01:00:00 -05:00
+date: 2010-11-28 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rails
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 2
-        - 1
+        - 3
+        - 0
         - 0
-        version: 2.1.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 2
+        version: "2.2"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id002
 description: RSpec-2 for Rails-3
-email: dchelimsky@gmail.com;chad.humphries@gmail.com
+email: dchelimsky@gmail.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README.markdown
+- README.md
 files: 
 - .document
 - .gitignore
 - Gemfile
 - History.md
-- README.markdown
+- License.txt
+- README.md
 - Rakefile
 - Thorfile
 - Upgrade.markdown
@@ -71,6 +85,7 @@ files:
 - features/step_definitions/model_steps.rb
 - features/support/env.rb
 - features/view_specs/inferred_controller_path.feature
+- features/view_specs/stub_template.feature
 - features/view_specs/view_spec.feature
 - lib/autotest/rails_rspec2.rb
 - lib/generators/rspec.rb
@@ -168,7 +183,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-rails-2.1.0!
+    Thank you for installing rspec-rails-2.2.0!
   
     This version of rspec-rails only works with versions of rails >= 3.0.0
   
@@ -178,7 +193,7 @@ post_install_message: |
     can access its generators and rake tasks.
   
       group :development, :test do
-        gem "rspec-rails", ">= 2.1.0"
+        gem "rspec-rails", ">= 2.2.0"
       end
   
     Be sure to run the following command in each of your Rails apps if you're
@@ -209,7 +224,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 101005116309468581
+      hash: -949927593083894273
       segments: 
       - 0
       version: "0"
@@ -218,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 101005116309468581
+      hash: -949927593083894273
       segments: 
       - 0
       version: "0"
@@ -228,7 +243,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.1.0
+summary: rspec-rails-2.2.0
 test_files: 
 - features/README.markdown
 - features/controller_specs/anonymous_controller.feature
@@ -249,6 +264,7 @@ test_files:
 - features/step_definitions/model_steps.rb
 - features/support/env.rb
 - features/view_specs/inferred_controller_path.feature
+- features/view_specs/stub_template.feature
 - features/view_specs/view_spec.feature
 - spec/autotest/rails_rspec2_spec.rb
 - spec/rspec/rails/assertion_adapter_spec.rb