rspec-rails 2.0.0.beta.7 → 2.0.0.beta.8

data/README.markdown

@@ -27,7 +27,7 @@ Configure:
 
 Add this line to the Gemfile:
 
-    gem "rspec-rails", ">= 2.0.0.beta.1"
+    gem "rspec-rails", ">= 2.0.0.beta.8"
 
 This will expose generators, including rspec:install. Now you can run: 
 
@@ -44,8 +44,8 @@ doesn't work all that well yet.
 Currently supported:
 
 * each example runs in its own transaction
-  * not yet configurable
-    * i.e. no way to turn this off
+  * configurable in Rspec.configure
+    * see generated spec/spec_helper.rb
 * model specs in spec/models
 * controller specs in spec/controllers
   * no view isolation yet
@@ -71,14 +71,26 @@ Currently supported:
 
 ## Controller Specs
 
-Controller specs live in spec/controllers, and include
-behavior from ActionDispatch::Integration::Runner. The
-format for a request is:
+Controller specs live in spec/controllers, and mix in
+ActionController::TestCase::Behavior. See the documentation
+for ActionController::TestCase to see what facilities are
+available from Rails.
 
-    # get action, params, headers
-    get :show, {:id => '37'}, {'HTTP_ACCEPT' => Mime::JS}
+You can use RSpec expectations/matchers or Test::Unit assertions.
 
-This works for `get`, `post`, `put`, `delete`, `head`.
+In addition to what Rails offers, controller specs provide all
+of rspec-core's matchers and the rspec-rails' specific matchers
+as well.
+
+## Matchers
+
+### render_template
+Delegates to Rails' assert_template:
+
+    response.should render_template("new")
+
+### redirect_to
+Delegates to assert_redirect
+
+    response.should redirect_to(widgets_path)
 
-After a request is made, you set expectations on the `request` and `response`
-objects.

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.7
+2.0.0.beta.8

data/features/view_specs/view_spec.feature

@@ -0,0 +1,53 @@
+Feature: view spec
+
+  View specs live in spec/views and render view templates in isolation.
+
+  Scenario: passing spec
+    Given a file named "spec/views/widgets/index.html.erb_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe "widgets/index.html.erb" do
+        it "displays all the widgets" do
+          assign(:widgets, [
+            stub_model(Widget, :name => "slicer"),
+            stub_model(Widget, :name => "dicer")
+          ])
+
+          render
+
+          response.should contain("slicer")
+          response.should contain("dicer")
+        end
+      end
+      """
+    When I run "rspec spec/views"
+    Then I should see "1 example, 0 failures"
+
+  Scenario: passing spec with before and nesting
+    Given a file named "spec/views/widgets/index.html.erb_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe "widgets/index.html.erb" do
+
+        context "with 2 widgets" do
+          before(:each) do
+            assign(:widgets, [
+              stub_model(Widget, :name => "slicer"),
+              stub_model(Widget, :name => "dicer")
+            ])
+          end
+
+          it "displays both widgets" do
+            render
+
+            response.should contain("slicer")
+            response.should contain("dicer")
+          end
+        end
+      end
+      """
+    When I run "rspec spec/views"
+    Then I should see "1 example, 0 failures"
+

data/lib/generators/rspec/install/templates/lib/tasks/rspec.rake

@@ -28,7 +28,7 @@ end
 
 Rake.application.instance_variable_get('@tasks').delete('default')
 
-spec_prereq = File.exist?(File.join(Rails.root, 'config', 'database.yml')) ? "db:test:prepare" : :noop
+spec_prereq = Rails.root.join('config', 'database.yml').exist? ? "db:test:prepare" : :noop
 task :noop do
 end
 

data/lib/generators/rspec/install/templates/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 # This file is copied to ~/spec when you run 'ruby script/generate rspec'
 # from the project root directory.
 ENV["RAILS_ENV"] ||= 'test'
