rspec-rails 1.2.6 → 1.2.7

data/generators/rspec_scaffold/templates/edit_erb_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_dep
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "/<%= table_name %>/edit.<%= default_file_extension %>" do
   include <%= controller_class_name %>Helper
-  
+
   before(:each) do
     assigns[:<%= file_name %>] = @<%= file_name %> = stub_model(<%= class_name %>,
       :new_record? => false<%= output_attributes.empty? ? '' : ',' %>
@@ -15,7 +15,7 @@ describe "/<%= table_name %>/edit.<%= default_file_extension %>" do
 
   it "renders the edit <%= file_name %> form" do
     render
-    
+
     response.should have_tag("form[action=#{<%= file_name %>_path(@<%= file_name %>)}][method=post]") do
 <% for attribute in output_attributes -%>
       with_tag('<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>[name=?]', "<%= file_name %>[<%= attribute.name %>]")
@@ -23,5 +23,3 @@ describe "/<%= table_name %>/edit.<%= default_file_extension %>" do
     end
   end
 end
-
-

data/generators/rspec_scaffold/templates/helper_spec.rb

@@ -1,11 +1,11 @@
 require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper')
 
 describe <%= controller_class_name %>Helper do
-  
+
   #Delete this example and add some real ones or delete this file
   it "is included in the helper object" do
     included_modules = (class << helper; self; end).send :included_modules
     included_modules.should include(<%= controller_class_name %>Helper)
   end
-  
+
 end

data/generators/rspec_scaffold/templates/index_erb_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_dep
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "/<%= table_name %>/index.<%= default_file_extension %>" do
   include <%= controller_class_name %>Helper
-  
+
   before(:each) do
     assigns[:<%= table_name %>] = [
 <% [1,2].each_with_index do |id, model_index| -%>
@@ -25,4 +25,3 @@ describe "/<%= table_name %>/index.<%= default_file_extension %>" do
 <% end -%>
   end
 end
-

data/generators/rspec_scaffold/templates/new_erb_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_dep
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "/<%= table_name %>/new.<%= default_file_extension %>" do
   include <%= controller_class_name %>Helper
-  
+
   before(:each) do
     assigns[:<%= file_name %>] = stub_model(<%= class_name %>,
       :new_record? => true<%= output_attributes.empty? ? '' : ',' %>
@@ -15,7 +15,7 @@ describe "/<%= table_name %>/new.<%= default_file_extension %>" do
 
   it "renders new <%= file_name %> form" do
     render
-    
+
     response.should have_tag("form[action=?][method=post]", <%= table_name %>_path) do
 <% for attribute in output_attributes -%>
       with_tag("<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>[name=?]", "<%= file_name %>[<%= attribute.name %>]")
@@ -23,5 +23,3 @@ describe "/<%= table_name %>/new.<%= default_file_extension %>" do
     end
   end
 end
-
-

data/generators/rspec_scaffold/templates/routing_spec.rb

@@ -5,27 +5,27 @@ describe <%= controller_class_name %>Controller do
     it "maps #index" do
       route_for(:controller => "<%= table_name %>", :action => "index").should == "/<%= table_name %>"
     end
-  
+
     it "maps #new" do
       route_for(:controller => "<%= table_name %>", :action => "new").should == "/<%= table_name %>/new"
     end
-  
+
     it "maps #show" do
       route_for(:controller => "<%= table_name %>", :action => "show", :id => "1").should == "/<%= table_name %>/1"
     end
-  
+
     it "maps #edit" do
       route_for(:controller => "<%= table_name %>", :action => "edit", :id => "1").should == "/<%= table_name %>/1/edit"
     end
 
-  it "maps #create" do
-    route_for(:controller => "<%= table_name %>", :action => "create").should == {:path => "/<%= table_name %>", :method => :post}
-  end
+    it "maps #create" do
+      route_for(:controller => "<%= table_name %>", :action => "create").should == {:path => "/<%= table_name %>", :method => :post}
+    end
+
+    it "maps #update" do
+      route_for(:controller => "<%= table_name %>", :action => "update", :id => "1").should == {:path =>"/<%= table_name %>/1", :method => :put}
+    end
 
-  it "maps #update" do
-    route_for(:controller => "<%= table_name %>", :action => "update", :id => "1").should == {:path =>"/<%= table_name %>/1", :method => :put}
-  end
-  
     it "maps #destroy" do
       route_for(:controller => "<%= table_name %>", :action => "destroy", :id => "1").should == {:path =>"/<%= table_name %>/1", :method => :delete}
     end
@@ -35,27 +35,27 @@ describe <%= controller_class_name %>Controller do
     it "generates params for #index" do
       params_from(:get, "/<%= table_name %>").should == {:controller => "<%= table_name %>", :action => "index"}
     end
-  
+
     it "generates params for #new" do
       params_from(:get, "/<%= table_name %>/new").should == {:controller => "<%= table_name %>", :action => "new"}
     end
-  
+
     it "generates params for #create" do
       params_from(:post, "/<%= table_name %>").should == {:controller => "<%= table_name %>", :action => "create"}
     end
-  
+
     it "generates params for #show" do
       params_from(:get, "/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => "show", :id => "1"}
     end
-  
+
     it "generates params for #edit" do
       params_from(:get, "/<%= table_name %>/1/edit").should == {:controller => "<%= table_name %>", :action => "edit", :id => "1"}
     end
-  
+
     it "generates params for #update" do
       params_from(:put, "/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => "update", :id => "1"}
     end
-  
+
     it "generates params for #destroy" do
       params_from(:delete, "/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => "destroy", :id => "1"}
     end

data/generators/rspec_scaffold/templates/show_erb_spec.rb

@@ -20,4 +20,3 @@ describe "/<%= table_name %>/show.<%= default_file_extension %>" do
 <% end -%>
   end
 end
-

data/lib/autotest/discover.rb

@@ -1 +1,5 @@
-# This needs to be here for >= ZenTest-3.9.0 to add this directory to the load path.
+Autotest.add_discovery do
+  style = []
+  style << "rails" if File.exist? 'config/environment.rb'
+  style
+end

data/lib/spec/rails.rb

@@ -1,5 +1,3 @@
-RAILS_ENV ||= "test"
-
 begin
   require_dependency 'application_controller'
 rescue MissingSourceFile

data/lib/spec/rails/example.rb

@@ -9,6 +9,7 @@ require "spec/rails/example/controller_example_group"
 require "spec/rails/example/helper_example_group"
 require "spec/rails/example/view_example_group"
 require "spec/rails/example/routing_example_group"
+require "spec/rails/example/integration_example_group"
 require "spec/rails/example/cookies_proxy"
 
 module Spec

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

@@ -166,8 +166,15 @@ MESSAGE
           end
           
           def render(*args)
-            return super if Hash === args.last && args.last[:inline]
-            @_rendered ? record_render(args[0]) : super
+            if file = args.last[:file].instance_eval{@template_path}
+              record_render :file => file
+            elsif args.last[:inline]
+              super
+            elsif @_rendered
+              record_render(args[0])
+            else
+              super
+            end
           end
         
         private
@@ -213,6 +220,19 @@ MESSAGE
             end
           end
           
+          # Rails 2.3
+          def default_template(action_name = self.action_name)
+            if integrate_views?
+              super
+            else
+              begin
+                super
+              rescue ActionView::MissingTemplate
+                "#{self.class.name.sub(/Controller$/,'').underscore}/#{action_name}"
+              end
+            end
+          end
+          
           def response(&block)
             # NOTE - we're setting @update for the assert_select_spec - kinda weird, huh?
             @update = block

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

@@ -10,14 +10,36 @@ module Spec
 
         attr_reader :request, :response
 
+        # The params hash accessed within a view or helper. Use this before
+        # rendering a view or calling a helper to provide data used by the
+        # view or helper.
+        #
+        # == Examples
+        #   # in a view spec
+        #   params[:name] = "David"
+        #   render
+        #   response.should have_tag("div.name","David")
+        #    
+        #   # in a helper spec
+        #   params[:first_name] = "David"
+        #   params[:last_name] = "Chelimsky"
+        #   helper.full_name.should == "David Chelimsky"
         def params
           request.parameters
         end
 
+        # Provides access to the flash hash. Use this after rendering a
+        # view, calling a helper or calling a controller action.
+        #
+        # == Examples
+        #   post :create
+        #   flash[:notice].should == "Success!"
         def flash
           @controller.__send__ :flash
         end
 
+        # Provides acces to the session hash. Use this before or after
+        # rendering a view, calling a helper or calling a controller action.
         def session
           request.session
         end

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

@@ -0,0 +1,16 @@
+class ActionController::IntegrationTest
+  alias_method :orig_initialize, :initialize
+  def initialize(*args)
+    super
+  end
+end
+
+module Spec
+  module Rails
+    module Example
+      class IntegrationExampleGroup < ActionController::IntegrationTest
+        Spec::Example::ExampleGroupFactory.register(:integration, self)
+      end
+    end
+  end
+end

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

@@ -35,15 +35,28 @@ module Spec
           end
         end
         
+        def stub(*args)
+          if args[0] == :render
+            register_verify_after_each
+            render_proxy.stub(args.first, :expected_from => caller(1)[0])
+          else
+            super
+          end
+        end
+        
+        # FIXME - for some reason, neither alias nor alias_method are working
+        # as expected in the else branch, so this is a duplicate of stub()
+        # above. Could delegate, but then we'd run into craziness handling
+        # :expected_from. This will have to do for the moment.
         def stub!(*args)
           if args[0] == :render
             register_verify_after_each
-            render_proxy.stub!(:render, :expected_from => caller(1)[0])
+            render_proxy.stub!(args.first, :expected_from => caller(1)[0])
           else
             super
           end
         end
-
+        
         def verify_rendered_proc #:nodoc:
           template = self
           @verify_rendered_proc ||= Proc.new do

data/lib/spec/rails/extensions/spec/matchers/have.rb

@@ -6,14 +6,14 @@ module Spec #:nodoc:
 
       def failure_message_for_should_with_errors_on_extensions
         return "expected #{relativities[@relativity]}#{@expected} errors on :#{@args[0]}, got #{@actual}" if @collection_name == :errors_on
-        return "expected #{relativities[@relativity]}#{@expected} error on :#{@args[0]}, got #{@actual}" if @collection_name == :error_on
-        return failure_message_without_errors_on_extensions
+        return "expected #{relativities[@relativity]}#{@expected} error on :#{@args[0]}, got #{@actual}"  if @collection_name == :error_on
+        return failure_message_for_should_without_errors_on_extensions
       end
       alias_method_chain :failure_message_for_should, :errors_on_extensions
       
       def description_with_errors_on_extensions
-        return "should have #{relativities[@relativity]}#{@expected} errors on :#{@args[0]}" if @collection_name == :errors_on
-        return "should have #{relativities[@relativity]}#{@expected} error on :#{@args[0]}" if @collection_name == :error_on
+        return "have #{relativities[@relativity]}#{@expected} errors on :#{@args[0]}" if @collection_name == :errors_on
+        return "have #{relativities[@relativity]}#{@expected} error on :#{@args[0]}"  if @collection_name == :error_on
         return description_without_errors_on_extensions
       end
       alias_method_chain :description, :errors_on_extensions

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

@@ -1,44 +1,46 @@
-module Spec
-  module Rails
-    module Matchers
+if defined?(ActiveRecord::Base)
+  module Spec
+    module Rails
+      module Matchers
     
-      class ArBeValid  #:nodoc:
+        class ArBeValid  #:nodoc:
         
-        def initialize
-          @matcher = Spec::Matchers::Be.new :be_valid
-          @matcher.__send__ :handling_predicate!
-        end
+          def initialize
+            @matcher = Spec::Matchers::Be.new :be_valid
+            @matcher.__send__ :handling_predicate!
+          end
 
-        def matches?(actual)
-          @actual = actual
-          @matcher.matches? @actual
-        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
+          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
-        end
         
-        def failure_message_for_should_not
-          @matcher.failure_message_for_should_not
-        end
+          def failure_message_for_should_not
+            @matcher.failure_message_for_should_not
+          end
         
-        def description
-          "be valid"
+          def description
+            "be valid"
+          end
         end
-      end
 
-      # :call-seq:
-      #   response.should be_valid
-      #   response.should_not be_valid
-      def be_valid
-        ArBeValid.new
-      end
+        # :call-seq:
+        #   response.should be_valid
+        #   response.should_not be_valid
+        def be_valid
+          ArBeValid.new
+        end
     
+      end
     end
   end
 end

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

@@ -1,11 +1,13 @@
-module Spec
-  module Matchers
-    class Change
-      def evaluate_value_proc_with_ensured_evaluation_of_proxy
-        value = evaluate_value_proc_without_ensured_evaluation_of_proxy
-        ActiveRecord::Associations::AssociationProxy === value ? value.dup : value
+if defined?(ActiveRecord::Base)
+  module Spec
+    module Matchers
+      class Change
+        def evaluate_value_proc_with_ensured_evaluation_of_proxy
+          value = evaluate_value_proc_without_ensured_evaluation_of_proxy
+          ActiveRecord::Associations::AssociationProxy === value ? value.dup : value
+        end
+        alias_method_chain :evaluate_value_proc, :ensured_evaluation_of_proxy
       end
-      alias_method_chain :evaluate_value_proc, :ensured_evaluation_of_proxy
     end
   end
 end

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

@@ -33,7 +33,16 @@ module Spec
           return false if @actual.blank?
           given_controller_path, given_file = path_and_file(@actual)
           expected_controller_path, expected_file = path_and_file(@expected)
-          given_controller_path == expected_controller_path && given_file.match(expected_file)
+          given_controller_path == expected_controller_path && match_files(given_file, expected_file)
+        end
+        
+        def match_files(actual, expected)
+          actual_parts = actual.split('.')
+          expected_parts = expected.split('.')
+          expected_parts.each_with_index do |expected_part, index|
+            return false unless expected_part == actual_parts[index]
+          end
+          true
         end
         
         def failure_message_for_should

data/lib/spec/rails/spec_server.rb

@@ -1,3 +1,6 @@
+require 'spec/deprecation'
+Spec.deprecate('spec_server', 'spork (gem install spork)')
+
 if Rails::VERSION::STRING >= '2.2' && Rails.configuration.cache_classes
   raise <<-MESSAGE