rspec-rails 1.2.9 → 1.3.0

data/History.rdoc

@@ -1,3 +1,9 @@
+=== Version 1.3.0 / 2010-01-11
+
+* enhancements
+  * use stub() instead of stub!() in generators
+  * generate gem config in test.rb with 'script/generate rspec'
+
 === Version 1.2.9 / 2009-10-05
 
 * enhancements
@@ -15,6 +21,7 @@
     * no error if either action or template exist
     * error if neither exist
     * Closes #888.
+  * mock_model stubs destroyed? to return false
 
 * removals
   * spec_server has been removed in favor of spork.

data/Rakefile

@@ -15,7 +15,7 @@ Hoe.spec 'rspec-rails' do
   self.description = "Behaviour Driven Development for Ruby on Rails."
   self.rubyforge_name = 'rspec'
   self.developer 'RSpec Development Team', 'rspec-devel@rubyforge.org'
-  self.extra_deps = [["rspec",">=1.2.9"],["rack",">=1.0.0"]]
+  self.extra_deps = [["rspec",">=1.3.0"],["rack",">=1.0.0"]]
   self.extra_dev_deps = [["cucumber",">= 0.3.99"]]
   self.remote_rdoc_dir = "rspec-rails/#{Spec::Rails::VERSION::STRING}"
   self.history_file = 'History.rdoc'

data/Upgrade.rdoc

@@ -1,4 +1,4 @@
-= Upgrade to 1.2.8 (in git)
+= Upgrade to 1.2.8/1.2.9/1.3.0
 
 == What's new
 

data/generators/rspec/rspec_generator.rb

@@ -24,6 +24,26 @@ file so that it can be updated and you can manually restore your changes.
 HELPFUL_INSTRUCTIONS
     end
     Dir.mkdir('lib/tasks') unless File.directory?('lib/tasks')
+
+    if Rails::VERSION::STRING >= '2.1'
+      test_env = 'config/environments/test.rb'
+      contents = File.read(test_env)
+      unless contents =~ /config\.gem\s+(\"|\')rspec/m
+        puts "Configuring rspec and rspec-rails gems in #{test_env} ..."
+        puts
+        require File.expand_path('../../../lib/spec/rails/version.rb', __FILE__)
+        rspec_config = <<-EOF
+  config.gem 'rspec',       :version => '>= #{Spec::Rails::VERSION::STRING}', :lib => false unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec'))
+  config.gem 'rspec-rails', :version => '>= #{Spec::Rails::VERSION::STRING}', :lib => false unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))
+  EOF
+        File.open(test_env, "wb") do |f|
+          f.puts contents
+          f.puts
+          f.puts rspec_config
+        end
+      end
+    end
+
     super
   end
 

data/generators/rspec/templates/spec_helper.rb

@@ -41,7 +41,7 @@ Spec::Runner.configure do |config|
   #
   # == Mock Framework
   #
-  # RSpec uses it's own mocking framework by default. If you prefer to
+  # RSpec uses its own mocking framework by default. If you prefer to
   # use mocha, flexmock or RR, uncomment the appropriate line:
   #
   # config.mock_with :mocha

data/generators/rspec_scaffold/templates/controller_spec.rb

@@ -8,7 +8,7 @@ describe <%= controller_class_name %>Controller do
 
   describe "GET index" do
     it "assigns all <%= table_name.pluralize %> as @<%= table_name.pluralize %>" do
-      <%= class_name %>.stub!(:find).with(:all).and_return([mock_<%= file_name %>])
+      <%= class_name %>.stub(:find).with(:all).and_return([mock_<%= file_name %>])
       get :index
       assigns[:<%= table_name %>].should == [mock_<%= file_name %>]
     end
@@ -16,7 +16,7 @@ describe <%= controller_class_name %>Controller do
 
   describe "GET show" do
     it "assigns the requested <%= file_name %> as @<%= file_name %>" do
-      <%= class_name %>.stub!(:find).with("37").and_return(mock_<%= file_name %>)
+      <%= class_name %>.stub(:find).with("37").and_return(mock_<%= file_name %>)
       get :show, :id => "37"
       assigns[:<%= file_name %>].should equal(mock_<%= file_name %>)
     end
