rspec-rails 2.8.0.rc1 → 2.8.0.rc2

data/lib/rspec/rails/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Rails
     module Version
-      STRING = '2.8.0.rc1'
+      STRING = '2.8.0.rc2'
     end
   end
 end

data/lib/rspec/rails/view_assigns.rb

@@ -1,46 +1,43 @@
 module RSpec
   module Rails
     module ViewAssigns
-      extend ActiveSupport::Concern
-
-      module InstanceMethods
-        # Assigns a value to an instance variable in the scope of the
-        # view being rendered.
-        #
-        # == Examples
-        #
-        #   assign(:widget, stub_model(Widget))
-        def assign(key, value)
-          _encapsulated_assigns[key] = value
-        end
-
-        def view_assigns
-          begin
-            # TODO: _assigns was deprecated in favor of view_assigns after
-            # Rails-3.0.0 was released. Since we are not able to predict when
-            # the _assigns/view_assigns patch will be released (I thought it
-            # would have been in 3.0.1, but 3.0.1 bypassed this change for a
-            # security fix), this bit ensures that we do the right thing without
-            # knowing anything about the Rails version we are dealing with.
-            #
-            # Once that change _is_ released, this can be changed to something
-            # that checks for the Rails version when the module is being
-            # interpreted, as it was before commit dd0095.
-            super.merge(_encapsulated_assigns)
-          rescue
-            _assigns
-          end
-        end
+      # Assigns a value to an instance variable in the scope of the
+      # view being rendered.
+      #
+      # @example
+      #
+      #     assign(:widget, stub_model(Widget))
+      def assign(key, value)
+        _encapsulated_assigns[key] = value
+      end
 
-        def _assigns
+      def view_assigns
+        begin
+          # TODO: _assigns was deprecated in favor of view_assigns after
+          # Rails-3.0.0 was released. Since we are not able to predict when
+          # the _assigns/view_assigns patch will be released (I thought it
+          # would have been in 3.0.1, but 3.0.1 bypassed this change for a
+          # security fix), this bit ensures that we do the right thing without
+          # knowing anything about the Rails version we are dealing with.
+          #
+          # Once that change _is_ released, this can be changed to something
+          # that checks for the Rails version when the module is being
+          # interpreted, as it was before commit dd0095.
           super.merge(_encapsulated_assigns)
+        rescue
+          _assigns
         end
+      end
+
+      # @api private
+      def _assigns
+        super.merge(_encapsulated_assigns)
+      end
 
       private
 
-        def _encapsulated_assigns
-          @_encapsulated_assigns ||= {}
-        end
+      def _encapsulated_assigns
+        @_encapsulated_assigns ||= {}
       end
 
     end

data/lib/rspec/rails/view_rendering.rb

@@ -34,25 +34,26 @@ module RSpec
           metadata[:rspec_rails] = metadata[:rspec_rails] ? metadata[:rspec_rails].dup : {}
         end
 
-        # See RSpec::Rails::ControllerExampleGroup
+        # @see RSpec::Rails::ControllerExampleGroup
         def render_views(true_or_false=true)
           metadata_for_rspec_rails[:render_views] = true_or_false
         end
 
+        # @deprecated Use `render_views` instead.
         def integrate_views
           RSpec.deprecate("integrate_views","render_views")
           render_views
         end
 
+        # @api private
         def render_views?
           metadata_for_rspec_rails[:render_views] || RSpec.configuration.render_views?
         end
       end
 
-      module InstanceMethods
-        def render_views?
-          self.class.render_views? || !controller.class.respond_to?(:view_paths)
-        end
+      # @api private
+      def render_views?
+        self.class.render_views? || !controller.class.respond_to?(:view_paths)
       end
 
       # Delegates find_all to the submitted path set and then returns templates
@@ -64,6 +65,7 @@ module RSpec
           @original_path_set = original_path_set
         end
 
