rspec-rails 2.0.0.beta.11 → 2.0.0.beta.12

data/README.markdown

@@ -95,7 +95,7 @@ available from Rails.
 
 You can use RSpec expectations/matchers or Test::Unit assertions.
 
-## rendering views
+## `render_views`
 By default, controller specs do not render views (as of beta.9).
 This supports specifying controllers without concern for whether
 the views they render work correctly or even exist. If you prefer
@@ -106,17 +106,24 @@ to render the views (a la Rails' functional tests), you can use the
       render_views
       ...
 
-## Matchers
-In addition to what Rails offers, controller specs provide all
-of rspec-core's matchers and the rspec-rails' specific matchers
-as well.
+### * Upgrade note
 
-### render_template
+`render_views` replaces `integrate_views` from rspec-rails-1.3
+
+## `assigns`
+
+Use `assigns(key)` to express expectations about instance variables that a controller
+assigns to the view in the course of an action:
+
+    get :index
+    assigns(:widgets).should eq(expected_value)
+
+## `render_template`
 Delegates to Rails' assert_template:
 
     response.should render_template("new")
 
-### redirect_to
+## `redirect_to`
 Delegates to assert_redirect
 
     response.should redirect_to(widgets_path)
@@ -134,6 +141,31 @@ View specs live in spec/views, and mix in ActionView::TestCase::Behavior.
         rendered.should contain("Chicago")
       end
     end
+    
+## `assign(key, val)`
+
+Use this to assign values to instance variables in the view:
+
+    assign(:widget, stub_model(Widget))
+    render
+    
+The code above assigns `stub_model(Widget)` to the `@widget` variable in the view, and then
+renders the view.
+
+### * Upgrade note
+
+`assign(key, value)` replaces `assigns[key] = value` from rspec-rails-1.3
+
+## `rendered`
+
+This represents the rendered view.
+
+    render
+    rendered.should =~ /Some text expected to appear on the page/
+
+### * Upgrade note
+
+`rendered` replaces `response` from rspec-rails-1.3
 
 # Helper specs
 

data/Rakefile

@@ -38,7 +38,7 @@ begin
   Be sure to run the following command in each of your
   Rails apps if you're upgrading:
 
-    script/rails generate rspec
+    script/rails generate rspec:install
 
 #{"*"*50}
 EOM

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.11
+2.0.0.beta.12

data/lib/autotest/rails_rspec2.rb

@@ -26,8 +26,8 @@ require 'active_support/core_ext'
 require 'autotest/rspec2'
 
 Autotest.add_hook :initialize do |at|
-  %w{config/ coverage/ db/ doc/ log/ public/ script/ tmp/ vendor/rails vendor/plugins previous_failures.txt}.each do |exception|
-    at.add_exception(exception)
+  %w{config/ coverage/ db/ doc/ log/ public/ script/ tmp/ vendor/rails vendor/plugins vendor/gems}.each do |exception|
+    at.add_exception("^#{exception}")
   end
   
   at.clear_mappings

data/lib/generators/rspec/install/install_generator.rb

@@ -11,6 +11,10 @@ DESC
         @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
       end
 
+      def copy_dot_rspec
+        template '.rspec'
+      end
+
       def copy_spec_files
         directory 'spec'
       end

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

@@ -0,0 +1 @@
+--colour

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

@@ -3,4 +3,4 @@
     g.integration_tool :rspec
     g.test_framework   :rspec
   end
-end
+end if defined? <%= app_name %>

data/lib/generators/rspec/mailer/templates/mailer_spec.rb

@@ -1,13 +1,23 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe <%= class_name %> do
 <% for action in actions -%>
-  it "should deliver <%= action.gsub("_", " ") %> message" do
-    @expected.subject = <%= action.to_s.humanize.inspect %>
-    @expected.to      = "to@example.org"
-    @expected.from    = "from@example.com"
-    @expected.body    = read_fixture("<%= action %>")
+  describe "<%= action %>" do
+    let(:mail) { <%= class_name %>.<%= action %> }
+
+    it "renders the headers" do
+      mail.subject.should eq(<%= action.to_s.humanize.inspect %>)
+      mail.to.should eq(["to@example.org"])
+      mail.from.should eq(["from@example.com"])
+    end
+
+    it "renders the body" do
+      mail.body.encoded.should match("Hi")
+    end
   end
 
 <% end -%>
+<% if actions.blank? -%>
+  pending "add some examples to (or delete) #{__FILE__}"
+<% end -%>
 end

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

@@ -82,8 +82,7 @@ module RSpec::Rails
     include Webrat::Matchers
     include Webrat::Methods
     include RSpec::Matchers
-
-    attr_reader :controller
+    include RSpec::Rails::ControllerSpecMatchers
 
     module ClassMethods
       def controller_class
@@ -91,6 +90,10 @@ module RSpec::Rails
       end
     end
 
+    module InstanceMethods
+      attr_reader :controller
+    end
+
     included do
       before do
         @routes = ::Rails.application.routes

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

@@ -4,21 +4,14 @@ module RSpec::Rails
   module MailerExampleGroup
     extend ActiveSupport::Concern
 
+    include ActionMailer::TestCase::Behavior
+
     include Webrat::Matchers
     include RSpec::Matchers
 
-    def read_fixture(action)
-      IO.readlines(File.join(Rails.root, 'spec', 'fixtures', self.described_class.name.underscore, action))
-    end
-
-    included do
-      before do
-        ActionMailer::Base.delivery_method = :test
-        ActionMailer::Base.perform_deliveries = true
-        ActionMailer::Base.deliveries.clear
-        @expected = Mail.new
-        @expected.content_type ["text", "plain", { "charset" => "utf-8" }]
-        @expected.mime_version = '1.0'
+    module ClassMethods
+      def mailer_class
+        describes
       end
     end
 

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

@@ -12,22 +12,24 @@ module RSpec::Rails
     include Webrat::Methods
     include RSpec::Matchers
 
+    module InstanceMethods
+      def app
+        ::Rails.application
+      end
+
+      def last_response
+        response
+      end
+    end
+
     included do
       before do
         @router = ::Rails.application.routes
       end
-    end
-    
-    def app
-      ::Rails.application
-    end
 
-    def last_response
-      response
-    end
-
-    Webrat.configure do |config|
-      config.mode = :rack
+      Webrat.configure do |config|
+        config.mode = :rack
+      end
     end
 
     RSpec.configure do |c|

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

@@ -18,7 +18,6 @@ module RSpec::Rails
   #       rendered.should contain("Bar")
   #     end
   #   end
-  #
   module ViewExampleGroup
     extend  ActiveSupport::Concern
 
@@ -34,7 +33,7 @@ module RSpec::Rails
         rendered
       end
 
-      # :callseq:
+      # :call-seq:
       #   render 
       #   render(:template => "widgets/new.html.erb")
       #   render({:partial => "widgets/widget.html.erb"}, {... locals ...})
@@ -57,6 +56,27 @@ module RSpec::Rails
         super(options, local_assigns, &block)
       end
 
+      # The instance of ActionView::Base that is used to render the template.
+      # Use this before the +render+ call to stub any methods you want to stub
+      # on the view:
+      #
+      #   describe "widgets/new.html.erb" do
+      #     it "shows all the widgets" do
+      #       view.stub(:foo) { "foo" }
+      #       render
+      #       ...
+      #     end
+      #   end
+      def view
+        _view
+      end
+
+      # Deprecated. Use +view+ instead.
+      def template
+        RSpec.deprecate("template","view")
+        view
+      end
+
     private
 
       def _default_file_to_render

data/lib/rspec/rails/matchers.rb

@@ -16,19 +16,32 @@ end
 begin
   require "active_record"
 rescue LoadError
-
 end
 
-RSpec::Matchers.define :redirect_to do |destination|
-  match_unless_raises Test::Unit::AssertionFailedError do |_|
-    assert_redirected_to destination
-  end
-end
+module RSpec::Rails
+  module ControllerSpecMatchers
+    extend RSpec::Matchers::DSL
+
+    matcher :redirect_to do |destination|
+      match_unless_raises Test::Unit::AssertionFailedError do |_|
+        assert_redirected_to destination
+      end
+
+      failure_message_for_should do
+        rescued_exception.message
+      end
+    end
+
+    matcher :render_template do |options, message|
+      match_unless_raises Test::Unit::AssertionFailedError do |_|
+        options = options.to_s if Symbol === options
+        assert_template options, message
+      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
+      failure_message_for_should do
+        rescued_exception.message
+      end
+    end
   end
 end
 

data/lib/rspec/rails/mocks.rb

@@ -55,6 +55,10 @@ module RSpec
           def @object.to_s
             "#{model_class.name}_#{id}"
           end
+
+          def @object.model_name
+            "#{model_class}"
+          end
         CODE
         yield m if block_given?
         m

data/lib/rspec/rails/monkey.rb

@@ -1,3 +1,4 @@
 require 'rspec/rails/monkey/action_controller/test_case'
 require 'rspec/rails/monkey/action_view/test_case'
+require 'rspec/rails/monkey/action_mailer/test_case'
 require 'rspec/rails/monkey/active_support/notifications/fanout'

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

@@ -0,0 +1,69 @@
+require 'action_mailer'
+
+module ActionMailer
+  unless defined?(ActionMailer::TestCase::Behavior)
+    class TestCase < ActiveSupport::TestCase
+      module Behavior
+        extend ActiveSupport::Concern
+
+        include TestHelper
+
+        module ClassMethods
+          def tests(mailer)
+            write_inheritable_attribute(:mailer_class, mailer)
+          end
+
+          def mailer_class
+            if mailer = read_inheritable_attribute(:mailer_class)
+              mailer
+            else
+              tests determine_default_mailer(name)
+            end
+          end
+
+          def determine_default_mailer(name)
+            name.sub(/Test$/, '').constantize
+          rescue NameError => e
+            raise NonInferrableMailerError.new(name)
+          end
+        end
+
+        module InstanceMethods
+
+        protected
+
+          def initialize_test_deliveries
+            ActionMailer::Base.delivery_method = :test
+            ActionMailer::Base.perform_deliveries = true
+            ActionMailer::Base.deliveries.clear
+          end
+
+          def set_expected_mail
+            @expected = Mail.new
+            @expected.content_type ["text", "plain", { "charset" => charset }]
+            @expected.mime_version = '1.0'
+          end
+
+        private
+
+          def charset
+            "UTF-8"
+          end
+
+          def encode(subject)
+            Mail::Encodings.q_value_encode(subject, charset)
+          end
+
+          def read_fixture(action)
+            IO.readlines(File.join(Rails.root, 'test', 'fixtures', self.class.mailer_class.name.underscore, action))
+          end
+        end
+
+        included do
+          setup :initialize_test_deliveries
+          setup :set_expected_mail
+        end
+      end
+    end
+  end
+end

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

@@ -142,12 +142,14 @@ unless defined?(ActionView::TestCase::Behavior)
         end
 
         def _view
-          view = ActionView::Base.new(ActionController::Base.view_paths, _assigns, @controller)
-          view.singleton_class.send :include, _helpers
-          view.singleton_class.send :include, @controller._router.url_helpers
-          view.singleton_class.send :delegate, :alert, :notice, :to => "request.flash"
-          view.output_buffer = self.output_buffer
-          view
+          @_view ||= begin
+                       view = ActionView::Base.new(ActionController::Base.view_paths, _assigns, @controller)
+                       view.singleton_class.send :include, _helpers
+                       view.singleton_class.send :include, @controller._router.url_helpers
+                       view.singleton_class.send :delegate, :alert, :notice, :to => "request.flash"
+                       view.output_buffer = self.output_buffer
+                       view
+                     end
         end
 
         EXCLUDE_IVARS = %w{

data/lib/rspec/rails/view_assigns.rb

@@ -4,7 +4,7 @@ module RSpec
       extend ActiveSupport::Concern
 
       module InstanceMethods
-        # :callseq:
+        # :call-seq:
         #   assign(:widget, stub_model(Widget))
         #
         # Assigns a value to an instance variable in the scope of the

data/rspec-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "2.0.0.beta.11"
+  s.version = "2.0.0.beta.12"
 
   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-06-06}
+  s.date = %q{2010-06-14}
   s.description = %q{RSpec-2 for Rails-3}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
      "lib/generators/rspec/helper/helper_generator.rb",
      "lib/generators/rspec/helper/templates/helper_spec.rb",
      "lib/generators/rspec/install/install_generator.rb",
+     "lib/generators/rspec/install/templates/.rspec",
      "lib/generators/rspec/install/templates/autotest/discover.rb",
      "lib/generators/rspec/install/templates/config/initializers/rspec_generator.rb.tt",
      "lib/generators/rspec/install/templates/lib/tasks/rspec.rake",
@@ -81,6 +82,7 @@ Gem::Specification.new do |s|
      "lib/rspec/rails/mocks.rb",
      "lib/rspec/rails/monkey.rb",
      "lib/rspec/rails/monkey/action_controller/test_case.rb",
+     "lib/rspec/rails/monkey/action_mailer/test_case.rb",
      "lib/rspec/rails/monkey/action_view/test_case.rb",
      "lib/rspec/rails/monkey/active_support/notifications/fanout.rb",
      "lib/rspec/rails/null_resolver.rb",
@@ -111,7 +113,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.11!
+  Thank you for installing rspec-rails-2.0.0.beta.12!
 
   This version of rspec-rails only works with 
   versions of rails >= 3.0.0.pre.
@@ -119,7 +121,7 @@ Gem::Specification.new do |s|
   Be sure to run the following command in each of your
   Rails apps if you're upgrading:
 
-    script/rails generate rspec
+    script/rails generate rspec:install
 
 **************************************************
 }