@@ -24,7 +24,7 @@ describe <%= controller_class_name %>Controller do
 
   describe "GET new" do
     it "assigns a new <%= file_name %> as @<%= file_name %>" do
-      <%= class_name %>.stub!(:new).and_return(mock_<%= file_name %>)
+      <%= class_name %>.stub(:new).and_return(mock_<%= file_name %>)
       get :new
       assigns[:<%= file_name %>].should equal(mock_<%= file_name %>)
     end
@@ -32,7 +32,7 @@ describe <%= controller_class_name %>Controller do
 
   describe "GET edit" do
     it "assigns the requested <%= file_name %> as @<%= file_name %>" do
-      <%= class_name %>.stub!(:find).with("37").and_return(mock_<%= file_name %>)
+      <%= class_name %>.stub(:find).with("37").and_return(mock_<%= file_name %>)
       get :edit, :id => "37"
       assigns[:<%= file_name %>].should equal(mock_<%= file_name %>)
     end
@@ -42,13 +42,13 @@ describe <%= controller_class_name %>Controller do
 
     describe "with valid params" do
       it "assigns a newly created <%= file_name %> as @<%= file_name %>" do
-        <%= class_name %>.stub!(:new).with({'these' => 'params'}).and_return(mock_<%= file_name %>(:save => true))
+        <%= class_name %>.stub(:new).with({'these' => 'params'}).and_return(mock_<%= file_name %>(:save => true))
         post :create, :<%= file_name %> => {:these => 'params'}
         assigns[:<%= file_name %>].should equal(mock_<%= file_name %>)
       end
 
       it "redirects to the created <%= file_name %>" do
-        <%= class_name %>.stub!(:new).and_return(mock_<%= file_name %>(:save => true))
+        <%= class_name %>.stub(:new).and_return(mock_<%= file_name %>(:save => true))
         post :create, :<%= file_name %> => {}
         response.should redirect_to(<%= table_name.singularize %>_url(mock_<%= file_name %>))
       end
@@ -56,13 +56,13 @@ describe <%= controller_class_name %>Controller do
 
     describe "with invalid params" do
       it "assigns a newly created but unsaved <%= file_name %> as @<%= file_name %>" do
-        <%= class_name %>.stub!(:new).with({'these' => 'params'}).and_return(mock_<%= file_name %>(:save => false))
+        <%= class_name %>.stub(:new).with({'these' => 'params'}).and_return(mock_<%= file_name %>(:save => false))
         post :create, :<%= file_name %> => {:these => 'params'}
         assigns[:<%= file_name %>].should equal(mock_<%= file_name %>)
       end
 
       it "re-renders the 'new' template" do
-        <%= class_name %>.stub!(:new).and_return(mock_<%= file_name %>(:save => false))
+        <%= class_name %>.stub(:new).and_return(mock_<%= file_name %>(:save => false))
         post :create, :<%= file_name %> => {}
         response.should render_template('new')
       end
@@ -80,13 +80,13 @@ describe <%= controller_class_name %>Controller do
       end
 
       it "assigns the requested <%= file_name %> as @<%= file_name %>" do
-        <%= class_name %>.stub!(:find).and_return(mock_<%= file_name %>(:update_attributes => true))
+        <%= class_name %>.stub(:find).and_return(mock_<%= file_name %>(:update_attributes => true))
         put :update, :id => "1"
         assigns[:<%= file_name %>].should equal(mock_<%= file_name %>)
       end
 
       it "redirects to the <%= file_name %>" do
-        <%= class_name %>.stub!(:find).and_return(mock_<%= file_name %>(:update_attributes => true))
+        <%= class_name %>.stub(:find).and_return(mock_<%= file_name %>(:update_attributes => true))
         put :update, :id => "1"
         response.should redirect_to(<%= table_name.singularize %>_url(mock_<%= file_name %>))
       end
@@ -100,13 +100,13 @@ describe <%= controller_class_name %>Controller do
       end
 
       it "assigns the <%= file_name %> as @<%= file_name %>" do
