Download as
Browse Code »

Commit 63a32df7230f9a3abebf8c5694c2badf963d2961

Authored by AntonioTerceiro
1 parent 43e8b3ad
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

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 83 cancel
84 84 end
85 85  
  86 + def rejected?
  87 + self.status == Task::Status::CANCELLED
  88 + end
  89 +
86 90 # Approves the enterprise registration request.
87 91 def approve
88 92 finish
89 93 end
90 94  
  95 + # tells if this request was appoved
  96 + def approved?
  97 + self.status == Task::Status::FINISHED
  98 + end
  99 +
91 100 # actually creates the enterprise after the request is approved.
92 101 def perform
93 102 enterprise = Enterprise.new
... ... @@ -97,7 +106,7 @@ class CreateEnterprise < Task
97 106 enterprise.send("#{field}=", self.send(field))
98 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 110 profile_fields.include?(key.to_s)
102 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 121 assert !enterprise.new_record?
122 122 assert_equal person.user, enterprise.user
123 123 assert_equal environment, enterprise.environment
  124 +
  125 + # the data is not erased
  126 + assert_equal task.name, enterprise.name
124 127 end
125 128  
126 129 should 'override message methods from Task' do
... ... @@ -160,4 +163,17 @@ class CreateEnterpriseTest < Test::Unit::TestCase
160 163 assert_not_nil CreateEnterprise.new.target_notification_message
161 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 179 end
... ...