Download as
Browse Code »

Commit ffbfbfa307e5389ab8179ecd61a75366f3eab2c7

Authored by JoenioCosta
1 parent de19d380
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

ActionItem480: message for disabled enterprise is displayed for 

non-enterprises


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2088 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 4 changed files with 17 additions and 3 deletions   Show diff stats
app/views/content_viewer/view_page.rhtml
  Diff comments   View file @ffbfbfa
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 </div> 50 </div>
51 <% end %> 51 <% end %>
52 52
53 -<% unless profile.enabled? %> 53 +<% if profile.enterprise? and !profile.enabled? %>
54 <div id='profile-disabled'> 54 <div id='profile-disabled'>
55 <%= environment.message_for_disabled_enterprise %> 55 <%= environment.message_for_disabled_enterprise %>
56 </div> 56 </div>
app/views/profile/index.rhtml
  Diff comments   View file @ffbfbfa
1 -<% unless profile.enabled? %> 1 +<% if profile.enterprise? and !profile.enabled? %>
2 <div id='profile-disabled'> 2 <div id='profile-disabled'>
3 <%= environment.message_for_disabled_enterprise %> 3 <%= environment.message_for_disabled_enterprise %>
4 </div> 4 </div>
test/functional/content_viewer_controller_test.rb
  Diff comments   View file @ffbfbfa
@@ -266,4 +266,11 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase @@ -266,4 +266,11 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase
266 assert_tag :tag => 'div', :attributes => { :id => 'profile-disabled' }, :content => Environment.default.message_for_disabled_enterprise 266 assert_tag :tag => 'div', :attributes => { :id => 'profile-disabled' }, :content => Environment.default.message_for_disabled_enterprise
267 end 267 end
268 268
  269 + should 'not show message for disabled enterprise to non-enterprises' do
  270 + login_as(@profile.identifier)
  271 + @profile.enabled = false; @profile.save!
  272 + get :view_page, :profile => @profile.identifier, :page => []
  273 + assert_no_tag :tag => 'div', :attributes => { :id => 'profile-disabled' }, :content => Environment.default.message_for_disabled_enterprise
  274 + end
  275 +
269 end 276 end
test/functional/profile_controller_test.rb
  Diff comments   View file @ffbfbfa
@@ -213,13 +213,20 @@ class ProfileControllerTest &lt; Test::Unit::TestCase @@ -213,13 +213,20 @@ class ProfileControllerTest &lt; Test::Unit::TestCase
213 assert_no_tag :tag => 'a', :content => 'Add friend' 213 assert_no_tag :tag => 'a', :content => 'Add friend'
214 end 214 end
215 215
216 - should 'show message for disabled enterprises' do 216 + should 'show message for disabled enterprise' do
217 login_as(@profile.identifier) 217 login_as(@profile.identifier)
218 ent = Enterprise.create!(:name => 'my test enterprise', :identifier => 'my-test-enterprise', :enabled => false) 218 ent = Enterprise.create!(:name => 'my test enterprise', :identifier => 'my-test-enterprise', :enabled => false)
219 get :index, :profile => ent.identifier 219 get :index, :profile => ent.identifier
220 assert_tag :tag => 'div', :attributes => { :id => 'profile-disabled' }, :content => Environment.default.message_for_disabled_enterprise 220 assert_tag :tag => 'div', :attributes => { :id => 'profile-disabled' }, :content => Environment.default.message_for_disabled_enterprise
221 end 221 end
222 222
  223 + should 'not show message for disabled enterprise to non-enterprises' do
  224 + login_as(@profile.identifier)
  225 + @profile.enabled = false; @profile.save!
  226 + get :index, :profile => @profile.identifier
  227 + assert_no_tag :tag => 'div', :attributes => { :id => 'profile-disabled' }, :content => Environment.default.message_for_disabled_enterprise
  228 + end
  229 +
223 should 'display "Products" link for enterprise' do 230 should 'display "Products" link for enterprise' do
224 ent = Enterprise.create!(:name => 'my test enterprise', :identifier => 'my-test-enterprise', :enabled => false) 231 ent = Enterprise.create!(:name => 'my test enterprise', :identifier => 'my-test-enterprise', :enabled => false)
225 232