-        <%= class_name %>.stub!(:find).and_return(mock_<%= file_name %>(:update_attributes => false))
+        <%= class_name %>.stub(:find).and_return(mock_<%= file_name %>(:update_attributes => false))
         put :update, :id => "1"
         assigns[:<%= file_name %>].should equal(mock_<%= file_name %>)
       end
 
       it "re-renders the 'edit' template" do
-        <%= class_name %>.stub!(:find).and_return(mock_<%= file_name %>(:update_attributes => false))
+        <%= class_name %>.stub(:find).and_return(mock_<%= file_name %>(:update_attributes => false))
         put :update, :id => "1"
         response.should render_template('edit')
       end
@@ -122,7 +122,7 @@ describe <%= controller_class_name %>Controller do
     end
 
     it "redirects to the <%= table_name %> list" do
-      <%= class_name %>.stub!(:find).and_return(mock_<%= file_name %>(:destroy => true))
+      <%= class_name %>.stub(:find).and_return(mock_<%= file_name %>(:destroy => true))
       delete :destroy, :id => "1"
       response.should redirect_to(<%= table_name %>_url)
     end

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

@@ -43,7 +43,7 @@ module Spec
       #
       class ControllerExampleGroup < FunctionalExampleGroup
         class << self
-                    
+
           # Use integrate_views to instruct RSpec to render views in
           # your controller examples in Integration mode.
           #
@@ -56,11 +56,11 @@ module Spec
           def integrate_views(integrate_views = true)
             @integrate_views = integrate_views
           end
-          
+
           def integrate_views? # :nodoc:
             @integrate_views
           end
-          
+
           def inherited(klass) # :nodoc:
             klass.integrate_views(integrate_views?)
             klass.subject { controller }
@@ -93,7 +93,7 @@ module Spec
             tests "#{name}_controller".camelize.constantize
           end
         end
-        
+
         before(:each) do
           # Some Rails apps explicitly disable ActionMailer in environment.rb
           if defined?(ActionMailer)
@@ -107,7 +107,7 @@ Controller specs need to know what controller is being specified. You can
 indicate this by passing the controller to describe():
 
   describe MyController do
-    
+
 or by declaring the controller's name
 
   describe "a MyController" do
@@ -121,7 +121,7 @@ MESSAGE
         end
 
         attr_reader :response, :request, :controller
-        
+
         def integrate_views?
           @integrate_views || self.class.integrate_views?
         end
@@ -143,7 +143,7 @@ MESSAGE
             end
           end
         end
-        
+
       protected
 
         def _assigns_hash_proxy
@@ -151,27 +151,33 @@ MESSAGE
         end
 
       private
-        
+
         module TemplateIsolationExtensions
           def file_exists?(ignore); true; end
-          
+
           def render_file(*args)
             @first_render ||= args[0] unless args[0] =~ /^layouts/
           end
-          
+
           # Rails 2.2
           def _pick_template(*args)
             @_first_render ||= args[0] unless args[0] =~ /^layouts/
             PickedTemplate.new
           end
-          
+
           def __action_exists?(params)
             controller.respond_to? params[:action]
           end
-          
+
+          def __template_exists?(args)
+            self.view_paths.respond_to?(:find_template) ?
+              self.view_paths.find_template(args[0][:file], template_format) :
+              false
+          end
+
           def render(*args)
             if ::Rails::VERSION::STRING >= "2.1"
-              return super unless __action_exists?(params) 
+              return super unless __action_exists?(params) || __template_exists?(args)
             end
             if file = args.last[:file].instance_eval{@template_path}
               record_render :file => file
@@ -183,23 +189,24 @@ MESSAGE
               super
             end
           end
-        
+
         private
-        
+
           def record_render(opts)
-            (@_rendered[:template] ||= opts[:file]) if opts[:file]
-            (@_rendered[:partials][opts[:partial]] += 1) if opts[:partial]
+            return unless @_rendered
+            @_rendered[:template] ||= opts[:file] if opts[:file]
+            @_rendered[:partials][opts[:partial]] += 1 if opts[:partial]
           end
