rspec-rails 2.9.0 → 2.10.0

data/.document

@@ -1,5 +1,5 @@
-README.markdown
 lib/**/*.rb
-bin/*
-features/**/*.feature
+-
+README.md
 License.txt
+Changelog.md

data/.yardopts

@@ -4,6 +4,5 @@
 --markup markdown
 --template-path yard/template/
 -
-README.md
 Changelog.md
 License.txt

data/Changelog.md

@@ -1,13 +1,30 @@
+### 2.10.0 / 2012-05-03
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.9.0...v2.10.0)
+
+Bug fixes
+
+* `render_views` called in a spec can now override the config setting. (martinsvalin)
+* Fix `render_views` for anonymous controllers on 1.8.7. (hudge, mudge)
+* Eliminate use of deprecated `process_view_paths`
+* Fix false negatives when using `route_to` matcher with `should_not`
+* `controller` is no longer nil in `config.before` hooks
+* Change `request.path_parameters` keys to symbols to match real Rails
+  environment (Nathan Broadbent)
+* Silence deprecation warnings in pre-2.9 generated view specs (Jonathan del
+  Strother)
+
 ### 2.9.0 / 2012-03-17
 [full changelog](http://github.com/rspec/rspec-rails/compare/v2.8.1...v2.9.0)
 
 Enhancments
+
 * add description method to RouteToMatcher (John Wulff)
 * Run "db:test:clone_structure" instead of "db:test:prepare" if Active Record's
   schema format is ":sql". (Andrey Voronkov)
 
 Bug fixes
-* mock_model(XXX).as_null_object.unknown_method returns self again
+
+* `mock_model(XXX).as_null_object.unknown_method` returns self again
 * Generated view specs use different IDs for each attribute.
 
 ### 2.8.1 / 2012-01-04

data/README.md

@@ -26,7 +26,7 @@ Add `rspec-rails` to the `:test` and `:development` groups in the Gemfile:
 
 ```ruby
 group :test, :development do
-  gem "rspec-rails", "~> 2.6"
+  gem "rspec-rails", "~> 2.0"
 end
 ```
 
@@ -360,7 +360,7 @@ rendered.should xxx
 Model specs live in spec/models.
 
 ```ruby
-describe Articles do
+describe Article do
   describe ".recent" do
     it "includes articles published less than one week ago" do
       article = Article.create!(:published_at => Date.today - 1.week + 1.second)

data/features/controller_specs/controller_spec.feature

@@ -16,3 +16,20 @@ Feature: controller spec
       """
     When I run `rspec spec`
     Then the example should pass
+
+  Scenario: controller is exposed to global before hooks
+    Given a file named "spec/controllers/widgets_controller_spec.rb" with:
+      """
+      require "spec_helper"
+
+      RSpec.configure {|c| c.before { controller.should_not be_nil }}
+
+      describe WidgetsController do
+        describe "GET index" do
+          it "doesn't matter" do
+          end
+        end
+      end
+      """
+    When I run `rspec spec`
+    Then the example should pass

data/features/controller_specs/isolation_from_views.feature

@@ -17,12 +17,12 @@ Feature: views are stubbed by default
           it "renders the index template" do
             get :index
             response.should render_template("index")
-            response.body.should == ""
+            response.body.should eq ""
           end
           it "renders the widgets/index template" do
             get :index
             response.should render_template("widgets/index")
-            response.body.should == ""
+            response.body.should eq ""
           end
         end
       end
@@ -59,7 +59,7 @@ Feature: views are stubbed by default
             controller.append_view_path 'app/views'
             get :custom_action
             response.should render_template("custom_action")
-            response.body.should == ""
+            response.body.should eq ""
           end
         end
       end
@@ -67,29 +67,21 @@ Feature: views are stubbed by default
     When I run `rspec spec`
     Then the examples should all pass
 
-  Scenario: expect template to render when view path is changed at runtime (fails)
+  Scenario: expect template to render the real template with render_views when view path is changed at runtime
     Given a file named "spec/controllers/things_controller_spec.rb" with:
       """
       require "spec_helper"
 
       describe ThingsController do
-        describe "custom_action" do
-          it "renders the custom_action template" do
-            render_views
-            controller.prepend_view_path 'app/views'
-            get :custom_action
-            response.should render_template("custom_action")
-            response.body.should == ""
-          end
+        render_views
 
-          it "renders an empty custom_action template" do
-            controller.prepend_view_path 'app/views'
-            get :custom_action
-            response.should render_template("custom_action")
-            response.body.should == ""
-          end
+        it "renders the real custom_action template" do
+          controller.prepend_view_path 'app/views'
+          get :custom_action
+          response.should render_template("custom_action")
+          response.body.should match(/template for a custom action/)
         end
       end
       """
     When I run `rspec spec`
-    Then the output should contain "2 examples, 1 failure"
+    Then the examples should all pass

data/features/model_specs/errors_on.feature

@@ -8,6 +8,7 @@ Feature: errors_on
       class ValidatingWidget < ActiveRecord::Base
         set_table_name :widgets
         validates_presence_of :name
+        attr_accessible :name
       end
 
       describe ValidatingWidget do

data/features/step_definitions/additional_cli_steps.rb

@@ -1,4 +1,4 @@
 Then /^the example(s)? should( all)? pass$/ do |_, _|
-  Then %q{the output should contain "0 failures"}
-  Then %q{the exit status should be 0}
+  step %q{the output should contain "0 failures"}
+  step %q{the exit status should be 0}
 end

data/features/view_specs/inferred_controller_path.feature

@@ -7,7 +7,7 @@ Feature: view spec infers controller path and action
 
       describe "widgets/new" do
         it "infers the controller path" do
-          controller.request.path_parameters["controller"].should eq("widgets")
+          controller.request.path_parameters[:controller].should eq("widgets")
         end
       end
       """
@@ -21,7 +21,7 @@ Feature: view spec infers controller path and action
 
       describe "widgets/new" do
         it "infers the controller path" do
-          controller.request.path_parameters["action"].should eq("new")
+          controller.request.path_parameters[:action].should eq("new")
         end
       end
       """
@@ -35,7 +35,7 @@ Feature: view spec infers controller path and action
 
       describe "widgets/_form" do
         it "includes a link to new" do
-          controller.request.path_parameters["action"].should be_nil
+          controller.request.path_parameters[:action].should be_nil
         end
       end
       """

data/features/view_specs/view_spec.feature

@@ -158,3 +158,17 @@ Feature: view spec
       """
     When I run `rspec spec/views/secrets`
     Then the examples should all pass
+
+  Scenario: request.path_parameters should match Rails by using symbols for keys
+    Given a file named "spec/views/widgets/index.html.erb_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe "controller.request.path_parameters" do
+        it "matches the Rails environment by using symbols for keys" do
+          [:controller, :action].each { |k| controller.request.path_parameters.keys.should include(k) }
+        end
+      end
+      """
+    When I run `rspec spec/views`
+    Then the examples should all pass

data/lib/rspec/rails/adapters.rb

@@ -12,7 +12,7 @@ module RSpec
         # Wraps `setup` calls from within Rails' testing framework in `before`
         # hooks.
         def setup(*methods)
-          methods.each {|method| before { send method } }
+          methods.each {|method| prepend_before { send method } }
         end
 
         # @api private

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

@@ -58,10 +58,10 @@ module RSpec::Rails
                          controller_class :
                          ApplicationController
 
-        metadata[:example_group][:described_class] = Class.new(base_class, &body)
-        metadata[:example_group][:described_class].singleton_class.class_eval do
-          def name; "AnonymousController" end
+        metadata[:example_group][:described_class] = Class.new(base_class) do
+          def self.name; "AnonymousController"; end
         end
+        metadata[:example_group][:described_class].class_eval(&body)
 
         before do
           @orig_routes, @routes = @routes, ActionDispatch::Routing::RouteSet.new

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

@@ -42,7 +42,7 @@ module RSpec::Rails
       #       end
       #     end
       def render(options={}, local_assigns={}, &block)
-        options = {:template => _default_file_to_render} if Hash === options and options.empty?
+        options = _default_render_options if Hash === options and options.empty?
         super(options, local_assigns, &block)
       end
 
@@ -98,6 +98,19 @@ module RSpec::Rails
         example.example_group.top_level_description
       end
 
+      def _default_render_options
+        # pluck the handler, format, and locale out of, eg, posts/index.de.html.haml
+        template, *components = _default_file_to_render.split('.')
+        handler, format, locale = *components.reverse
+
+        render_options = {:template => template}
+        render_options[:handlers] = [handler] if handler
+        render_options[:formats] = [format] if format
+        render_options[:locales] = [locale] if locale
+
+        render_options
+      end
+
       def _path_parts
         _default_file_to_render.split("/")
       end
@@ -133,8 +146,8 @@ module RSpec::Rails
           # rails 3.0
           controller.controller_path = _controller_path
         end
-        controller.request.path_parameters["controller"] = _controller_path
-        controller.request.path_parameters["action"]     = _inferred_action unless _inferred_action =~ /^_/
+        controller.request.path_parameters[:controller] = _controller_path
+        controller.request.path_parameters[:action]     = _inferred_action unless _inferred_action =~ /^_/
       end
     end
   end

data/lib/rspec/rails/matchers.rb

@@ -1,5 +1,5 @@
 require 'rspec/core/deprecation'
-require 'rspec/matchers'
+require 'rspec/expectations'
 
 module RSpec::Rails
   module Matchers

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

@@ -23,7 +23,9 @@ module RSpec::Rails::Matchers
       # @api private
       def matches?(verb_to_path_map)
         @verb_to_path_map = verb_to_path_map
-        match_unless_raises ActiveSupport::TestCase::Assertion do
+        # assert_recognizes does not consider ActionController::RoutingError an
+        # assertion failure, so we have to capture that and Assertion here.
+        match_unless_raises ActiveSupport::TestCase::Assertion, ActionController::RoutingError do
           path, query = *verb_to_path_map.values.first.split('?')
           @scope.assert_recognizes(
             @expected_options,

data/lib/rspec/rails/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Rails
     module Version
-      STRING = '2.9.0'
+      STRING = '2.10.0'
     end
   end
 end

data/lib/rspec/rails/view_rendering.rb

@@ -47,7 +47,9 @@ module RSpec
 
         # @api private
         def render_views?
-          metadata_for_rspec_rails[:render_views] || RSpec.configuration.render_views?
+          metadata_for_rspec_rails.fetch(:render_views) do
+            RSpec.configuration.render_views?
+          end
         end
       end
 
@@ -95,7 +97,7 @@ module RSpec
         private
 
         def _path_decorator(path)
-          EmptyTemplatePathSetDecorator.new(::ActionView::Base::process_view_paths(path))
+          EmptyTemplatePathSetDecorator.new(ActionView::PathSet.new(Array.wrap(path)))
         end
       end
 

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

@@ -108,10 +108,15 @@ module RSpec::Rails
       end
 
       context "given no input" do
-        it "sends render(:file => (described file)) to the view" do
-          view_spec.stub(:_default_file_to_render) { "widgets/new.html.erb" }
+        it "sends render(:template => (described file)) to the view" do
+          view_spec.stub(:_default_file_to_render) { "widgets/new" }
           view_spec.render
-          view_spec.received.first.should == [{:template => "widgets/new.html.erb"},{}, nil]
+          view_spec.received.first.should == [{:template => "widgets/new"},{}, nil]
+        end
+        it "converts the filename components into render options" do
+          view_spec.stub(:_default_file_to_render) { "widgets/new.en.html.erb" }
+          view_spec.render
+          view_spec.received.first.should == [{:template => "widgets/new", :locales=>['en'], :formats=>['html'], :handlers=>['erb']},{}, nil]
         end
       end
 

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

@@ -20,7 +20,6 @@ describe "route_to" do
   end
 
   context "with shortcut syntax" do
-
     it "routes with extra options" do
       self.should_receive(:assert_recognizes).with({ :controller => "controller", :action => "action", :extra => "options"}, { :method=> :get, :path=>"path" }, {})
       get("path").should route_to("controller#action", :extra => "options")
@@ -65,14 +64,25 @@ describe "route_to" do
       end
     end
 
-    context "when assert_recognizes fails" do
+    context "when assert_recognizes fails with an assertion failure" do
       it "fails with message from assert_recognizes" do
         self.stub!(:assert_recognizes) do
           raise ActiveSupport::TestCase::Assertion.new("this message")
         end
         expect do
           {:get => "path"}.should route_to("these" => "options")
-        end.to raise_error("this message")
+        end.to raise_error(RSpec::Expectations::ExpectationNotMetError, "this message")
+      end
+    end
+
+    context "when assert_recognizes fails with a routing error" do
+      it "fails with message from assert_recognizes" do
+        self.stub!(:assert_recognizes) do
+          raise ActionController::RoutingError.new("this message")
+        end
+        expect do
+          {:get => "path"}.should route_to("these" => "options")
+        end.to raise_error(RSpec::Expectations::ExpectationNotMetError, "this message")
       end
     end
 
@@ -98,7 +108,7 @@ describe "route_to" do
       end
     end
 
-    context "when assert_recognizes fails" do
+    context "when assert_recognizes fails with an assertion failure" do
       it "passes" do
         self.stub!(:assert_recognizes) do
           raise ActiveSupport::TestCase::Assertion.new("this message")
@@ -109,6 +119,17 @@ describe "route_to" do
       end
     end
 
+    context "when assert_recognizes fails with a routing error" do
+      it "passes" do
+        self.stub!(:assert_recognizes) do
+          raise ActionController::RoutingError.new("this message")
+        end
+        expect do
+          {:get => "path"}.should_not route_to("these" => "options")
+        end.to_not raise_error
+      end
+    end
+
     context "when an exception is raised" do
       it "raises that exception" do
         self.stub!(:assert_recognizes) do
@@ -120,6 +141,7 @@ describe "route_to" do
       end
     end
   end
+
   it "uses failure message from assert_recognizes" do
     self.stub!(:assert_recognizes).and_raise(
       ActiveSupport::TestCase::Assertion.new("this message"))
@@ -128,4 +150,3 @@ describe "route_to" do
     end.to raise_error("this message")
   end
 end
-

data/spec/rspec/rails/view_rendering_spec.rb

@@ -54,6 +54,12 @@ module RSpec::Rails
           group.render_views false
           group.new.render_views?.should be_false
         end
+
+        it "overrides the global config if render_views is enabled there" do
+          RSpec.configuration.stub(:render_views?).and_return true
+          group.render_views false
+          group.new.render_views?.should be_false
+        end
       end
 
       context "in a nested group" do

metadata

@@ -1,92 +1,166 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rspec-rails
-version: !ruby/object:Gem::Version 
-  hash: 43
+version: !ruby/object:Gem::Version
+  version: 2.10.0
   prerelease: 
-  segments: 
-  - 2
-  - 9
-  - 0
-  version: 2.9.0
 platform: ruby
-authors: 
+authors:
 - David Chelimsky
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-17 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
-  prerelease: false
-  requirement: *id001
+date: 2012-05-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
   prerelease: false
-  requirement: *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
   name: actionpack
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
   prerelease: false
-  requirement: *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
   name: railties
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 2
-        - 9
-        - 0
-        version: 2.9.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
   prerelease: false
-  requirement: *id004
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.10.0
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.10.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.9
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.9
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.11
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.11
+- !ruby/object:Gem::Dependency
+  name: ZenTest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.6.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.6.2
+- !ruby/object:Gem::Dependency
+  name: ammeter
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.4
 description: RSpec for Rails
 email: rspec-users@rubyforge.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/autotest/rails_rspec2.rb
 - lib/generators/rspec.rb
 - lib/generators/rspec/controller/controller_generator.rb
@@ -228,39 +302,38 @@ files:
 - spec/support/helpers.rb
 - spec/support/matchers.rb
 homepage: http://github.com/rspec/rspec-rails
-licenses: 
+licenses:
 - MIT
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2355321046634655389
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -2355321046634655389
 requirements: []
-
 rubyforge_project: rspec
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.9.0
-test_files: 
+summary: rspec-rails-2.10.0
+test_files:
 - features/Autotest.md
 - features/Generators.md
 - features/GettingStarted.md