+        # @api private
         def find_all(*args)
           original_path_set.find_all(*args).collect do |template|
             ::ActionView::Template.new(
@@ -80,15 +82,18 @@ module RSpec
       end
 
       module EmptyTemplates
+        # @api private
         def prepend_view_path(new_path)
           lookup_context.view_paths.unshift(*_path_decorator(new_path))
         end
 
+        # @api private
         def append_view_path(new_path)
           lookup_context.view_paths.push(*_path_decorator(new_path))
         end
 
         private
+
         def _path_decorator(path)
           EmptyTemplatePathSetDecorator.new(::ActionView::Base::process_view_paths(path))
         end
@@ -109,7 +114,6 @@ module RSpec
           end
         end
       end
-
     end
   end
 end

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

@@ -84,7 +84,7 @@ module RSpec::Rails
         RSpec.configuration.stub(:infer_base_class_for_anonymous_controllers?).and_return(true)
         group.controller { }
 
-        controller_class = group.metadata[:example_group][:describes]
+        controller_class = group.metadata[:example_group][:described_class]
         controller_class.superclass.should eq(group.controller_class)
       end
 
@@ -92,7 +92,7 @@ module RSpec::Rails
         RSpec.configuration.stub(:infer_base_class_for_anonymous_controllers?).and_return(false)
         group.controller { }
 
-        controller_class = group.metadata[:example_group][:describes]
+        controller_class = group.metadata[:example_group][:described_class]
         controller_class.superclass.should eq(ApplicationController)
       end
     end

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

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 module RSpec::Rails
-  describe HelperExampleGroup::InstanceMethods do
+  describe HelperExampleGroup do
     module ::FoosHelper; end
     subject { HelperExampleGroup }
 
@@ -9,8 +9,8 @@ module RSpec::Rails
     it { should be_included_in_files_in('.\\spec\\helpers\\') }
 
     it "provides a controller_path based on the helper module's name" do
-      helper_spec = Object.new.extend HelperExampleGroup::InstanceMethods
-      helper_spec.stub_chain(:example, :example_group, :describes).and_return(FoosHelper)
+      helper_spec = Object.new.extend HelperExampleGroup
+      helper_spec.stub_chain(:example, :example_group, :described_class).and_return(FoosHelper)
       helper_spec.__send__(:_controller_path).should == "foos"
     end
 
@@ -23,7 +23,7 @@ module RSpec::Rails
 
     describe "#helper" do
       it "returns the instance of AV::Base provided by AV::TC::Behavior" do
-        helper_spec = Object.new.extend HelperExampleGroup::InstanceMethods
+        helper_spec = Object.new.extend HelperExampleGroup
         helper_spec.should_receive(:view_assigns)
         av_tc_b_view = double('_view')
         av_tc_b_view.should_receive(:assign)
@@ -55,7 +55,7 @@ module RSpec::Rails
     describe "determine_default_helper_class" do
       it "returns the helper module passed to describe" do
         helper_spec = Object.new.extend HelperExampleGroup::ClassMethods
-        helper_spec.stub(:describes) { FoosHelper }
+        helper_spec.stub(:described_class) { FoosHelper }
         helper_spec.determine_default_helper_class("ignore this").
           should eq(FoosHelper)
       end

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

@@ -94,7 +94,7 @@ module RSpec::Rails
             end
           end
           include Local
-          include ViewExampleGroup::InstanceMethods
+          include ViewExampleGroup::ExampleMethods
         end.new
       end
 
@@ -124,7 +124,7 @@ module RSpec::Rails
     describe '#params' do
       let(:view_spec) do
         Class.new do
-          include ViewExampleGroup::InstanceMethods
+          include ViewExampleGroup::ExampleMethods
           def controller
             @controller ||= Object.new
           end
@@ -140,7 +140,7 @@ module RSpec::Rails
     describe "#_controller_path" do
       let(:view_spec) do
         Class.new do
-          include ViewExampleGroup::InstanceMethods
+          include ViewExampleGroup::ExampleMethods
         end.new
       end
       context "with a common _default_file_to_render" do
@@ -165,7 +165,7 @@ module RSpec::Rails
     describe "#view" do
       let(:view_spec) do
         Class.new do
-          include ViewExampleGroup::InstanceMethods
+          include ViewExampleGroup::ExampleMethods
         end.new
       end
 
@@ -179,7 +179,7 @@ module RSpec::Rails
     describe "#template" do
       let(:view_spec) do
         Class.new do
-          include ViewExampleGroup::InstanceMethods
+          include ViewExampleGroup::ExampleMethods
           def _view; end
         end.new
       end

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

@@ -1,6 +1,8 @@
 require "spec_helper"
 
 describe "be_a_new matcher" do
+  include RSpec::Rails::Matchers
+
   context "new record" do
     let(:record) do
       Class.new do

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

@@ -1,6 +1,8 @@
 require "spec_helper"
 
 describe "be_new_record" do
+  include RSpec::Rails::Matchers
+
   context "un-persisted record" do
     it "passes" do
       record = double('record', :persisted? => false)

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

@@ -61,7 +61,7 @@ describe "render_template" do
   context "with should_not" do
     context "when assert_template fails" do
       it "passes" do
-        self.stub!(:assert_template) do
+        def assert_template(*)
           raise ActiveSupport::TestCase::Assertion.new("this message")
         end
         expect do
@@ -72,7 +72,7 @@ describe "render_template" do
 
     context "when assert_template passes" do
       it "fails with custom failure message" do
-        self.stub!(:assert_template)
+        def assert_template(*); end
         expect do
           response.should_not render_template("template_name")
         end.to raise_error(/expected not to render \"template_name\", but did/)
@@ -81,9 +81,7 @@ describe "render_template" do
 
     context "when fails due to some other exception" do
       it "raises that exception" do
-        self.stub!(:assert_template) do
-          raise "oops"
-        end
+        def assert_template(*); raise "oops"; end
         expect do
           response.should_not render_template("template_name")
         end.to raise_exception("oops")

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

@@ -188,6 +188,34 @@ describe "mock_model(RealModel)" do
         it "says it will respond_to?(key) if RealModel has the attribute 'key'" do
           @model.respond_to?("column_a").should be(true)
         end
+        it "stubs column accessor (with string)" do
+          @model.respond_to?("column_a")
+          @model.column_a.should be_nil
+        end
+        it "stubs column accessor (with symbol)" do
+          @model.respond_to?(:column_a)
+          @model.column_a.should be_nil
+        end
+        it "does not stub column accessor if already stubbed in declaration (with string)" do
+          model = mock_model(MockableModel, "column_a" => "a")
+          model.respond_to?("column_a")
+          model.column_a.should eq("a")
+        end
+        it "does not stub column accessor if already stubbed in declaration (with symbol)" do
+          model = mock_model(MockableModel, :column_a => "a")
+          model.respond_to?("column_a")
+          model.column_a.should eq("a")
+        end
+        it "does not stub column accessor if already stubbed after declaration (with string)" do
+          @model.stub("column_a" => "a")
+          @model.respond_to?("column_a")
+          @model.column_a.should eq("a")
+        end
+        it "does not stub column accessor if already stubbed after declaration (with symbol)" do
+          @model.stub(:column_a => "a")
+          @model.respond_to?("column_a")
+          @model.column_a.should eq("a")
+        end
         it "says it will not respond_to?(key) if RealModel does not have the attribute 'key'" do
           @model.respond_to?("column_c").should be(false)
         end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  hash: 15424215
+  hash: 15424209
   prerelease: 6
   segments: 
   - 2
   - 8
   - 0
   - rc
-  - 1
-  version: 2.8.0.rc1
+  - 2
+  version: 2.8.0.rc2
 platform: ruby
 authors: 
 - David Chelimsky
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-06 00:00:00 Z
+date: 2011-12-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -30,10 +30,10 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  requirement: *id001
-  type: :runtime
   prerelease: false
+  requirement: *id001
   name: activesupport
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -45,10 +45,10 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  requirement: *id002
-  type: :runtime
   prerelease: false
+  requirement: *id002
   name: actionpack
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -60,36 +60,37 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  requirement: *id003
-  type: :runtime
   prerelease: false
+  requirement: *id003
   name: railties
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15424215
+        hash: 15424209
         segments: 
         - 2
         - 8
         - 0
         - rc
-        - 1
-        version: 2.8.0.rc1
-  requirement: *id004
-  type: :runtime
+        - 2
+        version: 2.8.0.rc2
   prerelease: false
+  requirement: *id004
   name: rspec
+  type: :runtime
 description: RSpec-2 for Rails-3
-email: dchelimsky@gmail.com
+email: rspec-users@rubyforge.org
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
 - README.md
+- License.txt
 files: 
 - lib/autotest/rails_rspec2.rb
 - lib/generators/rspec.rb
@@ -151,6 +152,7 @@ files:
 - lib/rspec/rails/version.rb
 - lib/rspec/rails/view_assigns.rb
 - lib/rspec/rails/view_rendering.rb
+- License.txt
 - README.md
 - features/Autotest.md
 - features/Generators.md
@@ -228,8 +230,8 @@ files:
 - spec/support/helpers.rb
 - spec/support/matchers.rb
 homepage: http://github.com/rspec/rspec-rails
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -261,7 +263,7 @@ rubyforge_project: rspec
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.8.0.rc1
+summary: rspec-rails-2.8.0.rc2
 test_files: 
 - features/Autotest.md
 - features/Generators.md
@@ -338,3 +340,4 @@ test_files:
 - spec/support/ar_classes.rb
 - spec/support/helpers.rb
 - spec/support/matchers.rb
+has_rdoc: