Fix tests failing when config.order set to random

lib/metric_fu.rb

@@ -35,4 +35,13 @@ def self.tasks_load(tasks_relative_path)
   end
 
   LOADER.setup
+
+  def self.reset
+    # TODO Don't like how this method needs to know
+    # all of these class variables that are defined
+    # in separate classes.
+    @configuration = nil
+    @graph = nil
+    @result = nil
+  end
 end

spec/metric_fu/formatter/html_spec.rb

@@ -12,6 +12,12 @@
     # for some platforms.
     @metric_with_graph = MetricFu.configuration.mri? ? :cane : :flay
     @metric_without_graph = :hotspots
+    MetricFu::Configuration.run do |config|
+      config.configure_metrics.each do |metric|
+        metric.enabled = true if [@metric_with_graph, @metric_without_graph].include?(metric.name)
+      end
+    end
+
     MetricFu.result.add(@metric_with_graph) # metric w/ graph
     MetricFu.result.add(@metric_without_graph) # metric w/out graph
   end
@@ -67,7 +73,8 @@ def directory(name)
 
     context 'when on OS X' do
       before do
-        MetricFu.configuration.stub(:platform).and_return('darwin')
+        MetricFu.configuration.stub(:osx?).and_return(true)
+        MetricFu.configuration.stub(:is_cruise_control_rb?).and_return(false)
       end
 
       it "can open the results in the browser" do
@@ -117,7 +124,8 @@ def directory(name)
 
     context 'when on OS X' do
       before do
-        MetricFu.configuration.stub(:platform).and_return('darwin')
+        MetricFu.configuration.stub(:osx?).and_return(true)
+        MetricFu.configuration.stub(:is_cruise_control_rb?).and_return(false)
       end
 
       it "can open the results in the browser from the custom output directory" do

spec/run_spec.rb

@@ -161,11 +161,7 @@ def data_directory
       MetricFu::Configuration.run do |config|
         config.formatters.clear
       end
-
-      cleanup_fs
     end
-
-
   end
 
   context "given other options" do
@@ -187,6 +183,10 @@ def data_directory
 
   end
 
+  after do
+    cleanup_fs
+  end
+
   def metric_fu(options = "--no-open")
     MfDebugger::Logger.capture_output {
       begin

spec/spec_helper.rb

@@ -29,4 +29,8 @@ def mf_log(msg); mf_debug(msg); end
   config.after(:suite) do
     cleanup_test_files
   end
+
+  config.after(:each) do
+    MetricFu.reset
+  end
 end