Download as
Browse Code »

Commit 80516055f3996901804be7e579da5193d6312abc

Authored by MoisesMachado
1 parent 1dd1cd53
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

ActionItem11: some tests added to the profile and the enterprise controller 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@331 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 8 changed files with 20 additions and 4 deletions   Show diff stats
app/controllers/manage_tags_controller.rb
  Diff comments   View file @8051605
1 -require 'extended_tag.rb'  
2 -  
3 # Manage tags stored by the acts-as_taggable_on_steroids plugin by providing an interface to create, destroy, update and list them 1 # Manage tags stored by the acts-as_taggable_on_steroids plugin by providing an interface to create, destroy, update and list them
4 class ManageTagsController < ApplicationController 2 class ManageTagsController < ApplicationController
5 3
app/views/enterprise/_form.rhtml
  Diff comments   View file @8051605
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 <%= text_area 'organization_info', 'management_information', 'cols' => 40, 'rows' => 20 %></p> 26 <%= text_area 'organization_info', 'management_information', 'cols' => 40, 'rows' => 20 %></p>
27 27
28 <p><label for="validation_entity"><%= _('Validation Entity') %></label><br/> 28 <p><label for="validation_entity"><%= _('Validation Entity') %></label><br/>
29 -<%= select 'validation_entity', 'id', @validation_entities.map{|v| [v.name, v.id] } %></p> 29 +<%= select 'validation_entity', 'id', @validation_entities.map{|v| [v.name, v.id]}, :include_blank => true %></p>
30 30
31 <p><label for="tag_list"><%= _('Tags') %></label><br/> 31 <p><label for="tag_list"><%= _('Tags') %></label><br/>
32 <%= text_field 'enterprise', 'tag_list', 'size' => 20 %></p> 32 <%= text_field 'enterprise', 'tag_list', 'size' => 20 %></p>
app/views/enterprise/search.rhtml 0 → 100644
  Diff comments   View file @8051605
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
  1 +<h2> <%= @tagged_enterprises.size.to_s + _(' tags found') %> </h2>
  2 +
  3 +<%= render :partial => 'enterprise', :collection => @tagged_enterprises %>
config/environment.rb
  Diff comments   View file @8051605
@@ -53,6 +53,7 @@ end @@ -53,6 +53,7 @@ end
53 # Include your application configuration below 53 # Include your application configuration below
54 54
55 require 'gettext/rails' 55 require 'gettext/rails'
  56 +require 'extended_tag'
56 Tag.hierarchical = true 57 Tag.hierarchical = true
57 58
58 Comatose.configure do |config| 59 Comatose.configure do |config|
lib/extended_tag.rb
  Diff comments   View file @8051605
@@ -15,7 +15,6 @@ class Tag @@ -15,7 +15,6 @@ class Tag
15 15
16 acts_as_ferret :fields => [:name] 16 acts_as_ferret :fields => [:name]
17 17
18 -  
19 # Return all the tags that were suggested but not yet approved 18 # Return all the tags that were suggested but not yet approved
20 def self.find_pendings 19 def self.find_pendings
21 self.find_with_pendings(:all, :conditions => ['pending = ?', true]) 20 self.find_with_pendings(:all, :conditions => ['pending = ?', true])
test/fixtures/profiles.yml
  Diff comments   View file @8051605
@@ -47,3 +47,4 @@ colivre: @@ -47,3 +47,4 @@ colivre:
47 flexible_template_template: 'default' 47 flexible_template_template: 'default'
48 flexible_template_icon_theme: 'default' 48 flexible_template_icon_theme: 'default'
49 flexible_template_theme: 'default' 49 flexible_template_theme: 'default'
  50 +
test/functional/enterprise_controller_test.rb
  Diff comments   View file @8051605
@@ -17,6 +17,7 @@ class EnterpriseControllerTest &lt; Test::Unit::TestCase @@ -17,6 +17,7 @@ class EnterpriseControllerTest &lt; Test::Unit::TestCase
17 login_as 'ze' 17 login_as 'ze'
18 get :index 18 get :index
19 assert_response :redirect 19 assert_response :redirect
  20 + assert_redirected_to :action => 'show'
20 21
21 assert_kind_of Array, assigns(:my_pending_enterprises) 22 assert_kind_of Array, assigns(:my_pending_enterprises)
22 end 23 end
test/unit/profile_test.rb
  Diff comments   View file @8051605
@@ -63,4 +63,17 @@ class ProfileTest &lt; Test::Unit::TestCase @@ -63,4 +63,17 @@ class ProfileTest &lt; Test::Unit::TestCase
63 assert !p.errors.invalid?(:name) 63 assert !p.errors.invalid?(:name)
64 end 64 end
65 65
  66 + def test_can_be_tagged
  67 + p = Profile.create(:name => 'tagged_profile', :identifier => 'tagged')
  68 + p.tags << Tag.create(:name => 'a_tag')
  69 + assert Profile.find_tagged_with('a_tag').include?(p)
  70 + end
  71 +
  72 + def test_can_have_affiliated_people
  73 + pr = Profile.create(:name => 'composite_profile', :identifier => 'composite')
  74 + pe = User.create(:login => 'aff', :email => 'aff@pr.coop', :password => 'blih', :password_confirmation => 'blih').person
  75 + pr.people << pe
  76 +
  77 + assert pe.profiles.include?(pr)
  78 + end
66 end 79 end