Adding new domains [#23 state:resloved]

kennethkalmer · Jul 4, 2008 · 5acc556 · 5acc556
1 parent bf03d73
commit 5acc556
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/app/controllers/zones_controller.rb b/app/controllers/zones_controller.rb
@@ -21,11 +21,11 @@ def new
   end
 
   def create
-    if params[:zone_template][:id].nil?
-      @zone = Zone.new( params[:zone] )
+    @zone_template = ZoneTemplate.find(params[:zone_template][:id]) unless params[:zone_template][:id].blank?
+    unless @zone_template.nil?
+      @zone = @zone_template.build( params[:zone][:name] )
     else
-      @zone_template = ZoneTemplate.find(params[:zone_template][:id])
-      @zone = @zone_template.build(params[:zone][:name].to_s)
+      @zone = Zone.new( params[:zone] )
     end
     @zone.user = current_user unless current_user.has_role?( 'admin' )
 

diff --git a/spec/controllers/zones_controller_spec.rb b/spec/controllers/zones_controller_spec.rb
@@ -47,11 +47,13 @@
     assigns[:zone_templates].should_not be_empty
   end
 
-  it "should build the zone from a zone template if a zone template is selected" do
+  it "should build from a zone template if selected" do
+    @zone_template = zone_templates(:east_coast_dc)
+    ZoneTemplate.stubs(:find).with('1').returns(@zone_template)
+
     post 'create', :zone => { :name => 'example.org' }, :zone_template => { :id => "1" }
 
-    assigns[:zone_template].should_not be_empty
-    assigns[:zone].should_not be_empty
+    assigns[:zone].should_not be_nil
     response.should be_redirect
     response.should redirect_to( zone_path(assigns[:zone]) )
   end