rspec-rails 2.13.1 → 2.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2867278a722c089dbb2bd8f6063ecb479760f05
-  data.tar.gz: bb564009cc97a8fb65e1088e71d3c0d0538bebd3
+  metadata.gz: bde9d78133ed3ae52ae2a3d1899ac9e698da737f
+  data.tar.gz: b3112c615d1bd84ebc99f76d72ff063a7a57910b
 SHA512:
-  metadata.gz: e030efde0376019bc0f8397c361c73aebf1ce81ba9e62412ef702c56e74c1f3145a43feb7b41e9dcc482e2cd1bd8c1b831c7620348c83bae9e844dffda224fd4
-  data.tar.gz: 8397abcbfdf655a2c8c9daa3891b03e4a4cf38ff1f60b6106cdf8b7240d29ff496883360ea16ee4c74a48fb61f89599b1cad36157402d33a7380c7a6bb304f5e
+  metadata.gz: a20ea10e0d036f6fc3a14a4689c1c140c87256b4386890fad04f6acaa77bb258b6846a6420e8f9b224b38cf197560467461799781fc1e9ec4e4c0cd3061f1613
+  data.tar.gz: 97fb4eb068173b5b2f7710ea395595b57a547ff3520f7f29bce52d4bec1b3db19fa65835f829fc56704b5319502b4fb51942dc807758176345c0197cd0bf0b24

data/Changelog.md

@@ -1,4 +1,15 @@
-### 2.13.1
+### 2.13.2 / 2013-05-18
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.13.1...v2.13.2)
+
+Bug fixes
+
+* `let` definitions may override methods defined in modules brought in via
+  `config.include` in controller specs. Fixes regression introduced in 2.13.
+  (Andy Lindeman, Jon Rowe)
+* Code that checks Rails version numbers is more robust in cases where Rails is
+  not fully loaded. (Andy Lindeman)
+
+### 2.13.1 / 2013-04-27
 [full changelog](http://github.com/rspec/rspec-rails/compare/v2.13.0...v2.13.1)
 
 Bug fixes

data/README.md

@@ -121,7 +121,7 @@ spec](#feature-specs).
 
 ## <a id="request-spec"></a>Request Specs
 
-Request specs live in spec/requests, spec/features, spec/api and
+Request specs live in spec/requests, spec/api and
 spec/integration, and mix in behavior
 [ActionDispatch::Integration::Runner](http://api.rubyonrails.org/classes/ActionDispatch/Integration/Runner.html),
 which is the basis for [Rails' integration

data/lib/generators/rspec.rb

@@ -1,5 +1,4 @@
 require 'rails/generators/named_base'
-require 'rspec/rails/rails_version'
 
 module Rspec
   module Generators
@@ -8,7 +7,7 @@ module Rspec
         @_rspec_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'rspec', generator_name, 'templates'))
       end
 
-      if RSpec::Rails.rails_version_satisfied_by?('< 3.1')
+      if ::Rails::VERSION::STRING < '3.1'
         def module_namespacing
           yield if block_given?
         end

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

@@ -1,5 +1,3 @@
-require 'rspec/rails/rails_version'
-
 module Rspec
   module Generators
     class InstallGenerator < ::Rails::Generators::Base

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

@@ -8,7 +8,7 @@ require 'rspec/autorun'
 # in spec/support/ and its subdirectories.
 Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
 
-<% if RSpec::Rails.rails_version_satisfied_by?('>= 4.0.0.beta1') -%>
+<% if ::Rails::VERSION::STRING >= '4' -%>
 # Checks for pending migrations before tests are run.
 # If you are not using ActiveRecord, you can remove this line.
 ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration)

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

@@ -109,7 +109,7 @@ describe <%= controller_class_name %>Controller do
         # specifies that the <%= class_name %> created on the previous line
         # receives the :update_attributes message with whatever params are
         # submitted in the request.
-        <%- if RSpec::Rails.rails_version_satisfied_by?('>= 4.0.0.beta1') -%>
+        <%- if ::Rails::VERSION::STRING >= '4' -%>
         <%= class_name %>.any_instance.should_receive(:update).with(<%= formatted_hash(example_params_for_update) %>)
         <%- else -%>
         <%= class_name %>.any_instance.should_receive(:update_attributes).with(<%= formatted_hash(example_params_for_update) %>)

