rspec-rails 2.4.1 → 2.5.0

data/features/routing_specs/be_routable_matcher.feature

@@ -32,7 +32,7 @@ Feature: be_routable matcher
       """
 
     When I run "rspec spec/routing/widgets_routing_spec.rb"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: specify routeable route should be routable (passes)
     Given a file named "spec/routing/widgets_routing_spec.rb" with:
@@ -47,7 +47,7 @@ Feature: be_routable matcher
       """
 
     When I run "rspec spec/routing/widgets_routing_spec.rb"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: specify non-routeable route should be routable (fails)
     Given a file named "spec/routing/widgets_routing_spec.rb" with:
@@ -77,4 +77,4 @@ Feature: be_routable matcher
       """
 
     When I run "rspec spec/controllers/widgets_controller_spec.rb"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass

data/features/routing_specs/named_routes.feature

@@ -15,4 +15,4 @@ Feature: named routes
       end
       """
     When I run "rspec spec"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass

data/features/routing_specs/route_to_matcher.feature

@@ -19,7 +19,7 @@ Feature: route_to matcher
       """
 
     When I run "rspec spec/routing/widgets_routing_spec.rb"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: route spec for a route that doesn't exist (fails)
     Given a file named "spec/routing/widgets_routing_spec.rb" with:

data/features/step_definitions/{rspec_steps.rb → additional_cli_steps.rb}

@@ -1,5 +1,4 @@
-Then /^the example(s)? should( all)? pass$/ do |_,_|
+Then /^the example(s)? should( all)? pass$/ do |_, _|
   Then %q{the exit status should be 0}
   Then %q{the output should contain "0 failures"}
 end
-

data/features/view_specs/inferred_controller_path.feature

@@ -12,7 +12,7 @@ Feature: view spec infers controller path and action
       end
       """
     When I run "rspec spec/views"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: infer action
     Given a file named "spec/views/widgets/new.html.erb_spec.rb" with:
@@ -26,7 +26,7 @@ Feature: view spec infers controller path and action
       end
       """
     When I run "rspec spec/views"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: do not infer action in a partial
     Given a file named "spec/views/widgets/_form.html.erb_spec.rb" with:
@@ -40,5 +40,5 @@ Feature: view spec infers controller path and action
       end
       """
     When I run "rspec spec/views"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 

data/features/view_specs/stub_template.feature

@@ -27,7 +27,7 @@ Feature: stub template
       <%= 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"
+    Then the examples should all pass
 
   Scenario: stub template that exists
     Given a file named "spec/views/gadgets/edit.html.erb_spec.rb" with:
@@ -47,5 +47,5 @@ Feature: stub template
       end
       """
     When I run "rspec spec/views/gadgets/edit.html.erb_spec.rb"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 

data/features/view_specs/view_spec.feature

@@ -22,7 +22,7 @@ Feature: view spec
       end
       """
     When I run "rspec spec/views"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: passing spec with before and nesting
     Given a file named "spec/views/widgets/index.html.erb_spec.rb" with:
@@ -49,7 +49,7 @@ Feature: view spec
       end
       """
     When I run "rspec spec/views"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: passing spec with explicit template rendering
     Given a file named "spec/views/widgets/widget.html.erb_spec.rb" with:
@@ -71,7 +71,7 @@ Feature: view spec
       <h2><%= @widget.name %></h2>
       """
     When I run "rspec spec/views"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: passing spec with rendering of locals in a partial
     Given a file named "spec/views/widgets/_widget.html.erb_spec.rb" with:
@@ -93,7 +93,7 @@ Feature: view spec
       <h3><%= widget.name %></h3>
       """
     When I run "rspec spec/views"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: passing spec with rendering of locals in an implicit partial
     Given a file named "spec/views/widgets/_widget.html.erb_spec.rb" with:
@@ -115,7 +115,7 @@ Feature: view spec
       <h3><%= widget.name %></h3>
       """
     When I run "rspec spec/views"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: passing spec with rendering of text
     Given a file named "spec/views/widgets/direct.html.erb_spec.rb" with:
@@ -132,7 +132,7 @@ Feature: view spec
       end
       """
     When I run "rspec spec/views"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: passing spec with rendering of Prototype helper update
     Given a file named "spec/views/widgets/prototype_update.html.erb_spec.rb" with:
@@ -151,7 +151,7 @@ Feature: view spec
       end
       """
     When I run "rspec spec/views"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: spec with view that accesses helper_method helpers
     Given a file named "app/views/secrets/index.html.erb" with:
