Download as
Browse Code »

Commit 8f20ecab96375ec72daef0001cea95844a81e8a1

Authored by Fabio Teixeira
1 parent 707e08f1
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

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 10 @request = ActionController::TestRequest.new
11 11 @response = ActionController::TestResponse.new
12 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 17 LicenseInfo.create(:version=>"CC-GPL-V2", :link=>"http://creativecommons.org/licenses/GPL/2.0/legalcode.pt")
16 18 ProgramLanguage.create(:name =>"language")
... ... @@ -65,9 +67,11 @@ class MpogSoftwarePluginMyprofileControllerTest &lt; ActionController::TestCase
65 67 end
66 68  
67 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 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 76 end
73 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 121  
122 122 <%= fields_for @license_info do |lcv| %>
123 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 127 <h4> <%= _("License link") %> </h4>
128 128 <% LicenseHelper.getListLicenses.each do | license | %>
129 129 <input type="hidden" id = "version_<%=license.id %>" value = "<%=license.link%>">
... ...