data/lib/rspec/rails.rb

@@ -5,7 +5,7 @@ RSpec::configure do |c|
   c.backtrace_clean_patterns << /lib\/rspec\/rails/
 end
 
-require 'rspec/rails/rails_version'
+require 'rails/version'
 require 'rspec/rails/extensions'
 require 'rspec/rails/view_rendering'
 require 'rspec/rails/adapters'

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

@@ -142,9 +142,11 @@ module RSpec::Rails
       end
     end
 
-    included do
-      subject { controller }
+    def subject
+      controller
+    end
 
+    included do
       metadata[:type] = :controller
 
       before do

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

@@ -1,14 +1,13 @@
 # Temporary workaround to resolve circular dependency between rspec-rails' spec
 # suite and ammeter.
 require 'rspec/rails/matchers'
-require 'rspec/rails/rails_version'
 
 module RSpec
   module Rails
     module RailsExampleGroup
       extend ActiveSupport::Concern
       include RSpec::Rails::SetupAndTeardownAdapter
-      include RSpec::Rails::MiniTestLifecycleAdapter if RSpec::Rails.rails_version_satisfied_by?('>= 4.0.0.beta1')
+      include RSpec::Rails::MiniTestLifecycleAdapter if ::Rails::VERSION::STRING >= '4'
       include RSpec::Rails::TestUnitAssertionAdapter
       include RSpec::Rails::Matchers
     end

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

@@ -107,7 +107,7 @@ module RSpec::Rails
       end
 
       def _default_render_options
-        if RSpec::Rails.rails_version_satisfied_by?('>= 3.2')
+        if ::Rails::VERSION::STRING >= '3.2'
           # 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

data/lib/rspec/rails/fixture_support.rb

@@ -4,7 +4,7 @@ module RSpec
       module FixtureSupport
         extend ActiveSupport::Concern
         include RSpec::Rails::SetupAndTeardownAdapter
-        include RSpec::Rails::MiniTestLifecycleAdapter if RSpec::Rails.rails_version_satisfied_by?('>= 4.0.0.beta1')
+        include RSpec::Rails::MiniTestLifecycleAdapter if ::Rails::VERSION::STRING > '4'
         include RSpec::Rails::TestUnitAssertionAdapter
         include ActiveRecord::TestFixtures
 

data/lib/rspec/rails/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Rails
     module Version
-      STRING = '2.13.1'
+      STRING = '2.13.2'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rails
 version: !ruby/object:Gem::Version
-  version: 2.13.1
+  version: 2.13.2
 platform: ruby
 authors:
 - David Chelimsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-27 00:00:00.000000000 Z
+date: 2013-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -241,7 +241,6 @@ files:
 - lib/rspec/rails/matchers/routing_matchers.rb
 - lib/rspec/rails/mocks.rb
 - lib/rspec/rails/module_inclusion.rb
-- lib/rspec/rails/rails_version.rb
 - lib/rspec/rails/tasks/rspec.rake
 - lib/rspec/rails/vendor/capybara.rb
 - lib/rspec/rails/vendor/webrat.rb
@@ -254,94 +253,6 @@ files:
 - Capybara.md
 - .yardopts
 - .document
