test/juicer/merger/test_base.rb in cjohansen-juicer-0.2.0 vs test/juicer/merger/test_base.rb in cjohansen-juicer-0.2.4

@@ -2,12 +2,11 @@
 
 class TestMergerBase < Test::Unit::TestCase
 
   def setup
     @file_merger = Juicer::Merger::Base.new
-    @file_setup = Juicer::Test::FileSetup.new($DATA_DIR)
-    @file_setup.create!
+    Juicer::Test::FileSetup.new.create
   end
 
   def teardown
     file = path('test_out.css')
     File.delete(file) if File.exists?(file)
@@ -116,8 +115,8 @@
   end
 end
 
 class MockImportResolver
   def resolve(file)
-    yield file
+    [file]
   end
 end