rspec-rails 2.0.0.a5 → 2.0.0.a6

data/README.markdown

@@ -34,7 +34,9 @@ Currently supported:
 
 * each example runs in its own transaction
   * not yet configurable
+    * i.e. no way to turn this off
 * model specs in spec/models
+* controller specs in spec/controllers
 * request specs in spec/requests
   * these wrap rails integration tests
 * rails assertions
@@ -43,7 +45,6 @@ Currently supported:
 
 ### Known issues
 
-* no controller specs
 * no view specs
 * no helper specs
 * no routing specs

data/Rakefile

@@ -18,7 +18,7 @@ begin
     gem.homepage = "http://github.com/rspec/rspec-rails"
     gem.authors = ["David Chelimsky", "Chad Humphries"]
     gem.add_dependency "rspec", ">= 2.0.0.a5"
-    gem.add_dependency "webrat", "0.7.0"
+    gem.add_dependency "webrat", ">= 0.7.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/example_app_template.rb

@@ -8,7 +8,7 @@ run('bundle install')
 
 run('script/rails g rspec:install')
 # run('script/rails g model thing name:string')
-run('script/rails g scaffold wombats name:string')
+run('script/rails g scaffold widgets name:string')
 # run('script/rails g controller widgets index')
 # run('script/rails g integration_test widgets')
 

data/lib/generators/rspec/controller/controller_generator.rb

@@ -6,7 +6,7 @@ module Rspec
       argument :actions, :type => :array, :default => [], :banner => "action action"
 
       class_option :template_engine, :desc => "Template engine to generate view files"
-      class_option :controllers, :type => :boolean, :default => false
+      class_option :controllers, :type => :boolean, :default => true
       class_option :views,       :type => :boolean, :default => false
 
       def create_controller_files

data/lib/generators/rspec/install/templates/config/initializers/rspec_generator.rb.tt

@@ -6,7 +6,6 @@
     g.integration_tool :rspec
     g.test_framework   :rspec,
                        :fixture     => false,
-                       :controllers => false,
                        :views       => false,
                        :helpers     => false,
                        :routes      => false,

data/lib/generators/rspec/scaffold/scaffold_generator.rb

@@ -11,7 +11,7 @@ module Rspec
       class_option :template_engine, :desc => "Template engine to generate view files"
       class_option :singleton, :type => :boolean, :desc => "Supply to create a singleton controller"
 
-      class_option :controllers, :type => :boolean, :default => false
+      class_option :controllers, :type => :boolean, :default => true
       class_option :views,       :type => :boolean, :default => false
       class_option :routes,      :type => :boolean, :default => false
 

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

@@ -3,40 +3,40 @@ require 'spec_helper'
 describe <%= controller_class_name %>Controller do
 
   def <%= mock_file_name %>(stubs={})
-    @<%= mock_file_name %> ||= mock_model(<%= class_name %>, stubs)
+    @<%= mock_file_name %> ||= mock_model(<%= class_name %>, stubs).as_null_object
   end
 
   <% unless options[:singleton] -%>
   describe "GET index" do
     it "assigns all <%= table_name.pluralize %> as @<%= table_name.pluralize %>" do
-      <%= stub orm_class.all(class_name) %>.and_return([<%= mock_file_name %>])
+      <%= stub! orm_class.all(class_name) %>.and_return([<%= mock_file_name %>])
       get :index
-      assigns[:<%= table_name %>].should == [<%= mock_file_name %>]
+      assigns(:<%= table_name %>).should == [<%= mock_file_name %>]
     end
   end
   <% end -%>
 
   describe "GET show" do
     it "assigns the requested <%= file_name %> as @<%= file_name %>" do
-      <%= stub orm_class.find(class_name, "37".inspect) %>.and_return(<%= mock_file_name %>)
+      <%= stub! orm_class.find(class_name, "37".inspect) %>.and_return(<%= mock_file_name %>)
       get :show, :id => "37"
-      assigns[:<%= file_name %>].should equal(<%= mock_file_name %>)
+      assigns(:<%= file_name %>).should equal(<%= mock_file_name %>)
     end
   end
 
   describe "GET new" do
     it "assigns a new <%= file_name %> as @<%= file_name %>" do
-      <%= stub orm_class.build(class_name) %>.and_return(<%= mock_file_name %>)
+      <%= stub! orm_class.build(class_name) %>.and_return(<%= mock_file_name %>)
       get :new
