appliance-spec.rb in boxgrinder-build-0.8.1

- old
+ new

@@ -118,34 +118,35 @@
       it "should read definition with standard appliance definition file" do
         prepare_appliance
 
         appliance_config = ApplianceConfig.new
 
-        appliance_helper = mock(ApplianceHelper)
-        appliance_helper.should_receive(:read_definitions).with("#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.appl").and_return([{}, appliance_config])
+        appliance_helper = mock(ApplianceDefinitionHelper)
+        appliance_helper.should_receive(:read_definitions).with("#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.appl")
+        appliance_helper.should_receive(:appliance_configs).and_return([appliance_config])
 
-        ApplianceHelper.should_receive(:new).with(:log => @log).and_return(appliance_helper)
+        ApplianceDefinitionHelper.should_receive(:new).with(:log => @log).and_return(appliance_helper)
 
         appliance_config_helper = mock(ApplianceConfigHelper)
 
         appliance_config.should_receive(:clone).and_return(appliance_config)
         appliance_config.should_receive(:init_arch).and_return(appliance_config)
         appliance_config.should_receive(:initialize_paths).and_return(appliance_config)
 
         appliance_config_helper.should_receive(:merge).with(appliance_config).and_return(appliance_config)
 
-        ApplianceConfigHelper.should_receive(:new).with({}).and_return(appliance_config_helper)
+        ApplianceConfigHelper.should_receive(:new).with([appliance_config]).and_return(appliance_config_helper)
 
         @appliance.read_definition
       end
 
       it "should read definition with kickstart appliance definition file" do
         prepare_appliance({}, "#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.ks")
 
         appliance_config = ApplianceConfig.new
 
-        appliance_helper = mock(ApplianceHelper)
+        appliance_helper = mock(ApplianceDefinitionHelper)
         appliance_helper.should_receive(:read_definitions).with("#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.ks").and_raise("Unknown format")
 
         clazz = mock('PluginClass')
 
         plugin_manager = mock(PluginManager)
@@ -157,11 +158,11 @@
 
         clazz.should_receive(:new).and_return(plugin)
 
         PluginManager.should_receive(:instance).and_return(plugin_manager)
 
-        ApplianceHelper.should_receive(:new).with(:log => @log).and_return(appliance_helper)
+        ApplianceDefinitionHelper.should_receive(:new).with(:log => @log).and_return(appliance_helper)
 
         appliance_config_helper = mock(ApplianceConfigHelper)
 
         appliance_config.should_receive(:clone).and_return(appliance_config)
         appliance_config.should_receive(:init_arch).and_return(appliance_config)
@@ -175,19 +176,19 @@
       end
 
       it "should read definition with kickstart appliance definition file and fail because there was no plugin able to read .ks" do
         prepare_appliance({}, "#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.ks")
 
-        appliance_helper = mock(ApplianceHelper)
+        appliance_helper = mock(ApplianceDefinitionHelper)
         appliance_helper.should_receive(:read_definitions).with("#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.ks").and_raise("Unknown format")
 
         plugin_manager = mock(PluginManager)
         plugin_manager.should_receive(:plugins).and_return({:os => {}})
 
 
         PluginManager.should_receive(:instance).and_return(plugin_manager)
 
-        ApplianceHelper.should_receive(:new).with(:log => @log).and_return(appliance_helper)
+        ApplianceDefinitionHelper.should_receive(:new).with(:log => @log).and_return(appliance_helper)
 
         lambda {
           @appliance.read_definition
         }.should raise_error("Couldn't read appliance definition file: jeos-f13.ks")
       end