-require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)
+require File.dirname(__FILE__) + "/../config/environment" unless defined?(Rails)
 require 'rspec/rails'
 
 # Requires supporting files with custom matchers and macros, etc,
@@ -20,5 +20,5 @@ Rspec.configure do |config|
 
   # If you'd prefer not to run each of your examples within a transaction,
   # uncomment the following line.
-  # config.use_transactional_examples false
+  # config.use_transactional_examples = false
 end

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

@@ -66,7 +66,7 @@ describe <%= controller_class_name %>Controller do
       it "re-renders the 'new' template" do
         <%= stub! orm_class.build(class_name) %> { <%= mock_file_name(:save => false) %> }
         post :create, :<%= file_name %> => {}
-        response.should render_template(:new)
+        response.should render_template("new")
       end
     end
 
@@ -104,7 +104,7 @@ describe <%= controller_class_name %>Controller do
       it "re-renders the 'edit' template" do
         <%= stub! orm_class.find(class_name) %> { <%= mock_file_name(:update_attributes => false) %> }
         put :update, :id => "1"
-        response.should render_template(:edit)
+        response.should render_template("edit")
       end
     end
 

data/lib/rspec/rails.rb

@@ -1,3 +1,5 @@
+require 'rspec/rails/monkey'
+require 'rspec/rails/adapters'
 require 'rspec/rails/transactional_database_support'
 require 'rspec/rails/matchers'
 require 'rspec/rails/example'

data/lib/rspec/rails/adapters.rb

@@ -0,0 +1,28 @@
+require 'active_support/concern'
+require 'test/unit/assertions'
+
+module Rspec
+  module Rails
+    module SetupAndTeardownAdapter
+      def setup(*methods)
+        methods.each {|method| before { send method } }
+      end
+
+      def teardown(*methods)
+        methods.each {|method| after { send method } }
+      end
+    end
+
+    module TestUnitAssertionAdapter
+      extend ActiveSupport::Concern
+
+      included do
+        include Test::Unit::Assertions
+
+        before do
+          @_result = Struct.new(:add_assertion).new
+        end
+      end
+    end
+  end
+end

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

@@ -1,53 +1,32 @@
-require 'active_support/core_ext/class/attribute_accessors'
 require 'action_controller'
-require 'action_dispatch'
 require 'webrat'
 
-# Preliminary documentation (more to come ....):
-#
-#   allow_forgery_protection is set to false
-#   - you can set it to true in a before(:each) block
-#     if you have a specific example that needs it, but
-#     be sure to restore it to false (or supply tokens
-#     to all of your example requests)
-
 module ControllerExampleGroupBehaviour
-  include ActionDispatch::Assertions
-  include ActionDispatch::Integration::Runner
-  include Webrat::Matchers
-  include Webrat::Methods
-  include Rspec::Matchers
-
-  def self.setup(*args); end
-  def self.teardown(*args); end
+  extend ActiveSupport::Concern
 
-  include ActionController::TemplateAssertions
-
-  def self.included(mod)
-    mod.before do
-      @_result = Struct.new(:add_assertion).new
-      ActionController::Base.allow_forgery_protection = false
+  module ControllerClassReader
+    def controller_class
+      describes
     end
   end
 
-  def app 
-    described_class.action(@_action).tap do |endpoint|
-      def endpoint.routes
-        Rails.application.routes
-      end
+  included do
+    extend  Rspec::Rails::SetupAndTeardownAdapter
+    include Rspec::Rails::TestUnitAssertionAdapter
+    include ActionController::TestCase::Behavior
+    extend  ControllerClassReader
+    include Webrat::Matchers
+    include Webrat::Methods
+    include Rspec::Matchers
+    before do
+      @routes = ::Rails.application.routes
+      ActionController::Base.allow_forgery_protection = false
     end
   end
 
-  %w[get post put delete head].map do |method|
-    eval <<-CODE
-      def #{method}(*args)
-        @_action = args.shift
-        super '/', *args
-      end
-    CODE
-  end
-
   Rspec.configure do |c|
