Fix an error when creating an app that already exists

frodenas · Dec 11, 2011 · dd93ad9 · dd93ad9
1 parent 72af83b
commit dd93ad9
Show file tree

Hide file tree

Showing 5 changed files with 233 additions and 114 deletions.
diff --git a/app/models/app.rb b/app/models/app.rb
@@ -103,6 +103,12 @@ def find_app_instances_states(app_info)
   def create(name, instances, memsize, url, framework, runtime, service)
     raise "Application name cannot be blank" if name.nil? || name.empty?
     raise "Invalid application name: \"" + name + "\". Must contain only word characters (letter, number, underscore)" if (name =~ /^[\w-]+$/).nil?
+    begin
+      app_info = @cf_client.app_info(name)
+    rescue
+      app_info = nil
+    end
+    raise "Application name already exists" if !app_info.nil?
     raise "Number of instances cannot be blank" if instances.nil? || instances.empty?
     raise "Number of instances must be numeric" if (instances =~ /^\d+$/).nil?
     raise "There must be at least 1 instance" if instances.to_i < 1

diff --git a/spec/fixtures/models/logged/app_create_action.yml b/spec/fixtures/models/logged/app_create_action.yml
diff --git a/spec/fixtures/models/logged/app_create_duplicate_action.yml b/spec/fixtures/models/logged/app_create_duplicate_action.yml