Download as
Browse Code »

Commit 7ba0055ecfc6593d5765eeb43fc3aaac9505774d

Authored by Rodrigo Souto
1 parent 24c76fe1
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

[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 16 end
17 17  
18 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 21 end
22 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 36 end
37 37  
38 38 should 'not display field if profile is an organization' do
39   - organization = fast_create(Organization)
  39 + organization = fast_create(Community)
40 40 organization.add_admin @person
41 41 get :edit, :profile => organization.identifier
42 42 assert_no_tag_in_string @response.body, :tag => 'label', :content => /USP number/, :attributes => { :for => 'usp_id_field' }
... ...