Moving all of the support classes to util/.

This makes it easier for our loader to distinguish between
code that Facter uses and new facts.

1 files changed, 7 insertions, 2 deletions

diff --git a/spec/integration/facter.rb b/spec/integration/facter.rb
index b503c9d..e1f2025 100755
--- a/spec/integration/facter.rb
+++ b/spec/integration/facter.rb
@@ -8,10 +8,15 @@ describe Facter do
         Facter.loadfacts
     end
 
+    after do
+        Facter.reset
+    end
+
     it "should create a new collection if one does not exist" do
         Facter.reset
-        Facter::Collection.expects(:new).returns "coll"
-        Facter.collection.should == "coll"
+        coll = mock('coll')
+        Facter::Util::Collection.stubs(:new).returns coll
+        Facter.collection.should equal(coll)
         Facter.reset
     end