-    c.include self, :example_group => { :file_path => /\bspec\/controllers\// }
+    c.include self, :example_group => {
+      :describes => lambda {|described| described < ActionController::Base }
+    }
   end
 end

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

@@ -2,15 +2,17 @@ require 'action_dispatch'
 require 'webrat'
 
 module RequestExampleGroupBehaviour
-  include ActionDispatch::Assertions
+  extend ActiveSupport::Concern
   include ActionDispatch::Integration::Runner
-  include Webrat::Matchers
-  include Webrat::Methods
-  include Rspec::Matchers
 
-  def self.included(mod)
-    mod.before do
-      @_result = Struct.new(:add_assertion).new
+  included do
+    include Rspec::Rails::TestUnitAssertionAdapter
+    include ActionDispatch::Assertions
+    include Webrat::Matchers
+    include Webrat::Methods
+    include Rspec::Matchers
+
+    before do
       @router = ::Rails.application.routes
     end
   end
@@ -19,14 +21,14 @@ module RequestExampleGroupBehaviour
     ::Rails.application
   end
 
-  Webrat.configure do |config|
-    config.mode = :rack
-  end
-
   def last_response
     response
   end
 
+  Webrat.configure do |config|
+    config.mode = :rack
+  end
+
   Rspec.configure do |c|
     c.include self, :example_group => { :file_path => /\bspec\/requests\// }
   end

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

@@ -41,7 +41,7 @@ module ViewExampleGroupBehaviour
   end
 
   def file_to_render
-    running_example.example_group.description
+    running_example.example_group.top_level_description
   end
 
   def controller_path

data/lib/rspec/rails/matchers.rb

@@ -13,7 +13,7 @@ end
 
 begin
   require "active_record"
-rescue
+rescue LoadError
 
 end
 
@@ -25,6 +25,7 @@ end
 
 Rspec::Matchers.define :render_template do |options, message|
   match_unless_raises Test::Unit::AssertionFailedError do |_|
+    options = options.to_s if Symbol === options
     assert_template options, message
   end
 end

data/lib/rspec/rails/mocks.rb

@@ -4,29 +4,42 @@ module Rspec
     class IllegalDataAccessException < StandardError; end
 
     module Mocks
+
+      module InstanceMethods
+        def valid?
+          true
+        end
+
+        def as_new_record
+          self.stub(:id) { nil }
+          self
+        end
+
+        def new_record?
+          !persisted?
+        end
+
+        def persisted?
+          !!id
+        end
+      end
       
       # 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
+        id = options_and_stubs.has_key?(: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,
-          :marked_for_destruction? => false,
-          :errors => stub("errors", :count => 0, :any? => false)
+          :marked_for_destruction? => false
         })
         derived_name = "#{model_class.name}_#{id}"
         m = mock(derived_name, options_and_stubs)
+        m.extend InstanceMethods
+        m.extend ActiveModel::Conversion
+        m.stub(:errors) { ActiveModel::Errors.new(m) }
         m.__send__(:__mock_proxy).instance_eval(<<-CODE, __FILE__, __LINE__)
-          def @object.as_new_record
-            self.stub(:id) { nil }
-            self.stub(:to_param) { nil }
-            self.stub(:new_record?) { true }
-            self
-          end
           def @object.is_a?(other)
             #{model_class}.ancestors.include?(other)
           end

data/lib/rspec/rails/monkey.rb

@@ -0,0 +1,2 @@
+require 'rspec/rails/monkey/action_controller/test_case'
+require 'rspec/rails/monkey/active_support/notifications/fanout'

data/lib/rspec/rails/monkey/action_controller/test_case.rb

@@ -0,0 +1,199 @@
+require 'action_controller'
+require 'action_controller/test_case'
+
+module ActionController
+  # This has been merged to rails HEAD after the 3.0.0.beta.3 release (see
+  # https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/4433).
+  # Once 3.0.0.rc.1 comes out, we can remove it.
+  module TemplateAssertions
+    def teardown_subscriptions
+      ActiveSupport::Notifications.unsubscribe("action_view.render_template")
+      ActiveSupport::Notifications.unsubscribe("action_view.render_template!")
+    end
+  end
+
+  # The remainder of this file has yet to be merged to rails HEAD and is
+  # therefore merely speculative and hopeful.
+  class TestCase < ActiveSupport::TestCase
+    module Behavior
+      extend ActiveSupport::Concern
+      include ActionDispatch::TestProcess
+
+      attr_reader :response, :request
+
+      module ClassMethods
+
+        # Sets the controller class name. Useful if the name can't be inferred from test class.
+        # Expects +controller_class+ as a constant. Example: <tt>tests WidgetController</tt>.
+        def tests(controller_class)
+          self.controller_class = controller_class
+        end
+        
+        def controller_class=(new_class)
+          prepare_controller_class(new_class) if new_class
+          write_inheritable_attribute(:controller_class, new_class)
+        end
+
+        def controller_class
+          if current_controller_class = read_inheritable_attribute(:controller_class)
+            current_controller_class
+          else
+            self.controller_class = determine_default_controller_class(name)
+          end
+        end
+
+        def determine_default_controller_class(name)
+          name.sub(/Test$/, '').constantize
+        rescue NameError
+          nil
+        end
+
+        def prepare_controller_class(new_class)
+          new_class.send :include, ActionController::TestCase::RaiseActionExceptions
+        end
+
+      end
+
+      # Executes a request simulating GET HTTP method and set/volley the response
+      def get(action, parameters = nil, session = nil, flash = nil)
+        process(action, parameters, session, flash, "GET")
+      end
+
+      # Executes a request simulating POST HTTP method and set/volley the response
+      def post(action, parameters = nil, session = nil, flash = nil)
+        process(action, parameters, session, flash, "POST")
+      end
+
+      # Executes a request simulating PUT HTTP method and set/volley the response
+      def put(action, parameters = nil, session = nil, flash = nil)
+        process(action, parameters, session, flash, "PUT")
+      end
+
+      # Executes a request simulating DELETE HTTP method and set/volley the response
+      def delete(action, parameters = nil, session = nil, flash = nil)
+        process(action, parameters, session, flash, "DELETE")
+      end
+
+      # Executes a request simulating HEAD HTTP method and set/volley the response
+      def head(action, parameters = nil, session = nil, flash = nil)
+        process(action, parameters, session, flash, "HEAD")
+      end
+
+      def xml_http_request(request_method, action, parameters = nil, session = nil, flash = nil)
+        @request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
+        @request.env['HTTP_ACCEPT'] ||=  [Mime::JS, Mime::HTML, Mime::XML, 'text/xml', Mime::ALL].join(', ')
+        returning __send__(request_method, action, parameters, session, flash) do
+          @request.env.delete 'HTTP_X_REQUESTED_WITH'
+          @request.env.delete 'HTTP_ACCEPT'
+        end
+      end
+      alias xhr :xml_http_request
+
+      def process(action, parameters = nil, session = nil, flash = nil, http_method = 'GET')
+        # Sanity check for required instance variables so we can give an
+        # understandable error message.
+        %w(@routes @controller @request @response).each do |iv_name|
+          if !(instance_variable_names.include?(iv_name) || instance_variable_names.include?(iv_name.to_sym)) || instance_variable_get(iv_name).nil?
+            raise "#{iv_name} is nil: make sure you set it in your test's setup method."
+          end
+        end
+
+        @request.recycle!
+        @response.recycle!
+        @controller.response_body = nil
+        @controller.formats = nil
+        @controller.params = nil
+
+        @html_document = nil
+        @request.env['REQUEST_METHOD'] = http_method
+
+        parameters ||= {}
+        @request.assign_parameters(@routes, @controller.class.name.underscore.sub(/_controller$/, ''), action.to_s, parameters)
+
+        @request.session = ActionController::TestSession.new(session) unless session.nil?
+        @request.session["flash"] = @request.flash.update(flash || {})
+        @request.session["flash"].sweep
+
+        @controller.request = @request
+        @controller.params.merge!(parameters)
+        build_request_uri(action, parameters)
+        Base.class_eval { include Testing }
+        @controller.process_with_new_base_test(@request, @response)
+        @request.session.delete('flash') if @request.session['flash'].blank?
+        @response
+      end
+
+      def setup_controller_request_and_response
+        @request = TestRequest.new
+        @response = TestResponse.new
+
+        if klass = self.class.controller_class
+          @controller ||= klass.new rescue nil
+        end
+
+        @request.env.delete('PATH_INFO')
+
+        if @controller
+          @controller.request = @request
+          @controller.params = {}
+        end
+      end
+
+      # Cause the action to be rescued according to the regular rules for rescue_action when the visitor is not local
+      def rescue_action_in_public!
+        @request.remote_addr = '208.77.188.166' # example.com
+      end
+
+      included do
+        include ActionController::TemplateAssertions
+        include ActionDispatch::Assertions
+        setup :setup_controller_request_and_response
+      end
+
+    private
+
+      def build_request_uri(action, parameters)
+        unless @request.env["PATH_INFO"]
+          options = @controller.__send__(:url_options).merge(parameters)
+          options.update(
+            :only_path => true,
+            :action => action,
+            :relative_url_root => nil,
+            :_path_segments => @request.symbolized_path_parameters)
+
+          url, query_string = @routes.url_for(options).split("?", 2)
+
+          @request.env["SCRIPT_NAME"] = @controller.config.relative_url_root
+          @request.env["PATH_INFO"] = url
+          @request.env["QUERY_STRING"] = query_string || ""
+        end
+      end
+    end
+
+    # When the request.remote_addr remains the default for testing, which is 0.0.0.0, the exception is simply raised inline
+    # (bystepping the regular exception handling from rescue_action). If the request.remote_addr is anything else, the regular
+    # rescue_action process takes place. This means you can test your rescue_action code by setting remote_addr to something else
+    # than 0.0.0.0.
+    #
+    # The exception is stored in the exception accessor for further inspection.
+    module RaiseActionExceptions
+      def self.included(base)
+        base.class_eval do
+          attr_accessor :exception
+          protected :exception, :exception=
+        end
+      end
+
+      protected
+        def rescue_action_without_handler(e)
+          self.exception = e
+
+          if request.remote_addr == "0.0.0.0"
+            raise(e)
+          else
+            super(e)
+          end
+        end
+    end
+  end
+end

data/lib/rspec/rails/monkey/active_support/notifications/fanout.rb

@@ -0,0 +1,20 @@
+require 'active_support/notifications/fanout'
+
+# This has been merged to rails HEAD after the 3.0.0.beta.3 release (see
+# https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/4433).
+# Once 3.0.0.rc.1 comes out, we can remove it.
+class ActiveSupport::Notifications::Fanout
+  def unsubscribe(subscriber_or_name)
+    @listeners_for.clear
+    @subscribers.reject! do |s|
+      s.instance_eval do
+        case subscriber_or_name
+        when String
+          @pattern && @pattern =~ subscriber_or_name
+        when self
+          true
+        end
+      end
+    end
+  end
+end

data/rspec-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "2.0.0.beta.7"
+  s.version = "2.0.0.beta.8"
 
   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-04-17}
