From 7ba0055ecfc6593d5765eeb43fc3aaac9505774d Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Wed, 21 Aug 2013 20:59:17 -0300 Subject: [PATCH] [plugins-tests] Fixing stoa tests (one test still failing) --- plugins/stoa/install.rb | 9 ++++++++- plugins/stoa/lib/ext/person.rb | 4 ++-- plugins/stoa/test/functional/profile_editor_controller_test.rb | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/plugins/stoa/install.rb b/plugins/stoa/install.rb index f960f51..f13b7fd 100644 --- a/plugins/stoa/install.rb +++ b/plugins/stoa/install.rb @@ -1 +1,8 @@ -raise "Not ready yet" +#FIXME one functional test is failing +raise "Not ready yet..." + +require 'fileutils' + +config_path = File.join('plugins', 'stoa', 'config.yml') +config_template = File.join('plugins', 'stoa', 'config.yml.dist') +FileUtils.cp(config_template, config_path) if !File.exist?(config_path) diff --git a/plugins/stoa/lib/ext/person.rb b/plugins/stoa/lib/ext/person.rb index 66d8e93..e6cd2af 100644 --- a/plugins/stoa/lib/ext/person.rb +++ b/plugins/stoa/lib/ext/person.rb @@ -16,7 +16,7 @@ class Person end def invitation_task - Task.pending.find(:first, :conditions => {:code => invitation_code}) || - Task.finished.find(:first, :conditions => {:code => invitation_code, :target_id => id}) + Task.pending.find(:first, :conditions => {:code => invitation_code.to_s}) || + Task.finished.find(:first, :conditions => {:code => invitation_code.to_s, :target_id => id}) end end diff --git a/plugins/stoa/test/functional/profile_editor_controller_test.rb b/plugins/stoa/test/functional/profile_editor_controller_test.rb index 10f5386..f4e4605 100644 --- a/plugins/stoa/test/functional/profile_editor_controller_test.rb +++ b/plugins/stoa/test/functional/profile_editor_controller_test.rb @@ -36,7 +36,7 @@ class StoaPluginProfileEditorControllerTest < ActionController::TestCase end should 'not display field if profile is an organization' do - organization = fast_create(Organization) + organization = fast_create(Community) organization.add_admin @person get :edit, :profile => organization.identifier assert_no_tag_in_string @response.body, :tag => 'label', :content => /USP number/, :attributes => { :for => 'usp_id_field' } -- libgit2 0.21.2