@@ -127,7 +129,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.11}
+  s.summary = %q{rspec-rails-2.0.0.beta.12}
   s.test_files = [
     "spec/rspec/rails/example/controller_example_group_spec.rb",
      "spec/rspec/rails/example/helper_example_group_spec.rb",
@@ -151,14 +153,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.11"])
+      s.add_runtime_dependency(%q<rspec>, ["= 2.0.0.beta.12"])
       s.add_runtime_dependency(%q<webrat>, [">= 0.7.0"])
     else
-      s.add_dependency(%q<rspec>, ["= 2.0.0.beta.11"])
+      s.add_dependency(%q<rspec>, ["= 2.0.0.beta.12"])
       s.add_dependency(%q<webrat>, [">= 0.7.0"])
     end
   else
-    s.add_dependency(%q<rspec>, ["= 2.0.0.beta.11"])
+    s.add_dependency(%q<rspec>, ["= 2.0.0.beta.12"])
     s.add_dependency(%q<webrat>, [">= 0.7.0"])
   end
 end

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

@@ -73,5 +73,40 @@ module RSpec::Rails
         end
       end
     end
+
+    describe "#view" do
+      let(:view_spec) do
+        Class.new do
+          include ViewExampleGroup::InstanceMethods
+        end.new
+      end
+
+      it "delegates to _view" do
+        view = double("view")
+        view_spec.stub(:_view) { view }
+        view_spec.view.should == view
+      end
+    end
+
+    describe "#template" do
+      let(:view_spec) do
+        Class.new do
+          include ViewExampleGroup::InstanceMethods
+          def _view; end
+        end.new
+      end
+
+      before { RSpec.stub(:deprecate) }
+
+      it "is deprecated" do
+        RSpec.should_receive(:deprecate)
+        view_spec.template
+      end
+
+      it "delegates to #view" do
+        view_spec.should_receive(:view)
+        view_spec.template
+      end
+    end
   end
 end

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

@@ -1,8 +1,20 @@
 require "spec_helper"
+require "action_controller/test_case"
 
 describe "redirect_to" do
+  include RSpec::Rails::ControllerSpecMatchers
+
   it "delegates to assert_redirected_to" do
     self.should_receive(:assert_redirected_to).with("destination")
     "response".should redirect_to("destination")
   end
+
+  it "uses failure message from assert_redirected_to" do
+    self.stub!(:assert_redirected_to).and_raise(
+      Test::Unit::AssertionFailedError.new("this message"))
+    response = ActionController::TestResponse.new
+    expect do
+      response.should redirect_to("destination")
+    end.to raise_error("this message")
+  end
 end

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

@@ -1,6 +1,17 @@
 require "spec_helper"
 
 describe "render_template" do
+  include RSpec::Rails::ControllerSpecMatchers
+
+  it "uses failure message from render_template" do
+    self.stub!(:assert_template).and_raise(
+      Test::Unit::AssertionFailedError.new("this message"))
+    response = ActionController::TestResponse.new
+    expect do
+      response.should render_template("destination")
+    end.to raise_error("this message")
+  end
+
   context "given a hash" do
     it "delegates to assert_template" do
       self.should_receive(:assert_template).with({:this => "hash"}, "this message")

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

@@ -74,6 +74,17 @@ describe "mock_model(RealModel)" do
     end
   end
 
+  describe "#model_name" do
+    before(:each) do
+      @model = mock_model(SubMockableModel)
+    end
+
+    it "says its model_name" do
+      @model.model_name.should == "SubMockableModel"
+    end
+  end
+
+
   describe "#destroyed?" do
     context "default" do
       it "returns false" do

data/templates/Gemfile

@@ -1,5 +1,6 @@
 source 'http://rubygems.org'
 
+gem "arel", :path => "../../vendor/arel"
 gem "rails", :path => "../../vendor/rails"
 
 gem 'sqlite3-ruby', :require => 'sqlite3'

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 11
-  version: 2.0.0.beta.11
+  - 12
+  version: 2.0.0.beta.12
 platform: ruby
 authors: 
 - David Chelimsky
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-06 00:00:00 -04:00
+date: 2010-06-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,8 +32,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 11
-        version: 2.0.0.beta.11
+        - 12
+        version: 2.0.0.beta.12
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -85,6 +85,7 @@ files:
 - lib/generators/rspec/helper/helper_generator.rb
 - lib/generators/rspec/helper/templates/helper_spec.rb
 - lib/generators/rspec/install/install_generator.rb
+- lib/generators/rspec/install/templates/.rspec
 - lib/generators/rspec/install/templates/autotest/discover.rb
 - lib/generators/rspec/install/templates/config/initializers/rspec_generator.rb.tt
 - lib/generators/rspec/install/templates/lib/tasks/rspec.rake
@@ -124,6 +125,7 @@ files:
 - lib/rspec/rails/mocks.rb
 - lib/rspec/rails/monkey.rb
 - lib/rspec/rails/monkey/action_controller/test_case.rb
+- lib/rspec/rails/monkey/action_mailer/test_case.rb
 - lib/rspec/rails/monkey/action_view/test_case.rb
 - lib/rspec/rails/monkey/active_support/notifications/fanout.rb
 - lib/rspec/rails/null_resolver.rb
@@ -157,7 +159,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-rails-2.0.0.beta.11!
+    Thank you for installing rspec-rails-2.0.0.beta.12!
   
     This version of rspec-rails only works with 
     versions of rails >= 3.0.0.pre.
@@ -165,7 +167,7 @@ post_install_message: |
     Be sure to run the following command in each of your
     Rails apps if you're upgrading:
   
-      script/rails generate rspec
+      script/rails generate rspec:install
   
   **************************************************
 
@@ -195,7 +197,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.0.0.beta.11
+summary: rspec-rails-2.0.0.beta.12
 test_files: 
 - spec/rspec/rails/example/controller_example_group_spec.rb
 - spec/rspec/rails/example/helper_example_group_spec.rb