spec/spec_helper.rb in ridley-0.12.2 vs spec/spec_helper.rb in ridley-0.12.3

@@ -17,28 +17,20 @@
     config.mock_with :rspec
     config.treat_symbols_as_metadata_keys_with_true_values = true
     config.filter_run focus: true
     config.run_all_when_everything_filtered = true
 
+    config.before(:suite) { Ridley::RSpec::ChefServer.start }
+
     config.before(:all) do
-      Celluloid.logger = nil
-      Ridley.logger = nil
+      Ridley.logger = Celluloid.logger = nil
       WebMock.disable_net_connect!(allow_localhost: true, net_http_connect_on_start: true)
-      Ridley::RSpec::ChefServer.start
     end
 
-    config.after(:all) do
-      Ridley::RSpec::ChefServer.stop
-    end
-
     config.before(:each) do
       Celluloid.shutdown
       Celluloid.boot
       clean_tmp_path
-      Ridley::RSpec::ChefServer.server.clear_data
-    end
-
-    config.after(:each) do
       Ridley::RSpec::ChefServer.server.clear_data
     end
   end
 end