Download as
Browse Code »

Commit 16601d45d35cad1b1eea9329b2fcd4fb331716de

Authored by AntonioTerceiro
1 parent 5cf17423
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem93: removing models that act as design must imply removing theis desig… 

…n boxes and blocks (updated plugin to implement this)



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1046 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 37 additions and 11 deletions   Show diff stats
test/unit/environment_test.rb
  Diff comments   View file @16601d4
@@ -191,4 +191,21 @@ class EnvironmentTest < Test::Unit::TestCase @@ -191,4 +191,21 @@ class EnvironmentTest < Test::Unit::TestCase
191 assert_equal "?", env.to_s 191 assert_equal "?", env.to_s
192 end 192 end
193 193
  194 + should 'remove boxes and blocks when removing environment' do
  195 + env = Environment.create!(:name => 'test environment')
  196 +
  197 + env_boxes = env.boxes.size
  198 + env_blocks = env.blocks.size
  199 + assert env_boxes > 0
  200 + assert env_blocks > 0
  201 +
  202 + boxes = Design::Box.count
  203 + blocks = Design::Block.count
  204 +
  205 + env.destroy
  206 +
  207 + assert_equal boxes - env_boxes, Design::Box.count
  208 + assert_equal blocks - env_blocks, Design::Block.count
  209 + end
  210 +
194 end 211 end
test/unit/profile_test.rb
  Diff comments   View file @16601d4
@@ -68,12 +68,6 @@ class ProfileTest < Test::Unit::TestCase @@ -68,12 +68,6 @@ class ProfileTest < Test::Unit::TestCase
68 assert !p.errors.invalid?(:name) 68 assert !p.errors.invalid?(:name)
69 end 69 end
70 70
71 - def test_can_be_tagged  
72 - p = Profile.create(:name => 'tagged_profile', :identifier => 'tagged')  
73 - p.tags << Tag.create(:name => 'a_tag')  
74 - assert Profile.find_tagged_with('a_tag').include?(p)  
75 - end  
76 -  
77 def test_can_have_affiliated_people 71 def test_can_have_affiliated_people
78 pr = Profile.create(:name => 'composite_profile', :identifier => 'composite') 72 pr = Profile.create(:name => 'composite_profile', :identifier => 'composite')
79 pe = User.create(:login => 'aff', :email => 'aff@pr.coop', :password => 'blih', :password_confirmation => 'blih').person 73 pe = User.create(:login => 'aff', :email => 'aff@pr.coop', :password => 'blih', :password_confirmation => 'blih').person
@@ -85,13 +79,11 @@ class ProfileTest &lt; Test::Unit::TestCase @@ -85,13 +79,11 @@ class ProfileTest &lt; Test::Unit::TestCase
85 assert pe.memberships.include?(pr) 79 assert pe.memberships.include?(pr)
86 end 80 end
87 81
88 - def test_search 82 + def test_find_by_contents
89 p = Profile.create(:name => 'wanted', :identifier => 'wanted') 83 p = Profile.create(:name => 'wanted', :identifier => 'wanted')
90 - p.update_attribute(:tag_list, 'bla')  
91 84
92 - assert Profile.search('wanted').include?(p)  
93 - assert Profile.search('bla').include?(p)  
94 - assert ! Profile.search('not_wanted').include?(p) 85 + assert Profile.find_by_contents('wanted').include?(p)
  86 + assert ! Profile.find_by_contents('not_wanted').include?(p)
95 end 87 end
96 88
97 should 'remove pages when removing profile' do 89 should 'remove pages when removing profile' do
@@ -208,6 +200,23 @@ class ProfileTest &lt; Test::Unit::TestCase @@ -208,6 +200,23 @@ class ProfileTest &lt; Test::Unit::TestCase
208 assert_equal profile, Profile['testprofile'] 200 assert_equal profile, Profile['testprofile']
209 end 201 end
210 202
  203 + should 'remove boxes and blocks when removing profile' do
  204 + profile = Profile.create!(:name => 'test environment', :identifier => 'testenv')
  205 +
  206 + profile_boxes = profile.boxes.size
  207 + profile_blocks = profile.blocks.size
  208 + assert profile_boxes > 0
  209 + assert profile_blocks > 0
  210 +
  211 + boxes = Design::Box.count
  212 + blocks = Design::Block.count
  213 +
  214 + profile.destroy
  215 +
  216 + assert_equal boxes - profile_boxes, Design::Box.count
  217 + assert_equal blocks - profile_blocks, Design::Block.count
  218 + end
  219 +
211 private 220 private
212 221
213 def assert_invalid_identifier(id) 222 def assert_invalid_identifier(id)