-      assigns[:<%= file_name %>].should equal(<%= mock_file_name %>)
+      assigns(:<%= file_name %>).should equal(<%= mock_file_name %>)
     end
   end
 
   describe "GET edit" do
     it "assigns the requested <%= file_name %> as @<%= file_name %>" do
-      <%= stub orm_class.find(class_name, "37".inspect) %>.and_return(<%= mock_file_name %>)
+      <%= stub! orm_class.find(class_name, "37".inspect) %>.and_return(<%= mock_file_name %>)
       get :edit, :id => "37"
-      assigns[:<%= file_name %>].should equal(<%= mock_file_name %>)
+      assigns(:<%= file_name %>).should equal(<%= mock_file_name %>)
     end
   end
 
@@ -44,13 +44,13 @@ describe <%= controller_class_name %>Controller do
 
     describe "with valid params" do
       it "assigns a newly created <%= file_name %> as @<%= file_name %>" do
-        <%= stub orm_class.build(class_name, params) %>.and_return(<%= mock_file_name(:save => true) %>)
+        <%= stub! orm_class.build(class_name, params) %>.and_return(<%= mock_file_name(:save => true) %>)
         post :create, :<%= file_name %> => <%= params %>
-        assigns[:<%= file_name %>].should equal(<%= mock_file_name %>)
+        assigns(:<%= file_name %>).should equal(<%= mock_file_name %>)
       end
 
       it "redirects to the created <%= file_name %>" do
-        <%= stub orm_class.build(class_name) %>.and_return(<%= mock_file_name(:save => true) %>)
+        <%= stub! orm_class.build(class_name) %>.and_return(<%= mock_file_name(:save => true) %>)
         post :create, :<%= file_name %> => {}
         response.should redirect_to(<%= table_name.singularize %>_url(<%= mock_file_name %>))
       end
@@ -58,13 +58,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
-        <%= stub orm_class.build(class_name, params) %>.and_return(<%= mock_file_name(:save => false) %>)
+        <%= stub! orm_class.build(class_name, params) %>.and_return(<%= mock_file_name(:save => false) %>)
         post :create, :<%= file_name %> => <%= params %>
-        assigns[:<%= file_name %>].should equal(<%= mock_file_name %>)
+        assigns(:<%= file_name %>).should equal(<%= mock_file_name %>)
       end
 
       it "re-renders the 'new' template" do
-        <%= stub orm_class.build(class_name) %>.and_return(<%= mock_file_name(:save => false) %>)
+        <%= stub! orm_class.build(class_name) %>.and_return(<%= mock_file_name(:save => false) %>)
         post :create, :<%= file_name %> => {}
         response.should render_template('new')
       end
@@ -76,19 +76,19 @@ describe <%= controller_class_name %>Controller do
 
     describe "with valid params" do
       it "updates the requested <%= file_name %>" do
-        <%= should! orm_class.find(class_name, "37".inspect) %>.and_return(<%= mock_file_name %>)
-        mock_<%= should! orm_instance.update_attributes(params) %>
+        <%= should_receive! orm_class.find(class_name, "37".inspect) %>.and_return(<%= mock_file_name %>)
+        mock_<%= should_receive! orm_instance.update_attributes(params) %>
         put :update, :id => "37", :<%= file_name %> => <%= params %>
       end
 
       it "assigns the requested <%= file_name %> as @<%= file_name %>" do
-        <%= stub orm_class.find(class_name) %>.and_return(<%= mock_file_name(:update_attributes => true) %>)
+        <%= stub! orm_class.find(class_name) %>.and_return(<%= mock_file_name(:update_attributes => true) %>)
         put :update, :id => "1"
-        assigns[:<%= file_name %>].should equal(<%= mock_file_name %>)
+        assigns(:<%= file_name %>).should equal(<%= mock_file_name %>)
       end
 
       it "redirects to the <%= file_name %>" do
-        <%= stub orm_class.find(class_name) %>.and_return(<%= mock_file_name(:update_attributes => true) %>)
+        <%= stub! orm_class.find(class_name) %>.and_return(<%= mock_file_name(:update_attributes => true) %>)
         put :update, :id => "1"
         response.should redirect_to(<%= table_name.singularize %>_url(<%= mock_file_name %>))
       end
@@ -96,13 +96,13 @@ describe <%= controller_class_name %>Controller do
 
     describe "with invalid params" do
       it "assigns the <%= file_name %> as @<%= file_name %>" do
-        <%= stub orm_class.find(class_name) %>.and_return(<%= mock_file_name(:update_attributes => false) %>)
+        <%= stub! orm_class.find(class_name) %>.and_return(<%= mock_file_name(:update_attributes => false) %>)
         put :update, :id => "1"
