rspec-core 3.0.4 → 3.12.2

data/lib/rspec/core/minitest_assertions_adapter.rb

@@ -1,9 +1,9 @@
 begin
-  # Only the minitest 5.x gem includes the minitest.rb and assertions.rb files
+  # Only the minitest 5.x gem includes the minitest.rb and assertions.rb files.
   require 'minitest'
   require 'minitest/assertions'
-rescue LoadError => _ignored
-  # We must be using Ruby Core's MiniTest or the Minitest gem 4.x
+rescue LoadError
+  # We must be using Ruby Core's MiniTest or the Minitest gem 4.x.
   require 'minitest/unit'
   Minitest = MiniTest
 end
@@ -13,6 +13,9 @@ module RSpec
     # @private
     module MinitestAssertionsAdapter
       include ::Minitest::Assertions
+      # Need to forcefully include Pending after Minitest::Assertions
+      # to make sure our own #skip method beats Minitest's.
+      include ::RSpec::Core::Pending
 
       # Minitest 5.x requires this accessor to be available. See
       # https://github.com/seattlerb/minitest/blob/38f0a5fcbd9c37c3f80a3eaad4ba84d3fc9947a0/lib/minitest/assertions.rb#L8

data/lib/rspec/core/mocking_adapters/flexmock.rb

@@ -10,10 +10,12 @@ module RSpec
       module Flexmock
         include ::FlexMock::MockContainer
 
-        def self.framework_name; :flexmock end
+        def self.framework_name
+          :flexmock
+        end
 
         def setup_mocks_for_rspec
-          # No setup required
+          # No setup required.
         end
 
         def verify_mocks_for_rspec

data/lib/rspec/core/mocking_adapters/mocha.rb

@@ -2,22 +2,22 @@
 # hoops here.
 #
 # mocha >= '0.13.0':
-#   require 'mocha/api' is required
-#   require 'mocha/object' raises a LoadError b/c the file no longer exists
+#   require 'mocha/api' is required.
+#   require 'mocha/object' raises a LoadError b/c the file no longer exists.
 # mocha < '0.13.0', >= '0.9.7'
-#   require 'mocha/api' is required
-#   require 'mocha/object' is required
+#   require 'mocha/api' is required.
+#   require 'mocha/object' is required.
 # mocha < '0.9.7':
-#   require 'mocha/api' raises a LoadError b/c the file does not yet exist
-#   require 'mocha/standalone' is required
-#   require 'mocha/object' is required
+#   require 'mocha/api' raises a LoadError b/c the file does not yet exist.
+#   require 'mocha/standalone' is required.
+#   require 'mocha/object' is required.
 begin
   require 'mocha/api'
 
   begin
     require 'mocha/object'
   rescue LoadError
-    # Mocha >= 0.13.0 no longer contains this file nor needs it to be loaded
+    # Mocha >= 0.13.0 no longer contains this file nor needs it to be loaded.
   end
 rescue LoadError
   require 'mocha/standalone'
@@ -29,7 +29,9 @@ module RSpec
     module MockingAdapters
       # @private
       module Mocha
-        def self.framework_name; :mocha end
+        def self.framework_name
+          :mocha
+        end
 
         # Mocha::Standalone was deprecated as of Mocha 0.9.7.
         begin

data/lib/rspec/core/mocking_adapters/null.rb

@@ -4,7 +4,9 @@ module RSpec
       # @private
       module Null
         def setup_mocks_for_rspec; end
+
         def verify_mocks_for_rspec; end
+
         def teardown_mocks_for_rspec; end
       end
     end

data/lib/rspec/core/mocking_adapters/rr.rb

@@ -8,7 +8,9 @@ module RSpec
     module MockingAdapters
       # @private
       module RR
-        def self.framework_name; :rr end
+        def self.framework_name
+          :rr
+        end
 
         include ::RR::Extensions::InstanceMethods
 

data/lib/rspec/core/mocking_adapters/rspec.rb

@@ -7,7 +7,9 @@ module RSpec
       module RSpec
         include ::RSpec::Mocks::ExampleMethods
 
-        def self.framework_name; :rspec end
+        def self.framework_name
+          :rspec
+        end
 
         def self.configuration
           ::RSpec::Mocks.configuration