Download as
Browse Code »

Commit 7ba0055ecfc6593d5765eeb43fc3aaac9505774d

Authored by Rodrigo Souto
1 parent 24c76fe1
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

[plugins-tests] Fixing stoa tests (one test still failing)

Showing 3 changed files with 11 additions and 4 deletions   Show diff stats
plugins/stoa/install.rb
  Diff comments   View file @7ba0055
1 -raise "Not ready yet" 1 +#FIXME one functional test is failing
  2 +raise "Not ready yet..."
  3 +
  4 +require 'fileutils'
  5 +
  6 +config_path = File.join('plugins', 'stoa', 'config.yml')
  7 +config_template = File.join('plugins', 'stoa', 'config.yml.dist')
  8 +FileUtils.cp(config_template, config_path) if !File.exist?(config_path)
plugins/stoa/lib/ext/person.rb
  Diff comments   View file @7ba0055
@@ -16,7 +16,7 @@ class Person @@ -16,7 +16,7 @@ class Person
16 end 16 end
17 17
18 def invitation_task 18 def invitation_task
19 - Task.pending.find(:first, :conditions => {:code => invitation_code}) ||  
20 - Task.finished.find(:first, :conditions => {:code => invitation_code, :target_id => id}) 19 + Task.pending.find(:first, :conditions => {:code => invitation_code.to_s}) ||
  20 + Task.finished.find(:first, :conditions => {:code => invitation_code.to_s, :target_id => id})
21 end 21 end
22 end 22 end
plugins/stoa/test/functional/profile_editor_controller_test.rb
  Diff comments   View file @7ba0055
@@ -36,7 +36,7 @@ class StoaPluginProfileEditorControllerTest < ActionController::TestCase @@ -36,7 +36,7 @@ class StoaPluginProfileEditorControllerTest < ActionController::TestCase
36 end 36 end
37 37
38 should 'not display field if profile is an organization' do 38 should 'not display field if profile is an organization' do
39 - organization = fast_create(Organization) 39 + organization = fast_create(Community)
40 organization.add_admin @person 40 organization.add_admin @person
41 get :edit, :profile => organization.identifier 41 get :edit, :profile => organization.identifier
42 assert_no_tag_in_string @response.body, :tag => 'label', :content => /USP number/, :attributes => { :for => 'usp_id_field' } 42 assert_no_tag_in_string @response.body, :tag => 'label', :content => /USP number/, :attributes => { :for => 'usp_id_field' }