Merge branch 'master' into fix-1554

Author: Laurent Cobos

Changelog.md

@@ -1,4 +1,15 @@
 ### Development
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.7.1...master)
+
+### 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)
 
 Bug Fixes:
 

lib/rspec/rails/configuration.rb

@@ -51,7 +51,14 @@ def self.add_test_type_configurations(config)
       config.include RSpec::Rails::Matchers
 
       if ActionPack::VERSION::STRING >= "5.1"
-        config.include RSpec::Rails::SystemExampleGroup, :type => :system
+        begin
+          require 'puma'
+          require 'capybara'
+          config.include RSpec::Rails::SystemExampleGroup, :type => :system
+        # rubocop:disable Lint/HandleExceptions
+        rescue LoadError
+          # rubocop:enable Lint/HandleExceptions
+        end
       end
     end
 

lib/rspec/rails/example.rb

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

lib/rspec/rails/version.rb

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