rspec-rails 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7082373e70e8e1b7a77e4a29acde414d3a0f88d
-  data.tar.gz: 0a6fd867ecf7f7d201e2b6f8d3ebaaef7357b6bd
+  metadata.gz: 027f378aa2e20a95523b0a2c7db67603858cab97
+  data.tar.gz: 767ac26b5cac44dc1be51ff6e053d2492235d3d4
 SHA512:
-  metadata.gz: edae3eef56dee24c9ef3b6aa78e971ac353c83058a38a9bbc05efb7da6cd8ed00b89f4add64f54c5d606cf88b4df8ba0846d9315f966b4dc0709583bf51b1b50
-  data.tar.gz: ac61c06796d8788ba676bb95d1ee3551b727e4757e1b78c2bbecfdba86551fb4bfbc9d141c594f42a03ed6c8008009dea09237ea1ba2b75d3440a809ad2256c6
+  metadata.gz: 629452b4ef924f97a6b036b462476254b6dad7962f1a44dfc44110f8fea02cca43b4fb52a9a0a6391b0a7ef163ea36248d9df277a63161c6d4fb0f0a83d5cb12
+  data.tar.gz: e800239d5939a807e15cd4082a4b1277878886fb7fe5f5d8633b335e5f935e5cffabaaf877fc4a6a3fa7445cf907670f5368cb48be1430b228c9e0cc522483cc

data/Changelog.md

