diff --git a/controllers/mpog_software_plugin_myprofile_controller.rb b/controllers/mpog_software_plugin_myprofile_controller.rb index 30f822f..abfa34f 100644 --- a/controllers/mpog_software_plugin_myprofile_controller.rb +++ b/controllers/mpog_software_plugin_myprofile_controller.rb @@ -60,7 +60,7 @@ class MpogSoftwarePluginMyprofileController < MyProfileController def community_must_be_approved end - + private def add_software_erros diff --git a/test/unit/database_helper_test.rb b/test/unit/database_helper_test.rb index 7bc6f44..e141a97 100644 --- a/test/unit/database_helper_test.rb +++ b/test/unit/database_helper_test.rb @@ -27,12 +27,14 @@ class DatabaseHelperTest < ActiveSupport::TestCase should "return a list with current database objects" do list_compare = [] - assert_equal list_compare.class, DatabaseHelper.list_database(@database_objects).class + db_tables = DatabaseHelper.list_database(@database_objects) + assert_equal list_compare.class, db_tables.class end should "have same information from the list passed as parameter" do list_compare = DatabaseHelper.list_database(@database_objects) - assert_equal @database_objects.first[:database_description_id].to_i, list_compare.first.database_description_id + db_objects_id = @database_objects.first[:database_description_id] + assert_equal db_objects_id.to_i, list_compare.first.database_description_id end should "return a list with the same size of the parameter" do @@ -57,8 +59,9 @@ class DatabaseHelperTest < ActiveSupport::TestCase software_database.database_description = database_description databases << software_database + db_tables = DatabaseHelper.database_as_tables(databases) - assert_not_nil DatabaseHelper.database_as_tables(databases).first.call.index("linux") + assert_not_nil db_tables.first.call.index("linux") end should "remove invalid tables from the list" do diff --git a/test/unit/database_validation_test.rb b/test/unit/database_validation_test.rb index 8aae786..61d6ba8 100644 --- a/test/unit/database_validation_test.rb +++ b/test/unit/database_validation_test.rb @@ -21,28 +21,28 @@ class DatabaseValidationTest < ActiveSupport::TestCase assert_equal true, @database.save end - should "Don't save database if database_description database_description is empty" do + should "not save database if database_description is empty" do @database.database_description = nil assert_equal true, !@database.save end - should "Don't save database if operating system are empty" do + should "not save database if operating system are empty" do @database.operating_system = " " assert_equal true, !@database.save end - should "Don't save database if version are empty" do + should "not save database if version are empty" do @database.version = " " assert_equal true, !@database.save end - should "Don't save database if version is too long" do + should "not save database if version is too long" do @database.version = "A too long version to be a valid version for database" assert !@database.save end - should "Don't save database if operating system is too long" do - @database.operating_system = "A too long operating system to be a valid operating system for library" + should "not save database if operating system is too long" do + @database.operating_system = "A too long operating system to be a valid db" assert !@database.save end end diff --git a/test/unit/governmental_power_test.rb b/test/unit/governmental_power_test.rb index ef4ce13..5f777e6 100644 --- a/test/unit/governmental_power_test.rb +++ b/test/unit/governmental_power_test.rb @@ -13,8 +13,20 @@ class GovernmentalPowerTest < ActiveSupport::TestCase end should "get public institutions" do - gov_power = GovernmentalPower::new :name=>"Some gov power" - InstitutionTestHelper.create_public_institution("Ministerio Publico da Uniao", "MPU", "BR", "DF", "Gama", @juridical_nature, gov_power, @gov_sphere, "12.345.678/9012-45") + inst_name = "Ministerio Publico da Uniao" + inst_cnpj = "12.345.678/9012-45" + gov_power = GovernmentalPower.create(:name=>"Some gov power") + InstitutionTestHelper.create_public_institution( + inst_name, + "MPU", + "BR", + "DF", + "Gama", + @juridical_nature, + gov_power, + @gov_sphere, + inst_cnpj + ) assert_equal gov_power.public_institutions.count, PublicInstitution.count end diff --git a/test/unit/library_helper_test.rb b/test/unit/library_helper_test.rb index ec9c0f7..34201dd 100644 --- a/test/unit/library_helper_test.rb +++ b/test/unit/library_helper_test.rb @@ -5,7 +5,8 @@ class LibraryHelperTest < ActiveSupport::TestCase include LibraryHelper def setup - @license_objects = [{"name" => "license1" ,"version" => "2.0", "license" => "debian", "software_id" => "1"}, + @license_objects = [ + {"name" => "license1" ,"version" => "2.0", "license" => "debian", "software_id" => "1"}, {"name" => "license2" ,"version" => "2.1", "license" => "debian", "software_id" => "1"}, {"name" => "license3" ,"version" => "2.2", "license" => "debian", "software_id" => "1"}] end @@ -21,7 +22,8 @@ class LibraryHelperTest < ActiveSupport::TestCase should "return a list with current library objects" do list_compare = [] - assert_equal list_compare.class, LibraryHelper.list_libraries(@license_objects).class + lib_table = LibraryHelper.list_libraries(@license_objects) + assert_equal list_compare.class, lib_table.class end should "have same information from the list passed as parameter" do @@ -46,7 +48,8 @@ class LibraryHelperTest < ActiveSupport::TestCase library_description.name = "Lib" libraries << library_description + lib_table = LibraryHelper.library_as_tables(libraries) - assert_not_nil LibraryHelper.library_as_tables(libraries).first.call.index("lib") + assert_not_nil lib_table.first.call.index("lib") end end diff --git a/test/unit/mpog_person_test.rb b/test/unit/mpog_person_test.rb index 1a619bf..ae4c5cb 100644 --- a/test/unit/mpog_person_test.rb +++ b/test/unit/mpog_person_test.rb @@ -11,7 +11,9 @@ class MpogSoftwarePluginPersonTest < ActiveSupport::TestCase end should 'save person with a valid full name with accents' do - p = Person::new :name=>'Jônatàs dâ Sîlvã Jösé', :identifier=>"jonatas-jose-da-silva" + name = 'Jônatàs dâ Sîlvã Jösé' + identifier = "jonatas-jose-da-silva" + p = Person::new :name=>name, :identifier=>identifier p.user = fast_create(:user) assert_equal true, p.save diff --git a/test/unit/mpog_software_plugin_test.rb b/test/unit/mpog_software_plugin_test.rb index 2bee384..4041e1c 100644 --- a/test/unit/mpog_software_plugin_test.rb +++ b/test/unit/mpog_software_plugin_test.rb @@ -6,7 +6,15 @@ class MpogSoftwarePluginTest < ActiveSupport::TestCase def setup @plugin = MpogSoftwarePlugin.new - @person = create_person("My Name", "user@email.com", "123456", "123456", "user@secondary_email.com", "Any State", "Some City") + @person = create_person( + "My Name", + "user@email.com", + "123456", + "123456", + "user@secondary_email.com", + "Any State", + "Some City" + ) end def teardown diff --git a/test/unit/software_helper_test.rb b/test/unit/software_helper_test.rb index d29e924..a4ecd05 100644 --- a/test/unit/software_helper_test.rb +++ b/test/unit/software_helper_test.rb @@ -6,9 +6,11 @@ class SoftwareHelperTest < ActiveSupport::TestCase should "Create ProgrammingLanguages based on file with languages names" do ProgrammingLanguage.delete_all - SoftwareHelper.create_list_with_file("plugins/mpog_software/public/static/languages.txt", ProgrammingLanguage) + PATH_TO_FILE = "plugins/mpog_software/public/static/languages.txt" - list = File.open("plugins/mpog_software/public/static/languages.txt", "r") + SoftwareHelper.create_list_with_file(PATH_TO_FILE, ProgrammingLanguage) + + list = File.open(PATH_TO_FILE, "r") count = list.readlines.count list.close diff --git a/test/unit/software_info_validation_test.rb b/test/unit/software_info_validation_test.rb index 7b8ab08..e869f8d 100644 --- a/test/unit/software_info_validation_test.rb +++ b/test/unit/software_info_validation_test.rb @@ -3,17 +3,27 @@ require File.dirname(__FILE__) + '/../../../../test/test_helper' class SoftwareInfoValidationTest < ActiveSupport::TestCase def setup - @community = fast_create(Community, :identifier => 'new-software', :name => 'New Software') + @community = fast_create( + Community, + :identifier => 'new-software', + :name => 'New Software' + ) @language = ProgrammingLanguage.new(:name => 'C++') @language.save - @software_language = SoftwareLanguage.new(:version => '1', :operating_system => 'os') + @software_language = SoftwareLanguage.new( + :version => '1', + :operating_system => 'os' + ) @software_language.programming_language = @language @software_language.save @database = DatabaseDescription.new(:name => 'Oracle') @database.save - @software_database = SoftwareDatabase.new(:version => '2', :operating_system => 'os2') + @software_database = SoftwareDatabase.new( + :version => '2', + :operating_system => 'os2' + ) @software_database.database_description = @database @software_database.save @@ -23,20 +33,23 @@ class SoftwareInfoValidationTest < ActiveSupport::TestCase @operating_system.operating_system_name = @operating_system_name @operating_system.save - @software_info = SoftwareInfo.new(:acronym => "SFTW", :e_mag => true,:icp_brasil => true,:intern => true,:e_ping => true, - :e_arq => true, :operating_platform => true, :objectives => "", :features => "") + @software_info = SoftwareInfo.new( + :acronym => "SFTW", + :e_mag => true, + :icp_brasil => true, + :intern => true, + :e_ping => true, + :e_arq => true, + :operating_platform => true, + :objectives => "", + :features => "" + ) @software_info.software_languages << @software_language @software_info.software_databases << @software_database @software_info.operating_systems << @operating_system @software_info.features = "Do a lot of things" @software_info.objectives = "All tests should pass !" - - software_categories = SoftwareCategories::new - software_categories.administration = true - software_categories.save - - @software_info.software_categories = software_categories end def teardown @@ -47,7 +60,6 @@ class SoftwareInfoValidationTest < ActiveSupport::TestCase OperatingSystem.destroy_all OperatingSystemName.destroy_all SoftwareInfo.destroy_all - SoftwareCategories.destroy_all end should 'Save SoftwareInfo if all fields are filled' do @@ -94,15 +106,17 @@ class SoftwareInfoValidationTest < ActiveSupport::TestCase should "Not save if features are longer than 4000" do @software_info.features = "a"*4001 + error_msg = _("Features is too long (maximum is 4000 characters)") assert_equal false, @software_info.save - assert_equal true, @software_info.errors.full_messages.include?(_("Features is too long (maximum is 4000 characters)")) + assert_equal true, @software_info.errors.full_messages.include?(error_msg) end should "Not save if objectives are longer than 4000" do @software_info.objectives = "a"*4001 + error_msg = _("Objectives is too long (maximum is 4000 characters)") assert_equal false, @software_info.save - assert_equal true, @software_info.errors.full_messages.include?(_("Objectives is too long (maximum is 4000 characters)")) + assert_equal true, @software_info.errors.full_messages.include?(error_msg) end end diff --git a/test/unit/software_language_helper_test.rb b/test/unit/software_language_helper_test.rb index b828f5e..60e62a0 100644 --- a/test/unit/software_language_helper_test.rb +++ b/test/unit/software_language_helper_test.rb @@ -27,12 +27,15 @@ class SoftwareLanguageHelperTest < ActiveSupport::TestCase should "return a list with current software language objects" do list_compare = [] - assert_equal list_compare.class, SoftwareLanguageHelper.list_language(@software_language_objects).class + softwares = SoftwareLanguageHelper.list_language(@software_language_objects) + assert_equal list_compare.class, softwares.class end should "have same information from the list passed as parameter" do list_compare = SoftwareLanguageHelper.list_language(@software_language_objects) - assert_equal @software_language_objects.first[:programming_language_id].to_i, list_compare.first.programming_language_id + lang_id = @software_language_objects.first[:programming_language_id].to_i + + assert_equal lang_id, list_compare.first.programming_language_id end should "return a list with the same size of the parameter" do @@ -57,8 +60,8 @@ class SoftwareLanguageHelperTest < ActiveSupport::TestCase software_language.programming_language = programming_language softwares_languages << software_language - - assert_not_nil SoftwareLanguageHelper.language_as_tables(softwares_languages).first.call.index("linux") + lang_table = SoftwareLanguageHelper.language_as_tables(softwares_languages) + assert_not_nil lang_table.first.call.index("linux") end should "remove invalid tables from the list" do diff --git a/test/unit/software_license_info_test.rb b/test/unit/software_license_info_test.rb index 633e4cd..81ab2ee 100644 --- a/test/unit/software_license_info_test.rb +++ b/test/unit/software_license_info_test.rb @@ -3,18 +3,26 @@ require File.dirname(__FILE__) + '/../../../../test/test_helper' class SoftwareDatabaseTest < ActiveSupport::TestCase should "save if all informations are filled" do - @software_license_info = LicenseInfo.create(:version => "GPL", :link => "www.gpl2.com") + @software_license_info = LicenseInfo.create( + :version => "GPL", + :link => "www.gpl2.com" + ) assert @software_license_info.save!, "License Info should have been saved" end should "not save if license info version is empty" do - @software_license_info = LicenseInfo.create(:version => "GPL", :link => "www.gpl2.com") + @software_license_info = LicenseInfo.create( + :version => "GPL", + :link => "www.gpl2.com" + ) @software_license_info.version = nil assert !@software_license_info.save, "Version can't be blank" end should "save if link is empty" do - @software_license_info = LicenseInfo.create(:version => "GPL", :link => "www.gpl2.com") + @software_license_info = LicenseInfo.create( + :version => "GPL", + :link => "www.gpl2.com") @software_license_info.link = nil assert @software_license_info.save, "License info should have been saved" end diff --git a/test/unit/softwares_block_test.rb b/test/unit/softwares_block_test.rb index f56943b..d14e080 100644 --- a/test/unit/softwares_block_test.rb +++ b/test/unit/softwares_block_test.rb @@ -23,7 +23,14 @@ class SoftwaresBlockTest < ActiveSupport::TestCase end should 'list softwares' do - user = create_person("Jose_Augusto", "jose_augusto@email.com", "aaaaaaa", "aaaaaaa", "jose_silva@email.com", "DF", "Gama") + user = create_person("Jose_Augusto", + "jose_augusto@email.com", + "aaaaaaa", + "aaaaaaa", + "jose_silva@email.com", + "DF", + "Gama" + ) software_info = create_software_info("new software") software_info.community.add_member(user) -- libgit2 0.21.2