From ad2b99ba3ddeea33b345fafc4e9a87418b39dfe7 Mon Sep 17 00:00:00 2001 From: Marcos Ronaldo Date: Tue, 1 Dec 2015 17:29:31 -0200 Subject: [PATCH] fix unit tests --- src/noosfero-spb/software_communities/lib/ext/person.rb | 2 +- src/noosfero-spb/software_communities/lib/software_communities_plugin/api_entities.rb | 4 ++-- src/noosfero-spb/software_communities/test/unit/communities_block_test.rb | 5 +++-- src/noosfero-spb/software_communities/test/unit/software_communities_person_test.rb | 3 +-- src/noosfero-spb/software_communities/test/unit/software_info_validation_test.rb | 7 ++++++- src/noosfero-spb/software_communities/test/unit/software_language_validation.rb | 1 + src/noosfero-spb/software_communities/test/unit/software_tab_data_block_test.rb | 24 ++++++++++++------------ src/noosfero-spb/software_communities/test/unit/softwares_block_test.rb | 4 ++-- 8 files changed, 28 insertions(+), 22 deletions(-) diff --git a/src/noosfero-spb/software_communities/lib/ext/person.rb b/src/noosfero-spb/software_communities/lib/ext/person.rb index 7aa9f60..a791ca6 100644 --- a/src/noosfero-spb/software_communities/lib/ext/person.rb +++ b/src/noosfero-spb/software_communities/lib/ext/person.rb @@ -18,7 +18,7 @@ class Person # end def softwares - memberships.softwares + Software.memberships_of(self) end end diff --git a/src/noosfero-spb/software_communities/lib/software_communities_plugin/api_entities.rb b/src/noosfero-spb/software_communities/lib/software_communities_plugin/api_entities.rb index db62d1a..5cbbfe3 100644 --- a/src/noosfero-spb/software_communities/lib/software_communities_plugin/api_entities.rb +++ b/src/noosfero-spb/software_communities/lib/software_communities_plugin/api_entities.rb @@ -3,8 +3,8 @@ module Entities root 'software_infos', 'software_info' expose :id, :finality, :repository_link, :public_software, :acronym, :objectives, :features,:license_info, :software_languages, :software_databases, :operating_system_names - expose :community_id do |software_info,options| - software_info.community.id + expose :software_id do |software_info,options| + software_info.software.id end end end diff --git a/src/noosfero-spb/software_communities/test/unit/communities_block_test.rb b/src/noosfero-spb/software_communities/test/unit/communities_block_test.rb index 8f53a61..6033210 100644 --- a/src/noosfero-spb/software_communities/test/unit/communities_block_test.rb +++ b/src/noosfero-spb/software_communities/test/unit/communities_block_test.rb @@ -7,7 +7,7 @@ class CommunitiesBlockTest < ActiveSupport::TestCase @person = create_person("My Name", "user@email.com", "123456", "123456", "Any State", "Some City") @software_info = create_software_info("Novo Software") - @software_info.community.add_member(@person) + @software_info.software.add_member(@person) @community = fast_create(Community) @community.add_member(@person) @@ -23,9 +23,10 @@ class CommunitiesBlockTest < ActiveSupport::TestCase @community = nil @software_info = nil end + should "not have community of software or institution in block" do assert_includes @comminities_block.profile_list, @community - assert_not_includes @comminities_block.profile_list, @software_info.community + assert_not_includes @comminities_block.profile_list, @software_info.software end end diff --git a/src/noosfero-spb/software_communities/test/unit/software_communities_person_test.rb b/src/noosfero-spb/software_communities/test/unit/software_communities_person_test.rb index ee5f1f4..cd9c690 100644 --- a/src/noosfero-spb/software_communities/test/unit/software_communities_person_test.rb +++ b/src/noosfero-spb/software_communities/test/unit/software_communities_person_test.rb @@ -26,10 +26,9 @@ class GovUserPluginPersonTest < ActiveSupport::TestCase should 'get a list of softwares of a person' do software1 = create_software_info "noosfero" - software2 = create_software_info "colab" community = fast_create(Community) - software1.community.add_member @person + software1.software.add_member @person software1.save! community.add_member @person community.save! diff --git a/src/noosfero-spb/software_communities/test/unit/software_info_validation_test.rb b/src/noosfero-spb/software_communities/test/unit/software_info_validation_test.rb index b5324a6..4e2a9b1 100644 --- a/src/noosfero-spb/software_communities/test/unit/software_info_validation_test.rb +++ b/src/noosfero-spb/software_communities/test/unit/software_info_validation_test.rb @@ -9,6 +9,11 @@ class SoftwareInfoValidationTest < ActiveSupport::TestCase :name => 'New Software' ) + @software = fast_create(Software, + :identifier => 'new-software', + :name => 'New Software' + ) + @language = ProgrammingLanguage.new(:name => 'C++') @language.save @software_language = SoftwareLanguage.new( @@ -49,7 +54,7 @@ class SoftwareInfoValidationTest < ActiveSupport::TestCase @software_info.features = "Do a lot of things" @software_info.objectives = "All tests should pass !" - @software_info.community = @community + @software_info.software=@software end def teardown diff --git a/src/noosfero-spb/software_communities/test/unit/software_language_validation.rb b/src/noosfero-spb/software_communities/test/unit/software_language_validation.rb index c4fef33..b269abf 100644 --- a/src/noosfero-spb/software_communities/test/unit/software_language_validation.rb +++ b/src/noosfero-spb/software_communities/test/unit/software_language_validation.rb @@ -51,6 +51,7 @@ class SoftwareLanguageValidationTest < ActiveSupport::TestCase software_info = SoftwareInfo.new software_info.software = software software_info.software.name = 'Noosfero' + software_info.software.identifier = 'Noosfero'.to_slug software_info.e_mag = true software_info.icp_brasil = true software_info.intern = true diff --git a/src/noosfero-spb/software_communities/test/unit/software_tab_data_block_test.rb b/src/noosfero-spb/software_communities/test/unit/software_tab_data_block_test.rb index aad8c8c..076f57d 100644 --- a/src/noosfero-spb/software_communities/test/unit/software_tab_data_block_test.rb +++ b/src/noosfero-spb/software_communities/test/unit/software_tab_data_block_test.rb @@ -8,32 +8,32 @@ class SoftwareTabDataBlockTest < ActiveSupport::TestCase @software_info = create_software_info("A new Software") @software_info.save! - @soft_community = @software_info.community + @software = @software_info.software - @soft_community.blogs << Blog.new(:name=>"First blog") - @soft_community.blogs << Blog.new(:name=>"Second blog") - @soft_community.save! + @software.blogs << Blog.new(:name=>"First blog") + @software.blogs << Blog.new(:name=>"Second blog") + @software.save! - SoftwareTabDataBlock.any_instance.stubs(:owner).returns(@soft_community) + SoftwareTabDataBlock.any_instance.stubs(:owner).returns(@software) end should "get its owner blogs" do - assert_equal @soft_community.blogs, SoftwareTabDataBlock.new.blogs + assert_equal @software.blogs, SoftwareTabDataBlock.new.blogs end should "actual_blog get the first blog if it is not defined" do - assert_equal @soft_community.blogs.first, SoftwareTabDataBlock.new.actual_blog + assert_equal @software.blogs.first, SoftwareTabDataBlock.new.actual_blog end - should "actual_blog get the defined community blog" do - last_blog = @soft_community.blogs.last + should "actual_blog get the defined software blog" do + last_blog = @software.blogs.last soft_tab_data = create_software_tab_data_block(last_blog) assert_equal last_blog, soft_tab_data.actual_blog end should "get the actual_blog posts" do - last_blog = @soft_community.blogs.last + last_blog = @software.blogs.last soft_tab_data = create_software_tab_data_block(last_blog) craete_sample_posts(last_blog, 2) @@ -42,7 +42,7 @@ class SoftwareTabDataBlockTest < ActiveSupport::TestCase end should "limit the number of posts" do - last_blog = @soft_community.blogs.last + last_blog = @software.blogs.last soft_tab_data = create_software_tab_data_block(last_blog) craete_sample_posts(last_blog, 6) @@ -60,7 +60,7 @@ class SoftwareTabDataBlockTest < ActiveSupport::TestCase def craete_sample_posts blog, quantity=1 quantity.times do |number| TinyMceArticle.create! :name=>"Simple post #{number}", :body=>"Simple post #{number}", - :parent=> blog, :profile=>@soft_community + :parent=> blog, :profile=>@software end end end diff --git a/src/noosfero-spb/software_communities/test/unit/softwares_block_test.rb b/src/noosfero-spb/software_communities/test/unit/softwares_block_test.rb index 44b5064..f102e1f 100644 --- a/src/noosfero-spb/software_communities/test/unit/softwares_block_test.rb +++ b/src/noosfero-spb/software_communities/test/unit/softwares_block_test.rb @@ -32,12 +32,12 @@ class SoftwaresBlockTest < ActiveSupport::TestCase ) software_info = create_software_info("new software") - software_info.community.add_member(user) + software_info.software.add_member(user) block = SoftwaresBlock.new block.expects(:owner).at_least_once.returns(user) - assert_equivalent [software_info.community], block.profiles + assert_equivalent [software_info.software], block.profiles end end -- libgit2 0.21.2