+  s.date = %q{2010-04-27}
   s.description = %q{Rspec-2 for Rails-3}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
      "features/model_specs/transactional_examples.feature",
      "features/step_definitions/model_steps.rb",
      "features/support/env.rb",
+     "features/view_specs/view_spec.feature",
      "lib/autotest/rails_rspec2.rb",
      "lib/generators/rspec.rb",
      "lib/generators/rspec/controller/controller_generator.rb",
@@ -59,6 +60,7 @@ Gem::Specification.new do |s|
      "lib/generators/rspec/view/view_generator.rb",
      "lib/rspec-rails.rb",
      "lib/rspec/rails.rb",
+     "lib/rspec/rails/adapters.rb",
      "lib/rspec/rails/example.rb",
      "lib/rspec/rails/example/controller_example_group.rb",
      "lib/rspec/rails/example/mailer_example_group.rb",
@@ -66,6 +68,9 @@ Gem::Specification.new do |s|
      "lib/rspec/rails/example/view_example_group.rb",
      "lib/rspec/rails/matchers.rb",
      "lib/rspec/rails/mocks.rb",
+     "lib/rspec/rails/monkey.rb",
+     "lib/rspec/rails/monkey/action_controller/test_case.rb",
+     "lib/rspec/rails/monkey/active_support/notifications/fanout.rb",
      "lib/rspec/rails/transactional_database_support.rb",
      "lib/rspec/rails/version.rb",
      "rspec-rails.gemspec",
