From 8f20ecab96375ec72daef0001cea95844a81e8a1 Mon Sep 17 00:00:00 2001 From: Fabio Teixeira Date: Mon, 15 Sep 2014 17:14:41 -0300 Subject: [PATCH] find_offerer:Searching lincense info by version field --- test/functional/mpog_software_plugin_myprofile_controller_test.rb | 12 ++++++++---- views/mpog_software_plugin_myprofile/new_software.html.erb | 6 +++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/test/functional/mpog_software_plugin_myprofile_controller_test.rb b/test/functional/mpog_software_plugin_myprofile_controller_test.rb index 4490478..9261014 100644 --- a/test/functional/mpog_software_plugin_myprofile_controller_test.rb +++ b/test/functional/mpog_software_plugin_myprofile_controller_test.rb @@ -10,7 +10,9 @@ class MpogSoftwarePluginMyprofileControllerTest < ActionController::TestCase @request = ActionController::TestRequest.new @response = ActionController::TestResponse.new @person = create_user('person').person - @offer = create_user('angela') + @offer = create_user('Angela Silva') + @offer_1 = create_user('Ana de Souza') + @offer_2 = create_user('Angelo Roberto') LicenseInfo.create(:version=>"CC-GPL-V2", :link=>"http://creativecommons.org/licenses/GPL/2.0/legalcode.pt") ProgramLanguage.create(:name =>"language") @@ -65,9 +67,11 @@ class MpogSoftwarePluginMyprofileControllerTest < ActionController::TestCase end should 'search new offers while creating a new software' do - candidate_offers = "Angela" - post :search_offerers, :profile => person.identifier,:q => candidate_offers + offer_token = "An" + post :search_offerers, :profile => person.identifier,:q => offer_token response = JSON.parse(@response.body) - assert_equal "angela",response[0]["name"] + assert_equal "Angelo Roberto",response[0]["name"] + assert_equal "Ana de Souza",response[1]["name"] + assert_equal "Angela Silva",response[2]["name"] end end diff --git a/views/mpog_software_plugin_myprofile/new_software.html.erb b/views/mpog_software_plugin_myprofile/new_software.html.erb index 39c0bd8..774a1b8 100644 --- a/views/mpog_software_plugin_myprofile/new_software.html.erb +++ b/views/mpog_software_plugin_myprofile/new_software.html.erb @@ -121,9 +121,9 @@ offerers'), :pre_populate => @tokenized_children}) %> <%= fields_for @license_info do |lcv| %>
-

<%= lcv.label _("License Version: ") %> - <%= lcv.select(:version, LicenseInfo.all.map {|l| [l.version, l.id]}, {:selected=>1}, :onchange => "get_license_link('license_info_version')") %> -

+

<%= lcv.label _("License Version: ") %>

+ <%= lcv.select(:version, LicenseInfo.all.map {|l| [l.version, l.version]}, {:selected=>1}, :onchange => "get_license_link('license_info_version')") %> +

<%= _("License link") %>

<% LicenseHelper.getListLicenses.each do | license | %> -- libgit2 0.21.2