spec_helper.rb in berkshelf-5.6.3

- old
+ new
@@ -1,89 +1,83 @@
-require "spork"
-
 def windows?
   !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
 end
 
 BERKS_SPEC_DATA = File.expand_path("../data", __FILE__)
 
-Spork.prefork do
-  require "rspec"
-  require "cleanroom/rspec"
-  require "webmock/rspec"
-  require "berkshelf/api/rspec" unless windows?
+require "rspec"
+require "cleanroom/rspec"
+require "webmock/rspec"
+require "berkshelf/api/rspec" unless windows?
 
-  Dir["spec/support/**/*.rb"].each { |f| require File.expand_path(f) }
+Dir["spec/support/**/*.rb"].each { |f| require File.expand_path(f) }
 
-  RSpec.configure do |config|
-    config.include Berkshelf::RSpec::FileSystemMatchers
-    config.include Berkshelf::RSpec::ChefAPI
-    config.include Berkshelf::RSpec::ChefServer
-    config.include Berkshelf::RSpec::Git
-    config.include Berkshelf::RSpec::PathHelpers
-    config.include Berkshelf::API::RSpec unless windows?
+RSpec.configure do |config|
+  config.include Berkshelf::RSpec::FileSystemMatchers
+  config.include Berkshelf::RSpec::ChefAPI
+  config.include Berkshelf::RSpec::ChefServer
+  config.include Berkshelf::RSpec::Git
+  config.include Berkshelf::RSpec::PathHelpers
+  config.include Berkshelf::API::RSpec unless windows?
 
-    config.expect_with :rspec do |c|
-      c.syntax = :expect
-    end
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
 
-    config.mock_with :rspec
-    config.filter_run focus: true
-    config.filter_run_excluding not_supported_on_windows: windows?
-    config.run_all_when_everything_filtered = true
+  config.mock_with :rspec
+  config.filter_run focus: true
+  config.filter_run_excluding not_supported_on_windows: windows?
+  config.run_all_when_everything_filtered = true
 
-    config.before(:each) do
-      Berkshelf.logger = Berkshelf::Logger.new(nil)
-      Berkshelf.set_format(:null)
-      Berkshelf.ui.mute!
-    end
+  config.before(:each) do
+    Berkshelf.logger = Berkshelf::Logger.new(nil)
+    Berkshelf.set_format(:null)
+    Berkshelf.ui.mute!
+  end
 
-    config.before(:suite) do
-      WebMock.disable_net_connect!(allow_localhost: true, net_http_connect_on_start: true)
-      Berkshelf::RSpec::ChefServer.start
-      Berkshelf::API::RSpec::Server.start unless windows?
-    end
+  config.before(:suite) do
+    WebMock.disable_net_connect!(allow_localhost: true, net_http_connect_on_start: true)
+    Berkshelf::RSpec::ChefServer.start
+    Berkshelf::API::RSpec::Server.start unless windows?
+  end
 
-    config.before(:all) do
-      ENV["BERKSHELF_PATH"] = berkshelf_path.to_s
-    end
+  config.before(:all) do
+    ENV["BERKSHELF_PATH"] = berkshelf_path.to_s
+  end
 
-    config.before(:each) do
-      Berkshelf::API::RSpec::Server.clear_cache unless windows?
-      clean_tmp_path
-      Berkshelf.initialize_filesystem
-      Berkshelf::CookbookStore.instance.initialize_filesystem
-      reload_configs
-    end
+  config.before(:each) do
+    Berkshelf::API::RSpec::Server.clear_cache unless windows?
+    clean_tmp_path
+    Berkshelf.initialize_filesystem
+    Berkshelf::CookbookStore.instance.initialize_filesystem
+    reload_configs
   end
+end
 
-  def capture(stream)
-    begin
-      stream = stream.to_s
-      eval "$#{stream} = StringIO.new"
-      yield
-      result = eval("$#{stream}").string
-    ensure
-      eval("$#{stream} = #{stream.upcase}")
-    end
-
-    result
+def capture(stream)
+  begin
+    stream = stream.to_s
+    eval "$#{stream} = StringIO.new"
+    yield
+    result = eval("$#{stream}").string
+  ensure
+    eval("$#{stream} = #{stream.upcase}")
   end
+
+  result
 end
 
-Spork.each_run do
-  require "berkshelf"
+require "berkshelf"
 
-  module Berkshelf
-    class GitLocation
-      include Berkshelf::RSpec::Git
+module Berkshelf
+  class GitLocation
+    include Berkshelf::RSpec::Git
 
-      alias :real_clone :clone
-      def clone
-        fake_remote = generate_fake_git_remote(uri, tags: @branch ? [@branch] : [])
-        tmp_clone = File.join(self.class.tmpdir, uri.gsub(/[\/:]/, "-"))
-        @uri = "file://#{fake_remote}"
-        real_clone
-      end
+    alias :real_clone :clone
+    def clone
+      fake_remote = generate_fake_git_remote(uri, tags: @branch ? [@branch] : [])
+      tmp_clone = File.join(self.class.tmpdir, uri.gsub(/[\/:]/, "-"))
+      @uri = "file://#{fake_remote}"
+      real_clone
     end
   end
 end