From 7d49172751e702f8e7dc1017651528504ee44a84 Mon Sep 17 00:00:00 2001 From: Arthur Del Esposte Date: Tue, 3 Nov 2015 16:42:54 -0200 Subject: [PATCH] Fix search controller tests in software communities plugin --- src/noosfero-spb/software_communities/lib/software_communities_plugin.rb | 6 ------ src/noosfero-spb/software_communities/test/functional/search_controller_test.rb | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------- 2 files changed, 56 insertions(+), 62 deletions(-) diff --git a/src/noosfero-spb/software_communities/lib/software_communities_plugin.rb b/src/noosfero-spb/software_communities/lib/software_communities_plugin.rb index a58412f..04acb0d 100644 --- a/src/noosfero-spb/software_communities/lib/software_communities_plugin.rb +++ b/src/noosfero-spb/software_communities/lib/software_communities_plugin.rb @@ -123,12 +123,6 @@ class SoftwareCommunitiesPlugin < Noosfero::Plugin where('softwares.community_id IS NULL') return [scope, asset] - # # Select only communities that are related to a software. - # elsif asset.to_s == 'software_communities_plugin/software_infos' - # scope = scope.joins('INNER JOIN software_communities_plugin_software_infos as softwares - # ON profiles.id = softwares.community_id') - # return [scope, asset] - # # Go with the flow. else return [scope, asset] end diff --git a/src/noosfero-spb/software_communities/test/functional/search_controller_test.rb b/src/noosfero-spb/software_communities/test/functional/search_controller_test.rb index 1141158..a04d755 100644 --- a/src/noosfero-spb/software_communities/test/functional/search_controller_test.rb +++ b/src/noosfero-spb/software_communities/test/functional/search_controller_test.rb @@ -51,13 +51,13 @@ class SearchControllerTest < ActionController::TestCase assert_not_includes assigns(:searches)[:communities][:results], @softwares.first.community end - should "software_infos search don't have community" do + should "softwares search don't have community" do community = create_community("Community One") - get :software_infos, :query => "One" + get :softwares, :query => "One" - assert_includes assigns(:searches)[:software_infos][:results], @softwares.first.community - assert_not_includes assigns(:searches)[:software_infos][:results], community + assert_includes assigns(:searches)["software_communities_plugin/software_infos"][:results], @softwares.first.community + assert_not_includes assigns(:searches)["software_communities_plugin/software_infos"][:results], community end @@ -79,18 +79,18 @@ class SearchControllerTest < ActionController::TestCase ) end - should "software_infos search by category" do + should "softwares search by category" do get( - :software_infos, + :softwares, :query => "", :selected_categories_id => [Category.first.id] ) - assert_includes assigns(:searches)[:software_infos][:results], @softwares.first.community - assert_not_includes assigns(:searches)[:software_infos][:results], @softwares.last.community + assert_includes assigns(:searches)["software_communities_plugin/software_infos"][:results], @softwares.first.community + assert_not_includes assigns(:searches)["software_communities_plugin/software_infos"][:results], @softwares.last.community end - should "software_infos search by programming language" do + should "softwares search by programming language" do @softwares.first.software_languages << create_software_language("Python", "1.0") @softwares.last.software_languages << create_software_language("Java", "8.1") @@ -98,15 +98,15 @@ class SearchControllerTest < ActionController::TestCase @softwares.last.save! get( - :software_infos, + :softwares, :query => "python", ) - assert_includes assigns(:searches)[:software_infos][:results], @softwares.first.community - assert_not_includes assigns(:searches)[:software_infos][:results], @softwares.last.community + assert_includes assigns(:searches)["software_communities_plugin/software_infos"][:results], @softwares.first.community + assert_not_includes assigns(:searches)["software_communities_plugin/software_infos"][:results], @softwares.last.community end - should "software_infos search by database description" do + should "softwares search by database description" do @softwares.first.software_databases << create_software_database("MySQL", "1.0") @softwares.last.software_databases << create_software_database("Postgrees", "8.1") @@ -114,36 +114,36 @@ class SearchControllerTest < ActionController::TestCase @softwares.last.save! get( - :software_infos, + :softwares, :query => "mysql", ) - assert_includes assigns(:searches)[:software_infos][:results], @softwares.first.community - assert_not_includes assigns(:searches)[:software_infos][:results], @softwares.last.community + assert_includes assigns(:searches)["software_communities_plugin/software_infos"][:results], @softwares.first.community + assert_not_includes assigns(:searches)["software_communities_plugin/software_infos"][:results], @softwares.last.community end - should "software_infos search by finality" do + should "softwares search by finality" do get( - :software_infos, + :softwares, :query => "help", ) - assert_includes assigns(:searches)[:software_infos][:results], @softwares.first.community - assert_not_includes assigns(:searches)[:software_infos][:results], @softwares.last.community + assert_includes assigns(:searches)["software_communities_plugin/software_infos"][:results], @softwares.first.community + assert_not_includes assigns(:searches)["software_communities_plugin/software_infos"][:results], @softwares.last.community end - should "software_infos search by acronym" do + should "softwares search by acronym" do get( - :software_infos, + :softwares, :query => "SFO", ) - assert_includes assigns(:searches)[:software_infos][:results], @softwares.first.community - assert_not_includes assigns(:searches)[:software_infos][:results], @softwares.last.community + assert_includes assigns(:searches)["software_communities_plugin/software_infos"][:results], @softwares.first.community + assert_not_includes assigns(:searches)["software_communities_plugin/software_infos"][:results], @softwares.last.community end - should "software_infos search by relevance" do + should "softwares search by relevance" do @softwares << create_software_info("Software Three", :acronym => "SFW", :finality => "Java") @softwares.last.license_info = SoftwareCommunitiesPlugin::LicenseInfo.create :version => "GPL - 3.0" @@ -155,17 +155,17 @@ class SearchControllerTest < ActionController::TestCase @softwares[1].community.save! get( - :software_infos, + :softwares, :sort => "relevance", :query => "Java" ) - assert_equal assigns(:searches)[:software_infos][:results][0], @softwares[1].community - assert_equal assigns(:searches)[:software_infos][:results][1], @softwares[2].community - assert_equal assigns(:searches)[:software_infos][:results][2], @softwares[0].community + assert_equal assigns(:searches)["software_communities_plugin/software_infos"][:results][0], @softwares[1].community + assert_equal assigns(:searches)["software_communities_plugin/software_infos"][:results][1], @softwares[2].community + assert_equal assigns(:searches)["software_communities_plugin/software_infos"][:results][2], @softwares[0].community end - should "software_infos search only public_software" do + should "softwares search only public_software" do software_one = create_software_info("Software One", :acronym => "SFO", :finality => "Help") software_two = create_software_info("Java", :acronym => "SFT", :finality => "Task") software_three = create_software_info("Software Three", :acronym => "SFW", :finality => "Java") @@ -173,16 +173,16 @@ class SearchControllerTest < ActionController::TestCase software_three.save! get( - :software_infos, + :softwares, :software_type => "public_software" ) - assert_includes assigns(:searches)[:software_infos][:results], software_one.community - assert_includes assigns(:searches)[:software_infos][:results], software_two.community - assert_not_includes assigns(:searches)[:software_infos][:results], software_three.community + assert_includes assigns(:searches)["software_communities_plugin/software_infos"][:results], software_one.community + assert_includes assigns(:searches)["software_communities_plugin/software_infos"][:results], software_two.community + assert_not_includes assigns(:searches)["software_communities_plugin/software_infos"][:results], software_three.community end - should "software_infos search public_software and other all" do + should "softwares search public_software and other all" do software_one = create_software_info("Software One", :acronym => "SFO", :finality => "Help") software_two = create_software_info("Java", :acronym => "SFT", :finality => "Task") software_three = create_software_info("Software Three", :acronym => "SFW", :finality => "Java") @@ -190,56 +190,56 @@ class SearchControllerTest < ActionController::TestCase software_three.save! get( - :software_infos, + :softwares, :software_type => "all" ) - assert_includes assigns(:searches)[:software_infos][:results], software_one.community - assert_includes assigns(:searches)[:software_infos][:results], software_two.community - assert_includes assigns(:searches)[:software_infos][:results], software_three.community + assert_includes assigns(:searches)["software_communities_plugin/software_infos"][:results], software_one.community + assert_includes assigns(:searches)["software_communities_plugin/software_infos"][:results], software_two.community + assert_includes assigns(:searches)["software_communities_plugin/software_infos"][:results], software_three.community end - should "software_infos search return only the software in params" do + should "softwares search return only the software in params" do software_one = create_software_info("Software One", :acronym => "SFO", :finality => "Help") software_two = create_software_info("Java", :acronym => "SFT", :finality => "Task") software_three = create_software_info("Software Three", :acronym => "SFW", :finality => "Java") get( - :software_infos, + :softwares, :only_softwares => ["software-three", "java"] ) - assert_includes assigns(:searches)[:software_infos][:results], software_two.community - assert_includes assigns(:searches)[:software_infos][:results], software_three.community - assert_not_includes assigns(:searches)[:software_infos][:results], software_one.community + assert_includes assigns(:searches)["software_communities_plugin/software_infos"][:results], software_two.community + assert_includes assigns(:searches)["software_communities_plugin/software_infos"][:results], software_three.community + assert_not_includes assigns(:searches)["software_communities_plugin/software_infos"][:results], software_one.community end - should "software_infos search return only enabled softwares" do + should "softwares search return only enabled softwares" do s1 = SoftwareCommunitiesPlugin::SoftwareInfo.first s2 = SoftwareCommunitiesPlugin::SoftwareInfo.last # First get them all normally get( - :software_infos, + :softwares, :query => "software" ) - assert_includes assigns(:searches)[:software_infos][:results], s1.community - assert_includes assigns(:searches)[:software_infos][:results], s2.community + assert_includes assigns(:searches)["software_communities_plugin/software_infos"][:results], s1.community + assert_includes assigns(:searches)["software_communities_plugin/software_infos"][:results], s2.community s2.community.disable # Now it should not contain the disabled community get( - :software_infos, + :softwares, :query => "software" ) - assert_includes assigns(:searches)[:software_infos][:results], s1.community - assert_not_includes assigns(:searches)[:software_infos][:results], s2.community + assert_includes assigns(:searches)["software_communities_plugin/software_infos"][:results], s1.community + assert_not_includes assigns(:searches)["software_communities_plugin/software_infos"][:results], s2.community end - should "software_infos search not return software with secret community" do + should "softwares search not return software with secret community" do software_one = create_software_info("Software ABC", :acronym => "SFO", :finality => "Help") software_two = create_software_info("Python", :acronym => "SFT", :finality => "Task") software_three = create_software_info("Software DEF", :acronym => "SFW", :finality => "Java") @@ -248,12 +248,12 @@ class SearchControllerTest < ActionController::TestCase software_one.community.save! get( - :software_infos, + :softwares, ) - assert_includes assigns(:searches)[:software_infos][:results], software_two.community - assert_includes assigns(:searches)[:software_infos][:results], software_three.community - assert_not_includes assigns(:searches)[:software_infos][:results], software_one.community + assert_includes assigns(:searches)["software_communities_plugin/software_infos"][:results], software_two.community + assert_includes assigns(:searches)["software_communities_plugin/software_infos"][:results], software_three.community + assert_not_includes assigns(:searches)["software_communities_plugin/software_infos"][:results], software_one.community end private -- libgit2 0.21.2