dchelimsky-rspec-rails 1.1.12 → 1.1.99.1

data/generators/rspec_scaffold/templates/routing_spec.rb

@@ -2,57 +2,61 @@ require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_dep
 
 describe <%= controller_class_name %>Controller do
   describe "route generation" do
-    it "should map #index" do
+    it "maps #index" do
       route_for(:controller => "<%= table_name %>", :action => "index").should == "/<%= table_name %>"
     end
   
-    it "should map #new" do
+    it "maps #new" do
       route_for(:controller => "<%= table_name %>", :action => "new").should == "/<%= table_name %>/new"
     end
   
-    it "should map #show" do
-      route_for(:controller => "<%= table_name %>", :action => "show", :id => 1).should == "/<%= table_name %>/1"
+    it "maps #show" do
+      route_for(:controller => "<%= table_name %>", :action => "show", :id => "1").should == "/<%= table_name %>/1"
     end
   
-    it "should map #edit" do
-      route_for(:controller => "<%= table_name %>", :action => "edit", :id => 1).should == "/<%= table_name %>/1<%= resource_edit_path %>"
-    end
-  
-    it "should map #update" do
-      route_for(:controller => "<%= table_name %>", :action => "update", :id => 1).should == "/<%= table_name %>/1"
+    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 #update" do
+    route_for(:controller => "<%= table_name %>", :action => "update", :id => "1").should == {:path =>"/<%= table_name %>/1", :method => :put}
+  end
   
-    it "should map #destroy" do
-      route_for(:controller => "<%= table_name %>", :action => "destroy", :id => 1).should == "/<%= table_name %>/1"
+    it "maps #destroy" do
+      route_for(:controller => "<%= table_name %>", :action => "destroy", :id => "1").should == {:path =>"/<%= table_name %>/1", :method => :delete}
     end
   end
 
   describe "route recognition" do
-    it "should generate params for #index" do
+    it "generates params for #index" do
       params_from(:get, "/<%= table_name %>").should == {:controller => "<%= table_name %>", :action => "index"}
     end
   
-    it "should generate params for #new" do
+    it "generates params for #new" do
       params_from(:get, "/<%= table_name %>/new").should == {:controller => "<%= table_name %>", :action => "new"}
     end
   
-    it "should generate params for #create" do
+    it "generates params for #create" do
       params_from(:post, "/<%= table_name %>").should == {:controller => "<%= table_name %>", :action => "create"}
     end
   