-- features/Autotest.md
-- features/Generators.md
-- features/GettingStarted.md
-- features/README.md
-- features/RailsVersions.md
-- features/Transactions.md
-- features/Upgrade.md
-- features/controller_specs/Cookies.md
-- features/controller_specs/README.md
-- features/controller_specs/anonymous_controller.feature
-- features/controller_specs/bypass_rescue.feature
-- features/controller_specs/controller_spec.feature
-- features/controller_specs/engine_routes.feature
-- features/controller_specs/isolation_from_views.feature
-- features/controller_specs/render_views.feature
-- features/feature_specs/feature_spec.feature
-- features/helper_specs/helper_spec.feature
-- features/mailer_specs/url_helpers.feature
-- features/matchers/README.md
-- features/matchers/new_record_matcher.feature
-- features/matchers/redirect_to_matcher.feature
-- features/matchers/relation_match_array.feature
-- features/matchers/render_template_matcher.feature
-- features/mocks/mock_model.feature
-- features/mocks/stub_model.feature
-- features/model_specs/README.md
-- features/model_specs/errors_on.feature
-- features/model_specs/transactional_examples.feature
-- features/request_specs/request_spec.feature
-- features/routing_specs/README.md
-- features/routing_specs/be_routable_matcher.feature
-- features/routing_specs/engine_routes.feature
-- features/routing_specs/named_routes.feature
-- features/routing_specs/route_to_matcher.feature
-- features/step_definitions/additional_cli_steps.rb
-- features/step_definitions/model_steps.rb
-- features/support/env.rb
-- features/support/rails_versions.rb
-- features/view_specs/inferred_controller_path.feature
-- features/view_specs/stub_template.feature
-- features/view_specs/view_spec.feature
-- spec/autotest/rails_rspec2_spec.rb
-- spec/generators/rspec/controller/controller_generator_spec.rb
-- spec/generators/rspec/helper/helper_generator_spec.rb
-- spec/generators/rspec/install/install_generator_spec.rb
-- spec/generators/rspec/integration/integration_generator_spec.rb
-- spec/generators/rspec/mailer/mailer_generator_spec.rb
-- spec/generators/rspec/model/model_generator_spec.rb
-- spec/generators/rspec/observer/observer_generator_spec.rb
-- spec/generators/rspec/scaffold/scaffold_generator_spec.rb
-- spec/generators/rspec/view/view_generator_spec.rb
-- spec/rspec/rails/assertion_adapter_spec.rb
-- spec/rspec/rails/assertion_delegator_spec.rb
-- spec/rspec/rails/configuration_spec.rb
-- spec/rspec/rails/deprecations_spec.rb
-- spec/rspec/rails/example/controller_example_group_spec.rb
-- spec/rspec/rails/example/feature_example_group_spec.rb
-- spec/rspec/rails/example/helper_example_group_spec.rb
-- spec/rspec/rails/example/mailer_example_group_spec.rb
-- spec/rspec/rails/example/model_example_group_spec.rb
-- spec/rspec/rails/example/request_example_group_spec.rb
-- spec/rspec/rails/example/routing_example_group_spec.rb
-- spec/rspec/rails/example/view_example_group_spec.rb
-- spec/rspec/rails/extensions/active_model/errors_on_spec.rb
-- spec/rspec/rails/extensions/active_record/base_spec.rb
-- spec/rspec/rails/extensions/active_record/records_spec.rb
-- spec/rspec/rails/fixture_support_spec.rb
-- spec/rspec/rails/matchers/be_a_new_spec.rb
-- spec/rspec/rails/matchers/be_new_record_spec.rb
-- spec/rspec/rails/matchers/be_routable_spec.rb
-- spec/rspec/rails/matchers/be_valid_spec.rb
-- spec/rspec/rails/matchers/errors_on_spec.rb
-- spec/rspec/rails/matchers/has_spec.rb
-- spec/rspec/rails/matchers/have_rendered_spec.rb
-- spec/rspec/rails/matchers/redirect_to_spec.rb
-- spec/rspec/rails/matchers/relation_match_array_spec.rb
-- spec/rspec/rails/matchers/route_to_spec.rb
-- spec/rspec/rails/minitest_lifecycle_adapter_spec.rb
-- spec/rspec/rails/mocks/mock_model_spec.rb
-- spec/rspec/rails/mocks/stub_model_spec.rb
-- spec/rspec/rails/rails_version_spec.rb
-- spec/rspec/rails/setup_and_teardown_adapter_spec.rb
-- spec/rspec/rails/view_rendering_spec.rb
-- spec/spec_helper.rb
-- spec/support/ar_classes.rb
-- spec/support/helpers.rb
-- spec/support/matchers.rb
-- spec/support/null_object.rb
 homepage: http://github.com/rspec/rspec-rails
 licenses:
 - MIT
