From 51f9397d8ad680f1b72eb2d9571f308701d11f2c Mon Sep 17 00:00:00 2001 From: AntonioTerceiro Date: Thu, 8 Nov 2007 17:56:37 +0000 Subject: [PATCH] ActionItem16: changing interface to find pending validation by code --- app/models/organization.rb | 9 +++++++-- test/unit/organization_test.rb | 18 +++++++++++++----- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/app/models/organization.rb b/app/models/organization.rb index d0bfd3a..ed12b51 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -24,7 +24,12 @@ class Organization < Profile restrictions || ('' + _('(not informed)') + '') end - def pending_validations(conditions = nil) - CreateEnterprise.pending_for(self, conditions) + def pending_validations + CreateEnterprise.pending_for(self) end + + def find_pending_validation(code) + CreateEnterprise.pending_for(self, :code => code).first + end + end diff --git a/test/unit/organization_test.rb b/test/unit/organization_test.rb index b15ef63..fdf9e55 100644 --- a/test/unit/organization_test.rb +++ b/test/unit/organization_test.rb @@ -62,14 +62,22 @@ class OrganizationTest < Test::Unit::TestCase should 'list pending enterprise validations' do org = Organization.new - CreateEnterprise.expects(:pending_for).with(org, nil).returns([]) - assert_equal [], org.pending_validations + empty = [] + CreateEnterprise.expects(:pending_for).with(org).returns(empty) + assert_same empty, org.pending_validations end - should 'accept an optional conditions hash for pending_validations' do + should 'be able to find a pending validation by its code' do org = Organization.new - CreateEnterprise.expects(:pending_for).with(org, { :lala => 'lele'}).returns([]) - assert_equal [], org.pending_validations({ :lala => 'lele'}) + validation = mock + CreateEnterprise.expects(:pending_for).with(org, { :code => 'lele'}).returns([validation]) + assert_same validation, org.find_pending_validation('lele') + end + + should 'return nil when finding for an unexisting pending validation' do + org = Organization.new + CreateEnterprise.expects(:pending_for).with(org, { :code => 'lele'}).returns([]) + assert_nil org.find_pending_validation('lele') end end -- libgit2 0.21.2