rspec-core 3.13.5 → 4.0.0.beta1

data/lib/rspec/core/project_initializer/spec/spec_helper.rb

@@ -15,38 +15,31 @@
 # See https://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
   # rspec-expectations config goes here. You can use an alternate
-  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertion/expectation library such as wrong or minitest
   # assertions if you prefer.
   config.expect_with :rspec do |expectations|
-    # This option will default to `true` in RSpec 4. It makes the `description`
-    # and `failure_message` of custom matchers include text for helper methods
-    # defined using `chain`, e.g.:
-    #     be_bigger_than(2).and_smaller_than(4).description
-    #     # => "be bigger than 2 and smaller than 4"
-    # ...rather than:
-    #     # => "be bigger than 2"
-    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+    # The default output length is 200, you can increase it to make the
+    # output more verbose, or decrease it to make it more concise.
+    expectations.max_formatted_output_length = 200
   end
 
   # rspec-mocks config goes here. You can use an alternate test double
   # library (such as bogus or mocha) by changing the `mock_with` option here.
   config.mock_with :rspec do |mocks|
     # Prevents you from mocking or stubbing a method that does not exist on
-    # a real object. This is generally recommended, and will default to
-    # `true` in RSpec 4.
+    # a real object. This is generally recommended, and is the default since
+    # RSpec 4.
     mocks.verify_partial_doubles = true
   end
 
-  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
-  # have no way to turn it off -- the option exists only for backwards
-  # compatibility in RSpec 3). It causes shared context metadata to be
-  # inherited by the metadata hash of host groups and examples, rather than
-  # triggering implicit auto-inclusion in groups with matching metadata.
-  config.shared_context_metadata_behavior = :apply_to_host_groups
-
 # The settings below are suggested to provide a good initial experience
 # with RSpec, but feel free to customize to your heart's content.
 =begin
+  # This setting turns on all Ruby warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies. The default is set to `:deprecations_only`
+  # but it can also be set to `:none` to suppress them.
+  config.warnings = :all
+
   # This allows you to limit a spec run to individual examples or groups
   # you care about by tagging them with `:focus` metadata. When nothing
   # is tagged with `:focus`, all examples get run. RSpec also provides
@@ -59,15 +52,6 @@ RSpec.configure do |config|
   # you configure your source control system to ignore this file.
   config.example_status_persistence_file_path = "spec/examples.txt"
 
-  # Limits the available syntax to the non-monkey patched syntax that is
-  # recommended. For more details, see:
-  # https://rspec.info/features/3-12/rspec-core/configuration/zero-monkey-patching-mode/
-  config.disable_monkey_patching!
-
-  # This setting enables warnings. It's recommended, but in some cases may
-  # be too noisy due to issues in dependencies.
-  config.warnings = true
-
   # Many RSpec users commonly either run the entire suite or an individual
   # file, and it's useful to allow more verbose output when running an
   # individual spec file.
@@ -83,10 +67,9 @@ RSpec.configure do |config|
   # particularly slow.
   config.profile_examples = 10
 
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
+  # RSpec runs specs in a random order by default to surface order dependencies.
+  # We recommend this setting but it can be changed to others, such as `:defined`
+  # to run specs in the defined order. See the documentation for more details.
   config.order = :random
 
   # Seed global randomization in this process using the `--seed` CLI option.

data/lib/rspec/core/rake_task.rb

@@ -24,14 +24,11 @@ module RSpec
       # Default path to the RSpec executable.
       DEFAULT_RSPEC_PATH = File.expand_path('../../../../exe/rspec', __FILE__)
 
-      # Default pattern for spec files.
-      DEFAULT_PATTERN = 'spec/**{,/*/**}/*_spec.rb'
-
       # Name of task. Defaults to `:spec`.
       attr_accessor :name
 
       # Files matching this pattern will be loaded.
