Download as
Browse Code »

Commit 8f20ecab96375ec72daef0001cea95844a81e8a1

Authored by Fabio Teixeira
1 parent 707e08f1
Exists in master and in 5 other branches fix_search_by_software_highlight_block, r4, refactor_software_info_365, stable, update_translations

find_offerer:Searching lincense info by version field 

Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Showing 2 changed files with 11 additions and 7 deletions   Show diff stats
test/functional/mpog_software_plugin_myprofile_controller_test.rb
  Diff comments   View file @8f20eca
@@ -10,7 +10,9 @@ class MpogSoftwarePluginMyprofileControllerTest &lt; ActionController::TestCase @@ -10,7 +10,9 @@ class MpogSoftwarePluginMyprofileControllerTest &lt; ActionController::TestCase
10 @request = ActionController::TestRequest.new 10 @request = ActionController::TestRequest.new
11 @response = ActionController::TestResponse.new 11 @response = ActionController::TestResponse.new
12 @person = create_user('person').person 12 @person = create_user('person').person
13 - @offer = create_user('angela') 13 + @offer = create_user('Angela Silva')
  14 + @offer_1 = create_user('Ana de Souza')
  15 + @offer_2 = create_user('Angelo Roberto')
14 16
15 LicenseInfo.create(:version=>"CC-GPL-V2", :link=>"http://creativecommons.org/licenses/GPL/2.0/legalcode.pt") 17 LicenseInfo.create(:version=>"CC-GPL-V2", :link=>"http://creativecommons.org/licenses/GPL/2.0/legalcode.pt")
16 ProgramLanguage.create(:name =>"language") 18 ProgramLanguage.create(:name =>"language")
@@ -65,9 +67,11 @@ class MpogSoftwarePluginMyprofileControllerTest &lt; ActionController::TestCase @@ -65,9 +67,11 @@ class MpogSoftwarePluginMyprofileControllerTest &lt; ActionController::TestCase
65 end 67 end
66 68
67 should 'search new offers while creating a new software' do 69 should 'search new offers while creating a new software' do
68 - candidate_offers = "Angela"  
69 - post :search_offerers, :profile => person.identifier,:q => candidate_offers 70 + offer_token = "An"
  71 + post :search_offerers, :profile => person.identifier,:q => offer_token
70 response = JSON.parse(@response.body) 72 response = JSON.parse(@response.body)
71 - assert_equal "angela",response[0]["name"] 73 + assert_equal "Angelo Roberto",response[0]["name"]
  74 + assert_equal "Ana de Souza",response[1]["name"]
  75 + assert_equal "Angela Silva",response[2]["name"]
72 end 76 end
73 end 77 end
views/mpog_software_plugin_myprofile/new_software.html.erb
  Diff comments   View file @8f20eca
@@ -121,9 +121,9 @@ offerers&#39;), :pre_populate =&gt; @tokenized_children}) %&gt; @@ -121,9 +121,9 @@ offerers&#39;), :pre_populate =&gt; @tokenized_children}) %&gt;
121 121
122 <%= fields_for @license_info do |lcv| %> 122 <%= fields_for @license_info do |lcv| %>
123 <div class="formfieldline"> 123 <div class="formfieldline">
124 - <h4> <%= lcv.label _("License Version: ") %>  
125 - <%= lcv.select(:version, LicenseInfo.all.map {|l| [l.version, l.id]}, {:selected=>1}, :onchange => "get_license_link('license_info_version')") %>  
126 - </h4> 124 + <h4> <%= lcv.label _("License Version: ") %> </h4>
  125 + <%= lcv.select(:version, LicenseInfo.all.map {|l| [l.version, l.version]}, {:selected=>1}, :onchange => "get_license_link('license_info_version')") %>
  126 +
127 <h4> <%= _("License link") %> </h4> 127 <h4> <%= _("License link") %> </h4>
128 <% LicenseHelper.getListLicenses.each do | license | %> 128 <% LicenseHelper.getListLicenses.each do | license | %>
129 <input type="hidden" id = "version_<%=license.id %>" value = "<%=license.link%>"> 129 <input type="hidden" id = "version_<%=license.id %>" value = "<%=license.link%>">