Merge pull request #457 from rspec/remove-monkey-patching

Use globally unexposed DSL

Author: JonRowe

spec/rspec/support/comparable_version_spec.rb

@@ -1,7 +1,7 @@
 require 'rspec/support/comparable_version'
 
 module RSpec::Support
-  describe ComparableVersion do
+  RSpec.describe ComparableVersion do
     describe '#<=>' do
       [
         ['1.2.3',        '1.2.3',        0],

spec/rspec/support/directory_maker_spec.rb

@@ -3,7 +3,7 @@
 RSpec::Support.require_rspec_support("directory_maker")
 
 module RSpec::Support
-  describe DirectoryMaker do
+  RSpec.describe DirectoryMaker do
     shared_examples_for "an mkdir_p implementation" do
       include_context "isolated directory"
 

spec/rspec/support/encoded_string_spec.rb

@@ -2,7 +2,7 @@
 require 'rspec/support/spec/string_matcher'
 
 module RSpec::Support
-  describe EncodedString do
+  RSpec.describe EncodedString do
     let(:utf8_encoding) { 'UTF-8' }
 
     delegated_methods = String.instance_methods.map(&:to_s) & %w[eql? lines == encoding empty?]

spec/rspec/support/fuzzy_matcher_spec.rb

@@ -2,7 +2,7 @@
 
 module RSpec
   module Support
-    describe FuzzyMatcher, ".values_match?" do
+    RSpec.describe FuzzyMatcher, ".values_match?" do
       matcher :match_against do |actual|
         match { |expected| FuzzyMatcher.values_match?(expected, actual) }
       end

spec/rspec/support/method_signature_verifier_spec.rb

@@ -3,7 +3,7 @@
 
 module RSpec
   module Support
-    describe 'verifying methods' do
+    RSpec.describe 'verifying methods' do
       let(:signature) { MethodSignature.new(test_method) }
 
       def valid_non_kw_args?(arity)

spec/rspec/support/object_formatter_spec.rb

@@ -3,7 +3,7 @@
 
 module RSpec
   module Support
-    describe ObjectFormatter, ".format" do
+    RSpec.describe ObjectFormatter, ".format" do
       context 'with an array object containing other objects for which we have custom formatting' do
         let(:time)  { Time.utc(1969, 12, 31, 19, 01, 40, 101) }
         let(:formatted_time) { ObjectFormatter.format(time) }

spec/rspec/support/recursive_const_methods_spec.rb

@@ -2,7 +2,7 @@
 
 module RSpec
   module Support
-    describe RecursiveConstMethods do
+    RSpec.describe RecursiveConstMethods do
       include described_class
 
       module Foo

spec/rspec/support/ruby_features_spec.rb

@@ -2,7 +2,7 @@
 
 module RSpec
   module Support
-    describe OS do
+    RSpec.describe OS do
 
       describe ".windows?" do
         %w[cygwin mswin mingw bccwin wince emx].each do |fragment|
@@ -33,7 +33,7 @@ module Support
       end
     end
 
-    describe Ruby do
+    RSpec.describe Ruby do
       specify "jruby? reflects the state of RUBY_PLATFORM" do
         stub_const("RUBY_PLATFORM", "java")
         expect(Ruby).to be_jruby
@@ -58,7 +58,7 @@ module Support
       end
     end
 
-    describe RubyFeatures do
+    RSpec.describe RubyFeatures do
       specify "#fork_supported? exists" do
         RubyFeatures.fork_supported?
       end

spec/rspec/support/spec/in_sub_process_spec.rb

@@ -1,6 +1,6 @@
 require 'tempfile'
 
-describe 'isolating code to a sub process' do
+RSpec.describe 'isolating code to a sub process' do
   it 'isolates the block from the main process' do
     in_sub_process do
       module NotIsolated

spec/rspec/support/spec/stderr_splitter_spec.rb

@@ -2,7 +2,7 @@
 require 'tempfile'
 require 'rspec/support/spec/in_sub_process'
 
-describe 'RSpec::Support::StdErrSplitter' do
+RSpec.describe 'RSpec::Support::StdErrSplitter' do
   include RSpec::Support::InSubProcess
 
   let(:splitter) { RSpec::Support::StdErrSplitter.new stderr }

spec/rspec/support/spec/with_isolated_std_err_spec.rb

@@ -1,6 +1,6 @@
 require 'rspec/support/spec'
 
-describe 'isolating a spec from the stderr splitter' do
+RSpec.describe 'isolating a spec from the stderr splitter' do
   include RSpec::Support::WithIsolatedStdErr
 
   it 'allows a spec to output a warning' do

spec/rspec/support/warnings_spec.rb

@@ -1,7 +1,7 @@
 require "rspec/support/warnings"
 require 'rspec/support/spec/shell_out'
 
-describe "rspec warnings and deprecations" do
+RSpec.describe "rspec warnings and deprecations" do
   include RSpec::Support::ShellOut
   let(:warning_object) do
     Object.new.tap { |o| o.extend(RSpec::Support::Warnings) }