rspec-rails 3.7.1 → 3.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 134de934c54b071d9874f83f007e2a5fadfa6742
-  data.tar.gz: ab43a49aaeb1cea0c31c853e510eb31658e6ac9c
+  metadata.gz: 7adb1e867de1a32aa2321c7d214157d1624d4b95
+  data.tar.gz: cc75e1a431ac8dd3d91e515394b759aa4eb2de08
 SHA512:
-  metadata.gz: a41f1b6eb8e56b8761e3946eb78772c30ac4ab4b710e5f043dcae83b4d75c43e7894bc92e8de303cee3abab71ee6024dac1f08122d7d4fe7cea83919e01f89df
-  data.tar.gz: 595461c11fb2b7384ddf6611b1f5ec2aa26505b930976a97fb9c32f78e33e3c239b5a69559bae496033349503afdded19a2aa6b5bd54d218f928375fb4d07b92
+  metadata.gz: 77043a4efa1f5df35358d1531605b611ec55c2ac383f3f6c496fcc4afae68122f2cf37a5442061107c55357a29d621fb64913fe23d9e16acec0f468e645758be
+  data.tar.gz: d58a7c5f801e96d26399eedca46faca78d8dfb398b90b0ba1539780d35bf607b359c473e7acfc1daf1dbb4a0080be4474675dbf418bb99bf663f855709ebff9f

data/Changelog.md

@@ -1,5 +1,21 @@
 ### Development