-      # Defaults to `'spec/**{,/*/**}/*_spec.rb'`.
+      # Defaults to `nil`.
       attr_accessor :pattern
 
       # Files matching this pattern will be excluded.
@@ -45,11 +42,11 @@ module RSpec
       # A message to print to stderr when there are failures.
       attr_accessor :failure_message
 
-      if RUBY_VERSION < "1.9.0" || Support::Ruby.jruby?
+      if Support::Ruby.jruby?
         # Run RSpec with a clean (empty) environment is not supported
         # :nocov:
         def with_clean_environment=(_value)
-          raise ArgumentError, "Running in a clean environment is not supported on Ruby versions before 1.9.0"
+          raise ArgumentError, "Running in a clean environment is not supported on JRuby"
         end
 
         # Run RSpec with a clean (empty) environment is not supported
@@ -83,7 +80,7 @@ module RSpec
         @verbose       = true
         @fail_on_error = true
         @rspec_path    = DEFAULT_RSPEC_PATH
-        @pattern       = DEFAULT_PATTERN
+        @pattern       = nil
 
         define(args, &task_block)
       end
@@ -126,6 +123,8 @@ module RSpec
         elsif String === pattern && !File.exist?(pattern)
           return if [*rspec_opts].any? { |opt| opt =~ /--pattern/ }
           "--pattern #{escape pattern}"
+        elsif pattern.nil?
+          ""
         else
           # Before RSpec 3.1, we used `FileList` to get the list of matched
           # files, and then pass that along to the `rspec` command. Starting

data/lib/rspec/core/shared_example_group.rb

@@ -45,9 +45,8 @@ module RSpec
     # examples that you wish to use in multiple example groups.
     #
     # When defined, the shared group block is stored for later evaluation.
-    # It can later be included in an example group either explicitly
-    # (using `include_examples`, `include_context` or `it_behaves_like`)
-    # or implicitly (via matching metadata).
+    # It can later be included in an example group explicitly using
+    # `include_examples`, `include_context` or `it_behaves_like`.
     #
     # Named shared example groups are scoped based on where they are
     # defined. Shared groups defined in an example group are available
@@ -62,9 +61,7 @@ module RSpec
       # @overload shared_examples(name, metadata, &block)
       #   @param name [String, Symbol, Module] identifer to use when looking up
       #     this shared group
-      #   @param metadata [Array<Symbol>, Hash] metadata to attach to this
-      #     group; any example group or example with matching metadata will
-      #     automatically include this shared example group.
+      #   @param metadata [Array<Symbol>, Hash] metadata to attach to this group
       #   @param block The block to be eval'd
       #
       # Stores the block for later use. The block will be evaluated
@@ -114,56 +111,22 @@ module RSpec
             alias shared_examples_for shared_examples
           end
         end
-
-        # @private
-        def self.exposed_globally?
-          @exposed_globally ||= false
-        end
-
-        # @api private
-        #
-        # Adds the top level DSL methods to Module and the top level binding.
-        def self.expose_globally!
-          return if exposed_globally?
-          Core::DSL.change_global_dsl(&definitions)
-          @exposed_globally = true
-        end
-
-        # @api private
-        #
-        # Removes the top level DSL methods to Module and the top level binding.
-        def self.remove_globally!
-          return unless exposed_globally?
-
-          Core::DSL.change_global_dsl do
-            undef shared_examples
-            undef shared_context
-            undef shared_examples_for
-          end
-
-          @exposed_globally = false
-        end
       end
 
       # @private
       class Registry
         def add(context, name, *metadata_args, &block)
           unless block
-            RSpec.warning "Shared example group #{name} was defined without a "\
-                          "block and will have no effect. Please define a "\
+            RSpec.warning "Shared example group #{name} was defined without a " \
+                          "block and will have no effect. Please define a " \
                           "block or remove the definition."
           end
 
-          if RSpec.configuration.shared_context_metadata_behavior == :trigger_inclusion
-            return legacy_add(context, name, *metadata_args, &block)
-          end
-
           unless valid_name?(name)
             raise ArgumentError, "Shared example group names can only be a string, " \
                                  "symbol or module but got: #{name.inspect}"
           end
 
-          ensure_block_has_source_location(block) { CallerFilter.first_non_rspec_line }
           warn_if_key_taken context, name, block
 
           metadata = Metadata.build_hash_from(metadata_args)
@@ -182,25 +145,6 @@ module RSpec
 
       private
 
-        # TODO: remove this in RSpec 4. This exists only to support
-        # `config.shared_context_metadata_behavior == :trigger_inclusion`,
-        # the legacy behavior of shared context metadata, which we do
-        # not want to support in RSpec 4.
-        def legacy_add(context, name, *metadata_args, &block)
-          ensure_block_has_source_location(block) { CallerFilter.first_non_rspec_line }
-          shared_module = SharedExampleGroupModule.new(name, block, {})
-
-          if valid_name?(name)
-            warn_if_key_taken context, name, block
-            shared_example_groups[context][name] = shared_module
-          else
-            metadata_args.unshift name
-          end
-
-          return if metadata_args.empty?
-          RSpec.configuration.include shared_module, *metadata_args
-        end
-
         def shared_example_groups
           @shared_example_groups ||= Hash.new { |hash, context| hash[context] = {} }
         end
@@ -241,27 +185,8 @@ module RSpec
           end
         end
 
-        if RUBY_VERSION.to_f >= 1.9
-          def formatted_location(block)
-            block.source_location.join(":")
-          end
-        else # 1.8.7
-          # :nocov:
-          def formatted_location(block)
-            block.source_location.join(":").gsub(/:in.*$/, '')
-          end
-          # :nocov:
-        end
-
-        if Proc.method_defined?(:source_location)
-          def ensure_block_has_source_location(_block); end
-        else # for 1.8.7
-          # :nocov:
-          def ensure_block_has_source_location(block)
-            source_location = yield.split(':')
-            block.extend(Module.new { define_method(:source_location) { source_location } })
-          end
-          # :nocov:
+        def formatted_location(block)
+          block.source_location.take(2).join(":")
         end
       end
     end

data/lib/rspec/core/shell_escape.rb

@@ -1,3 +1,5 @@
+RSpec::Support.require_rspec_support 'ruby_features'
+
 module RSpec
   module Core
     # @private

data/lib/rspec/core/test_unit_assertions_adapter.rb

@@ -6,24 +6,11 @@ module RSpec
     module TestUnitAssertionsAdapter
       include ::Test::Unit::Assertions
 
-      # If using test/unit from Ruby core with Ruby 1.9+, it includes
-      # MiniTest::Assertions by default. Note the upcasing of 'Test'.
-      #
-      # If the test/unit gem is being loaded, it will not include any minitest
-      # assertions.
-      #
       # Only if Minitest 5.x is included / loaded do we need to worry about
-      # adding a shim for the new updates. Thus instead of checking on the
-      # RUBY_VERSION we need to check ancestors.
-      begin
-        # MiniTest is 4.x.
-        # Minitest is 5.x.
-        if ancestors.include?(::Minitest::Assertions)
-          require 'rspec/core/minitest_assertions_adapter'
-          include ::RSpec::Core::MinitestAssertionsAdapter
-        end
-      rescue NameError
-        # No-op. Minitest 5.x was not loaded.
+      # adding a shim, older versions automatically included their assertion module.
+      if defined?(::Minitest::Assertions) && ancestors.include?(::Minitest::Assertions)
+        require 'rspec/core/minitest_assertions_adapter'
+        include ::RSpec::Core::MinitestAssertionsAdapter
       end
     end
   end

data/lib/rspec/core/version.rb

@@ -3,7 +3,7 @@ module RSpec
     # Version information for RSpec Core.
     module Version
       # Current version of RSpec Core, in semantic versioning format.
-      STRING = '3.13.5'
+      STRING = '4.0.0.beta1'
     end
   end
 end

data/lib/rspec/core/world.rb

@@ -107,18 +107,18 @@ module RSpec
       #
       # Get count of examples to be run.
       def example_count(groups=example_groups)
-        FlatMap.flat_map(groups) { |g| g.descendants }.
+        groups.flat_map { |g| g.descendants }.
           inject(0) { |a, e| a + e.filtered_examples.size }
       end
 
       # @private
       def all_example_groups
-        FlatMap.flat_map(example_groups) { |g| g.descendants }
+        example_groups.flat_map { |g| g.descendants }
       end
 
       # @private
       def all_examples
-        FlatMap.flat_map(all_example_groups) { |g| g.examples }
+        all_example_groups.flat_map { |g| g.examples }
       end
 
       # @private
@@ -183,12 +183,6 @@ module RSpec
           end
         end
 
-        if @configuration.run_all_when_everything_filtered? && example_count.zero? && !@configuration.only_failures?
-          report_filter_message("#{everything_filtered_message}; ignoring #{inclusion_filter.description}")
-          filtered_examples.clear
-          inclusion_filter.clear
-        end
-
         return unless example_count.zero?
 
         example_groups.clear
@@ -233,19 +227,10 @@ module RSpec
 
       def descending_declaration_line_numbers_by_file
         @descending_declaration_line_numbers_by_file ||= begin
-          declaration_locations = FlatMap.flat_map(example_groups, &:declaration_locations)
-          hash_of_arrays = Hash.new { |h, k| h[k] = [] }
-
-          # TODO: change `inject` to `each_with_object` when we drop 1.8.7 support.
-          line_nums_by_file = declaration_locations.inject(hash_of_arrays) do |hash, (file_name, line_number)|
-            hash[file_name] << line_number
-            hash
-          end
-
-          line_nums_by_file.each_value do |list|
-            list.sort!
-            list.reverse!
-          end
+          example_groups.
+            flat_map(&:declaration_locations).
+            group_by(&:first). # by file name
+            transform_values { |lines| lines.map(&:last).sort.reverse }
         end
       end
 
@@ -269,7 +254,7 @@ module RSpec
           []
         end
 
-        def self.traverse_example_group_trees_until
+        def self.traverse_example_group_trees_until(&_block)
         end
 
         # :nocov:

data/lib/rspec/core.rb