@@ -1,3 +1,28 @@
+### 3.2.0 / 2015-02-03
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.1.0...v3.2.0)
+
+Enhancements:
+
+* Include generator for `ActionMailer` mailer previews (Takashi Nakagawa, #1185)
+* Configure the `ActionMailer` preview path via a Railtie (Aaron Kromer, #1236)
+* Show all RSpec generators when running `rails generate` (Eliot Sykes, #1248)
+* Support Ruby 2.2 with Rails 3.2 and 4.x (Aaron Kromer, #1264, #1277)
+* Improve `instance_double` to support verifying dynamic column methods defined
+  by `ActiveRecord` (Jon Rowe, #1238)
+* Mirror the use of Ruby 1.9 hash syntax for the `type` tags in the spec
+  generators on Rails 4. (Michael Stock, #1292)
+
+Bug Fixes:
+
+* Fix `rspec:feature` generator to use `RSpec` namespace preventing errors when
+  monkey-patching is disabled. (Rebecca Skinner, #1231)
+* Fix `NoMethodError` caused by calling `RSpec.feature` when Capybara is not
+  available or the Capybara version is < 2.4.0. (Aaron Kromer, #1261)
+* Fix `ArgumentError` when using an anonymous controller which inherits an
+  outer group's anonymous controller. (Yuji Nakayama, #1260)
+* Fix "Test is not a class (TypeError)" error when using a custom `Test` class
+  in Rails 4.1 and 4.2. (Aaron Kromer, #1295)
+
 ### 3.1.0 / 2014-09-04
 [Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.0.2...v3.1.0)
 
@@ -10,6 +35,8 @@ Enhancements:
 * Improve support for non-ActiveRecord apps by not loading ActiveRecord related
   settings in the generated `rails_helper`. (Aaron Kromer, #1150)
 * Remove Ruby warnings as a suggested configuration. (Aaron Kromer, #1163)
+* Improve the semantics of the controller spec for scaffolds. (Griffin Smith, #1204)
+* Use `#method` syntax in all generated controller specs. (Griffin Smith, #1206)
 
 Bug Fixes:
 

data/README.md

@@ -1,4 +1,4 @@
-# rspec-rails [![Build Status](https://secure.travis-ci.org/rspec/rspec-rails.png?branch=master)](http://travis-ci.org/rspec/rspec-rails) [![Code Climate](https://codeclimate.com/github/rspec/rspec-rails.png)](https://codeclimate.com/github/rspec/rspec-rails)
+# rspec-rails [![Build Status](https://secure.travis-ci.org/rspec/rspec-rails.svg?branch=master)](http://travis-ci.org/rspec/rspec-rails) [![Code Climate](https://img.shields.io/codeclimate/github/rspec/rspec-rails.svg)](https://codeclimate.com/github/rspec/rspec-rails)
 **rspec-rails** is a testing framework for Rails 3.x and 4.x.
 
 Use **[rspec-rails 1.x](http://github.com/dchelimsky/rspec-rails)** for Rails
@@ -11,7 +11,16 @@ Add `rspec-rails` to **both** the `:development` and `:test` groups in the
 
 ```ruby
 group :development, :test do
-  gem 'rspec-rails', '~> 3.0.0'
+  gem 'rspec-rails', '~> 3.0'
+end
+```
+
+Want to run against the `master` branch? You'll need to include the dependent
+RSpec repos as well. Add the following to your `Gemfile`:
+
+```ruby
+%w[rspec-core rspec-expectations rspec-mocks rspec-rails rspec-support].each do |lib|
+  gem lib, :git => "git://github.com/rspec/#{lib}.git", :branch => 'master'
 end
 ```
 
@@ -203,7 +212,7 @@ RSpec.describe "home page", :type => :request do
 end
 ```
 
-The above example uses only standard Rails and RSpec API's, but many
+The above example uses only standard Rails and RSpec APIs, but many
 RSpec/Rails users like to use extension libraries like
 [FactoryGirl](https://github.com/thoughtbot/factory_girl) and
 [Capybara](https://github.com/jnicklas/capybara):

data/lib/generators/rspec.rb

@@ -7,6 +7,8 @@ module Rspec
   module Generators
     # @private
     class Base < ::Rails::Generators::NamedBase
+      include RSpec::Rails::FeatureCheck
+
       def self.source_root(path = nil)
         if path
           @_rspec_source_root = path

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

@@ -1,10 +1,10 @@
 require 'rails_helper'
 
 <% module_namespacing do -%>
-RSpec.describe <%= class_name %>Controller, :type => :controller do
+RSpec.describe <%= class_name %>Controller, <%= type_metatag(:controller) %> do
 
 <% for action in actions -%>
-  describe "GET <%= action %>" do
+  describe "GET #<%= action %>" do
     it "returns http success" do
       get :<%= action %>
       expect(response).to have_http_status(:success)

data/lib/generators/rspec/controller/templates/view_spec.rb

@@ -1,5 +1,5 @@
 require 'rails_helper'
 
-RSpec.describe "<%= file_name %>/<%= @action %>.html.<%= options[:template_engine] %>", :type => :view do
+RSpec.describe "<%= file_name %>/<%= @action %>.html.<%= options[:template_engine] %>", <%= type_metatag(:view) %> do
   pending "add some examples to (or delete) #{__FILE__}"
 end

data/lib/generators/rspec/feature/templates/feature_spec.rb

@@ -1,5 +1,5 @@
 require 'rails_helper'
 
-feature "<%= class_name.pluralize %>", :type => :feature do
+RSpec.feature "<%= class_name.pluralize %>", <%= type_metatag(:feature) %> do
   pending "add some scenarios (or delete) #{__FILE__}"
 end

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

@@ -11,7 +11,7 @@ require 'rails_helper'
 #   end
 # end
 <% module_namespacing do -%>
-RSpec.describe <%= class_name %>Helper, :type => :helper do
+RSpec.describe <%= class_name %>Helper, <%= type_metatag(:helper) %> do
   pending "add some examples to (or delete) #{__FILE__}"
 end
 <% end -%>

data/lib/generators/rspec/install/templates/spec/rails_helper.rb

@@ -1,7 +1,7 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
-ENV["RAILS_ENV"] ||= 'test'
+ENV['RAILS_ENV'] ||= 'test'
 require 'spec_helper'
-require File.expand_path("../../config/environment", __FILE__)
+require File.expand_path('../../config/environment', __FILE__)
 require 'rspec/rails'
 # Add additional requires below this line. Rails is not loaded until this point!
 
@@ -18,7 +18,7 @@ require 'rspec/rails'
 # directory. Alternatively, in the individual `*_spec.rb` files, manually
 # require only the support files necessary.
 #
-# Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+# Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
 
 <% if RSpec::Rails::FeatureCheck.can_maintain_test_schema? -%>
 # Checks for pending migrations before tests are run.

data/lib/generators/rspec/integration/templates/request_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe "<%= class_name.pluralize %>", :type => :request do
+RSpec.describe "<%= class_name.pluralize %>", <%= type_metatag(:request) %> do
   describe "GET /<%= table_name %>" do
     it "works! (now write some real specs)" do
       get <%= index_helper %>_path

data/lib/generators/rspec/job/templates/job_spec.rb.erb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 <% module_namespacing do -%>
-RSpec.describe <%= class_name %>Job, :type => :job do
+RSpec.describe <%= class_name %>Job, <%= type_metatag(:job) %> do
   pending "add some examples to (or delete) #{__FILE__}"
 end
 <% end -%>

data/lib/generators/rspec/mailer/mailer_generator.rb

@@ -1,4 +1,5 @@
 require 'generators/rspec'
+require "rspec/rails/feature_check"
 
 module Rspec
   module Generators
@@ -16,6 +17,11 @@ module Rspec
           template "fixture", File.join("spec/fixtures", @path)
         end
       end
+
+      def generate_preview_files
+        return unless RSpec::Rails::FeatureCheck.has_action_mailer_preview?
+        template "preview.rb", File.join("spec/mailers/previews", class_path, "#{file_name}_preview.rb")
+      end
     end
   end
 end

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

@@ -1,7 +1,7 @@
 require "rails_helper"
 
 <% module_namespacing do -%>
-RSpec.describe <%= class_name %>, :type => :mailer do
+RSpec.describe <%= class_name %>, <%= type_metatag(:mailer) %> do
 <% for action in actions -%>
   describe "<%= action %>" do
     let(:mail) { <%= class_name %>.<%= action %> }

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

@@ -0,0 +1,13 @@
+<% module_namespacing do -%>
+# Preview all emails at http://localhost:3000/rails/mailers/<%= file_path %>
+class <%= class_name %>Preview < ActionMailer::Preview
+<% actions.each do |action| -%>
+
+  # Preview this email at http://localhost:3000/rails/mailers/<%= file_path %>/<%= action %>
+  def <%= action %>
+    <%= class_name %>.<%= action %>
+  end
+<% end -%>
+
+end
+<% end -%>

data/lib/generators/rspec/model/templates/model_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 <% module_namespacing do -%>
-RSpec.describe <%= class_name %>, :type => :model do
+RSpec.describe <%= class_name %>, <%= type_metatag(:model) %> do
   pending "add some examples to (or delete) #{__FILE__}"
 end
 <% end -%>

data/lib/generators/rspec/observer/templates/observer_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 <% module_namespacing do -%>
-RSpec.describe <%= class_name %>Observer, :type => :observer do
+RSpec.describe <%= class_name %>Observer, <%= type_metatag(:observer) %> do
   pending "add some examples to (or delete) #{__FILE__}"
 end
 <% end -%>

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

@@ -19,7 +19,7 @@ require 'rails_helper'
 # that an instance is receiving a specific message.
 
 <% module_namespacing do -%>
-RSpec.describe <%= controller_class_name %>Controller, :type => :controller do
+RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:controller) %> do
 
   # This should return the minimal set of attributes required to create a valid
   # <%= class_name %>. As you add validations to <%= class_name %>, be sure to
@@ -38,7 +38,7 @@ RSpec.describe <%= controller_class_name %>Controller, :type => :controller do
   let(:valid_session) { {} }
 
 <% unless options[:singleton] -%>
-  describe "GET index" do
+  describe "GET #index" do
     it "assigns all <%= table_name.pluralize %> as @<%= table_name.pluralize %>" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
       get :index, {}, valid_session
@@ -47,7 +47,7 @@ RSpec.describe <%= controller_class_name %>Controller, :type => :controller do
   end
 
 <% end -%>
-  describe "GET show" do
+  describe "GET #show" do
     it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
       get :show, {:id => <%= file_name %>.to_param}, valid_session
@@ -55,14 +55,14 @@ RSpec.describe <%= controller_class_name %>Controller, :type => :controller do
     end
   end
 
-  describe "GET new" do
+  describe "GET #new" do
     it "assigns a new <%= ns_file_name %> as @<%= ns_file_name %>" do
       get :new, {}, valid_session
       expect(assigns(:<%= ns_file_name %>)).to be_a_new(<%= class_name %>)
     end
   end
 
-  describe "GET edit" do
+  describe "GET #edit" do
     it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
       get :edit, {:id => <%= file_name %>.to_param}, valid_session
@@ -70,8 +70,8 @@ RSpec.describe <%= controller_class_name %>Controller, :type => :controller do
     end
   end
 
-  describe "POST create" do
-    describe "with valid params" do
+  describe "POST #create" do
+    context "with valid params" do
       it "creates a new <%= class_name %>" do
         expect {
           post :create, {:<%= ns_file_name %> => valid_attributes}, valid_session
@@ -90,7 +90,7 @@ RSpec.describe <%= controller_class_name %>Controller, :type => :controller do
       end
     end
 
-    describe "with invalid params" do
+    context "with invalid params" do
       it "assigns a newly created but unsaved <%= ns_file_name %> as @<%= ns_file_name %>" do
         post :create, {:<%= ns_file_name %> => invalid_attributes}, valid_session
         expect(assigns(:<%= ns_file_name %>)).to be_a_new(<%= class_name %>)
@@ -103,8 +103,8 @@ RSpec.describe <%= controller_class_name %>Controller, :type => :controller do
     end
   end
 
-  describe "PUT update" do
-    describe "with valid params" do
+  describe "PUT #update" do
+    context "with valid params" do
       let(:new_attributes) {
         skip("Add a hash of attributes valid for your model")
       }
@@ -129,7 +129,7 @@ RSpec.describe <%= controller_class_name %>Controller, :type => :controller do
       end
     end
 
-    describe "with invalid params" do
+    context "with invalid params" do
       it "assigns the <%= ns_file_name %> as @<%= ns_file_name %>" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
         put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => invalid_attributes}, valid_session
@@ -144,7 +144,7 @@ RSpec.describe <%= controller_class_name %>Controller, :type => :controller do
     end
   end
 
-  describe "DELETE destroy" do
+  describe "DELETE #destroy" do
     it "destroys the requested <%= ns_file_name %>" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
       expect {

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

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-RSpec.describe "<%= ns_table_name %>/edit", :type => :view do
+RSpec.describe "<%= ns_table_name %>/edit", <%= type_metatag(:view) %> do
   before(:each) do
     @<%= ns_file_name %> = assign(:<%= ns_file_name %>, <%= class_name %>.create!(<%= '))' if output_attributes.empty? %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>

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

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-RSpec.describe "<%= ns_table_name %>/index", :type => :view do
+RSpec.describe "<%= ns_table_name %>/index", <%= type_metatag(:view) %> do
   before(:each) do
     assign(:<%= table_name %>, [
 <% [1,2].each_with_index do |id, model_index| -%>

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

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-RSpec.describe "<%= ns_table_name %>/new", :type => :view do
+RSpec.describe "<%= ns_table_name %>/new", <%= type_metatag(:view) %> do
   before(:each) do
     assign(:<%= ns_file_name %>, <%= class_name %>.new(<%= '))' if output_attributes.empty? %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>

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

@@ -1,7 +1,7 @@
 require "rails_helper"
 
 <% module_namespacing do -%>
-RSpec.describe <%= controller_class_name %>Controller, :type => :routing do
+RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:routing) %> do
   describe "routing" do
 
 <% unless options[:singleton] -%>

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

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-RSpec.describe "<%= ns_table_name %>/show", :type => :view do
+RSpec.describe "<%= ns_table_name %>/show", <%= type_metatag(:view) %> do
   before(:each) do
     @<%= ns_file_name %> = assign(:<%= ns_file_name %>, <%= class_name %>.create!(<%= '))' if output_attributes.empty? %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>

data/lib/generators/rspec/view/templates/view_spec.rb

@@ -1,5 +1,5 @@
 require 'rails_helper'
 
-RSpec.describe "<%= file_path %>/<%= @action %>", :type => :view do
+RSpec.describe "<%= file_path %>/<%= @action %>", <%= type_metatag(:view) %> do
   pending "add some examples to (or delete) #{__FILE__}"
 end

data/lib/rspec-rails.rb

@@ -1,3 +1,5 @@
+require 'rspec/rails/feature_check'
+
 # Namespace for all core RSpec projects.
 module RSpec
   # Namespace for rspec-rails code.
@@ -9,9 +11,40 @@ module RSpec
       generators.integration_tool :rspec
       generators.test_framework :rspec
 
+      generators do
+        ::Rails::Generators.hidden_namespaces.reject! { |namespace| namespace.start_with?("rspec") }
+      end
+
       rake_tasks do
         load "rspec/rails/tasks/rspec.rake"
       end
+
+      # This is called after the environment has been loaded but before Rails
+      # sets the default for the `preview_path`
+      initializer "rspec_rails.action_mailer",
+                  :before => "action_mailer.set_configs" do |app|
+        if ::RSpec::Rails::FeatureCheck.has_action_mailer_preview?
+          options = app.config.action_mailer
+          # Rails 4.1 does not have `show_previews`
+          if ::ActionMailer::Base.respond_to?(:show_previews=)
+            options.show_previews ||= ::Rails.env.development?
+            set_preview_path = options.show_previews
+          else
+            set_preview_path = ::Rails.env.development?
+          end
+
+          if set_preview_path
+            rspec_preview_path = "#{::Rails.root}/spec/mailers/previews"
+            config_preview_path = options.preview_path
+            if config_preview_path.blank?
+              options.preview_path = rspec_preview_path
+            elsif config_preview_path != rspec_preview_path
+              warn "Action Mailer `preview_path` is not the RSpec default. " \
+                   "Preview path is set to: #{config_preview_path}"
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/rspec/rails.rb

@@ -1,11 +1,16 @@
 require 'rspec/core'
 require 'rails/version'
+
+# Load any of our adapters and extensions early in the process
+require 'rspec/rails/adapters'
 require 'rspec/rails/extensions'
+
+# Load the rspec-rails parts
 require 'rspec/rails/view_rendering'
-require 'rspec/rails/adapters'
 require 'rspec/rails/matchers'
 require 'rspec/rails/fixture_support'
 require 'rspec/rails/example'
 require 'rspec/rails/vendor/capybara'
 require 'rspec/rails/configuration'
+require 'rspec/rails/active_record'
 require 'rspec/rails/feature_check'

data/lib/rspec/rails/active_record.rb

@@ -0,0 +1,21 @@
+module RSpec
+  module Rails
+    # Fake class to document RSpec ActiveRecord configuration options. In practice,
+    # these are dynamically added to the normal RSpec configuration object.
+    class ActiveRecordConfiguration
+      # @private
+      def self.initialize_activerecord_configuration(config)
+        config.before :suite do
+          # This allows dynamic columns etc to be used on ActiveRecord models when creating instance_doubles
+          if defined?(ActiveRecord) && defined?(::RSpec::Mocks)
+            ::RSpec::Mocks.configuration.when_declaring_verifying_double do |possible_model|
+              possible_model.target.define_attribute_methods if possible_model.target.respond_to?(:define_attribute_methods)
+            end
+          end
+        end
+      end
+
+      initialize_activerecord_configuration RSpec.configuration
+    end
+  end
+end

data/lib/rspec/rails/adapters.rb

@@ -1,6 +1,7 @@
 require 'delegate'
 require 'active_support'
 require 'active_support/concern'
+require 'active_support/core_ext/string'
 
 module RSpec
   module Rails
@@ -14,6 +15,44 @@ module RSpec
       # Constant aliased to either Minitest or TestUnit, depending on what is
       # loaded.
       Assertions = Minitest::Assertions
+    elsif RUBY_VERSION >= '2.2.0'
+      # Minitest / TestUnit has been removed from ruby core. However, we are
+      # on an old Rails version and must load the appropriate gem
+      if ::Rails::VERSION::STRING >= '4.0.0'
+        # ActiveSupport 4.0.x has the minitest '~> 4.2' gem as a dependency
+        # This gem has no `lib/minitest.rb` file.
+        gem 'minitest' if defined?(Kernel.gem)
+        require 'minitest/unit'
+        Assertions = MiniTest::Assertions
+      elsif ::Rails::VERSION::STRING >= '3.2.21'
+        # TODO: Change the above check to >= '3.2.22' once it's released
+        begin
+          # Test::Unit "helpfully" sets up autoload for its `AutoRunner`.
+          # While we do not reference it directly, when we load the `TestCase`
+          # classes from AS (ActiveSupport), AS kindly references `AutoRunner`
+          # for everyone.
+          #
+          # To handle this we need to pre-emptively load 'test/unit' and make
+          # sure the version installed has `AutoRunner` (the 3.x line does to
+          # date). If so, we turn the auto runner off.
+          require 'test/unit'
+          require 'test/unit/assertions'
+          Test::Unit::AutoRunner.need_auto_run = false if defined?(Test::Unit::AutoRunner)
+        rescue LoadError => e
+          raise LoadError, <<-ERR.squish, e.backtrace
+            Ruby 2.2+ has removed test/unit from the core library. Rails
+            requires this as a dependency. Please add test-unit gem to your
+            Gemfile: `gem 'test-unit', '~> 3.0'` (#{e.message})"
+          ERR
+        end
+        Assertions = Test::Unit::Assertions
+      else
+        abort <<-MSG.squish
+          Ruby 2.2+ is not supported on Rails #{::Rails::VERSION::STRING}.
+          Check the Rails release notes for the appropriate update with
+          support.
+        MSG
+      end
     else
       begin
         require 'test/unit/assertions'

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

@@ -64,7 +64,7 @@ module RSpec
               if superclass == root_controller || superclass.abstract?
                 "AnonymousController"
               else
-                superclass.to_s
+                superclass.name
               end
             end
           end

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

@@ -33,3 +33,40 @@ module RSpec
     end
   end
 end
+
+unless RSpec.respond_to?(:feature)
+  opts = {
+    :capybara_feature => true,
+    :type => :feature,
+    :skip => <<-EOT.squish
+      Feature specs require the Capybara (http://github.com/jnicklas/capybara)
+      gem, version 2.2.0 or later. We recommend version 2.4.0 or later to avoid
+      some deprecation warnings and have support for
+      `config.expose_dsl_globally = false`.
+    EOT
+  }
+
+  # Capybara's monkey patching causes us to have to jump through some hoops
+  top_level = self
+  main_feature = nil
+  if defined?(Capybara) && ::Capybara::VERSION.to_f < 2.4
+    # Capybara 2.2 and 2.3 do not use `alias_example_xyz`
+    opts[:skip] = <<-EOT.squish
+      Capybara < 2.4.0 does not support RSpec's namespace or
+      `config.expose_dsl_globally = false`. Upgrade to Capybara >= 2.4.0.
+    EOT
+    main_feature = top_level.method(:feature) if top_level.respond_to?(:feature)
+  end
+
+  RSpec.configure do |c|
+    main_feature = nil unless c.expose_dsl_globally?
+    c.alias_example_group_to :feature, opts
+    c.alias_example_to :scenario
+    c.alias_example_to :xscenario
+  end
+
+  # Due to load order issues and `config.expose_dsl_globally?` defaulting to
+  # `true` we need to put Capybara's monkey patch method back. Otherwise,
+  # app upgrades have a high likelyhood of having all feature specs skipped.
+  top_level.define_singleton_method(:feature, &main_feature) if main_feature
+end

data/lib/rspec/rails/feature_check.rb

@@ -29,6 +29,26 @@ module RSpec
       def has_active_record_migration?
         has_active_record? && defined?(::ActiveRecord::Migration)
       end
+
+      def has_action_mailer?
+        defined?(::ActionMailer)
+      end
+
+      def has_action_mailer_preview?
+        has_action_mailer? && defined?(::ActionMailer::Preview)
+      end
+
+      def has_1_9_hash_syntax?
+        ::Rails::VERSION::STRING > '4.0'
+      end
+
+      def type_metatag(type)
+        if has_1_9_hash_syntax?
+          "type: :#{type}"
+        else
+          ":type => :#{type}"
+        end
+      end
     end
     # rubocop:enable Style/IndentationConsistency
   end

data/lib/rspec/rails/matchers.rb

@@ -9,17 +9,6 @@ module RSpec
   end
 end
 
-begin
-  require 'test/unit/assertionfailederror'
-rescue LoadError
-  module Test
-    module Unit
-      class AssertionFailedError < StandardError
-      end
-    end
-  end
-end
-
 require 'rspec/rails/matchers/have_rendered'
 require 'rspec/rails/matchers/redirect_to'
 require 'rspec/rails/matchers/routing_matchers'

data/lib/rspec/rails/version.rb

@@ -3,7 +3,7 @@ module RSpec
     # Version information for RSpec Rails.
     module Version
       # Current version of RSpec Rails, in semantic versioning format.
-      STRING = '3.1.0'
+      STRING = '3.2.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rails
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - David Chelimsky
@@ -11,28 +11,40 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDjjCCAnagAwIBAgIBATANBgkqhkiG9w0BAQUFADBGMRIwEAYDVQQDDAlyc3Bl
-  Yy1kZXYxGzAZBgoJkiaJk/IsZAEZFgtnb29nbGVnb3VwczETMBEGCgmSJomT8ixk
-  ARkWA2NvbTAeFw0xMzExMDcxOTQyNTlaFw0xNDExMDcxOTQyNTlaMEYxEjAQBgNV
-  BAMMCXJzcGVjLWRldjEbMBkGCgmSJomT8ixkARkWC2dvb2dsZWdvdXBzMRMwEQYK
-  CZImiZPyLGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-  nhCeZouDLXWO55no+EdZNCtjXjfJQ1X9TbPcvBDD29OypIUce2h/VdKXB2gI7ZHs
-  F5NkPggslTErGFmWAtIiur7u943RVqHOsyoIsy065F9fCtrykkA+22elvTDha4Iz
-  RUCvuhQ3klatYk4jF+cGt1jNONNVdLOiy0bMynvcM7hoVQ2AomwGs+cEOWQ/4dkD
-  JcNV3qfzF5QBcTD2372XNM53b25nYVQSX2KH5FF7BhlKyov33bOm2gA9M+mWIujW
-  qgkyxVlfrlE+ZBgV3wXn1Cojg1LpTq35yOArgwioyrwwlZZJR9joN9s/nDklfr5A
-  +dyETjFc6cmEPWZrt2cJBQIDAQABo4GGMIGDMAkGA1UdEwQCMAAwCwYDVR0PBAQD
-  AgSwMB0GA1UdDgQWBBSW+WD7hn1swJ1A7i8tbuFeuNCJCjAkBgNVHREEHTAbgRly
-  c3BlYy1kZXZAZ29vZ2xlZ291cHMuY29tMCQGA1UdEgQdMBuBGXJzcGVjLWRldkBn
-  b29nbGVnb3Vwcy5jb20wDQYJKoZIhvcNAQEFBQADggEBAH27jAZ8sD7vnXupj6Y+
-  BaBdfHtCkFaslLJ0aKuMDIVXwYuKfqoW15cZPDLmSIEBuQFM3lw6d/hEEL4Uo2jZ
-  FvtmH5OxifPDzFyUtCL4yp6qgNe/Xf6sDsRg6FmKcpgqCwNOmsViaf0LPSUH/GYQ
-  3Teoz8QCaDbD7AKsffT7eDrnbHnKweO1XdemRJC98u/yYxnGzMSWKEsn09etBlZ9
-  7H67k5Z3uf6cfLZgToWL6zShzZY3Nun5r73YsNf2/QZOe4UZe4vfGvn6baw53ys9
-  1yHC1AcSYpvi2dAbOiHT5iQF+krm4wse8KctXgTNnjMsHEoGKulJS2/sZl90jcCz
-  muA=
+  MIIF1TCCA72gAwIBAgIJAPXjfUbCjdXUMA0GCSqGSIb3DQEBBQUAMIGAMQswCQYD
+  VQQGEwJVUzETMBEGA1UECAwKV2FzaGluZ3RvbjEQMA4GA1UEBwwHU2VhdHRsZTEO
+  MAwGA1UECgwFUlNwZWMxEzARBgNVBAMMCnJzcGVjLmluZm8xJTAjBgkqhkiG9w0B
+  CQEWFnJzcGVjQGdvb2dsZWdyb3Vwcy5jb20wHhcNMTQxMjIzMDkzNTIyWhcNMjQx
+  MjIyMDkzNTIyWjCBgDELMAkGA1UEBhMCVVMxEzARBgNVBAgMCldhc2hpbmd0b24x
+  EDAOBgNVBAcMB1NlYXR0bGUxDjAMBgNVBAoMBVJTcGVjMRMwEQYDVQQDDApyc3Bl
+  Yy5pbmZvMSUwIwYJKoZIhvcNAQkBFhZyc3BlY0Bnb29nbGVncm91cHMuY29tMIIC
+  IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsSmjgcHaKlD0jizRJowi2bGI
+  KMOHnJoExxRNHHxH+3w9kkl95YldvDRVX495b13ZCzwRe0AyqX24wq04tp0G5Z5C
+  e/w2pnNK4ol1eECPwQu+YGpepeODlZICL5gwQspe0cDifbBnHx5QySMiPpvx6bC0
+  tQTox0ppDIaMhch8IPCwyoE4DQK5bpsdwnLSHTsQjUIb7IM8tUMpd/iKrJgNffwc
+  6gC1TmhIlzQoB26nCNh9uK7xZjUM+sGECzvcYuImchUaIgJA/ybrlZS+m/hxzvBo
+  mLnn/xNEC6Vz5HG+3TR0Gb0cSUf6XUu2s51Jk/SJi3MhCZp2gs9OUg4EVZNzQVkZ
+  efLBjAZG2Mxk14JyB4/Omc+Jk0ajprINCBbUNnxzCJrYDM3J9TVWIwyUGNX/U3MO
+  s3tMAT+EVgx/mZMPnBO8EULlyF51MRUp3Wy9Mnw8AYLk30UnMG5AjqgO5JNyFlA7
+  Xeh3EVdWY3vMB1pkhPwlsenpcmj5gOzrd54lELOVbCGHCf48iSqeflY2Lhe0pvzK
+  blXCJBDmtrebvus291rM/dHcbEfK1SVd5Wut/n131iouf6dnNCFskFygDcgBbthC
+  gpEMqf80lEmhX59VUsm0Pv6OEo+ZPHBvXPiJA6DShQh9t3YtpwyA8uVDMbT/i32u
+  2FUsqZbbJcCmkBrGposCAwEAAaNQME4wHQYDVR0OBBYEFPPvQ5XT0Nvuhi6k+hrW
+  Vv35J+TeMB8GA1UdIwQYMBaAFPPvQ5XT0Nvuhi6k+hrWVv35J+TeMAwGA1UdEwQF
+  MAMBAf8wDQYJKoZIhvcNAQEFBQADggIBAIqbQSWH2aAF537DKwAMB8nMFsoe24MD
+  gtuQAyjTtbH+QBE4N2RdQF/sU7Y3PYR7nqdrCsYc3RxyqM5XXi7I3IYdpfe1RuxY
+  +pyPzVQsPPDhMlJlCrwJsADnxlpxZlAgxYSLKOan55ihscaAWA90wqRUrf/ZJM36
+  8LWCPVn5teIt5aaxZWX68RMxa+AXvpbtJOBwXLkIFk3apD8CX4DhelIdw67DbkUe
+  ghUd/u62qrnqBTVgditt7OoWIZjzh24/Fda5d0MxZyvLILGOrf5bN4cTbe/q9Cid
+  Xrik7Upm+mu3y3yQIfrw85xybHq6iNXyYHvCdSrFfCIKrGpd/0CAdmYnJlx59Fk/
+  UbD3Eyx4psBSkU+WKO0Uf+3zNI7N/nVeNIwU/Ft+l8l7/K+427656c+ZGWDO0Gt/
+  BeEOSTDKP7qQ1T+JvMrBcBQo+i0cnRT10J1aoV90BhxsvWTRizIbugbaqR6Tq3bj
+  Akt00cIlNSplL6DenIAKSh5kF7s0tRD0tC3bNkZmNjNGkdoGEcUODEpTB3RHKKiu
+  e6k2Jg6m00z5vGFQhOnROG/QaUzMA3A3mFBe1RHFo07xd0pFeoeWL3vF69Gx9Jwp
+  ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
+  F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -41,6 +53,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -48,6 +63,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -55,6 +73,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -62,6 +83,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -69,6 +93,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -76,62 +103,65 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: rspec-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -217,6 +247,7 @@ files:
 - lib/generators/rspec/mailer/mailer_generator.rb
 - lib/generators/rspec/mailer/templates/fixture
 - lib/generators/rspec/mailer/templates/mailer_spec.rb
+- lib/generators/rspec/mailer/templates/preview.rb
 - lib/generators/rspec/model/model_generator.rb
 - lib/generators/rspec/model/templates/fixtures.yml
 - lib/generators/rspec/model/templates/model_spec.rb
@@ -233,6 +264,7 @@ files:
 - lib/generators/rspec/view/view_generator.rb
 - lib/rspec-rails.rb
 - lib/rspec/rails.rb
+- lib/rspec/rails/active_record.rb
 - lib/rspec/rails/adapters.rb
 - lib/rspec/rails/configuration.rb
 - lib/rspec/rails/example.rb
@@ -287,6 +319,6 @@ rubyforge_project: rspec
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: rspec-rails-3.1.0
+summary: rspec-rails-3.2.0
 test_files: []
 has_rdoc: