RSpec: use 3.7, disable monkey patching mode

chef · Nov 21, 2017 · b945678 · b945678
1 parent 85726a0
commit b945678
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/mixlib-log.gemspec b/mixlib-log.gemspec
@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.files = Dir["lib/**/*"] + Dir["spec/**/*"] + ["Gemfile", "Rakefile", ".gemtest", "mixlib-log.gemspec"]
   gem.required_ruby_version = ">= 2.2"
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec", "~> 3.4"
+  gem.add_development_dependency "rspec", "~> 3.7"
   gem.add_development_dependency "chefstyle"
   gem.add_development_dependency "cucumber"
   gem.add_development_dependency "github_changelog_generator", ">= 1.11.3"

diff --git a/spec/mixlib/log/formatter_spec.rb b/spec/mixlib/log/formatter_spec.rb
@@ -19,7 +19,7 @@
 require "time"
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper"))
 
-describe Mixlib::Log::Formatter do
+RSpec.describe Mixlib::Log::Formatter do
   before(:each) do
     @formatter = Mixlib::Log::Formatter.new
   end

diff --git a/spec/mixlib/log_spec.rb b/spec/mixlib/log_spec.rb
@@ -37,7 +37,7 @@ def #{method_name}(message)
   end
 end
 
-describe Mixlib::Log do
+RSpec.describe Mixlib::Log do
 
   # Since we are testing class behaviour for an instance variable
   # that gets set once, we need to reset it prior to each example [cb]

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -24,6 +24,10 @@
 require "mixlib/log"
 require "mixlib/log/formatter"
 
+RSpec.configure do |config|
+  config.disable_monkey_patching!
+end
+
 class Logit
   extend Mixlib::Log
 end