@@ -84,7 +89,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/rspec/rspec-rails}
   s.post_install_message = %q{**************************************************
 
-  Thank you for installing rspec-rails-2.0.0.beta.7!
+  Thank you for installing rspec-rails-2.0.0.beta.8!
 
   This version of rspec-rails only works with 
   versions of rails >= 3.0.0.pre.
@@ -99,7 +104,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.6}
-  s.summary = %q{rspec-rails-2.0.0.beta.7}
+  s.summary = %q{rspec-rails-2.0.0.beta.8}
   s.test_files = [
     "spec/rspec/rails/matchers/be_a_new_spec.rb",
      "spec/rspec/rails/matchers/redirect_to_spec.rb",
@@ -116,14 +121,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rspec>, ["= 2.0.0.beta.7"])
+      s.add_runtime_dependency(%q<rspec>, ["= 2.0.0.beta.8"])
       s.add_runtime_dependency(%q<webrat>, [">= 0.7.0"])
     else
-      s.add_dependency(%q<rspec>, ["= 2.0.0.beta.7"])
+      s.add_dependency(%q<rspec>, ["= 2.0.0.beta.8"])
       s.add_dependency(%q<webrat>, [">= 0.7.0"])
     end
   else
-    s.add_dependency(%q<rspec>, ["= 2.0.0.beta.7"])
+    s.add_dependency(%q<rspec>, ["= 2.0.0.beta.8"])
     s.add_dependency(%q<webrat>, [">= 0.7.0"])
   end
 end

