From 63a32df7230f9a3abebf8c5694c2badf963d2961 Mon Sep 17 00:00:00 2001
From: AntonioTerceiro <AntonioTerceiro@3f533792-8f58-4932-b0fe-aaf55b0a4547>
Date: Fri, 9 Nov 2007 19:40:01 +0000
Subject: [PATCH] ActionItem16: adding approved? and rejected? and not erasing data from CreateEnterprise when performing

---
 app/models/create_enterprise.rb     | 11 ++++++++++-
 test/unit/create_enterprise_test.rb | 16 ++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/app/models/create_enterprise.rb b/app/models/create_enterprise.rb
index a2aea1d..0528eab 100644
--- a/app/models/create_enterprise.rb
+++ b/app/models/create_enterprise.rb
@@ -83,11 +83,20 @@ class CreateEnterprise < Task
     cancel
   end
 
+  def rejected?
+    self.status == Task::Status::CANCELLED
+  end
+
   # Approves the enterprise registration request.
   def approve
     finish
   end
 
+  # tells if this request was appoved 
+  def approved?
+    self.status == Task::Status::FINISHED
+  end
+
   # actually creates the enterprise after the request is approved.
   def perform
     enterprise = Enterprise.new
@@ -97,7 +106,7 @@ class CreateEnterprise < Task
       enterprise.send("#{field}=", self.send(field))
     end
 
-    organization_info_data = self.data.delete_if do |key,value|
+    organization_info_data = self.data.reject do |key,value|
       profile_fields.include?(key.to_s)
     end
 
diff --git a/test/unit/create_enterprise_test.rb b/test/unit/create_enterprise_test.rb
index b82bd57..6d3a1bf 100644
--- a/test/unit/create_enterprise_test.rb
+++ b/test/unit/create_enterprise_test.rb
@@ -121,6 +121,9 @@ class CreateEnterpriseTest < Test::Unit::TestCase
     assert !enterprise.new_record?
     assert_equal person.user, enterprise.user
     assert_equal environment, enterprise.environment
+
+    # the data is not erased
+    assert_equal task.name, enterprise.name
   end
 
   should 'override message methods from Task' do
@@ -160,4 +163,17 @@ class CreateEnterpriseTest < Test::Unit::TestCase
     assert_not_nil CreateEnterprise.new.target_notification_message
   end
 
+  should 'report as approved when approved' do
+    request = CreateEnterprise.new
+    request.stubs(:status).returns(Task::Status::FINISHED)
+    assert request.approved?
+  end
+
+  should 'report as rejected when rejected' do
+    request = CreateEnterprise.new
+    request.stubs(:status).returns(Task::Status::CANCELLED)
+    assert request.rejected?
+  end
+    
+
 end
--
libgit2 0.21.2