rspec-rails 2.0.0.beta.17 → 2.0.0.beta.18

data/README.markdown

@@ -65,8 +65,10 @@ Request specs live in spec/requests.
 
     describe "widgets resource" do
       describe "GET index" do
-        get "/widgets/index"
-        response.should have_selector("h1", :content => "Widgets")
+        it "contains the widgets header" do
+          get "/widgets/index"
+          response.should have_selector("h1", :content => "Widgets")
+        end
       end
     end
 

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.17
+2.0.0.beta.18

data/features/view_specs/view_spec.feature

@@ -152,3 +152,34 @@ Feature: view spec
       """
     When I run "rspec spec/views"
     Then the output should contain "1 example, 0 failures"
+
+  Scenario: spec with view that accesses helper_method helpers
+    Given a file named "app/views/secrets/index.html.erb" with:
+      """
+      <%- if admin? %>
+        <h1>Secret admin area</h1>
+      <%- end %>
+      """
+    And a file named "spec/views/secrets/index.html.erb_spec.rb" with:
+      """
+      require 'spec_helper'
+
+      describe 'secrets/index.html.erb' do
+        before do
+          controller.singleton_class.class_eval do
+            protected
+              def admin?
+                true
+              end
+              helper_method :admin?
+          end
+        end
+
+        it 'checks for admin access' do
+          render
+          rendered.should contain('Secret admin area')
+        end
+      end
+      """
+    When I run "rspec spec/views/secrets"
+    Then the output should contain "1 example, 0 failures"

data/lib/autotest/rails_rspec2.rb

@@ -29,9 +29,9 @@ Autotest.add_hook :initialize do |at|
   %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
-  
+
   at.add_mapping(%r%^(test|spec)/fixtures/(.*).yml$%) { |_, m|
     ["spec/models/#{m[2].singularize}_spec.rb"] + at.files_matching(%r%^spec\/views\/#{m[2]}/.*_spec\.rb$%)
   }

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

@@ -18,7 +18,7 @@ module Rspec
 
       def create_view_files
         return if actions.empty?
-        return unless options[:views] 
+        return unless options[:views]
 
         empty_directory File.join("spec", "views", file_path)
 

data/lib/generators/rspec/helper/templates/helper_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 # Specs in this file have access to a helper object that includes
 # the <%= class_name %>Helper. For example:
-# 
+#
 # describe <%= class_name %>Helper do
 #   describe "string concat" do
 #     it "concats two strings with spaces" do

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

@@ -22,15 +22,15 @@ describe <%= controller_class_name %>Controller do
     end
 
     it "recognizes and generates #create" do
-      { :post => "/<%= table_name %>" }.should route_to(:controller => "<%= table_name %>", :action => "create") 
+      { :post => "/<%= table_name %>" }.should route_to(:controller => "<%= table_name %>", :action => "create")
     end
 
     it "recognizes and generates #update" do
-      { :put => "/<%= table_name %>/1" }.should route_to(:controller => "<%= table_name %>", :action => "update", :id => "1") 
+      { :put => "/<%= table_name %>/1" }.should route_to(:controller => "<%= table_name %>", :action => "update", :id => "1")
     end
 
     it "recognizes and generates #destroy" do
-      { :delete => "/<%= table_name %>/1" }.should route_to(:controller => "<%= table_name %>", :action => "destroy", :id => "1") 
+      { :delete => "/<%= table_name %>/1" }.should route_to(:controller => "<%= table_name %>", :action => "destroy", :id => "1")
     end
 
   end

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

@@ -4,7 +4,7 @@ module RSpec::Rails
   # == Examples
   #
   # == with stubs
-  #   
+  #
   #   describe WidgetsController do
   #     describe "GET index" do
   #       it "assigns all widgets to @widgets" do
@@ -69,7 +69,7 @@ module RSpec::Rails
   #   describe WidgetsController do
   #     render_views
   #     ...
-  #     
+  #
   module ControllerExampleGroup
     extend ActiveSupport::Concern
     extend RSpec::Rails::ModuleInclusion

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

@@ -28,9 +28,24 @@ module RSpec::Rails
     include Webrat::Matchers
     include RSpec::Rails::Matchers::RenderTemplate
 
+    module ClassMethods
+      def _default_helper
+        base = metadata[:behaviour][:description].split('/').first
+        (base.camelize + 'Helper').constantize if base
+      rescue NameError
+        nil
+      end
+
+      def _default_helpers
+        helpers = [_default_helper].compact
+        helpers << ApplicationHelper if Object.const_defined?('ApplicationHelper')
+        helpers
+      end
+    end
+
     module InstanceMethods
       # :call-seq:
-      #   render 
+      #   render
       #   render(:template => "widgets/new.html.erb")
       #   render({:partial => "widgets/widget.html.erb"}, {... locals ...})
       #   render({:partial => "widgets/widget.html.erb"}, {... locals ...}) do ... end
@@ -73,13 +88,20 @@ module RSpec::Rails
         _view
       end
 
+      # Provides access to the params hash that will be available within the
+      # view:
+      #
+      #       params[:foo] = 'bar'
+      def params
+        controller.params
+      end
+
       # Deprecated. Use +view+ instead.
       def template
         RSpec.deprecate("template","view")
         view
       end
 
-
       # Deprecated. Use +rendered+ instead.
       def response
         RSpec.deprecate("response", "rendered")
@@ -95,12 +117,21 @@ module RSpec::Rails
       def _controller_path
         _default_file_to_render.split("/")[0..-2].join("/")
       end
+
+      def _include_controller_helpers
+        helpers = controller._helpers
+        view.singleton_class.class_eval do
+          include helpers unless included_modules.include?(helpers)
+        end
+      end
     end
 
     included do
       metadata[:type] = :view
+      helper *_default_helpers
 
       before do
+        _include_controller_helpers
         controller.controller_path = _controller_path
         # this won't be necessary if/when
         # https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/4903

data/lib/rspec/rails/extensions/active_record/base.rb

@@ -35,7 +35,7 @@ if defined?(ActiveRecord::Base)
       end
     end
   end
-  
+
   module ActiveRecord #:nodoc:
     class Base
       extend  RSpec::Rails::Extensions::ActiveRecord::ClassMethods

data/lib/rspec/rails/fixture_support.rb

@@ -9,13 +9,13 @@ module RSpec
       included do
         if RSpec.configuration.use_transactional_fixtures
           # TODO - figure out how to move this outside the included block
-          include ActiveRecord::TestFixtures 
+          include ActiveRecord::TestFixtures
 
-          self.fixture_path = RSpec.configuration.fixture_path 
+          self.fixture_path = RSpec.configuration.fixture_path
           self.use_transactional_fixtures = RSpec.configuration.use_transactional_fixtures
           self.use_instantiated_fixtures  = RSpec.configuration.use_instantiated_fixtures
           fixtures RSpec.configuration.global_fixtures if RSpec.configuration.global_fixtures
-        end 
+        end
       end
     end
   end

data/lib/rspec/rails/matchers/have_extension.rb

@@ -10,7 +10,7 @@ module RSpec #:nodoc:
         return failure_message_for_should_without_errors_on_extensions
       end
       alias_method_chain :failure_message_for_should, :errors_on_extensions
-      
+
       def description_with_errors_on_extensions
         return "have #{relativities[@relativity]}#{@expected} errors on :#{@args[0]}" if @collection_name == :errors_on
         return "have #{relativities[@relativity]}#{@expected} error on :#{@args[0]}"  if @collection_name == :error_on

data/lib/rspec/rails/mocks.rb

@@ -27,11 +27,40 @@ module RSpec
           self.stub(:id) { nil }
         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 = {})
+
+      # Creates a mock object instance for a +string_or_model_class+ with
+      # common methods stubbed out. Additional methods may be easily stubbed
+      # (via add_stubs) if +stubs+ is passed.
+      #
+      # +model_class+ can be any of:
+      #
+      #   * A String representing a Class that does not exist
+      #   * A String representing a Class that extends ActiveModel::Naming
+      #   * A Class that extends ActiveModel::Naming
+      def mock_model(string_or_model_class, options_and_stubs = {})
+        if String === string_or_model_class
+          if Object.const_defined?(string_or_model_class)
+            model_class = Object.const_get(string_or_model_class)
+          else
+            model_class = Object.const_set(string_or_model_class, Class.new do
+              extend ActiveModel::Naming
+            end)
+          end
+        else
+          model_class = string_or_model_class 
+        end
+
+        unless model_class.kind_of? ActiveModel::Naming
+          raise ArgumentError.new <<-EOM
+The mock_model method can only accept as its first argument:
+  * A String representing a Class that does not exist
+  * A String representing a Class that extends ActiveModel::Naming
+  * A Class that extends ActiveModel::Naming
+
+It received #{model_class.inspect}
+EOM
+        end
+
         id = options_and_stubs.has_key?(:id) ? options_and_stubs[:id] : next_id
         options_and_stubs = options_and_stubs.reverse_merge({
           :id => id,
@@ -65,10 +94,6 @@ 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
@@ -152,3 +177,4 @@ end
 RSpec.configure do |c|
   c.include RSpec::Rails::Mocks
 end
+

data/lib/rspec/rails/view_rendering.rb

@@ -51,7 +51,7 @@ module RSpec
             @controller.class.view_paths = ::ActionView::PathSet.new.push(@_path_set_delegator_resolver)
           end
         end
-        
+
         after do
           unless self.class.render_views?
             @controller.class.view_paths = @_path_set_delegator_resolver.path_set

data/rspec-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "2.0.0.beta.17"
+  s.version = "2.0.0.beta.18"
 
   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-07-11}
+  s.date = %q{2010-07-21}
   s.description = %q{RSpec-2 for Rails-3}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
@@ -122,7 +122,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.17!
+  Thank you for installing rspec-rails-2.0.0.beta.18!
 
   This version of rspec-rails only works with versions of rails >= 3.0.0.beta.4.
 
@@ -132,7 +132,7 @@ Gem::Specification.new do |s|
   can access its generators and rake tasks.
 
     group :development, :test do
-      gem "rspec-rails", ">= 2.0.0.beta.17"
+      gem "rspec-rails", ">= 2.0.0.beta.18"
     end
 
   Be sure to run the following command in each of your Rails apps if you're
@@ -158,7 +158,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{rspec-rails-2.0.0.beta.17}
+  s.summary = %q{rspec-rails-2.0.0.beta.18}
   s.test_files = [
     "spec/rspec/rails/example/controller_example_group_spec.rb",
      "spec/rspec/rails/example/helper_example_group_spec.rb",

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

@@ -12,6 +12,73 @@ module RSpec::Rails
       group.metadata[:type].should eq(:view)
     end
 
+    describe 'automatic inclusion of helpers' do
+      module ::ThingsHelper; end
+
+      it 'includes the helper with the same name' do
+        group = RSpec::Core::ExampleGroup.describe 'things/show.html.erb'
+        group.should_receive(:helper).with(ThingsHelper)
+        group.class_eval do
+          include ViewExampleGroup
+        end
+      end
+
+      it 'operates normally when no helper with the same name exists' do
+        raise 'unexpected constant found' if Object.const_defined?('ClocksHelper')
+        lambda {
+          RSpec::Core::ExampleGroup.describe 'clocks/show.html.erb' do
+            include ViewExampleGroup
+          end
+        }.should_not raise_error
+      end
+
+      context 'application helper exists' do
+        before do
+          if !Object.const_defined? 'ApplicationHelper'
+            module ::ApplicationHelper; end
+            @application_helper_defined = true
+          end
+        end
+
+        after do
+          if @application_helper_defined
+            Object.__send__ :remove_const, 'ApplicationHelper'
+          end
+        end
+
+        it 'includes the application helper' do
+          group = RSpec::Core::Example.describe 'bars/new.html.erb'
+          group.should_receive(:helper).with(ApplicationHelper)
+          group.class_eval do
+            include ViewExampleGroup
+          end
+        end
+      end
+
+      context 'no application helper exists' do
+        before do
+          if Object.const_defined? 'ApplicationHelper'
+            @application_helper = ApplicationHelper
+            Object.__send__ :remove_const, 'ApplicationHelper'
+          end
+        end
+
+        after do
+          if @application_helper
+            ApplicationHelper = @application_helper
+          end
+        end
+
+        it 'operates normally' do
+          lambda {
+            RSpec::Core::ExampleGroup.describe 'foos/edit.html.erb' do
+              include ViewExampleGroup
+            end
+          }.should_not raise_error
+        end
+      end
+    end
+
     describe "#render" do
       let(:view_spec) do
         Class.new do
@@ -54,6 +121,22 @@ module RSpec::Rails
       end
     end
 
+    describe '#params' do
+      let(:view_spec) do
+        Class.new do
+          include ViewExampleGroup::InstanceMethods
+          def controller
+            @controller ||= Object.new
+          end
+        end.new
+      end
+
+      it 'delegates to the controller' do
+        view_spec.controller.should_receive(:params).and_return({})
+        view_spec.params[:foo] = 1
+      end
+    end
+
     describe "#_controller_path" do
       let(:view_spec) do
         Class.new do

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

@@ -4,7 +4,7 @@ describe "error_on" do
   it "should provide a description including the name of what the error is on" do
     have(1).error_on(:whatever).description.should == "have 1 error on :whatever"
   end
-  
+
   it "should provide a failure message including the number actually given" do
     lambda {
       [].should have(1).error_on(:whatever)
@@ -16,7 +16,7 @@ describe "errors_on" do
   it "should provide a description including the name of what the error is on" do
     have(2).errors_on(:whatever).description.should == "have 2 errors on :whatever"
   end
-  
+
   it "should provide a failure message including the number actually given" do
     lambda {
       [1].should have(3).errors_on(:whatever)

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

@@ -35,7 +35,7 @@ describe "be_routable" do
   end
 
   context "with should_not" do
-    
+
     it "passes if routes do not recognize the path" do
       routes.stub(:recognize_path) { raise ActionController::RoutingError.new('ignore') }
       expect do

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

@@ -2,6 +2,41 @@ require 'spec_helper'
 require File.dirname(__FILE__) + '/ar_classes'
 
 describe "mock_model(RealModel)" do
+
+  context "given a String" do
+    context "that does not represent an existing constant" do
+      it "class says it's name" do
+        model = mock_model("Foo")
+        model.class.name.should eq("Foo")
+      end
+    end
+
+    context "that represents an existing constant" do
+      context "that extends ActiveModel::Naming" do
+        it "treats the constant as the class" do
+          model = mock_model("MockableModel")
+          model.class.name.should eq("MockableModel")
+        end
+      end
+
+      context "that does not extend ActiveModel::Naming" do
+        it "raises with a helpful message" do
+          expect do
+            mock_model("String")
+          end.to raise_error(ArgumentError)
+        end
+      end
+    end
+  end
+
+  context "given a class that does not extend ActiveModel::Naming" do
+    it "raises with a helpful message" do
+      expect do
+        mock_model(String)
+      end.to raise_error(ArgumentError)
+    end
+  end
+
   describe "with #id stubbed" do
     before(:each) do
       @model = mock_model(MockableModel, :id => 1)
@@ -105,17 +140,6 @@ 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
@@ -199,6 +223,5 @@ describe "mock_model(RealModel)" do
     def model
       mock_model(MockableModel, :id => nil)
     end
-
   end
 end

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

@@ -6,28 +6,28 @@ describe "stub_model" do
     it "should have an id" do
       stub_model(MockableModel).id.should be > 0
     end
-  
+
     it "should say it is not a new record" do
       stub_model(MockableModel).should_not be_new_record
     end
   end
-  
+
   it "should accept a stub id" do
     stub_model(MockableModel, :id => 37).id.should == 37
   end
-  
+
   it "should say it is a new record when id is set to nil" do
     stub_model(MockableModel, :id => nil).should be_new_record
   end
-  
+
   it "should accept any arbitrary stub" do
     stub_model(MockableModel, :foo => "bar").foo.should == "bar"
   end
-  
+
   it "should accept a stub for save" do
     stub_model(MockableModel, :save => false).save.should be(false)
   end
-  
+
   describe "#as_new_record" do
     it "should say it is a new record" do
       stub_model(MockableModel).as_new_record.should be_new_record
@@ -37,20 +37,20 @@ describe "stub_model" do
       stub_model(MockableModel).as_new_record.id.should be(nil)
     end
   end
-  
+
   pending "should raise when hitting the db" do
     lambda do
       model = stub_model(MockableModel, :changed => true, :attributes_with_quotes => {'this' => 'that'})
       model.save
     end.should raise_error(RSpec::Rails::IllegalDataAccessException, /stubbed models are not allowed to access the database/)
   end
-  
+
   it "should increment the id" do
     first = stub_model(MockableModel)
     second = stub_model(MockableModel)
     second.id.should == (first.id + 1)
   end
-  
+
   describe "as association" do
     before(:each) do
       @real = AssociatedModel.create!

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  hash: 62196417
+  hash: 62196423
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
   - beta
-  - 17
-  version: 2.0.0.beta.17
+  - 18
+  version: 2.0.0.beta.18
 platform: ruby
 authors: 
 - David Chelimsky
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-11 00:00:00 -05:00
+date: 2010-07-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -173,7 +173,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-rails-2.0.0.beta.17!
+    Thank you for installing rspec-rails-2.0.0.beta.18!
   
     This version of rspec-rails only works with versions of rails >= 3.0.0.beta.4.
   
@@ -183,7 +183,7 @@ post_install_message: |
     can access its generators and rake tasks.
   
       group :development, :test do
-        gem "rspec-rails", ">= 2.0.0.beta.17"
+        gem "rspec-rails", ">= 2.0.0.beta.18"
       end
   
     Be sure to run the following command in each of your Rails apps if you're
@@ -235,7 +235,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.0.0.beta.17
+summary: rspec-rails-2.0.0.beta.18
 test_files: 
 - spec/rspec/rails/example/controller_example_group_spec.rb
 - spec/rspec/rails/example/helper_example_group_spec.rb