-          
+
           # Returned by _pick_template when running controller examples in isolation mode.
-          class PickedTemplate 
+          class PickedTemplate
             # Do nothing when running controller examples in isolation mode.
             def render_template(*ignore_args); end
             # Do nothing when running controller examples in isolation mode.
             def render_partial(*ignore_args);  end
           end
         end
-        
+
         module ControllerInstanceMethods # :nodoc:
           include Spec::Rails::Example::RenderObserver
 
@@ -230,7 +237,7 @@ MESSAGE
               end
             end
           end
-          
+
           # Rails 2.3
           def default_template(action_name = self.action_name)
             if integrate_views?
@@ -243,7 +250,7 @@ MESSAGE
               end
             end
           end
-          
+
           def response(&block)
             # NOTE - we're setting @update for the assert_select_spec - kinda weird, huh?
             @update = block
@@ -255,7 +262,7 @@ MESSAGE
           end
 
         private
-        
+
           def integrate_views?
             @integrate_views
           end
@@ -263,15 +270,15 @@ MESSAGE
           def matching_message_expectation_exists(options)
             render_proxy.__send__(:__mock_proxy).__send__(:find_matching_expectation, :render, options)
           end
-        
+
           def matching_stub_exists(options)
             render_proxy.__send__(:__mock_proxy).__send__(:find_matching_method_stub, :render, options)
           end
-        
+
         end
 
         Spec::Example::ExampleGroupFactory.register(:controller, self)
-        
+
       end
     end
   end

data/lib/spec/rails/example/functional_example_group.rb

@@ -38,7 +38,7 @@ module Spec
           @controller.__send__ :flash
         end
 
-        # Provides acces to the session hash. Use this before or after
+        # Provides access to the session hash. Use this before or after
         # rendering a view, calling a helper or calling a controller action.
         def session
           request.session

data/lib/spec/rails/example/model_example_group.rb

@@ -6,7 +6,8 @@ module Spec
       # Model examples use Spec::Rails::Example::ModelExampleGroup, which
       # provides support for fixtures and some custom expectations via extensions
       # to ActiveRecord::Base.
-      class ModelExampleGroup < ActiveSupport::TestCase
+      base = defined?(ActiveRecord::TestCase) ? ActiveRecord::TestCase : ActiveSupport::TestCase
+      class ModelExampleGroup < base
         Spec::Example::ExampleGroupFactory.register(:model, self)
       end
     end

data/lib/spec/rails/matchers/ar_be_valid.rb

@@ -1,46 +1,23 @@
 if defined?(ActiveRecord::Base)
-  module Spec
-    module Rails
-      module Matchers
-    
-        class ArBeValid  #:nodoc:
-        
-          def initialize
-            @matcher = Spec::Matchers::Be.new :be_valid
-            @matcher.__send__ :handling_predicate!
-          end
-
-          def matches?(actual)
-            @actual = actual
-            @matcher.matches? @actual
-          end
-      
-          def failure_message_for_should
-            if @actual.respond_to?(:errors) &&
-                ActiveRecord::Errors === @actual.errors
-              "Expected #{@actual.inspect} to be valid, but it was not\nErrors: " + @actual.errors.full_messages.join(", ")            
-            else
-              @matcher.failure_message_for_should
-            end
-          end
-        
-          def failure_message_for_should_not
-            @matcher.failure_message_for_should_not
-          end
-        
-          def description
-            "be valid"
-          end
+  module Spec::Rails::Matchers
+    # :call-seq:
+    #   response.should be_valid
+    #   response.should_not be_valid
+    def be_valid
+      ::Spec::Matchers::Matcher.new :be_valid do
+        match do |actual|
+          actual.valid?
         end
 
-        # :call-seq:
-        #   response.should be_valid
-        #   response.should_not be_valid
-        def be_valid
-          ArBeValid.new
+        failure_message_for_should do |actual|
+          if actual.respond_to?(:errors) && ActiveRecord::Errors === actual.errors
+            "Expected #{actual.inspect} to be valid, but it was not\nErrors: " + actual.errors.full_messages.join(", ")            
+          else
+            "Expected #{actual.inspect} to be valid"
+          end
         end
