From 6f5eea6b57eb8c8fbe7586db5917b711d251897a Mon Sep 17 00:00:00 2001 From: Leandro Nunes dos Santos Date: Fri, 2 Aug 2013 12:18:47 -0300 Subject: [PATCH] Rails3: Fix EnterpriseActivation unit tests --- test/unit/enterprise_activation_test.rb | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/test/unit/enterprise_activation_test.rb b/test/unit/enterprise_activation_test.rb index cb9a124..9db9e64 100644 --- a/test/unit/enterprise_activation_test.rb +++ b/test/unit/enterprise_activation_test.rb @@ -21,16 +21,18 @@ class EnterpriseActivationTest < ActiveSupport::TestCase should 'require an enterprise' do t = EnterpriseActivation.new t.valid? - assert t.errors.invalid?(:enterprise_id), "enterprise must be required" + assert t.errors[:enterprise_id].any?, "enterprise must be required" ent = Enterprise.create!(:name => 'my enterprise', :identifier => 'myent') t.enterprise = ent t.valid? - assert !t.errors.invalid?(:enterprise_id), "must validate after enterprise is set" + assert !t.errors[:enterprise_id].any?, "must validate after enterprise is set" end should 'activate enterprise when finished' do - ent = Enterprise.create!(:name => 'my enterprise', :identifier => 'myent', :enabled => false) + ent = Enterprise.create!(:name => 'my enterprise', :identifier => 'myent').tap do |e| + e.enabled = false + end t = EnterpriseActivation.create!(:enterprise => ent) t.requestor = profiles(:ze) @@ -41,7 +43,9 @@ class EnterpriseActivationTest < ActiveSupport::TestCase end should 'require requestor to finish' do - ent = Enterprise.create!(:name => 'my enterprise', :identifier => 'myent', :enabled => false) + ent = Enterprise.create!(:name => 'my enterprise', :identifier => 'myent').tap do |e| + e.enabled = false + end t = EnterpriseActivation.create!(:enterprise => ent) assert_raise EnterpriseActivation::RequestorRequired do @@ -50,7 +54,9 @@ class EnterpriseActivationTest < ActiveSupport::TestCase end should 'put requestor as enterprise owner when finishing' do - ent = Enterprise.create!(:name => 'my enterprise', :identifier => 'myent', :enabled => false) + ent = Enterprise.create!(:name => 'my enterprise', :identifier => 'myent').tap do |e| + e.enabled = false + end t = EnterpriseActivation.create!(:enterprise => ent) person = profiles(:ze) -- libgit2 0.21.2