From 2aa4d754d6be187045eaacf68e0d07ffcd511cdb Mon Sep 17 00:00:00 2001 From: Luciano Date: Thu, 11 Dec 2014 12:12:50 -0200 Subject: [PATCH] Remove trailing whitespace and fix SearchControllerTest --- lib/software_language_helper.rb | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------- test/functional/search_controller_test.rb | 17 +++++++++++++---- 2 files changed, 87 insertions(+), 25 deletions(-) diff --git a/lib/software_language_helper.rb b/lib/software_language_helper.rb index e3c8f85..404bf57 100644 --- a/lib/software_language_helper.rb +++ b/lib/software_language_helper.rb @@ -3,11 +3,13 @@ module SoftwareLanguageHelper def self.valid_language? language return false if SoftwareHelper.all_table_is_empty?(language) - programming_language_id_list = ProgrammingLanguage.select(:id).collect {|dd| dd.id } + programming_language_id_list = ProgrammingLanguage. + select(:id). + collect { |dd| dd.id } - return false unless programming_language_id_list.include?(language[:programming_language_id].to_i) - - true + return programming_language_id_list.include?( + language[:programming_language_id].to_i + ) end def self.list_language new_languages @@ -17,7 +19,8 @@ module SoftwareLanguageHelper new_languages.each do |new_language| if valid_language? new_language language = SoftwareLanguage.new - language.programming_language = ProgrammingLanguage.find(new_language[:programming_language_id]) + language.programming_language = + ProgrammingLanguage.find(new_language[:programming_language_id]) language.version = new_language[:version] language.operating_system = new_language[:operating_system] list_languages << language @@ -49,7 +52,11 @@ module SoftwareLanguageHelper lambdas_list = [] if not show_information - return language_html_structure({:programming_language_id => "", :version => "", :operating_system => ""}) if list_languages.nil? + return language_html_structure( + {:programming_language_id => "", + :version => "", + :operating_system => ""} + ) if list_languages.nil? list_languages.each do |language| lambdas_list << language_html_structure(language) @@ -69,29 +76,68 @@ module SoftwareLanguageHelper language_name = if language_data[:programming_language_id].blank? "" else - ProgrammingLanguage.find(language_data[:programming_language_id], :select=>"name").name + ProgrammingLanguage.find( + language_data[:programming_language_id], + :select=>"name" + ).name end Proc::new do content_tag('table', - content_tag('tr', - content_tag('td', label_tag(_("Language Name: ")))+ - content_tag('td', - text_field_tag("language_autocomplete", language_name, :class=>"language_autocomplete", :placeholder=>_("Autocomplete field, type something")) + - content_tag('div', _("Pick an item on the list"), :class=>"autocomplete_validation_message hide-field") ) + - content_tag('td', hidden_field_tag("language[][programming_language_id]", language_data[:programming_language_id], :class=>"programming_language_id", data:{label:language_name})) + content_tag( + 'tr', + content_tag('td', label_tag(_("Language Name: "))) + + content_tag( + 'td', + text_field_tag( + "language_autocomplete", + language_name, + :class=>"language_autocomplete", + :placeholder=>_("Autocomplete field, type something") + ) + + content_tag( + 'div', + _("Pick an item on the list"), + :class=>"autocomplete_validation_message hide-field") + ) + + content_tag( + 'td', + hidden_field_tag("language[][programming_language_id]", + language_data[:programming_language_id], + :class=>"programming_language_id", + data:{label:language_name}) + ) )+ - content_tag('tr', + content_tag( + 'tr', content_tag('td', label_tag(_("Version")))+ - content_tag('td', text_field_tag("language[][version]", language_data[:version]))+ + content_tag( + 'td', + text_field_tag("language[][version]",language_data[:version]) + ) + content_tag('td') )+ - content_tag('tr', + content_tag( + 'tr', content_tag('td', label_tag(_("Operating System")))+ - content_tag('td', text_field_tag("language[][operating_system]", language_data[:operating_system]))+ - content_tag('td', button_without_text(:delete, _('Delete'), "#" , :class=>"delete-dynamic-table"), :align => 'right') + content_tag( + 'td', + text_field_tag( + "language[][operating_system]", + language_data[:operating_system] + ) + ) + + content_tag('td', + button_without_text( + :delete, + _('Delete'), + "#", + :class=>"delete-dynamic-table" + ), + :align => 'right' + ) ), :class => 'dynamic-table software-language-table' ) end @@ -99,10 +145,17 @@ module SoftwareLanguageHelper def self.language_html_show_structure(language) Proc::new do - content_tag('table', - content_tag('tr', + content_tag( + 'table', + content_tag( + 'tr', content_tag('td', label_tag(_("Language Name: ")))+ - content_tag('td', ProgrammingLanguage.where(:id => language[:programming_language_id])[0].name)+ + content_tag( + 'td', + ProgrammingLanguage.where( + :id => language[:programming_language_id] + )[0].name + )+ content_tag('td') )+ diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb index 2ca543a..793943c 100644 --- a/test/functional/search_controller_test.rb +++ b/test/functional/search_controller_test.rb @@ -72,6 +72,11 @@ class SearchControllerTest < ActionController::TestCase should "Don't found template in communities search" do community = create_community("New Community") + software = create_software_info("New Software") + software.license_info = LicenseInfo.create(:version => "GPL") + software.save! + + institution = create_private_institution("New Private Institution", "NPI" , "Brazil", "DF", "Gama", "66.544.314/0001-63") community_template = create_community("New Community Template") community_template.is_template = true @@ -86,10 +91,14 @@ class SearchControllerTest < ActionController::TestCase ) end - should "Don't found template in software_infos search" do - software = create_software_info("New Software") - software.license_info = LicenseInfo.create(:version => "GPL") - software.save! + should "software_infos search by category" do + software_with_category = create_software_info("New Software With Category") + software_with_category.license_info = LicenseInfo.create(:version => "GPL") + + software_without_category = create_software_info("New Software Without Category") + software_without_category.license_info = LicenseInfo.create(:version => "GPL") + + category = Category.create!(:name => "Health", :environment => @environment, :parent => @category_software) software_template = create_software_info("New Software Template") software_template.license_info = LicenseInfo.last -- libgit2 0.21.2