spec/spec_helper.rb in nanoc-4.8.2 vs spec/spec_helper.rb in nanoc-4.8.3

@@ -15,10 +15,14 @@
 require 'fuubar'
 
 Nanoc::CLI.setup
 
 RSpec.configure do |c|
+  c.include(Nanoc::Spec::Helper)
+
+  c.include(Nanoc::Spec::HelperHelper, helper: true)
+
   c.fuubar_progress_bar_options = {
     format: '%c/%C |<%b>%i| %p%%',
   }
 
   c.around(:each) do |example|
@@ -27,20 +31,17 @@
     Nanoc::CLI::ErrorHandler.enable
   end
 
   c.around(:each) do |example|
     Dir.mktmpdir('nanoc-test') do |dir|
-      FileUtils.cd(dir) do
-        example.run
-      end
+      chdir(dir) { example.run }
     end
   end
 
   c.around(:each, chdir: false) do |example|
-    FileUtils.cd(__dir__ + '/..') do
-      example.run
-    end
+    Dir.chdir(__dir__ + '/..')
+    example.run
   end
 
   c.before(:each) do
     Nanoc::Int::NotificationCenter.reset
   end
@@ -68,11 +69,9 @@
 
     File.write('nanoc.yaml', '{}')
 
     File.write('Rules', 'passthrough "/**/*"')
   end
-
-  c.include(Nanoc::Spec::HelperHelper, helper: true)
 
   # Set focus if any
   if ENV.fetch('FOCUS', false)
     $stdout.puts "Focusing spec on '#{ENV['FOCUS']}'"
     c.filter_run_including ENV['FOCUS'].to_sym => true