-        assigns[:<%= file_name %>].should equal(<%= mock_file_name %>)
+        assigns(:<%= file_name %>).should equal(<%= mock_file_name %>)
       end
 
       it "re-renders the 'edit' template" do
-        <%= stub orm_class.find(class_name) %>.and_return(<%= mock_file_name(:update_attributes => false) %>)
+        <%= stub! orm_class.find(class_name) %>.and_return(<%= mock_file_name(:update_attributes => false) %>)
         put :update, :id => "1"
         response.should render_template('edit')
       end
@@ -112,13 +112,13 @@ describe <%= controller_class_name %>Controller do
 
   describe "DELETE destroy" do
     it "destroys the requested <%= file_name %>" do
-      <%= should! orm_class.find(class_name, "37".inspect) %>.and_return(<%= mock_file_name %>)
-      mock_<%= should! orm_instance.destroy %>
+      <%= should_receive! orm_class.find(class_name, "37".inspect) %>.and_return(<%= mock_file_name %>)
+      mock_<%= should_receive! orm_instance.destroy %>
       delete :destroy, :id => "37"
     end
 
     it "redirects to the <%= table_name %> list" do
-      <%= stub orm_class.find(class_name) %>.and_return(<%= mock_file_name(:destroy => true) %>)
+      <%= stub! orm_class.find(class_name) %>.and_return(<%= mock_file_name(:destroy => true) %>)
       delete :destroy, :id => "1"
       response.should redirect_to(<%= table_name %>_url)
     end

data/lib/rspec/rails.rb

@@ -1,3 +1,4 @@
 require 'rspec/rails/transactional_database_support'
 require 'rspec/rails/matchers'
 require 'rspec/rails/example'
+require 'rspec/rails/mocks'

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

@@ -20,12 +20,12 @@ module ControllerExampleGroupBehaviour
     eval <<-CODE
       def #{method}(*args)
         @_action = args.shift
-        super '/'
+        super '/', *args
       end
     CODE
   end
 
   Rspec::Core.configure do |c|