@@ -363,97 +274,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rspec
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: rspec-rails-2.13.1
-test_files:
-- features/Autotest.md
-- features/Generators.md
-- features/GettingStarted.md
-- features/README.md
-- features/RailsVersions.md
-- features/Transactions.md
-- features/Upgrade.md
-- features/controller_specs/Cookies.md
-- features/controller_specs/README.md
-- features/controller_specs/anonymous_controller.feature
-- features/controller_specs/bypass_rescue.feature
-- features/controller_specs/controller_spec.feature
-- features/controller_specs/engine_routes.feature
-- features/controller_specs/isolation_from_views.feature
-- features/controller_specs/render_views.feature
-- features/feature_specs/feature_spec.feature
-- features/helper_specs/helper_spec.feature
-- features/mailer_specs/url_helpers.feature
-- features/matchers/README.md
-- features/matchers/new_record_matcher.feature
-- features/matchers/redirect_to_matcher.feature
-- features/matchers/relation_match_array.feature
-- features/matchers/render_template_matcher.feature
-- features/mocks/mock_model.feature
-- features/mocks/stub_model.feature
-- features/model_specs/README.md
-- features/model_specs/errors_on.feature
-- features/model_specs/transactional_examples.feature
-- features/request_specs/request_spec.feature
-- features/routing_specs/README.md
-- features/routing_specs/be_routable_matcher.feature
-- features/routing_specs/engine_routes.feature
-- features/routing_specs/named_routes.feature
-- features/routing_specs/route_to_matcher.feature
-- features/step_definitions/additional_cli_steps.rb
-- features/step_definitions/model_steps.rb
-- features/support/env.rb
-- features/support/rails_versions.rb
-- features/view_specs/inferred_controller_path.feature
-- features/view_specs/stub_template.feature
-- features/view_specs/view_spec.feature
-- spec/autotest/rails_rspec2_spec.rb
-- spec/generators/rspec/controller/controller_generator_spec.rb
-- spec/generators/rspec/helper/helper_generator_spec.rb
-- spec/generators/rspec/install/install_generator_spec.rb
-- spec/generators/rspec/integration/integration_generator_spec.rb
-- spec/generators/rspec/mailer/mailer_generator_spec.rb
-- spec/generators/rspec/model/model_generator_spec.rb
-- spec/generators/rspec/observer/observer_generator_spec.rb
-- spec/generators/rspec/scaffold/scaffold_generator_spec.rb
-- spec/generators/rspec/view/view_generator_spec.rb
-- spec/rspec/rails/assertion_adapter_spec.rb
-- spec/rspec/rails/assertion_delegator_spec.rb
-- spec/rspec/rails/configuration_spec.rb
-- spec/rspec/rails/deprecations_spec.rb
-- spec/rspec/rails/example/controller_example_group_spec.rb
-- spec/rspec/rails/example/feature_example_group_spec.rb
-- spec/rspec/rails/example/helper_example_group_spec.rb
-- spec/rspec/rails/example/mailer_example_group_spec.rb
-- spec/rspec/rails/example/model_example_group_spec.rb
-- spec/rspec/rails/example/request_example_group_spec.rb
-- spec/rspec/rails/example/routing_example_group_spec.rb
-- spec/rspec/rails/example/view_example_group_spec.rb
-- spec/rspec/rails/extensions/active_model/errors_on_spec.rb
-- spec/rspec/rails/extensions/active_record/base_spec.rb
-- spec/rspec/rails/extensions/active_record/records_spec.rb
-- spec/rspec/rails/fixture_support_spec.rb
-- spec/rspec/rails/matchers/be_a_new_spec.rb
-- spec/rspec/rails/matchers/be_new_record_spec.rb
-- spec/rspec/rails/matchers/be_routable_spec.rb
-- spec/rspec/rails/matchers/be_valid_spec.rb
-- spec/rspec/rails/matchers/errors_on_spec.rb
-- spec/rspec/rails/matchers/has_spec.rb
-- spec/rspec/rails/matchers/have_rendered_spec.rb
-- spec/rspec/rails/matchers/redirect_to_spec.rb
-- spec/rspec/rails/matchers/relation_match_array_spec.rb
-- spec/rspec/rails/matchers/route_to_spec.rb
-- spec/rspec/rails/minitest_lifecycle_adapter_spec.rb
-- spec/rspec/rails/mocks/mock_model_spec.rb
-- spec/rspec/rails/mocks/stub_model_spec.rb
-- spec/rspec/rails/rails_version_spec.rb
-- spec/rspec/rails/setup_and_teardown_adapter_spec.rb
-- spec/rspec/rails/view_rendering_spec.rb
-- spec/spec_helper.rb
-- spec/support/ar_classes.rb
-- spec/support/helpers.rb
-- spec/support/matchers.rb
-- spec/support/null_object.rb
+summary: rspec-rails-2.13.2
+test_files: []
 has_rdoc: 