data/spec/rspec/rails/matchers/render_template_spec.rb

@@ -1,8 +1,25 @@
 require "spec_helper"
 
 describe "render_template" do
-  it "delegates to assert_template" do
-    self.should_receive(:assert_template).with({:this => "hash"}, "this message")
-    "response".should render_template({:this => "hash"}, "this message")
+  context "given a hash" do
+    it "delegates to assert_template" do
+      self.should_receive(:assert_template).with({:this => "hash"}, "this message")
+      "response".should render_template({:this => "hash"}, "this message")
+    end
+  end
+
+  context "given a string" do
+    it "delegates to assert_template" do
+      self.should_receive(:assert_template).with("this string", "this message")
+      "response".should render_template("this string", "this message")
+    end
+  end
+
+  context "given a string" do
+    it "converts to_s and delegates to assert_template" do
+      self.should_receive(:assert_template).with("template_name", "this message")
+      "response".should render_template(:template_name, "this message")
+    end
   end
 end
+

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

@@ -52,6 +52,25 @@ describe "mock_model" do
     end
   end
 
+  context "with id nil" do
+    it "is not persisted" do
+      mock_model(MockableModel, :id => nil).should_not be_persisted
+    end
+  end
+
+  describe "valid?" do
+    context "default" do
+      it "returns true" do
+        mock_model(MockableModel).should be_valid
+      end
+    end
+    context "stubbed with false" do
+      it "returns false" do
+        mock_model(MockableModel, :valid? => false).should_not be_valid
+      end
+    end
+  end
+
   describe "as association", :type => :view do
     before(:each) do
       @real = AssociatedModel.create!
