From 5255150fd38ebdf3bb0feae59d516141367bf72b Mon Sep 17 00:00:00 2001 From: Fabio Teixeira Date: Wed, 5 Nov 2014 14:56:20 -0200 Subject: [PATCH] fix_institution: Fix unit and some functional tests --- lib/software_database.rb | 2 ++ test/functional/institution_test_helper.rb | 31 +++++++++++++++++++++++-------- test/functional/mpog_software_plugin_controller_test.rb | 2 +- test/functional/mpog_software_plugin_myprofile_controller_test.rb | 2 +- test/functional/profile_editor_controller_test.rb | 2 +- test/helpers/institution_test_helper.rb | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ test/unit/communities_block_test.rb | 3 ++- test/unit/database_helper_test.rb | 7 +++---- test/unit/database_validation_test.rb | 2 ++ test/unit/governmental_power_test.rb | 47 +++++++++-------------------------------------- test/unit/institution_test.rb | 2 +- test/unit/institutions_block_test.rb | 2 +- test/unit/juridical_nature_test.rb | 4 ++-- test/unit/mpog_software_plugin_user_test.rb | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ test/unit/mpog_user_test.rb | 127 ------------------------------------------------------------------------------------------------------------------------------- test/unit/plugin_test_helper.rb | 31 ++++++++----------------------- test/unit/private_institution_test.rb | 6 +++--- test/unit/public_institution_test.rb | 6 +++--- test/unit/software_categories_test.rb | 5 +++++ test/unit/software_database_test.rb | 5 +++++ 20 files changed, 258 insertions(+), 214 deletions(-) create mode 100644 test/helpers/institution_test_helper.rb create mode 100644 test/unit/mpog_software_plugin_user_test.rb delete mode 100644 test/unit/mpog_user_test.rb diff --git a/lib/software_database.rb b/lib/software_database.rb index 5912b1f..9c279e4 100644 --- a/lib/software_database.rb +++ b/lib/software_database.rb @@ -8,4 +8,6 @@ class SoftwareDatabase < ActiveRecord::Base validates_length_of :operating_system, maximum: 20, too_long: _("Software database is too long (maximum is 20 characters)") validates_presence_of :database_description_id, :version, :operating_system + validates :database_description_id, :numericality => { :greater_than_or_equal_to => 1 } + end diff --git a/test/functional/institution_test_helper.rb b/test/functional/institution_test_helper.rb index d028bfc..0f129e3 100644 --- a/test/functional/institution_test_helper.rb +++ b/test/functional/institution_test_helper.rb @@ -22,15 +22,8 @@ module InstitutionTestHelper end def self.create_public_institution name, acronym, country, state, city, juridical_nature, gov_p, gov_s, cnpj - institution_community = Community::new - institution_community.name = name - institution_community.country = country - institution_community.state = state - institution_community.city = city - institution_community.save! - institution = PublicInstitution.new - institution.community = institution_community + institution.community = institution_community(name, country, state, city) institution.name = name institution.juridical_nature = juridical_nature institution.acronym = acronym @@ -41,4 +34,26 @@ module InstitutionTestHelper institution.save! institution end + + def self.create_private_institution name, acronym, country, state, city, cnpj + institution = PrivateInstitution.new + institution.community = institution_community(name, country, state, city) + institution.name = name + institution.acronym = acronym + institution.cnpj = cnpj + institution.corporate_name = "corporate default" + institution.save! + + institution + end + + def self.institution_community name, country, state, city + institution_community = Community::new + institution_community.name = name + institution_community.country = country + institution_community.state = state + institution_community.city = city + institution_community.save! + institution_community + end end \ No newline at end of file diff --git a/test/functional/mpog_software_plugin_controller_test.rb b/test/functional/mpog_software_plugin_controller_test.rb index 401b467..4626350 100644 --- a/test/functional/mpog_software_plugin_controller_test.rb +++ b/test/functional/mpog_software_plugin_controller_test.rb @@ -1,5 +1,5 @@ require File.dirname(__FILE__) + '/../../../../test/test_helper' -require File.dirname(__FILE__) + '/institution_test_helper' +require File.dirname(__FILE__) + '/../helpers/institution_test_helper' require File.dirname(__FILE__) + '/../../controllers/mpog_software_plugin_controller' class MpogSoftwarePluginController; def rescue_action(e) raise e end; end diff --git a/test/functional/mpog_software_plugin_myprofile_controller_test.rb b/test/functional/mpog_software_plugin_myprofile_controller_test.rb index fbbe2e2..ac661ea 100644 --- a/test/functional/mpog_software_plugin_myprofile_controller_test.rb +++ b/test/functional/mpog_software_plugin_myprofile_controller_test.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../../../../test/test_helper' require File.dirname(__FILE__) + '/../../controllers/mpog_software_plugin_myprofile_controller' require File.dirname(__FILE__) + '/software_test_helper' -require File.dirname(__FILE__) + '/institution_test_helper' +require File.dirname(__FILE__) + '/../helpers/institution_test_helper' class MpogSoftwarePluginMyprofileController; def rescue_action(e) raise e end; end diff --git a/test/functional/profile_editor_controller_test.rb b/test/functional/profile_editor_controller_test.rb index d88b09c..fc2d035 100644 --- a/test/functional/profile_editor_controller_test.rb +++ b/test/functional/profile_editor_controller_test.rb @@ -1,5 +1,5 @@ require File.dirname(__FILE__) + '/../../../../test/test_helper' -require File.dirname(__FILE__) + '/institution_test_helper' +require File.dirname(__FILE__) + '/../helpers/institution_test_helper' require File.dirname(__FILE__) + '/../../../../app/controllers/my_profile/profile_editor_controller' class ProfileEditorController; def rescue_action(e) raise e end; end diff --git a/test/helpers/institution_test_helper.rb b/test/helpers/institution_test_helper.rb new file mode 100644 index 0000000..1f4df2f --- /dev/null +++ b/test/helpers/institution_test_helper.rb @@ -0,0 +1,59 @@ +module InstitutionTestHelper + + def self.generate_form_fields name, country, state, city, cnpj, type + fields = { + :community => { + :name => name, + :country => country, + :state => state, + :city => city + }, + :institutions => { + :cnpj=> cnpj, + :type => type, + :acronym => "", + :governmental_power => "", + :governmental_sphere => "", + :juridical_nature => "", + :corporate_name => "coporate default" + } + } + fields + end + + def self.create_public_institution name, acronym, country, state, city, juridical_nature, gov_p, gov_s, cnpj + institution = PublicInstitution.new + institution.community = institution_community(name, country, state, city) + institution.name = name + institution.juridical_nature = juridical_nature + institution.acronym = acronym + institution.governmental_power = gov_p + institution.governmental_sphere = gov_s + institution.cnpj = cnpj + institution.corporate_name = "corporate default" + institution.save + institution + end + + def self.create_private_institution name, acronym, country, state, city, cnpj + institution = PrivateInstitution.new + institution.community = institution_community(name, country, state, city) + institution.name = name + institution.acronym = acronym + institution.cnpj = cnpj + institution.corporate_name = "corporate default" + institution.save + + institution + end + + def self.institution_community name, country, state, city + institution_community = Community::new + institution_community.name = name + institution_community.country = country + institution_community.state = state + institution_community.city = city + institution_community.save + institution_community + end +end \ No newline at end of file diff --git a/test/unit/communities_block_test.rb b/test/unit/communities_block_test.rb index 80d7b71..48a14fc 100644 --- a/test/unit/communities_block_test.rb +++ b/test/unit/communities_block_test.rb @@ -1,4 +1,5 @@ require File.dirname(__FILE__) + '/../../../../test/test_helper' +require File.dirname(__FILE__) + '/../helpers/institution_test_helper' require File.dirname(__FILE__) + '/plugin_test_helper' class CommunitiesBlockTest < ActiveSupport::TestCase @@ -10,7 +11,7 @@ class CommunitiesBlockTest < ActiveSupport::TestCase @gov_sphere = GovernmentalSphere.create(:name=>"Some Gov Sphere") @juridical_nature = JuridicalNature.create(:name => "Autarquia") - @institution = create_public_institution("Ministerio Publico da Uniao", "MPU", "BR", "DF", "Gama", @juridical_nature, @gov_power, @gov_sphere) + @institution = InstitutionTestHelper.create_public_institution("Ministerio Publico da Uniao", "MPU", "BR", "DF", "Gama", @juridical_nature, @gov_power, @gov_sphere, "12.345.678/9012-45") @institution.community.add_member(@person) @software_info = create_software_info("Novo Software") diff --git a/test/unit/database_helper_test.rb b/test/unit/database_helper_test.rb index 3645bcf..326f6b9 100644 --- a/test/unit/database_helper_test.rb +++ b/test/unit/database_helper_test.rb @@ -11,12 +11,12 @@ class DatabaseHelperTest < ActiveSupport::TestCase @database_objects = [ {:database_description_id => dd1.id.to_s ,:version => "2.0", :operating_system => "debian"}, {:database_description_id => dd2.id.to_s ,:version => "2.1", :operating_system => "debian"}, - {:database_description_id => dd1.id.to_s ,:version => "2.2", :operating_system => "debian"}] - @database_objects + ] end def teardown @database_objects = nil + SoftwareDatabase.destroy_all DatabaseDescription.destroy_all end @@ -70,7 +70,6 @@ class DatabaseHelperTest < ActiveSupport::TestCase database_objects_length = @database_objects.count list_compare = DatabaseHelper.list_database(@database_objects) - - assert_equal database_objects_length-1, list_compare.count + assert_equal list_compare.count, database_objects_length-1 end end diff --git a/test/unit/database_validation_test.rb b/test/unit/database_validation_test.rb index 73c4fb6..8aae786 100644 --- a/test/unit/database_validation_test.rb +++ b/test/unit/database_validation_test.rb @@ -13,6 +13,8 @@ class DatabaseValidationTest < ActiveSupport::TestCase def teardown @database = nil + DatabaseDescription.destroy_all + SoftwareDatabase.destroy_all end should "Save database if all fields are filled" do diff --git a/test/unit/governmental_power_test.rb b/test/unit/governmental_power_test.rb index e2f45cd..937de21 100644 --- a/test/unit/governmental_power_test.rb +++ b/test/unit/governmental_power_test.rb @@ -1,50 +1,21 @@ require File.dirname(__FILE__) + '/../../../../test/test_helper' +require File.dirname(__FILE__) + '/../helpers/institution_test_helper' class GovernmentalPowerTest < ActiveSupport::TestCase + + def setup + @gov_sphere = GovernmentalSphere.create(:name=>"Some Gov Sphere") + @juridical_nature = JuridicalNature.create(:name => "Autarquia") + end + def teardown Institution.destroy_all 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") - assert build_institution("one").save - assert build_institution("two").save - assert build_institution("three").save - - assert gov_power.public_institutions.count == PublicInstitution.count - end - - should "not get private institutions" do - gov_power = GovernmentalPower::new :name=>"Some gov power" - - assert build_institution("one", "PrivateInstitution", "00.000.000/0000-00").save - assert build_institution("two","PrivateInstitution", "00.000.000/0000-01").save - assert build_institution("three","PrivateInstitution", "00.000.000/0000-02").save - - assert gov_power.public_institutions.count == 0 - assert gov_power.public_institutions.count == PublicInstitution.count - assert gov_power.public_institutions.count != PrivateInstitution.count - end - - private - - def build_institution name, type="PublicInstitution", cnpj=nil - institution = Institution::new - institution.name = name - institution.type = type - institution.cnpj = cnpj - - institution.community = Community.create(:name => "Simple Public Institution") - institution.community.country = "BR" - institution.community.state = "DF" - institution.community.city = "Gama" - - if type == "PublicInstitution" - institution.governmental_power = GovernmentalPower.first - institution.governmental_sphere = GovernmentalSphere.first - end - - institution + assert_equal gov_power.public_institutions.count, PublicInstitution.count end end \ No newline at end of file diff --git a/test/unit/institution_test.rb b/test/unit/institution_test.rb index 911c3d1..a4ef1b1 100644 --- a/test/unit/institution_test.rb +++ b/test/unit/institution_test.rb @@ -8,7 +8,7 @@ class InstitutionTest < ActiveSupport::TestCase @gov_sphere = GovernmentalSphere.create(:name=>"Some Gov Sphere") @juridical_nature = JuridicalNature.create(:name => "Autarquia") - @institution = create_public_institution("Ministerio Publico da Uniao", "MPU", "BR", "DF", "Gama", @juridical_nature, @gov_power, @gov_sphere) + @institution = create_public_institution("Ministerio Publico da Uniao", "MPU", "BR", "DF", "Gama", @juridical_nature, @gov_power, @gov_sphere, "11.222.333/4444-55") end should "not save institutions without name" do diff --git a/test/unit/institutions_block_test.rb b/test/unit/institutions_block_test.rb index ca35f1d..a9ff9ed 100644 --- a/test/unit/institutions_block_test.rb +++ b/test/unit/institutions_block_test.rb @@ -25,7 +25,7 @@ class InstitutionsBlockTest < ActiveSupport::TestCase should 'list institutions' do user = create_person("Jose_Augusto", "jose_augusto@email.com", "aaaaaaa", "aaaaaaa", "jose_silva@email.com", "DF", "Gama") - institution = create_private_institution "inst", "00000000000000", "country", "state", "city" + institution = create_private_institution "inst name", "IN", "country", "state", "city", "00.111.222/3333-44" institution.community.add_member(user) block = InstitutionsBlock.new diff --git a/test/unit/juridical_nature_test.rb b/test/unit/juridical_nature_test.rb index d3e9159..f2a89be 100644 --- a/test/unit/juridical_nature_test.rb +++ b/test/unit/juridical_nature_test.rb @@ -16,8 +16,8 @@ class JuridicalNatureTest < ActiveSupport::TestCase should "get public institutions" do juridical_nature = JuridicalNature.create(:name => "Autarquia") - create_public_institution("Ministerio Publico da Uniao", "MPU", "BR", "DF", "Gama", juridical_nature, @govPower, @govSphere) - create_public_institution("Tribunal Regional da Uniao", "TRU", "BR", "DF", "Brasilia", juridical_nature, @govPower, @govSphere) + create_public_institution("Ministerio Publico da Uniao", "MPU", "BR", "DF", "Gama", juridical_nature, @govPower, @govSphere, "22.333.444/5555-66") + create_public_institution("Tribunal Regional da Uniao", "TRU", "BR", "DF", "Brasilia", juridical_nature, @govPower, @govSphere, "22.333.444/5555-77") assert juridical_nature.public_institutions.count == PublicInstitution.count end end diff --git a/test/unit/mpog_software_plugin_user_test.rb b/test/unit/mpog_software_plugin_user_test.rb new file mode 100644 index 0000000..887f393 --- /dev/null +++ b/test/unit/mpog_software_plugin_user_test.rb @@ -0,0 +1,127 @@ +require File.dirname(__FILE__) + '/../../../../test/test_helper' +require File.dirname(__FILE__) + '/plugin_test_helper' + +class MpogSoftwarePluginUserTest < ActiveSupport::TestCase + include PluginTestHelper + + should 'not save user whose both email and secondary email are the same' do + + user = fast_create(User) + user.email = "test@email.com" + user.secondary_email = "test@email.com" + + assert !user.save + end + + should 'not save user whose both email and secondary email have already been used' do + user1 = create_default_user + user2 = fast_create(User) + + user2.email = "primary@email.com" + user2.secondary_email = "secondary@email.com" + assert !user2.save + end + + should 'not save user whose email has already been used' do + user1 = create_default_user + user2 = fast_create(User) + + user2.email = "primary@email.com" + user2.secondary_email = "noosfero@email.com" + assert !user2.save + end + + should 'not save user whose email has already been used in another users secondary email' do + user1 = create_default_user + user2 = fast_create(User) + + user2.login = "another-login" + user2.email = "secondary@email.com" + user2.secondary_email = "noosfero@email.com" + assert !user2.save + end + + should 'not save user whose secondary email has already been used in another users email' do + user1 = create_default_user + user2 = fast_create(User) + + user2.login = "another-login" + user2.email = "noosfero@email.com" + user2.secondary_email = "primary@email.com" + assert !user2.save + end + + should 'not save user whose secondary email has already been used in another users secondary email' do + user1 = create_default_user + user2 = fast_create(User) + + user2.login = "another-login" + user2.email = "noosfero@email.com" + user2.secondary_email = "secondary@email.com" + assert !user2.save + end + + should 'not save user whose secondary email is in the wrong format' do + user = fast_create(User) + user.email = "test@email.com" + user.secondary_email = "notarightformat.com" + + assert !user.save + + user.secondary_email = "not@arightformatcom" + + assert !user.save + end + + should 'save more than one user without secondary email' do + user = fast_create(User) + user.email = "test@email.com" + user.secondary_email = "" + user.save + + user2 = fast_create(User) + user2.email = "test2@email.com" + user2.secondary_email = "" + assert user2.save + end + should 'return an error if secondary email is governmental and primary is not' do + user = fast_create(User) + + user.email = "test@email.com" + user.secondary_email = "test@gov.br" + + assert !user.save + assert user.errors.full_messages.include?("The governamental email must be the primary one.") + end + + should 'have institution if email is governmental' do + user = fast_create(User) + + user.email = "testtest@gov.br" + + user.institutions = [] + assert !user.save, "this should not save" + + gov_power = GovernmentalPower.create(:name=>"Some Gov Power") + gov_sphere = GovernmentalSphere.create(:name=>"Some Gov Sphere") + juridical_nature = JuridicalNature.create(:name => "Autarquia") + institution = create_public_institution("Ministerio Publico da Uniao", "MPU", "BR", "DF", "Gama", juridical_nature, gov_power, gov_sphere, "44.555.666/7777-88") + institution.save! + + user.institutions << institution + assert user.save, "this should save" + end + + private + + def create_default_user + user = fast_create(User) + user.login = "a-login" + user.email = "primary@email.com" + user.secondary_email = "secondary@email.com" + user.save + + return user + end + +end diff --git a/test/unit/mpog_user_test.rb b/test/unit/mpog_user_test.rb deleted file mode 100644 index cf5bb09..0000000 --- a/test/unit/mpog_user_test.rb +++ /dev/null @@ -1,127 +0,0 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' -require File.dirname(__FILE__) + '/plugin_test_helper' - -class MpogSoftwarePluginUserTest < ActiveSupport::TestCase - include PluginTestHelper - - should 'not save user whose both email and secondary email are the same' do - - user = fast_create(User) - user.email = "test@email.com" - user.secondary_email = "test@email.com" - - assert !user.save - end - - should 'not save user whose both email and secondary email have already been used' do - user1 = create_default_user - user2 = fast_create(User) - - user2.email = "primary@email.com" - user2.secondary_email = "secondary@email.com" - assert !user2.save - end - - should 'not save user whose email has already been used' do - user1 = create_default_user - user2 = fast_create(User) - - user2.email = "primary@email.com" - user2.secondary_email = "noosfero@email.com" - assert !user2.save - end - - should 'not save user whose email has already been used in another users secondary email' do - user1 = create_default_user - user2 = fast_create(User) - - user2.login = "another-login" - user2.email = "secondary@email.com" - user2.secondary_email = "noosfero@email.com" - assert !user2.save - end - - should 'not save user whose secondary email has already been used in another users email' do - user1 = create_default_user - user2 = fast_create(User) - - user2.login = "another-login" - user2.email = "noosfero@email.com" - user2.secondary_email = "primary@email.com" - assert !user2.save - end - - should 'not save user whose secondary email has already been used in another users secondary email' do - user1 = create_default_user - user2 = fast_create(User) - - user2.login = "another-login" - user2.email = "noosfero@email.com" - user2.secondary_email = "secondary@email.com" - assert !user2.save - end - - should 'not save user whose secondary email is in the wrong format' do - user = fast_create(User) - user.email = "test@email.com" - user.secondary_email = "notarightformat.com" - - assert !user.save - - user.secondary_email = "not@arightformatcom" - - assert !user.save - end - - should 'save more than one user without secondary email' do - user = fast_create(User) - user.email = "test@email.com" - user.secondary_email = "" - user.save - - user2 = fast_create(User) - user2.email = "test2@email.com" - user2.secondary_email = "" - assert user2.save - end - should 'return an error if secondary email is governmental and primary is not' do - user = fast_create(User) - - user.email = "test@email.com" - user.secondary_email = "test@gov.br" - - assert !user.save - assert user.errors.full_messages.include?("The governamental email must be the primary one.") - end - - should 'have institution if email is governmental' do - user = fast_create(User) - - user.email = "testtest@gov.br" - - user.institutions = [] - assert !user.save, "this should not save" - - gov_power = GovernmentalPower.create(:name=>"Some Gov Power") - gov_sphere = GovernmentalSphere.create(:name=>"Some Gov Sphere") - juridical_nature = JuridicalNature.create(:name => "Autarquia") - institution = create_public_institution("Ministerio Publico da Uniao", "MPU", "BR", "DF", "Gama", juridical_nature, gov_power, gov_sphere) - institution.save! - - user.institutions << institution - assert user.save, "this should save" - end - - private - - def create_default_user - user = fast_create(User) - user.login = "a-login" - user.email = "primary@email.com" - user.secondary_email = "secondary@email.com" - user.save - - return user - end - -end diff --git a/test/unit/plugin_test_helper.rb b/test/unit/plugin_test_helper.rb index 31e9fad..6e06ef1 100644 --- a/test/unit/plugin_test_helper.rb +++ b/test/unit/plugin_test_helper.rb @@ -1,5 +1,11 @@ +require File.dirname(__FILE__) + '/../helpers/institution_test_helper' + module PluginTestHelper + def create_public_institution *params + InstitutionTestHelper.create_public_institution *params + end + def create_community name community = fast_create(Community) community.name = name @@ -15,29 +21,8 @@ module PluginTestHelper software_info end - def create_public_institution name, acronym, country, state, city, juridical_nature, gov_p, gov_s - institution = PublicInstitution.new - institution.community = create_community_institution(name, country, state, city) - institution.name = name - institution.juridical_nature = juridical_nature - institution.sisp = false - institution.acronym = acronym - institution.governmental_power = gov_p - institution.governmental_sphere = gov_s - institution.save - - institution - end - - def create_private_institution name, cnpj, country, state, city - institution = PrivateInstitution.new - institution.community = create_community_institution(name, country, state, city) - institution.name = name - institution.sisp = false - institution.cnpj = cnpj - institution.save - - institution + def create_private_institution *params + InstitutionTestHelper.create_private_institution *params end def create_community_institution name, country, state, city diff --git a/test/unit/private_institution_test.rb b/test/unit/private_institution_test.rb index ae9581b..073ac9e 100644 --- a/test/unit/private_institution_test.rb +++ b/test/unit/private_institution_test.rb @@ -4,7 +4,7 @@ require File.dirname(__FILE__) + '/plugin_test_helper' class PrivateInstitutionTest < ActiveSupport::TestCase include PluginTestHelper def setup - @institution = create_private_institution "Simple Private Institution", "00.000.000/0001-00", "BR", "DF", "Gama" + @institution = create_private_institution "Simple Private Institution", "SPI", "BR", "DF", "Gama", "00.000.000/0001-00" end should "not save without a cnpj" do @@ -16,8 +16,8 @@ class PrivateInstitutionTest < ActiveSupport::TestCase should "not save with a repeated cnpj" do assert @institution.save - sec_institution = create_private_institution "Another Private Institution", "00.000.000/0001-00", "BR", "DF", "Gama" - assert !sec_institution.save + sec_institution = create_private_institution "Another Private Institution", "API", "BR", "DF", "Gama", "00.000.000/0001-00" + assert sec_institution.errors.full_messages.include? "Cnpj has already been taken" end diff --git a/test/unit/public_institution_test.rb b/test/unit/public_institution_test.rb index 3fba11c..940959e 100644 --- a/test/unit/public_institution_test.rb +++ b/test/unit/public_institution_test.rb @@ -8,12 +8,12 @@ class PublicInstitutionTest < ActiveSupport::TestCase @gov_sphere = GovernmentalSphere.create(:name=>"Some Gov Sphere") @juridical_nature = JuridicalNature.create(:name => "Autarquia") - @institution = create_public_institution("Ministerio Publico da Uniao", "MPU", "BR", "DF", "Gama", @juridical_nature, @gov_power, @gov_sphere) + @institution = create_public_institution("Ministerio Publico da Uniao", "MPU", "BR", "DF", "Gama", @juridical_nature, @gov_power, @gov_sphere, "11.222.333/4444-55") end - should "save without a cnpj" do + should "not save without a cnpj" do @institution.cnpj = nil - assert @institution.save + assert !@institution.save end should "save institution without an acronym" do diff --git a/test/unit/software_categories_test.rb b/test/unit/software_categories_test.rb index ee75642..8ecd009 100644 --- a/test/unit/software_categories_test.rb +++ b/test/unit/software_categories_test.rb @@ -41,6 +41,11 @@ class SoftwareCategoriesTest < ActiveSupport::TestCase @software_info.software_categories = @software_categories end + def teardown + SoftwareDatabase.destroy_all + DatabaseDescription.destroy_all + end + should "save software correctly with SoftwareCategories filds" do assert @software_info.save end diff --git a/test/unit/software_database_test.rb b/test/unit/software_database_test.rb index 5a2c6f4..ddd0014 100644 --- a/test/unit/software_database_test.rb +++ b/test/unit/software_database_test.rb @@ -8,6 +8,11 @@ class SoftwareDatabaseTest < ActiveSupport::TestCase @software_database.database_description_id = 1 end + def teardown + DatabaseDescription.destroy_all + SoftwareDatabase.destroy_all + end + should "save if all informations of @software_database are filled" do assert @software_database.save, "Database should have been saved" end -- libgit2 0.21.2