Download as
Browse Code »

Commit 63a32df7230f9a3abebf8c5694c2badf963d2961

Authored by AntonioTerceiro
1 parent 43e8b3ad
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

ActionItem16: adding approved? and rejected? and not erasing data from CreateEnt… 

…erprise when performing



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@880 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 26 additions and 1 deletions   Show diff stats
app/models/create_enterprise.rb
  Diff comments   View file @63a32df
@@ -83,11 +83,20 @@ class CreateEnterprise < Task @@ -83,11 +83,20 @@ class CreateEnterprise < Task
83 cancel 83 cancel
84 end 84 end
85 85
  86 + def rejected?
  87 + self.status == Task::Status::CANCELLED
  88 + end
  89 +
86 # Approves the enterprise registration request. 90 # Approves the enterprise registration request.
87 def approve 91 def approve
88 finish 92 finish
89 end 93 end
90 94
  95 + # tells if this request was appoved
  96 + def approved?
  97 + self.status == Task::Status::FINISHED
  98 + end
  99 +
91 # actually creates the enterprise after the request is approved. 100 # actually creates the enterprise after the request is approved.
92 def perform 101 def perform
93 enterprise = Enterprise.new 102 enterprise = Enterprise.new
@@ -97,7 +106,7 @@ class CreateEnterprise < Task @@ -97,7 +106,7 @@ class CreateEnterprise < Task
97 enterprise.send("#{field}=", self.send(field)) 106 enterprise.send("#{field}=", self.send(field))
98 end 107 end
99 108
100 - organization_info_data = self.data.delete_if do |key,value| 109 + organization_info_data = self.data.reject do |key,value|
101 profile_fields.include?(key.to_s) 110 profile_fields.include?(key.to_s)
102 end 111 end
103 112
test/unit/create_enterprise_test.rb
  Diff comments   View file @63a32df
@@ -121,6 +121,9 @@ class CreateEnterpriseTest < Test::Unit::TestCase @@ -121,6 +121,9 @@ class CreateEnterpriseTest < Test::Unit::TestCase
121 assert !enterprise.new_record? 121 assert !enterprise.new_record?
122 assert_equal person.user, enterprise.user 122 assert_equal person.user, enterprise.user
123 assert_equal environment, enterprise.environment 123 assert_equal environment, enterprise.environment
  124 +
  125 + # the data is not erased
  126 + assert_equal task.name, enterprise.name
124 end 127 end
125 128
126 should 'override message methods from Task' do 129 should 'override message methods from Task' do
@@ -160,4 +163,17 @@ class CreateEnterpriseTest < Test::Unit::TestCase @@ -160,4 +163,17 @@ class CreateEnterpriseTest < Test::Unit::TestCase
160 assert_not_nil CreateEnterprise.new.target_notification_message 163 assert_not_nil CreateEnterprise.new.target_notification_message
161 end 164 end
162 165
  166 + should 'report as approved when approved' do
  167 + request = CreateEnterprise.new
  168 + request.stubs(:status).returns(Task::Status::FINISHED)
  169 + assert request.approved?
  170 + end
  171 +
  172 + should 'report as rejected when rejected' do
  173 + request = CreateEnterprise.new
  174 + request.stubs(:status).returns(Task::Status::CANCELLED)
  175 + assert request.rejected?
  176 + end
  177 +
  178 +
163 end 179 end