From 1f06b3f0dc44be058643619a7b0667737adbd293 Mon Sep 17 00:00:00 2001 From: AntonioTerceiro Date: Fri, 12 Oct 2007 23:40:23 +0000 Subject: [PATCH] ActionItem14: tests passing --- app/models/create_enterprise.rb | 16 ++++++++++++++++ test/unit/create_enterprise_test.rb | 34 ++-------------------------------- 2 files changed, 18 insertions(+), 32 deletions(-) diff --git a/app/models/create_enterprise.rb b/app/models/create_enterprise.rb index 2f393dd..da79184 100644 --- a/app/models/create_enterprise.rb +++ b/app/models/create_enterprise.rb @@ -75,8 +75,24 @@ class CreateEnterprise < Task profile_fields.include?(key.to_s) end + enterprise.user = self.requestor.user + enterprise.organization_info = OrganizationInfo.new(organization_info_data) enterprise.save! end + def description + _('Enterprise registration: "%s"') % self.name + end + + def create_message + end + + def finish_message + end + + def cancel_message + end + + end diff --git a/test/unit/create_enterprise_test.rb b/test/unit/create_enterprise_test.rb index 80dbf98..b961769 100644 --- a/test/unit/create_enterprise_test.rb +++ b/test/unit/create_enterprise_test.rb @@ -75,7 +75,7 @@ class CreateEnterpriseTest < Test::Unit::TestCase task.approve end - should 'actually create an enterprise when finishing the task' do + should 'actually create an enterprise when finishing the task and associate the task requestor as its owner through the "user" association' do Environment.destroy_all environment = Environment.create!(:name => "My environment", :contact_email => 'test@localhost.localdomain', :is_default => true) @@ -103,37 +103,7 @@ class CreateEnterpriseTest < Test::Unit::TestCase task.finish assert !enterprise.new_record? - end - - should 'associate task requestor as enterprise administrator upon enterprise creation' do - - Environment.destroy_all - environment = Environment.create!(:name => "My environment", :contact_email => 'test@localhost.localdomain', :is_default => true) - region = Region.create!(:name => 'My region', :environment_id => environment.id) - validator = Organization.create!(:name => "My organization", :identifier => 'myorg', :environment_id => environment.id) - region.validators << validator - person = User.create!(:login => 'testuser', :password => 'test', :password_confirmation => 'test', :email => 'testuser@localhost.localdomain').person - - task = CreateEnterprise.create!({ - :name => 'My new enterprise', - :identifier => 'mynewenterprise', - :address => 'satan street, 666', - :contact_phone => '1298372198', - :contact_person => 'random joe', - :legal_form => 'cooperative', - :economic_activity => 'free software', - :region_id => region.id, - :requestor_id => person.id, - :target_id => validator.id, - }) - - enterprise = Enterprise.new - Enterprise.expects(:new).returns(enterprise) - - task.finish - - - flunk "don't know howt to test it yet" + assert_equal person.user, enterprise.user end end -- libgit2 0.21.2