data/features/Autotest.md

@@ -1,24 +0,0 @@
-The `rspec:install` generator creates a `.rspec` file, which tells RSpec to
-tell Autotest that you're using RSpec. You'll also need to add the ZenTest and
-autotest-rails gems to your Gemfile:
-
-    gem "ZenTest", "~> 4.4.2"
-    gem "autotest-rails", "~> 4.1.0"
-
-If all of the gems in your Gemfile are installed in system gems, you can just
-type
-
-    autotest
-
-If Bundler is managing any gems for you directly (i.e. you've got `:git` or
-`:path` attributes in the Gemfile), however, you may need to run
-
-    bundle exec autotest
-
-If you do, you require Autotest's bundler plugin in a `.autotest` file in the
-project root directory or your home directory:
-
-    require "autotest/bundler"
-
-Now you can just type `autotest`, it should prefix the generated shell command
-with `bundle exec`.

data/features/Generators.md

@@ -1,8 +0,0 @@
-If you type script/rails generate, the only RSpec generator you'll actually see
-is rspec:install. That's because RSpec is registered with Rails as the test
-framework, so whenever you generate application components like models,
-controllers, etc, RSpec specs are generated instead of Test::Unit tests.
-
-Note that the generators are there to help you get started, but they are no
-substitute for writing your own examples, and they are only guaranteed to work
-out of the box for with Rails' defaults (ActiveRecord, no Capybara or Webrat).

data/features/GettingStarted.md

@@ -1,84 +0,0 @@
-Install Rails-3
-
-    $ gem install rails -v "~> 3.0.0"
-
-### Generate an app
-
-    $ rails new example
-    $ cd example
-
-### Add rspec-rails to the Gemfile
-
-    $ echo 'gem "rspec-rails", :group => [:development, :test]' >> Gemfile
-
-### Install the bundle
-
-    $ bundle install
-
-### Bootstrap RSpec
-
-    $ rails generate rspec:install
-
-### Generate a scaffold
-
-    $ rails generate scaffold Widgets name:string
-
-This generates files in the `app` and `spec` directories. The files in the
-`app` directory are generated by Rails, and Rails delegates the generation of
-the files in the `spec` directory to RSpec.
-
-### Run migrations
-
-    $ rake db:migrate && rake db:test:prepare
-
-### Run RSpec
-
-    $ rake spec
-
-or
-
-    $ rspec spec --format documentation
-
-If all went well, you should see output ending with:
-
-    29 examples, 0 failures, 2 pending
-
-This output also includes the following controller spec:
-
-    WidgetsController
-      GET index
-        assigns all widgets as @widgets
-      GET show
-        assigns the requested widget as @widget
-      GET new
-        assigns a new widget as @widget
-      GET edit
-        assigns the requested widget as @widget
-      POST create
-        with valid params
-          creates a new Widget
-          assigns a newly created widget as @widget
-          redirects to the created widget
-        with invalid params
-          assigns a newly created but unsaved widget as @widget
-          re-renders the 'new' template
-      PUT update
-        with valid params
-          updates the requested widget
-          assigns the requested widget as @widget
-          redirects to the widget
-        with invalid params
-          assigns the widget as @widget
-          re-renders the 'edit' template
-      DELETE destroy
-        destroys the requested widget
-        redirects to the widgets list
-
-Output like this can help to quickly gain a high level understanding of how an
-object behaves. It also exposes which cases have been specified and which have
-not. Note the balance between the examples for the `create` and `update`
-actions. If the `redirects to the widget` example was missing from one or the
-other, it would be easy to spot.
-
-Take a look at the generated `spec/controllers/widgets_controller_spec.rb` to
-get a sense of how to organize your specs to generate output like this.