0
@@ -27,13 +27,18 @@ describe Silverline::Essential::Generator do
0
     FileSystemWatcher.stub!(:new).and_return @watcher
0
     
0
     @gen = Silverline::Essential::Generator
0
+
0
+    Silverline::Essential.instance_eval{ remove_const :XAP } if defined?(Silverline::Essential::XAP)
0
+    Silverline::Essential::XAP = mock("XAP")
0
+    @xap = Silverline::Essential::XAP
0
+    xap_instance = mock("XAPInstance")
0
+    @xap.stub!(:new).and_return xap_instance
0
+    xap_instance.stub!(:generate)
0
   end
0
   
0
   it "should watch directories to put into XAP" do
0
-    FileUtils = mock("FileUtils")
0
-    FileUtils.should_receive(:mkdir_p).with(Silverline::TMP_CLIENT)
0
-    FileUtils.should_receive(:mkdir_p).with(Silverline::CLIENT_ROOT)
0
-    
0
+    @gen.should_receive(:create_directories)
0
+
0
     @watcher.should_receive(:addDirectory).with(Silverline::CLIENT_ROOT)
0
     @watcher.should_receive(:addDirectory).with(Silverline::PLUGIN_CLIENT)
0
     
0
@@ -51,6 +56,13 @@ describe Silverline::Essential::Generator do
0
     @gen.register
0
   end
0
 
0
+  it "should create required directories" do
0
+    FileUtils = mock("FileUtils")
0
+    FileUtils.should_receive(:mkdir_p).with(Silverline::TMP_CLIENT)
0
+    FileUtils.should_receive(:mkdir_p).with(Silverline::CLIENT_ROOT)
0
+    @gen.create_directories
0
+  end
0
+
0
   it "should delete the XAP" do
0
     File = mock("File")
0
     FileUtils = mock("FileUtils", :null_object => true)

0
@@ -1,10 +1,13 @@
0
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
0
 
0
-Silverline::Essential.instance_eval{remove_const :Xap} if defined?(Silverline::Essential::Xap)
0
-Silverline::Essential::Xap = :chiron
0
+Silverline::Essential.instance_eval{remove_const :XAP} if defined?(Silverline::Essential::XAP)
0
 
0
-def prepare_xap(platform = nil)
0
+def define_xap
0
   Silverline::Essential.instance_eval{remove_const :Xap} if defined?(Silverline::Essential::Xap)
0
+end
0
+
0
+def prepare_xap(platform = nil)
0
+  define_xap
0
   yield
0
   load 'silverline/essential/xap.rb'
0
   @xap = Silverline::Essential::XAP.new("foo", "Bar")
0
@@ -14,6 +17,7 @@ end
0
 describe "XAPBase" do
0
   
0
   it "should initialize itself with a file to XAP to and a directory to XAP" do
0
+    Silverline::Essential::Xap = :chiron
0
     load 'silverline/essential/xap.rb'
0
     xapbase = Silverline::Essential::XAPBase.new("foo", "Bar")
0
     xapbase.instance_variable_get(:@file) == "foo"