-    
       end
     end
+
   end
 end

data/lib/spec/rails/mocks.rb

@@ -14,6 +14,7 @@ module Spec
           :id => id,
           :to_param => id.to_s,
           :new_record? => false,
+          :destroyed? => false,
           :errors => stub("errors", :count => 0)
         })
         m = mock("#{model_class.name}_#{id}", options_and_stubs)

data/lib/spec/rails/version.rb

@@ -3,8 +3,8 @@ module Spec # :nodoc:
     module VERSION # :nodoc:
       unless defined? MAJOR
         MAJOR  = 1
-        MINOR  = 2
-        TINY   = 9
+        MINOR  = 3
+        TINY   = 0
         PRE    = nil
       
         STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/spec/resources/views/view_spec/accessor.html.erb

@@ -1,5 +1,6 @@
 <div id="session"><%= session[:key] %></div>
 <div id="params"><%= params[:key] %></div>
 <div id="flash"><%= flash[:key] %></div>
+<div id="flash_now"><%= flash[:now_key] %></div>
 <div id="controller"><%= params[:controller] %></div>
 <div id="action"><%= params[:action] %></div>

data/spec/spec/rails/example/model_example_group_spec.rb

@@ -6,6 +6,18 @@ module Spec
       describe ModelExampleGroup do
         accesses_configured_helper_methods
         
+        if defined?(ActiveRecord::TestCase)
+          it "derives from ActiveRecord::TestCase" do
+            group = describe("foo", :type => :model) do; end
+            group.ancestors.should include(ActiveRecord::TestCase)
+          end
+        else
+          it "derives from ActiveSupport::TestCase" do
+            group = describe("foo", :type => :model) do; end
+            group.ancestors.should include(ActiveSupport::TestCase)
+          end
+        end
+        
         it "clears its name from the description" do
           group = describe("foo", :type => :model) do
             $nested_group = describe("bar") do

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

@@ -176,38 +176,35 @@ describe "A view", :type => :view do
     session[:key] = "session"
     params[:key] = "params"
     flash[:key] = "flash"
+    flash.now[:now_key] = "flash.now"
     render "view_spec/accessor"
   end
 
-  it "should use the template as the implicit subject" do
+  it "uses the template as the implicit subject" do
     subject.should == template
   end
 
-  describe "with a specified subject" do
-    subject { 'specified' }
-
-    it "should use the specified subject" do
-      subject.should == 'specified'
-    end
-  end
-
-  it "should have access to session data" do
+  it "has access to session data" do
     response.should have_tag("div#session", "session")
   end
 
-  specify "should have access to params data" do
+  it "has access to params data" do
     response.should have_tag("div#params", "params")
   end
 
-  it "should have access to flash data" do
+  it "has access to flash" do
     response.should have_tag("div#flash", "flash")
   end
 
-  it "should have a controller param" do
+  it "has access to flash.now" do
+    response.should have_tag("div#flash_now", "flash.now")
+  end
+
+  it "has a controller param" do
     response.should have_tag("div#controller", "view_spec")
   end
   
-  it "should have an action param" do
+  it "has an action param" do
     response.should have_tag("div#action", "accessor")
   end
 end

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

@@ -24,6 +24,9 @@ describe "mock_model" do
     it "should not say it instance_of? if it isn't, even if it's ancestor is" do
       @model.instance_of?(MockableModel).should be(false)
     end
+    it "should say it is not destroyed" do
+      @model.destroyed?(SubMockableModel).should be(false)
+    end
   end
 
   describe "with params" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  version: 1.2.9
+  version: 1.3.0
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-05 00:00:00 -05:00
+date: 2010-01-11 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.9
+        version: 1.3.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -237,7 +237,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-rails-1.2.9
+    Thank you for installing rspec-rails-1.3.0
     
     If you are upgrading, do this in each of your rails apps
     that you want to upgrade:
@@ -272,6 +272,6 @@ rubyforge_project: rspec
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: rspec-rails 1.2.9
+summary: rspec-rails 1.3.0
 test_files: []