-[Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.7.0...master)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.7.2...master)
+
+### 3.7.2 / 2017-11-20
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.7.1...v3.7.2)
+
+Bug Fixes:
+
+* Delay loading system test integration until used. (Jon Rowe, #1903)
+* Ensure specs using the aggregate failures feature take screenshots on failure.
+  (Matt Brictson, #1907)
+
+### 3.7.1 / 2017-10-18
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.7.0...v3.7.1)
+
+Bug Fixes:
+
+* Prevent system test integration loading when puma or capybara are missing (Sam Phippen, #1884)
 
 ### 3.7.0 / 2017-10-17
 [Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.6.0...v3.7.0)

data/README.md

@@ -197,7 +197,7 @@ end
 
 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
+[FactoryBot](https://github.com/thoughtbot/factory_bot) and
 [Capybara](https://github.com/jnicklas/capybara):
 
 ```ruby
@@ -205,7 +205,7 @@ require 'rails_helper'
 
 RSpec.describe "home page", :type => :request do
   it "displays the user's username after successful login" do
-    user = FactoryGirl.create(:user, :username => "jdoe", :password => "secret")
+    user = FactoryBot.create(:user, :username => "jdoe", :password => "secret")
     visit "/login"
     fill_in "Username", :with => "jdoe"
     fill_in "Password", :with => "secret"
@@ -216,7 +216,7 @@ RSpec.describe "home page", :type => :request do
 end
 ```
 
-FactoryGirl decouples this example from changes to validation requirements,
+FactoryBot decouples this example from changes to validation requirements,
 which can be encoded into the underlying factory definition without requiring
 changes to this example.
 
@@ -228,7 +228,7 @@ docs](http://rubydoc.info/gems/rspec-rails/file/Capybara.md).
 
 There are several other Ruby libs that implement the factory pattern or provide
 a DSL for request specs (a.k.a. acceptance or integration specs), but
-FactoryGirl and Capybara seem to be the most widely used. Whether you choose
+FactoryBot and Capybara seem to be the most widely used. Whether you choose
 these or other libs, we strongly recommend using something for each of these
 roles.
 

data/lib/rspec/rails.rb

@@ -10,6 +10,7 @@ require 'rspec/rails/view_rendering'
 require 'rspec/rails/matchers'
 require 'rspec/rails/fixture_support'
 require 'rspec/rails/file_fixture_support'
+require 'rspec/rails/fixture_file_upload_support'
 require 'rspec/rails/example'
 require 'rspec/rails/vendor/capybara'
 require 'rspec/rails/configuration'

data/lib/rspec/rails/configuration.rb

@@ -49,17 +49,7 @@ module RSpec
       config.include RSpec::Rails::ViewExampleGroup,       :type => :view
       config.include RSpec::Rails::FeatureExampleGroup,    :type => :feature
       config.include RSpec::Rails::Matchers
-
-      if ActionPack::VERSION::STRING >= "5.1"
-        begin
-          require 'puma'
-          require 'capybara'
-          config.include RSpec::Rails::SystemExampleGroup, :type => :system
-        # rubocop:disable Lint/HandleExceptions
-        rescue LoadError
-          # rubocop:enable Lint/HandleExceptions
-        end
-      end
+      config.include RSpec::Rails::SystemExampleGroup, :type => :system
     end
 
     # @private
@@ -91,6 +81,10 @@ module RSpec
         config.add_setting :file_fixture_path, :default => 'spec/fixtures/files'
         config.include RSpec::Rails::FileFixtureSupport
       end
+
+      # Add support for fixture_path on fixture_file_upload
+      config.include RSpec::Rails::FixtureFileUploadSupport
+
       # 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.rb

@@ -8,13 +8,4 @@ require 'rspec/rails/example/routing_example_group'
 require 'rspec/rails/example/model_example_group'
 require 'rspec/rails/example/job_example_group'
 require 'rspec/rails/example/feature_example_group'
-if ActionPack::VERSION::STRING >= "5.1"
-  begin
-    require 'puma'
-    require 'capybara'
-    require 'rspec/rails/example/system_example_group'
-  # rubocop:disable Lint/HandleExceptions
-  rescue LoadError
-    # rubocop:enable Lint/HandleExceptions
-  end
-end
+require 'rspec/rails/example/system_example_group'

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

@@ -1,85 +1,102 @@
-if ActionPack::VERSION::STRING >= "5.1"
-  require 'action_dispatch/system_test_case'
-  module RSpec
-    module Rails
-      # @api public
-      # Container class for system tests
-      module SystemExampleGroup
-        extend ActiveSupport::Concern
-        include RSpec::Rails::RailsExampleGroup
-        include ActionDispatch::Integration::Runner
-        include ActionDispatch::Assertions
-        include RSpec::Rails::Matchers::RedirectTo
-        include RSpec::Rails::Matchers::RenderTemplate
-        include ActionController::TemplateAssertions
-
-        include ActionDispatch::IntegrationTest::Behavior
+module RSpec
+  module Rails
+    # @api public
+    # Container class for system tests
+    module SystemExampleGroup
+      extend ActiveSupport::Concern
+      include RSpec::Rails::RailsExampleGroup
+      include RSpec::Rails::Matchers::RedirectTo
+      include RSpec::Rails::Matchers::RenderTemplate
+      include ActionDispatch::Integration::Runner
+      include ActionDispatch::Assertions
+      include ActionController::TemplateAssertions
 
+      # @private
+      module BlowAwayAfterTeardownHook
         # @private
-        module BlowAwayAfterTeardownHook
-          # @private
-          def after_teardown
-          end
+        def after_teardown
         end
+      end
 
-        original_after_teardown = ::ActionDispatch::SystemTesting::TestHelpers::SetupAndTeardown.instance_method(:after_teardown)
+      # for the SystemTesting Screenshot situation
+      def passed?
+        return false if RSpec.current_example.exception
+        return true unless defined?(::RSpec::Expectations::FailureAggregator)
 
-        include ::ActionDispatch::SystemTesting::TestHelpers::SetupAndTeardown
-        include ::ActionDispatch::SystemTesting::TestHelpers::ScreenshotHelper
-        include BlowAwayAfterTeardownHook
+        failure_notifier = ::RSpec::Support.failure_notifier
+        return true unless failure_notifier.is_a?(::RSpec::Expectations::FailureAggregator)
 
-        # for the SystemTesting Screenshot situation
-        def passed?
-          RSpec.current_example.exception.nil?
-        end
+        failure_notifier.failures.empty? && failure_notifier.other_errors.empty?
+      end
 
-        # @private
-        def method_name
-          @method_name ||= [
-            self.class.name.underscore,
-            RSpec.current_example.description.underscore,
-            rand(1000)
-          ].join("_").gsub(/[\/\.:, ]/, "_")
-        end
+      # @private
+      def method_name
+        @method_name ||= [
+          self.class.name.underscore,
+          RSpec.current_example.description.underscore,
+          rand(1000)
+        ].join("_").gsub(/[\/\.:, ]/, "_")
+      end
+
+      # Delegates to `Rails.application`.
+      def app
+        ::Rails.application
+      end
 
-        # Delegates to `Rails.application`.
-        def app
-          ::Rails.application
+      included do |other|
+        begin
+          require 'capybara'
+          require 'action_dispatch/system_test_case'
+        # rubocop:disable Lint/HandleExceptions
+        rescue LoadError
+          # rubocop:enable Lint/HandleExceptions
+          abort """
+            System test integration requires Rails >= 5.1 and has a hard
+            dependency on a webserver and `capybara`, please add capybara to
+            your Gemfile and configure a webserver (e.g. `Capybara.server =
+            :webrick`) before attempting to use system tests.
+          """.gsub(/\s+/, ' ').strip
         end
 
-        included do
-          attr_reader :driver
+        original_after_teardown =
+          ::ActionDispatch::SystemTesting::TestHelpers::SetupAndTeardown.instance_method(:after_teardown)
 
-          if ActionDispatch::SystemTesting::Server.respond_to?(:silence_puma=)
-            ActionDispatch::SystemTesting::Server.silence_puma = true
-          end
+        other.include ActionDispatch::IntegrationTest::Behavior
+        other.include ::ActionDispatch::SystemTesting::TestHelpers::SetupAndTeardown
+        other.include ::ActionDispatch::SystemTesting::TestHelpers::ScreenshotHelper
+        other.include BlowAwayAfterTeardownHook
 
-          def initialize(*args, &blk)
-            super(*args, &blk)
-            @driver = nil
-          end
+        attr_reader :driver
 
-          def driven_by(*args, &blk)
-            @driver = ::ActionDispatch::SystemTestCase.driven_by(*args, &blk).tap(&:use)
-          end
+        if ActionDispatch::SystemTesting::Server.respond_to?(:silence_puma=)
+          ActionDispatch::SystemTesting::Server.silence_puma = true
+        end
 
-          before do
-            # A user may have already set the driver, so only default if driver
-            # is not set
-            driven_by(:selenium) unless @driver
-            @routes = ::Rails.application.routes
-          end
+        def initialize(*args, &blk)
+          super(*args, &blk)
+          @driver = nil
+        end
+
+        def driven_by(*args, &blk)
+          @driver = ::ActionDispatch::SystemTestCase.driven_by(*args, &blk).tap(&:use)
+        end
+
+        before do
+          # A user may have already set the driver, so only default if driver
+          # is not set
+          driven_by(:selenium) unless @driver
+          @routes = ::Rails.application.routes
+        end
 
-          after do
-            orig_stdout = $stdout
-            $stdout = StringIO.new
-            begin
-              original_after_teardown.bind(self).call
-            ensure
-              myio = $stdout
-              RSpec.current_example.metadata[:extra_failure_lines] = myio.string
-              $stdout = orig_stdout
-            end
+        after do
+          orig_stdout = $stdout
+          $stdout = StringIO.new
+          begin
+            original_after_teardown.bind(self).call
+          ensure
+            myio = $stdout
+            RSpec.current_example.metadata[:extra_failure_lines] = myio.string
+            $stdout = orig_stdout
           end
         end
       end

data/lib/rspec/rails/fixture_file_upload_support.rb

@@ -0,0 +1,39 @@
+module RSpec
+  module Rails
+    # @private
+    module FixtureFileUploadSupport
+      delegate :fixture_file_upload, :to => :rails_fixture_file_wrapper
+
+    private
+
+      def rails_fixture_file_wrapper
+        resolved_fixture_path = (fixture_path || RSpec.configuration.fixture_path || '')
+        RailsFixtureFileWrapper.fixture_path = File.join(resolved_fixture_path, '')
+        RailsFixtureFileWrapper.instance
+      end
+
+      class RailsFixtureFileWrapper
+        include ActionDispatch::TestProcess if defined?(ActionDispatch::TestProcess)
+
+        class << self
+          attr_reader :fixture_path
+
+          # Get the instance of wrapper
+          def instance
+            @instance ||= new
+          end
+
+          # Override fixture_path set
+          # to support Rails 3.0->3.1 using ActionController::TestCase class to resolve fixture_path
+          # see https://apidock.com/rails/v3.0.0/ActionDispatch/TestProcess/fixture_file_upload
+          def fixture_path=(value)
+            if ActionController::TestCase.respond_to?(:fixture_path)
+              ActionController::TestCase.fixture_path = value
+            end
+            @fixture_path = value
+          end
+        end
+      end
+    end
+  end
+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.7.1'
+      STRING = '3.7.2'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rails
 version: !ruby/object:Gem::Version
-  version: 3.7.1
+  version: 3.7.2
 platform: ruby
 authors:
 - David Chelimsky
@@ -44,7 +44,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2017-10-18 00:00:00.000000000 Z
+date: 2017-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -254,6 +254,7 @@ files:
 - lib/rspec/rails/extensions/active_record/proxy.rb
 - lib/rspec/rails/feature_check.rb
 - lib/rspec/rails/file_fixture_support.rb
+- lib/rspec/rails/fixture_file_upload_support.rb
 - lib/rspec/rails/fixture_support.rb
 - lib/rspec/rails/matchers.rb
 - lib/rspec/rails/matchers/active_job.rb