@@ -12,7 +12,6 @@ RSpec::Support.define_optimized_require_for_rspec(:core) { |f| require_relative
   warnings
 
   set
-  flat_map
   filter_manager
   dsl
   notifications
@@ -101,24 +100,7 @@ module RSpec
   # The example being executed.
   #
   # The primary audience for this method is library authors who need access
-  # to the example currently being executed and also want to support all
-  # versions of RSpec 2 and 3.
-  #
-  # @example
-  #
-  #     RSpec.configure do |c|
-  #       # context.example is deprecated, but RSpec.current_example is not
-  #       # available until RSpec 3.0.
-  #       fetch_current_example = RSpec.respond_to?(:current_example) ?
-  #         proc { RSpec.current_example } : proc { |context| context.example }
-  #
-  #       c.before(:example) do
-  #         example = fetch_current_example.call(self)
-  #
-  #         # ...
-  #       end
-  #     end
-  #
+  # to the example currently being executed.
   def self.current_example
     RSpec::Support.thread_local_data[:current_example]
   end
@@ -206,7 +188,4 @@ module RSpec
     require MODULES_TO_AUTOLOAD.fetch(name) { return super }
     ::RSpec.const_get(name)
   end
-
-  Core::DSL.expose_globally!
-  Core::SharedExampleGroup::TopLevelDSL.expose_globally!
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-core
 version: !ruby/object:Gem::Version
-  version: 3.13.5
+  version: 4.0.0.beta1
 platform: ruby
 authors:
 - Steven Baker
@@ -12,11 +12,11 @@ bindir: exe
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIFvjCCA6agAwIBAgIJAPXjfUbCjdXVMA0GCSqGSIb3DQEBCwUAMIGAMQswCQYD
+  MIIFvjCCA6agAwIBAgIJAPXjfUbCjdXWMA0GCSqGSIb3DQEBCwUAMIGAMQswCQYD
   VQQGEwJVUzETMBEGA1UECAwKV2FzaGluZ3RvbjEQMA4GA1UEBwwHU2VhdHRsZTEO
   MAwGA1UECgwFUlNwZWMxEzARBgNVBAMMCnJzcGVjLmluZm8xJTAjBgkqhkiG9w0B
-  CQEWFnJzcGVjQGdvb2dsZWdyb3Vwcy5jb20wHhcNMjUwMjA2MTE0NjU2WhcNMjYw
-  MjA2MTE0NjU2WjCBgDELMAkGA1UEBhMCVVMxEzARBgNVBAgMCldhc2hpbmd0b24x
+  CQEWFnJzcGVjQGdvb2dsZWdyb3Vwcy5jb20wHhcNMjYwMjE3MTE0ODM0WhcNMjcw
+  MjE3MTE0ODM0WjCBgDELMAkGA1UEBhMCVVMxEzARBgNVBAgMCldhc2hpbmd0b24x
   EDAOBgNVBAcMB1NlYXR0bGUxDjAMBgNVBAoMBVJTcGVjMRMwEQYDVQQDDApyc3Bl
   Yy5pbmZvMSUwIwYJKoZIhvcNAQkBFhZyc3BlY0Bnb29nbGVncm91cHMuY29tMIIC
   IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsSmjgcHaKlD0jizRJowi2bGI
@@ -32,17 +32,17 @@ cert_chain:
   gpEMqf80lEmhX59VUsm0Pv6OEo+ZPHBvXPiJA6DShQh9t3YtpwyA8uVDMbT/i32u
   2FUsqZbbJcCmkBrGposCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFPPvQ5XT0Nvuhi6k+hrWVv35J+TeMA0GCSqGSIb3DQEBCwUAA4IC
-  AQBGBr0ll2yLrkO6IeK5Q7qZFnANaUCKfi6Of9VztZJXgKAU5KAQxyOidGktoA5N
-  lp+bFKudRkW8jSehqoNaNBdSZ9Bc07EGMXIhUFJZF9rq7Z2SKPwUm6EaSsBK13QR
-  U4K6wuaw5ZJSFzklapoGOJRGnFlnNtlhNFY6+tTwCeblwZbcuYGyGY8+Rg7GbyVl
-  3Tr4Gi1aS/qG/MDXKdE8HWm39dmaAMdbw6dg1VBd0JrX2VqH7xvE1dM/D3OlKrNp
-  gNFRNJig3Y8qPjocZR0cGkhgZoC9wribWxHSNawZm4CoV3fja2HNx9QyM7BaB+as
-  yuqAiBbA7vBcyc8nKATip3mxbyXYXoDD7nmO8JCPP7O/WsgG+U/B2a0kPdvYFoxE
-  Q0Js3GtFCuMvL+0rifqdxBOLtu0Pw9q4RvToTJIl2IR6eTgCb82B1hw9qKf7PjuL
-  BoEsYjjDhGw6FZvcJG8O6uj7aB+z4aF21YR74UGL7sq/RIPNNez5JI95jTGfqCPy
-  6yo0w3zja3yg28QK3Fj+tbOHeSLv9SDQWi/1jiPprGzbxGvbVvjvX11YZc46vkmY
-  AwP+qZPPf97FXXZGEGIYhhHpnj+Ltx9nCetRPiZ4rvYBcXgCWVQSg6eiEofrMwn/
-  AKMCABhZ1Y2eATsfMgdkmIZk7JIPZiSi6eUxPiCMP9M/pw==
+  AQBaeeGIZtBFDP33D1/4sXldSgwntVcL5qC5pcjamLWM4HK4/a6ePMy1uoX+dEnJ
+  J+BjZWURsUfFOob+xnUe8AMSbv9gupckfVehZoBzOvJDaWcALo8GKjJlmVtzEIqZ
+  TvBLO5zQwR4cWIrg0NWjkDOSQOrNNQ2Degv/aOFrR8dFPJSgxZG/IC0/t6s72cEt
+  V4SIe/NLIU4RyBzfgn/RBsalDEF1yIVlDWspMa78clS3bPmntkNyfLwIUwINDHhn
+  swFA8bEKMQWqRlupuRmEiy3nGe6az46YlPXzK5UWfXJ6Lb1wIE8W80TRx0HpSC7j
+  JfXPfQ0PLgiU4nnQqain2bIn96Ooco8kspeqp8rSJ8sbaMPTNmcFuwD3gzWsRnJ3
+  rIaJbmrUcq6DlJ7jfv3u5TPt4JWzDP7oDPf3nXNiF2Cn48Ne598G5lHH6Heyxe39
+  pYZdhEptKJWPHxbJWHXD02omKprkNuQKHpnXrW+mmbiO4IcqAMggiud+DaEQg20x
+  Dae4cNbvK5p3D+5xqvcEO2G4uCMDmJjrSd61kvTLBnm1qroHqrpi9GauEVWZZmD0
+  n0ph8oFAXOsKQWxZ+4uh6yGISk+WhngCZEVPZUjq7SIGAuVhQy2ZgwdjnLEz//lD
+  x0Qexp5yGeoxAL9qKM/RXYKtuRZBJV1z+L9A1YOtwaXXNg==
   -----END CERTIFICATE-----
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
@@ -50,16 +50,16 @@ dependencies:
   name: rspec-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.13.0
+        version: 4.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.13.0
+        version: 4.0.0.beta1
 description: BDD for Ruby. RSpec runner and example groups.
 email: rspec@googlegroups.com
 executables:
@@ -92,7 +92,6 @@ files:
 - lib/rspec/core/example_group.rb
 - lib/rspec/core/example_status_persister.rb
 - lib/rspec/core/filter_manager.rb
-- lib/rspec/core/flat_map.rb
 - lib/rspec/core/formatters.rb
 - lib/rspec/core/formatters/base_bisect_formatter.rb
 - lib/rspec/core/formatters/base_formatter.rb
@@ -153,11 +152,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rspec/rspec/issues
-  changelog_uri: https://github.com/rspec/rspec/blob/rspec-core-v3.13.5/rspec-core/Changelog.md
+  changelog_uri: https://github.com/rspec/rspec/tree/rspec-core-v4.0.0.beta1/rspec-core/Changelog.md
   documentation_uri: https://rspec.info/documentation/
   mailing_list_uri: https://groups.google.com/forum/#!forum/rspec
+  source_code_uri: https://github.com/rspec/rspec/tree/rspec-core-v4.0.0.beta1/rspec-core
   rubygems_mfa_required: 'true'
-  source_code_uri: https://github.com/rspec/rspec/blob/rspec-core-v3.13.5/rspec-core
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -166,14 +165,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.3
 specification_version: 4
-summary: rspec-core-3.13.5
+summary: rspec-core-4.0.0.beta1
 test_files: []

data/lib/rspec/core/flat_map.rb

@@ -1,20 +0,0 @@
-module RSpec
-  module Core
-    # @private
-    module FlatMap
-      if [].respond_to?(:flat_map)
-        def flat_map(array, &block)
-          array.flat_map(&block)
-        end
-      else # for 1.8.7
-        # :nocov:
-        def flat_map(array, &block)
-          array.map(&block).flatten(1)
-        end
-        # :nocov:
-      end
-
-      module_function :flat_map
-    end
-  end
-end