@@ -68,20 +87,7 @@ describe "mock_model" do
     end
   end
 
-  describe "with :null_object => true", :type => :view do
-    before(:each) do
-      @model = mock_model(MockableModel, :null_object => true, :mocked_method => "mocked")
-    end
-
-    it "should be able to mock methods" do
-      @model.mocked_method.should == "mocked"
-    end
-    it "should return itself to unmocked methods" do
-      @model.unmocked_method.should equal(@model)
-    end
-  end
-
-  describe "#as_null_object", :type => :view do
+  describe "#as_null_object" do
     before(:each) do
       @model = mock_model(MockableModel, :mocked_method => "mocked").as_null_object
     end
@@ -108,7 +114,26 @@ describe "mock_model" do
       mock_model(MockableModel).as_new_record.to_param.should be(nil)
     end
   end
+
+  describe "ActiveModel Lint tests" do
+    require 'test/unit/assertions'
+    require 'active_model/lint'
+    include Test::Unit::Assertions
+    include ActiveModel::Lint::Tests
+
+    ActiveModel::Lint::Tests.public_instance_methods.grep(/^test/).each do |m|
+      example m.gsub('_',' ') do
+        send m
+      end
+    end
+
+    def model
+      mock_model(MockableModel, :id => nil)
+    end
+
+  end
 end
 
 
 
+

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 7
-  version: 2.0.0.beta.7
+  - 8
+  version: 2.0.0.beta.8
 platform: ruby
 authors: 
 - David Chelimsky
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-17 00:00:00 -05:00
+date: 2010-04-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,8 +32,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 7
-        version: 2.0.0.beta.7
+        - 8
+        version: 2.0.0.beta.8
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -69,6 +69,7 @@ files:
 - features/model_specs/transactional_examples.feature
 - features/step_definitions/model_steps.rb
 - features/support/env.rb
+- features/view_specs/view_spec.feature
 - lib/autotest/rails_rspec2.rb
 - lib/generators/rspec.rb
 - lib/generators/rspec/controller/controller_generator.rb
@@ -102,6 +103,7 @@ files:
 - lib/generators/rspec/view/view_generator.rb
 - lib/rspec-rails.rb
 - lib/rspec/rails.rb
+- lib/rspec/rails/adapters.rb
 - lib/rspec/rails/example.rb
 - lib/rspec/rails/example/controller_example_group.rb
 - lib/rspec/rails/example/mailer_example_group.rb
@@ -109,6 +111,9 @@ files:
 - lib/rspec/rails/example/view_example_group.rb
 - lib/rspec/rails/matchers.rb
 - lib/rspec/rails/mocks.rb
+- lib/rspec/rails/monkey.rb
+- lib/rspec/rails/monkey/action_controller/test_case.rb
+- lib/rspec/rails/monkey/active_support/notifications/fanout.rb
 - lib/rspec/rails/transactional_database_support.rb
 - lib/rspec/rails/version.rb
 - rspec-rails.gemspec
@@ -130,7 +135,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-rails-2.0.0.beta.7!
+    Thank you for installing rspec-rails-2.0.0.beta.8!
   
     This version of rspec-rails only works with 
     versions of rails >= 3.0.0.pre.
@@ -167,7 +172,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.0.0.beta.7
+summary: rspec-rails-2.0.0.beta.8
 test_files: 
 - spec/rspec/rails/matchers/be_a_new_spec.rb
 - spec/rspec/rails/matchers/redirect_to_spec.rb