@@ -182,4 +182,4 @@ Feature: view spec
       end
       """
     When I run "rspec spec/views/secrets"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass

data/lib/generators/rspec/integration/templates/request_spec.rb

@@ -4,10 +4,10 @@ describe "<%= class_name.pluralize %>" do
   describe "GET /<%= table_name %>" do
     it "works! (now write some real specs)" do
 <% if webrat? -%>
-      visit <%= table_name %>_path
+      visit <%= index_helper %>_path
 <% else -%>
       # Run the generator again with the --webrat flag if you want to use webrat methods/matchers
-      get <%= table_name %>_path
+      get <%= index_helper %>_path
 <% end -%>
       response.status.should be(200)
     end

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

@@ -120,7 +120,7 @@ describe <%= controller_class_name %>Controller do
     it "redirects to the <%= table_name %> list" do
       <%= stub orm_class.find(class_name) %> { <%= mock_file_name %> }
       delete :destroy, :id => "1"
-      response.should redirect_to(<%= table_name %>_url)
+      response.should redirect_to(<%= index_helper %>_url)
     end
   end
 

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

@@ -21,7 +21,7 @@ describe "<%= table_name %>/edit.html.<%= options[:template_engine] %>" do
     end
 <% else -%>
     # Run the generator again with the --webrat flag if you want to use webrat matchers
-    assert_select "form", :action => <%= file_name %>_path(@<%= file_name %>), :method => "post" do
+    assert_select "form", :action => <%= index_helper %>_path(@<%= file_name %>), :method => "post" do
 <% for attribute in output_attributes -%>
       assert_select "<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>", :name => "<%= file_name %>[<%= attribute.name %>]"
 <% end -%>

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

@@ -20,7 +20,7 @@ describe "<%= table_name %>/new.html.<%= options[:template_engine] %>" do
     end
 <% else -%>
     # Run the generator again with the --webrat flag if you want to use webrat matchers
-    assert_select "form", :action => <%= table_name %>_path, :method => "post" do
+    assert_select "form", :action => <%= index_helper %>_path, :method => "post" do
 <% for attribute in output_attributes -%>
       assert_select "<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>", :name => "<%= file_name %>[<%= attribute.name %>]"
 <% end -%>

data/lib/rspec/rails/example.rb

@@ -18,9 +18,11 @@ RSpec::configure do |c|
   c.include RSpec::Rails::HelperExampleGroup, :type => :helper, :example_group => {
     :file_path => c.escaped_path(%w[spec helpers])
   }
-  c.include RSpec::Rails::MailerExampleGroup, :type => :mailer, :example_group => {
-    :file_path => c.escaped_path(%w[spec mailers])
-  }
+  if defined?(RSpec::Rails::MailerExampleGroup)
+    c.include RSpec::Rails::MailerExampleGroup, :type => :mailer, :example_group => {
+      :file_path => c.escaped_path(%w[spec mailers])
+    }
+  end
   c.include RSpec::Rails::ModelExampleGroup, :type => :model, :example_group => {
     :file_path => c.escaped_path(%w[spec models])
   }

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

@@ -56,15 +56,19 @@ module RSpec::Rails
   #
   # RSpec's preferred approach to spec'ing controller behaviour is to isolate
   # the controller from its collaborators.  By default, therefore, controller
-  # example groups do not render views. This means that a view template need
-  # not even exist in order to run a controller spec, and you can still specify
-  # which template the controller should render.
+  # example groups do not render the views in your app. Due to the way Rails
+  # searches for view templates, the template still needs to exist, but it
+  # won't actually be loaded.
+  #
+  # NOTE that this is different from rspec-rails-1 with rails-2, which did not
+  # require the presence of the file at all. Due to changes in rails-3, this
+  # was no longer feasible in rspec-rails-2.
   #
   # == View rendering
   #
-  # If you prefer a more integrated approach, similar to that of
-  # Rails' functional tests, you can tell controller groups to
-  # render views with the +render_views+ declaration:
+  # If you prefer a more integrated approach, similar to that of Rails'
+  # functional tests, you can tell controller groups to render the views in the
+  # app with the +render_views+ declaration:
   #
   #   describe WidgetsController do
   #     render_views

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

@@ -48,7 +48,7 @@ module RSpec::Rails
       metadata[:type] = :request
 
       before do
-        @router = ::Rails.application.routes
+        @routes = ::Rails.application.routes
       end
 
       webrat do

data/lib/rspec/rails/mocks.rb

@@ -27,6 +27,10 @@ module RSpec
           self.stub(:id) { nil }
         end
 
+        def [](key)
+          send(key)
+        end
+
         def new_record?
           !persisted?
         end
@@ -77,6 +81,7 @@ EOM
         stubs = stubs.reverse_merge(:persisted? => !!stubs[:id])
         stubs = stubs.reverse_merge(:destroyed? => false)
         stubs = stubs.reverse_merge(:marked_for_destruction? => false)
+        stubs = stubs.reverse_merge(:blank? => false)
 
         mock("#{model_class.name}_#{stubs[:id]}", stubs).tap do |m|
           m.extend ActiveModelInstanceMethods
@@ -188,6 +193,7 @@ EOM
             stubs = stubs.reverse_merge(:id => next_id)
             stubs = stubs.reverse_merge(:persisted? => !!stubs[:id])
           end
+          stubs = stubs.reverse_merge(:blank? => false)
           stubs.each do |k,v|
             m.__send__("#{k}=", stubs.delete(k)) if m.respond_to?("#{k}=")
           end

data/lib/rspec/rails/version.rb

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

data/lib/rspec/rails/view_rendering.rb

@@ -23,7 +23,7 @@ module RSpec
 
       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

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

@@ -1,14 +1,13 @@
-module NoConnections
-  def self.included(mod)
-    (class << mod; self; end).class_eval do
-      def columns
-        []
-      end
-
-      def connection
-        RSpec::Mocks::Mock.new.as_null_object
-      end
-    end
+module Connections
+  def self.extended(host)
+    host.establish_connection :adapter => 'sqlite3',
+                              :database => ':memory:'
+
+    host.connection.execute <<-eosql
+      CREATE TABLE #{host.table_name} (
+        #{host.primary_key} integer PRIMARY KEY AUTOINCREMENT
+      )
+    eosql
   end
 end
 
@@ -18,7 +17,7 @@ class NonActiveRecordModel
 end
 
 class MockableModel < ActiveRecord::Base
-  include NoConnections
+  extend Connections
   has_one :associated_model
 end
 
@@ -26,23 +25,12 @@ class SubMockableModel < MockableModel
 end
 
 class AssociatedModel < ActiveRecord::Base
-  include NoConnections
+  extend Connections
   belongs_to :mockable_model
 end
 
 class AlternatePrimaryKeyModel < ActiveRecord::Base
-  include NoConnections
   self.primary_key = :my_id
+  extend Connections
   attr_accessor :my_id
 end
-
-class ConnectableModel < ActiveRecord::Base
-  establish_connection :adapter => 'sqlite3',
-                       :database => ':memory:'
-
-  connection.execute <<-eosql
-    CREATE TABLE connectable_models (
-      id integer PRIMARY KEY AUTOINCREMENT
-    )
-  eosql
-end

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

@@ -260,6 +260,12 @@ describe "mock_model(RealModel)" do
     end
   end
 
+  describe "#blank?" do
+    it "is false" do
+      mock_model(MockableModel).should_not be_blank
+    end
+  end
+
   describe "ActiveModel Lint tests" do
     require 'test/unit/assertions'
     require 'active_model/lint'

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

@@ -35,6 +35,11 @@ describe "stub_model" do
       second.to_param.to_i.should == (first.to_param.to_i + 1)
     end
 
+    describe "#blank?" do
+      it "is false" do
+        stub_model(model_class).should_not be_blank
+      end
+    end
   end
 
   context "with ActiveModel (not ActiveRecord)" do
@@ -84,7 +89,7 @@ describe "stub_model" do
 
     it "raises when hitting the db" do
       lambda do
-        stub_model(ConnectableModel).connection
+        stub_model(MockableModel).connection
       end.should raise_error(RSpec::Rails::IllegalDataAccessException, /stubbed models are not allowed to access the database/)
     end
 
@@ -108,7 +113,7 @@ describe "stub_model" do
 
     describe "alternate primary key" do
       it "has the correct primary_key name" do
-        stub_model(AlternatePrimaryKeyModel).class.primary_key.should eql('my_id')
+        stub_model(AlternatePrimaryKeyModel).class.primary_key.to_s.should eql('my_id')
       end
 
       it "has a primary_key" do
@@ -138,11 +143,11 @@ describe "stub_model" do
       end
 
       it "passes associated_model == mock" do
-          @stub_model.should == @real.mockable_model
+        @stub_model.should == @real.mockable_model
       end
 
       it "passes mock == associated_model" do
-          @real.mockable_model.should == @stub_model
+        @real.mockable_model.should == @stub_model
       end
     end
 

data/spec/rspec/rails/view_rendering_spec.rb

@@ -88,7 +88,13 @@ module RSpec::Rails
           end
         end
 
-        it "overrides the parent group" do
+        it "leaves the parent group as/is" do
+          group.render_views
+          nested_group.render_views false
+          group.new.render_views?.should be_true
+        end
+
+        it "overrides the value inherited from the parent group" do
           group.render_views
           nested_group.render_views false
           nested_group.new.render_views?.should be_false

data/templates/Gemfile-base

@@ -0,0 +1,17 @@
+source 'http://rubygems.org'
+
+group :development, :test do
+  %w[rspec rspec-core rspec-expectations rspec-mocks rspec-rails].each do |lib|
+    library_path = File.expand_path("../../../../#{lib}", __FILE__)
+    if File.exist?(library_path)
+      gem lib, :path => library_path
+    else
+      gem lib
+    end
+  end
+  gem "rcov"
+  gem "webrat", "0.7.2"
+  gem "ZenTest", "4.4.2"
+end
+
+gem 'sqlite3-ruby', :require => 'sqlite3'