-    it "should generate params for #show" do
+    it "generates params for #show" do
       params_from(:get, "/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => "show", :id => "1"}
     end
   
-    it "should generate params for #edit" do
-      params_from(:get, "/<%= table_name %>/1<%= resource_edit_path %>").should == {:controller => "<%= table_name %>", :action => "edit", :id => "1"}
+    it "generates params for #edit" do
+      params_from(:get, "/<%= table_name %>/1/edit").should == {:controller => "<%= table_name %>", :action => "edit", :id => "1"}
     end
   
-    it "should generate params for #update" do
+    it "generates params for #update" do
       params_from(:put, "/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => "update", :id => "1"}
     end
   
-    it "should generate params for #destroy" do
+    it "generates params for #destroy" do
       params_from(:delete, "/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => "destroy", :id => "1"}
     end
   end

data/generators/rspec_scaffold/templates/show_erb_spec.rb

@@ -13,7 +13,7 @@ describe "/<%= table_name %>/show.<%= default_file_extension %>" do
 <% end -%>
   end
 
-  it "should render attributes in <p>" do
+  it "renders attributes in <p>" do
     render "/<%= table_name %>/show.<%= default_file_extension %>"
 <% for attribute in output_attributes -%>
     response.should have_text(/<%= Regexp.escape(attribute.default_value).gsub(/^"|"$/, '')%>/)

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

@@ -61,10 +61,17 @@ module Spec
           end
           
           def inherited(klass) # :nodoc:
-            klass.controller_class_name = controller_class_name
             klass.integrate_views(integrate_views?)
+            klass.subject { controller }
             super
           end
+          
+          def set_description(*args)
+            super
+            if described_class && described_class.ancestors.include?(ActionController::Base)
+              tests described_class
+            end
+          end
 
           # You MUST provide a controller_name within the context of
           # your controller specs:
@@ -73,11 +80,10 @@ module Spec
           #     controller_name :thing
           #     ...
           def controller_name(name)
-            @controller_class_name = "#{name}_controller".camelize
+            tests "#{name}_controller".camelize.constantize
           end
-          attr_accessor :controller_class_name # :nodoc:
         end
-
+        
         before(:each) do
           # Some Rails apps explicitly disable ActionMailer in environment.rb
           if defined?(ActionMailer)
@@ -107,14 +113,26 @@ module Spec
 
         def initialize(defined_description, options={}, &implementation) #:nodoc:
           super
-          controller_class_name = self.class.controller_class_name
-          if controller_class_name
-            @controller_class_name = controller_class_name.to_s
-          else
-            @controller_class_name = self.class.described_type.to_s
-          end
           @integrate_views = self.class.integrate_views?
         end
+        
+        class RouteForMatcher
+          def initialize(example, options)
+            @example, @options = example, options
+          end
+          
+          def ==(expected)
+            if Hash === expected
+              path, querystring = expected[:path].split('?')
+              path = expected.merge(:path => path)
+            else
+              path, querystring = expected.split('?')
+            end
+            params = querystring.blank? ? {} : @example.params_from_querystring(querystring)
+            @example.assert_recognizes(@options, path, params)
+            true
+          end
+        end
 
         # Uses ActionController::Routing::Routes to generate
         # the correct route for a given set of options.
@@ -122,28 +140,40 @@ module Spec
         #   route_for(:controller => 'registrations', :action => 'edit', :id => 1)
         #     => '/registrations/1;edit'
         def route_for(options)
-          ensure_that_routes_are_loaded
-          ActionController::Routing::Routes.generate(options)
+          RouteForMatcher.new(self, options)
         end
 
         # Uses ActionController::Routing::Routes to parse
         # an incoming path so the parameters it generates can be checked
         # == Example
-        #   params_from(:get, '/registrations/1;edit')
+        #   params_from(:get, '/registrations/1/edit')
         #     => :controller => 'registrations', :action => 'edit', :id => 1
         def params_from(method, path)
           ensure_that_routes_are_loaded
-          ActionController::Routing::Routes.recognize_path(path, :method => method)
+          path, querystring = path.split('?')
+          params = ActionController::Routing::Routes.recognize_path(path, :method => method)
+          querystring.blank? ? params : params.merge(params_from_querystring(querystring))
         end
 
-        protected
+        def params_from_querystring(querystring) # :nodoc:
+          params = {}
+          querystring.split('&').each do |piece|
+            key, value = piece.split('=')
+            params[key.to_sym] = value
+          end
+          params
+        end
+
+      protected
+
         def _assigns_hash_proxy
           @_assigns_hash_proxy ||= AssignsHashProxy.new self do
             @response.template
           end
         end
 
-        private
+      private
+
         def ensure_that_routes_are_loaded
           ActionController::Routing::Routes.reload if ActionController::Routing::Routes.empty?
         end

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

@@ -1,21 +1,15 @@
+require 'action_controller/test_case'
+
 module Spec
   module Rails
     module Example
-      class FunctionalExampleGroup < RailsExampleGroup
-        include ActionController::TestProcess
-        include ActionController::Assertions
+      class FunctionalExampleGroup < ActionController::TestCase
+        def setup
+          # no-op to override AC::TC's setup w/ conflicts with the before(:each) below
+        end
 
         attr_reader :request, :response
-        before(:each) do
-          @controller_class = @controller_class_name.split('::').inject(Object) { |k,n| k.const_get n }
-          raise "Can't determine controller class for #{@controller_class_name}" if @controller_class.nil?
 
-          @controller = @controller_class.new
-          @request = ActionController::TestRequest.new
-          @response = ActionController::TestResponse.new
-          @response.session = @request.session
-        end
-        
         def params
           request.parameters
         end
@@ -25,7 +19,7 @@ module Spec
         end
 
         def session
-          response.session
+          request.session
         end
         
         # Overrides the <tt>cookies()</tt> method in
@@ -35,15 +29,6 @@ module Spec
         # cookies in examples using the same API with which you set and read
         # them in controllers.
         #
-        # == Examples (Rails >= 1.2.6)
-        #
-        #   cookies[:user_id] = '1234'
-        #   get :index
-        #   assigns[:user].id.should == '1234'
-        #
-        #   post :login
-        #   cookies[:login].expires.should == 1.week.from_now
-        #
         # == Examples (Rails 2.0 > 2.2)
         #
         #   cookies[:user_id] = {:value => '1234', :expires => 1.minute.ago}

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

@@ -1,6 +1,10 @@
 module Spec
   module Rails
     module Example
+      class HelperExampleGroupController < ApplicationController #:nodoc:
+        attr_accessor :request, :url
+      end
+
       # Helper Specs live in $RAILS_ROOT/spec/helpers/.
       #
       # Helper Specs use Spec::Rails::Example::HelperExampleGroup, which allows you to
@@ -12,7 +16,7 @@ module Spec
       #
       # == Example
       #
-      #   class ThingHelper
+      #   module ThingHelper
       #     def number_of_things
       #       Thing.count
       #     end
@@ -26,6 +30,7 @@ module Spec
       #     end
       #   end
       class HelperExampleGroup < FunctionalExampleGroup
+        tests HelperExampleGroupController
         attr_accessor :output_buffer
         
         class HelperObject < ActionView::Base
@@ -109,10 +114,6 @@ module Spec
           include mod if mod.parents.include?(ActionView::Helpers)
         end
 
-        before(:all) do
-          @controller_class_name = 'Spec::Rails::Example::HelperExampleGroupController'
-        end
-
         before(:each) do
           @controller.request = @request
           @controller.url = ActionController::UrlRewriter.new @request, {} # url_for
@@ -162,10 +163,6 @@ module Spec
         end
 
       end
-
-      class HelperExampleGroupController < ApplicationController #:nodoc:
-        attr_accessor :request, :url
-      end
     end
   end
 end

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

@@ -6,7 +6,7 @@ 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 < RailsExampleGroup
+      class ModelExampleGroup < ActiveSupport::TestCase
         Spec::Example::ExampleGroupFactory.register(:model, self)
       end
     end

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

@@ -8,32 +8,6 @@ module Spec
       # and template and view examples
       module RenderObserver
 
-        # DEPRECATED
-        #
-        # Use should_receive(:render).with(opts) instead
-        def expect_render(opts={})
-          warn_deprecation("expect_render", "should_receive")
-          register_verify_after_each
-          render_proxy.should_receive(:render, :expected_from => caller(1)[0]).with(opts)
-        end
-
-        # DEPRECATED
-        #
-        # Use stub!(:render).with(opts) instead
-        def stub_render(opts={})
-          warn_deprecation("stub_render", "stub!")
-          register_verify_after_each
-          render_proxy.stub!(:render, :expected_from => caller(1)[0]).with(opts)
-        end
-        
-        def warn_deprecation(deprecated_method, new_method)
-          Kernel.warn <<-WARNING
-#{deprecated_method} is deprecated and will be removed from a future version of rspec-rails.
-
-Please just use object.#{new_method} instead.
-WARNING
-        end
-  
         def verify_rendered # :nodoc:
           render_proxy.rspec_verify
         end

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

@@ -1,6 +1,29 @@
 module Spec
   module Rails
     module Example
+      class ViewExampleGroupController < ApplicationController #:nodoc:
+        include Spec::Rails::Example::RenderObserver
+        attr_reader :template
+
+        def add_helper_for(template_path)
+          add_helper(template_path.split('/')[0])
+        end
+
+        def add_helper(name)
+          begin
+            helper_module = "#{name}_helper".camelize.constantize
+          rescue
+            return
+          end
+          (class << template; self; end).class_eval do
+            include helper_module
+          end
+        end
+        
+        def forget_variables_added_to_assigns
+        end
+      end
+
       # View Examples live in $RAILS_ROOT/spec/views/.
       #
       # View Specs use Spec::Rails::Example::ViewExampleGroup,
@@ -24,22 +47,21 @@ module Spec
       #     end
       #   end
       class ViewExampleGroup < FunctionalExampleGroup
-        before(:each) do
-          ensure_that_flash_and_session_work_properly
-        end
-
-        after(:each) do
-          ensure_that_base_view_path_is_not_set_across_example_groups
+        tests ViewExampleGroupController
+        class << self
+          def inherited(klass) # :nodoc:
+            klass.subject { template }
+            super
+          end
         end
 
-        def initialize(defined_description, options={}, &implementation) #:nodoc:
-          super
-          @controller_class_name = "Spec::Rails::Example::ViewExampleGroupController"
-        end
+        before {ensure_that_flash_and_session_work_properly}
+        after {ensure_that_base_view_path_is_not_set_across_example_groups}
 
         def ensure_that_flash_and_session_work_properly #:nodoc:
           @controller.send :initialize_template_class, @response
           @controller.send :assign_shortcuts, @request, @response
+          @controller.send :initialize_current_url
           @session = @controller.session
           @controller.class.send :public, :flash
         end
@@ -114,8 +136,6 @@ module Spec
 
           @controller.send(:params).reverse_merge! @request.parameters
 
-          @controller.send :initialize_current_url
-
           @controller.class.instance_eval %{
             def controller_path
               "#{derived_controller_name(options)}"
@@ -156,28 +176,6 @@ module Spec
         end
       end
 
-      class ViewExampleGroupController < ApplicationController #:nodoc:
-        include Spec::Rails::Example::RenderObserver
-        attr_reader :template
-
-        def add_helper_for(template_path)
-          add_helper(template_path.split('/')[0])
-        end
-
-        def add_helper(name)
-          begin
-            helper_module = "#{name}_helper".camelize.constantize
-          rescue
-            return
-          end
-          (class << template; self; end).class_eval do
-            include helper_module
-          end
-        end
-        
-        def forget_variables_added_to_assigns
-        end
-      end
     end
   end
 end

data/lib/spec/rails/example.rb

@@ -1,9 +1,7 @@
 dir = File.dirname(__FILE__)
 
 require 'spec/rails/example/assigns_hash_proxy'
-
 require "spec/rails/example/render_observer"
-require "spec/rails/example/rails_example_group"
 require "spec/rails/example/model_example_group"
 require "spec/rails/example/functional_example_group"
 require "spec/rails/example/controller_example_group"

data/lib/spec/rails/extensions/active_support/test_case.rb

@@ -0,0 +1,7 @@
+module ActiveSupport
+  class TestCase
+    include Spec::Rails::Matchers
+    include Spec::Rails::Mocks
+  end
+end
+

data/lib/spec/rails/extensions/spec/runner/configuration.rb

@@ -1,76 +1,44 @@
 require 'spec/runner/configuration'
 require 'test_help'
 
-begin
-module Spec
-  module Runner
-    class Configuration
+if defined?(ActiveRecord::Base)
+  module Spec
+    module Runner
+      class Configuration
       
-      TEST_CASE = ActiveSupport.const_defined?(:TestCase) ? ActiveSupport::TestCase : Test::Unit::TestCase
-      
-      # Rails 1.2.3 does a copy of the @inheritable_attributes to the subclass when the subclass is
-      # created. This causes an ordering issue when setting state on Configuration because the data is
-      # already copied.
-      # Iterating over EXAMPLE_GROUP_CLASSES causes the base ExampleGroup classes to have their
-      # @inheritable_attributes updated.
-      # TODO: BT - When we no longer support Rails 1.2.3, we can remove this functionality
-      EXAMPLE_GROUP_CLASSES = [
-        TEST_CASE,
-        ::Spec::Rails::Example::RailsExampleGroup,
-        ::Spec::Rails::Example::FunctionalExampleGroup,
-        ::Spec::Rails::Example::ControllerExampleGroup,
-        ::Spec::Rails::Example::ViewExampleGroup,
-        ::Spec::Rails::Example::HelperExampleGroup,
-        ::Spec::Rails::Example::ModelExampleGroup
-      ]
-      # All of this is ActiveRecord related and makes no sense if it's not used by the app
-      if defined?(ActiveRecord::Base)
         def initialize
           super
           self.fixture_path = RAILS_ROOT + '/spec/fixtures'
         end
 
         def use_transactional_fixtures
-          TEST_CASE.use_transactional_fixtures
+          ActiveSupport::TestCase.use_transactional_fixtures
         end
         def use_transactional_fixtures=(value)
-          EXAMPLE_GROUP_CLASSES.each do |example_group|
-            example_group.use_transactional_fixtures = value
-          end
+          ActiveSupport::TestCase.use_transactional_fixtures = value
         end
 
         def use_instantiated_fixtures
-          TEST_CASE.use_instantiated_fixtures
+          ActiveSupport::TestCase.use_instantiated_fixtures
         end
         def use_instantiated_fixtures=(value)
-          EXAMPLE_GROUP_CLASSES.each do |example_group|
-            example_group.use_instantiated_fixtures = value
-          end
+          ActiveSupport::TestCase.use_instantiated_fixtures = value
         end
 
         def fixture_path
-          TEST_CASE.fixture_path
+          ActiveSupport::TestCase.fixture_path
         end
         def fixture_path=(path)
-          EXAMPLE_GROUP_CLASSES.each do |example_group|
-            example_group.fixture_path = path
-          end
+          ActiveSupport::TestCase.fixture_path = path
         end
 
         def global_fixtures
-          TEST_CASE.fixture_table_names
+          ActiveSupport::TestCase.fixture_table_names
         end
         def global_fixtures=(fixtures)
-          EXAMPLE_GROUP_CLASSES.each do |example_group|
-            example_group.fixtures(*fixtures)
-          end
+          ActiveSupport::TestCase.fixtures(*fixtures)
         end
       end
     end
   end
 end
-rescue Exception => e
-  puts e.message
-  puts e.backtrace
-  raise e
-end

data/lib/spec/rails/extensions.rb

@@ -3,8 +3,8 @@ require 'spec'
 require 'spec/rails/extensions/spec/runner/configuration'
 require 'spec/rails/extensions/spec/matchers/have'
 
+require 'spec/rails/extensions/active_support/test_case'
 require 'spec/rails/extensions/active_record/base'
-require 'spec/rails/extensions/action_controller/base'
 require 'spec/rails/extensions/action_controller/rescue'
 require 'spec/rails/extensions/action_controller/test_response'
 require 'spec/rails/extensions/action_view/base'

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

@@ -27,6 +27,9 @@ module Spec
           @matcher.negative_failure_message
         end
         
+        def description
+          "be valid"
+        end
       end
 
       # :call-seq:

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

@@ -22,7 +22,7 @@ module Spec
           "expected not to have text #{expected.inspect}"
         end
         
-        def to_s
+        def description
           "have text #{expected.inspect}"
         end
       

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

@@ -21,7 +21,7 @@ module Spec
           "expected not to include text #{expected.inspect}"
         end
 
-        def to_s
+        def description
           "include text #{expected.inspect}"
         end
 
@@ -51,4 +51,4 @@ module Spec
 
     end
   end
-end
+end

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

@@ -11,7 +11,11 @@ module Spec
           @request = request
         end
 
-        def matches?(response)
+        def matches?(response_or_controller)
+          response  = response_or_controller.respond_to?(:response) ?
+                      response_or_controller.response :
+                      response_or_controller
+
           @redirected = response.redirect?
           @actual = response.redirect_url
           return false unless @redirected
@@ -55,7 +59,7 @@ module Spec
 
         def query_hash(url)
           query = url.split("?", 2)[1] || ""
-          QueryParameterParser.parse_query_parameters(query, @request)
+          Rack::Utils.parse_query(query)
         end
 
         def with(options)
@@ -95,18 +99,6 @@ module Spec
         def description
           "redirect to #{@expected.inspect}"
         end
-
-        class QueryParameterParser
-          def self.parse_query_parameters(query, request)
-            if defined?(CGIMethods)
-              CGIMethods.parse_query_parameters(query)
-            elsif defined?(ActionController::RequestParser)
-              ActionController::RequestParser.parse_query_parameters(query)
-            else
-              request.class.parse_query_parameters(query)
-            end
-          end
-        end
       end
 
       # :call-seq:

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

@@ -9,7 +9,11 @@ module Spec
           @expected = expected
         end
       
-        def matches?(response)
+        def matches?(response_or_controller)
+          response  = response_or_controller.respond_to?(:response) ?
+                      response_or_controller.response :
+                      response_or_controller
+
           if response.respond_to?(:rendered_file)
             @actual = response.rendered_file
           elsif response.respond_to?(:rendered)