-    c.include self, :example_group => { :file_path => /\/spec\/controllers\// }
+    c.include self, :example_group => { :file_path => /\bspec\/controllers\// }
   end
 end

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

@@ -21,6 +21,6 @@ module RequestExampleGroupBehaviour
   end
   
   Rspec::Core.configure do |c|
-    c.include self, :example_group => { :file_path => /\/spec\/requests\// }
+    c.include self, :example_group => { :file_path => /\bspec\/requests\// }
   end
 end

data/lib/rspec/rails/matchers.rb

@@ -1,4 +1,5 @@
 require 'rspec/matchers'
+require 'test/unit/assertionfailederror'
 
 module Rspec
   module Rails
@@ -6,11 +7,20 @@ module Rspec
       def redirect_to(destination)
         example = self
         Rspec::Matchers::Matcher.new :redirect_to, destination do |destination_|
-          match do |_|
+          match_unless_raises Test::Unit::AssertionFailedError do |_|
             example.assert_redirected_to destination_
           end
         end
       end
+
+      def render_template(options={}, message=nil)
+        example = self
+        Rspec::Matchers::Matcher.new :render_template, options, message do |options_, message_|
+          match_unless_raises Test::Unit::AssertionFailedError do |_|
+            example.assert_template options_, message_
+          end
+        end
+      end
     end
   end
 end

data/lib/rspec/rails/mocks.rb

@@ -0,0 +1,131 @@
+module Rspec
+  module Rails
+
+    class IllegalDataAccessException < StandardError; end
+
+    module Mocks
+      
+      # Creates a mock object instance for a +model_class+ with common
+      # methods stubbed out. Additional methods may be easily stubbed (via
+      # add_stubs) if +stubs+ is passed.
+      def mock_model(model_class, options_and_stubs = {})
+        id = options_and_stubs[:id] || next_id
+        options_and_stubs = options_and_stubs.reverse_merge({
+          :id => id,
+          :to_param => id.to_s,
+          :new_record? => false,
+          :destroyed? => false,
+          :errors => stub("errors", :count => 0)
+        })
+        derived_name = "#{model_class.name}_#{id}"
+        m = mock(derived_name, options_and_stubs)
+        m.__send__(:__mock_proxy).instance_eval <<-CODE
+          def @target.as_new_record
+            self.stub(:id) { nil }
+            self.stub(:to_param) { nil }
+            self.stub(:new_record?) { true }
+            self
+          end
+          def @target.is_a?(other)
+            #{model_class}.ancestors.include?(other)
+          end
+          def @target.kind_of?(other)
+            #{model_class}.ancestors.include?(other)
+          end
+          def @target.instance_of?(other)
+            other == #{model_class}
+          end
+          def @target.class
+            #{model_class}
+          end
+          def @target.to_s
+            "#{model_class.name}_#{id}"
+          end
+        CODE
+        yield m if block_given?
+        m
+      end
+      
+      module ModelStubber
+        def connection
+          raise Spec::Rails::IllegalDataAccessException.new("stubbed models are not allowed to access the database")
+        end
+        def new_record?
+          id.nil?
+        end
+        def as_new_record
+          self.id = nil
+          self
+        end
+      end
+
+      # :call-seq:
+      #   stub_model(Model)
+      #   stub_model(Model).as_new_record
+      #   stub_model(Model, hash_of_stubs)
+      #   stub_model(Model, instance_variable_name, hash_of_stubs)
+      #
+      # Creates an instance of +Model+ that is prohibited from accessing the
+      # database*. For each key in +hash_of_stubs+, if the model has a
+      # matching attribute (determined by asking it) are simply assigned the
+      # submitted values. If the model does not have a matching attribute, the
+      # key/value pair is 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
+      # 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
+      # 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)
+      #   stub_model(Person).as_new_record
+      #   stub_model(Person, :id => 37)
+      #   stub_model(Person) do |person|
+      #     person.first_name = "David"
+      #   end
+      def stub_model(model_class, stubs={})
+        stubs = {:id => next_id}.merge(stubs)
+        returning model_class.new do |m|
+          m.id = stubs.delete(:id)
+          m.extend ModelStubber
+          stubs.each do |k,v|
+            if m.has_attribute?(k)
+              m[k] = stubs.delete(k)
+            end
+          end
+          m.stub!(stubs)
+          yield m if block_given?
+        end
+      end
+      
+    private
+
+      @@model_id = 1000
+
+      def next_id
+        @@model_id += 1
+      end
+
+    end
+  end
+end
+
+Rspec::Core.configure do |c|
+  c.include Rspec::Rails::Mocks
+end

data/lib/rspec/rails/version.rb

@@ -5,7 +5,7 @@ module Rspec # :nodoc:
         MAJOR  = 2
         MINOR  = 0
         TINY   = 0
-        PRE    = 'a5'
+        PRE    = 'a6'
 
         STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
 

data/rspec-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "2.0.0.a5"
+  s.version = "2.0.0.a6"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Chelimsky", "Chad Humphries"]
-  s.date = %q{2010-02-07}
+  s.date = %q{2010-02-08}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
     "README.markdown"
@@ -56,6 +56,7 @@ Gem::Specification.new do |s|
      "lib/rspec/rails/example/controller_example_group.rb",
      "lib/rspec/rails/example/request_example_group.rb",
      "lib/rspec/rails/matchers.rb",
+     "lib/rspec/rails/mocks.rb",
      "lib/rspec/rails/transactional_database_support.rb",
      "lib/rspec/rails/version.rb",
      "rspec-rails.gemspec"
@@ -72,14 +73,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rspec>, [">= 2.0.0.a5"])
-      s.add_runtime_dependency(%q<webrat>, ["= 0.7.0"])
+      s.add_runtime_dependency(%q<webrat>, [">= 0.7.0"])
     else
       s.add_dependency(%q<rspec>, [">= 2.0.0.a5"])
-      s.add_dependency(%q<webrat>, ["= 0.7.0"])
+      s.add_dependency(%q<webrat>, [">= 0.7.0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 2.0.0.a5"])
-    s.add_dependency(%q<webrat>, ["= 0.7.0"])
+    s.add_dependency(%q<webrat>, [">= 0.7.0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  version: 2.0.0.a5
+  version: 2.0.0.a6
 platform: ruby
 authors: 
 - David Chelimsky
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-07 00:00:00 -04:00
+date: 2010-02-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,7 +29,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 0.7.0
     version: 
@@ -83,6 +83,7 @@ files:
 - lib/rspec/rails/example/controller_example_group.rb
 - lib/rspec/rails/example/request_example_group.rb
 - lib/rspec/rails/matchers.rb
+- lib/rspec/rails/mocks.rb
 - lib/rspec/rails/transactional_database_support.rb
 - lib/rspec/rails/version.rb
 - rspec-rails.gemspec