rspec-rails 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 293b41440231e04309edaff6ee96229fae92d409
-  data.tar.gz: b91fd0fe65386c2ce791c93b1164201ecb8da9b5
+  metadata.gz: 32d2e246a1000916e4c0eeaa3e5df27115c0d253
+  data.tar.gz: feed9967eb41264226b18f21ca7068ae1a35bed7
 SHA512:
-  metadata.gz: a04182629a0d1ea05441da7204b2319db54cdc1d85fa153b98c4b61cfd8c93edede9753d6ce46ef3764a52a0417ff09f4f98ffbc017f93374982985d31ff6edc
-  data.tar.gz: ddb7206a294cc3977bd4b34f1549989a13329c80449d58740e0b3da12973771ff7d1e997fd05d7e0f4c64b144619a191928ac7a452428e0906ff5c0b6e0ced76
+  metadata.gz: b3d482989d7aad1d9fe4a100513bae38b38972bf45f5c165717d3bd8b6fca0b4e3522df43c3c151d099821b1677cc782c77be6d067612d52d8ca15370ceced03
+  data.tar.gz: e523716b7ec418eb786f638e9c91dd0f0b671bdfe20e7b3d1836b3ca5dfaf459585bbdf7ebb83d6a4fd408751e44ba1b494c7e10ac59cb988ad2d4581caf64a3

data/Changelog.md

@@ -1,3 +1,15 @@
+### 3.2.2 / 2015-06-03
+
+Bug Fixes:
+
+* Fix auto-including of generic `Helper` object for view specs sitting in the
+  `app/views` root (David Daniell, #1289)
+* Remove pre-loading of ActionMailer in the Railtie (Aaron Kromer, #1327)
+* Fix undefined method `need_auto_run=` error when using Ruby 2.1 and Rails 3.2
+  without the test-unit gem (Orien Madgwick, #1350)
+* Fix load order issued which causes an undefined method `fixture_path` error
+  when loading rspec-rails after a spec has been created. (Aaron Kromer, #1372)
+
 ### 3.2.1 / 2015-02-23
 [Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.2.0...v3.2.1)
 

data/lib/rspec-rails.rb

@@ -23,28 +23,45 @@ module RSpec
       # 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
+        setup_preview_path(app)
+      end
+
+    private
+
+      def setup_preview_path(app)
+        # If the action mailer railtie isn't loaded the config will not respond
+        return unless supports_action_mailer_previews?(app.config)
+        options = app.config.action_mailer
+        config_default_preview_path(options) if config_preview_path?(options)
+      end
+
+      def config_preview_path?(options)
+        # This string version check avoids loading the ActionMailer class, as
+        # would happen using `defined?`. This is necessary because the
+        # ActionMailer class only loads it's settings once, at load time. If we
+        # load the class now any settings declared in a config block in an
+        # initializer will be ignored.
+        #
+        # We cannot use `respond_to?(:show_previews)` here as it will always
+        # return `true`.
+        if ::Rails::VERSION::STRING < '4.2'
+          ::Rails.env.development?
+        elsif options.show_previews.nil?
+          options.show_previews = ::Rails.env.development?
+        else
+          options.show_previews
         end
       end
+
+      def config_default_preview_path(options)
+        return unless options.preview_path.blank?
+        options.preview_path = "#{::Rails.root}/spec/mailers/previews"
+      end
+
+      def supports_action_mailer_previews?(config)
+        config.respond_to?(:action_mailer) &&
+          config.action_mailer.respond_to?(:preview_path)
+      end
     end
   end
 end

data/lib/rspec/rails/adapters.rb

@@ -5,6 +5,19 @@ require 'active_support/core_ext/string'
 
 module RSpec
   module Rails
+    def self.disable_testunit_autorun
+      # `Test::Unit::AutoRunner.need_auto_run=` was introduced to the test-unit
+      # gem in version 2.4.9. Previous to this version `Test::Unit.run=` was
+      # used. The implementation of test-unit included with Ruby has neither
+      # method.
+      if defined?(Test::Unit::AutoRunner.need_auto_run = ())
+        Test::Unit::AutoRunner.need_auto_run = false
+      elsif defined?(Test::Unit.run = ())
+        Test::Unit.run = false
+      end
+    end
+    private_class_method :disable_testunit_autorun
+
     if ::Rails::VERSION::STRING >= '4.1.0'
       if defined?(Kernel.gem)
         gem 'minitest'
@@ -37,7 +50,7 @@ module RSpec
           # 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)
+          disable_testunit_autorun
         rescue LoadError => e
           raise LoadError, <<-ERR.squish, e.backtrace
             Ruby 2.2+ has removed test/unit from the core library. Rails
@@ -62,7 +75,7 @@ module RSpec
         require 'test/unit/assertions'
       end
       # Turn off test unit's auto runner for those using the gem
-      Test::Unit::AutoRunner.need_auto_run = false if defined?(Test::Unit::AutoRunner)
+      disable_testunit_autorun
       # Constant aliased to either Minitest or TestUnit, depending on what is
       # loaded.
       Assertions = Test::Unit::Assertions

data/lib/rspec/rails/configuration.rb

@@ -56,12 +56,21 @@ module RSpec
       config.add_setting :infer_base_class_for_anonymous_controllers, :default => true
 
       # fixture support
-      config.include RSpec::Rails::FixtureSupport
       config.add_setting :use_transactional_fixtures, :alias_with => :use_transactional_examples
       config.add_setting :use_instantiated_fixtures
       config.add_setting :global_fixtures
       config.add_setting :fixture_path
 
+      # TODO: We'll need to create a deprecated module in order to properly
+      #  report to gems / projects which are relying on this being loaded
+      #  globally.
+      #
+      # See rspec/rspec-rails#1355 for history
+      #
+      # @deprecated Include `RSpec::Rails::RailsExampleGroup` or
+      #   `RSpec::Rails::FixtureSupport` directly instead
+      config.include RSpec::Rails::FixtureSupport
+
       # This allows us to expose `render_views` as a config option even though it
       # breaks the convention of other options by using `render_views` as a
       # command (i.e. `render_views = true`), where it would normally be used

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

@@ -14,7 +14,7 @@ module RSpec
       module ClassMethods
         def _default_helper
           base = metadata[:description].split('/')[0..-2].join('/')
-          (base.camelize + 'Helper').constantize if base
+          (base.camelize + 'Helper').constantize unless base.to_s.empty?
         rescue NameError
           nil
         end

data/lib/rspec/rails/feature_check.rb

@@ -38,6 +38,11 @@ module RSpec
         has_action_mailer? && defined?(::ActionMailer::Preview)
       end
 
+      def has_action_mailer_show_preview?
+        has_action_mailer_preview? &&
+          ::ActionMailer::Base.respond_to?(:show_previews=)
+      end
+
       def has_1_9_hash_syntax?
         ::Rails::VERSION::STRING > '4.0'
       end

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.2.1'
+      STRING = '3.2.2'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rails
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - David Chelimsky
@@ -44,7 +44,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -316,9 +316,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rspec
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: rspec-rails-3.2.1
+summary: rspec-rails-3.2.2
 test_files: []
 has_rdoc: