fix_institution: Fix unit and some functional tests

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

fix_institution: Fix unit and some functional tests
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Fabio Teixeira · Gabriela Navarro
1 parent 37d8ade7
Showing 20 changed files with 258 additions and 214 deletions Show diff stats
lib/software_database.rb
test/functional/institution_test_helper.rb
test/functional/mpog_software_plugin_controller_test.rb
test/functional/mpog_software_plugin_myprofile_controller_test.rb
test/functional/profile_editor_controller_test.rb
test/helpers/institution_test_helper.rb
test/unit/communities_block_test.rb
test/unit/database_helper_test.rb
test/unit/database_validation_test.rb
test/unit/governmental_power_test.rb
test/unit/institution_test.rb
test/unit/institutions_block_test.rb
test/unit/juridical_nature_test.rb
test/unit/mpog_software_plugin_user_test.rb
test/unit/mpog_user_test.rb
test/unit/plugin_test_helper.rb
test/unit/private_institution_test.rb
test/unit/public_institution_test.rb
test/unit/software_categories_test.rb
test/unit/software_database_test.rb
@@ -8,4 +8,6 @@ class SoftwareDatabase &lt; 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
@@ -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
 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
 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
 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
@@ -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
 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 &lt; 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")
@@ -11,12 +11,12 @@ class DatabaseHelperTest &lt; 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 &lt; 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
@@ -13,6 +13,8 @@ class DatabaseValidationTest &lt; ActiveSupport::TestCase
   def teardown
     @database = nil
+    DatabaseDescription.destroy_all
+    SoftwareDatabase.destroy_all
   end
   should "Save database if all fields are filled" do
 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
@@ -8,7 +8,7 @@ class InstitutionTest &lt; 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
@@ -25,7 +25,7 @@ class InstitutionsBlockTest &lt; 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
@@ -16,8 +16,8 @@ class JuridicalNatureTest &lt; 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
@@ -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
@@ -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
+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
@@ -4,7 +4,7 @@ require File.dirname(__FILE__) + &#39;/plugin_test_helper&#39;
 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 &lt; 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
@@ -8,12 +8,12 @@ class PublicInstitutionTest &lt; 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
@@ -41,6 +41,11 @@ class SoftwareCategoriesTest &lt; 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
@@ -8,6 +8,11 @@ class SoftwareDatabaseTest &lt; 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
	@@ -8,4 +8,6 @@ class SoftwareDatabase < ActiveRecord::Base		@@ -8,4 +8,6 @@ class SoftwareDatabase < ActiveRecord::Base
8	validates_length_of :operating_system, maximum: 20, too_long: _("Software database is too long (maximum is 20 characters)")	8	validates_length_of :operating_system, maximum: 20, too_long: _("Software database is too long (maximum is 20 characters)")
9		9
10	validates_presence_of :database_description_id, :version, :operating_system	10	validates_presence_of :database_description_id, :version, :operating_system
		11	+ validates :database_description_id, :numericality => { :greater_than_or_equal_to => 1 }
		12	+
11	end	13	end
	@@ -22,15 +22,8 @@ module InstitutionTestHelper		@@ -22,15 +22,8 @@ module InstitutionTestHelper
22	end	22	end
23		23
24	def self.create_public_institution name, acronym, country, state, city, juridical_nature, gov_p, gov_s, cnpj	24	def self.create_public_institution name, acronym, country, state, city, juridical_nature, gov_p, gov_s, cnpj
25	- institution_community = Community::new
26	- institution_community.name = name
27	- institution_community.country = country
28	- institution_community.state = state
29	- institution_community.city = city
30	- institution_community.save!
31	-
32	institution = PublicInstitution.new	25	institution = PublicInstitution.new
33	- institution.community = institution_community	26	+ institution.community = institution_community(name, country, state, city)
34	institution.name = name	27	institution.name = name
35	institution.juridical_nature = juridical_nature	28	institution.juridical_nature = juridical_nature
36	institution.acronym = acronym	29	institution.acronym = acronym
	@@ -41,4 +34,26 @@ module InstitutionTestHelper		@@ -41,4 +34,26 @@ module InstitutionTestHelper
41	institution.save!	34	institution.save!
42	institution	35	institution
43	end	36	end
		37	+
		38	+ def self.create_private_institution name, acronym, country, state, city, cnpj
		39	+ institution = PrivateInstitution.new
		40	+ institution.community = institution_community(name, country, state, city)
		41	+ institution.name = name
		42	+ institution.acronym = acronym
		43	+ institution.cnpj = cnpj
		44	+ institution.corporate_name = "corporate default"
		45	+ institution.save!
		46	+
		47	+ institution
		48	+ end
		49	+
		50	+ def self.institution_community name, country, state, city
		51	+ institution_community = Community::new
		52	+ institution_community.name = name
		53	+ institution_community.country = country
		54	+ institution_community.state = state
		55	+ institution_community.city = city
		56	+ institution_community.save!
		57	+ institution_community
		58	+ end
44	end	59	end
45	\ No newline at end of file	60	\ No newline at end of file
1	require File.dirname(__FILE__) + '/../../../../test/test_helper'	1	require File.dirname(__FILE__) + '/../../../../test/test_helper'
2	-require File.dirname(__FILE__) + '/institution_test_helper'	2	+require File.dirname(__FILE__) + '/../helpers/institution_test_helper'
3	require File.dirname(__FILE__) + '/../../controllers/mpog_software_plugin_controller'	3	require File.dirname(__FILE__) + '/../../controllers/mpog_software_plugin_controller'
4		4
5	class MpogSoftwarePluginController; def rescue_action(e) raise e end; end	5	class MpogSoftwarePluginController; def rescue_action(e) raise e end; end
	@@ -0,0 +1,59 @@		@@ -0,0 +1,59 @@
		1	+module InstitutionTestHelper
		2	+
		3	+ def self.generate_form_fields name, country, state, city, cnpj, type
		4	+ fields = {
		5	+ :community => {
		6	+ :name => name,
		7	+ :country => country,
		8	+ :state => state,
		9	+ :city => city
		10	+ },
		11	+ :institutions => {
		12	+ :cnpj=> cnpj,
		13	+ :type => type,
		14	+ :acronym => "",
		15	+ :governmental_power => "",
		16	+ :governmental_sphere => "",
		17	+ :juridical_nature => "",
		18	+ :corporate_name => "coporate default"
		19	+ }
		20	+ }
		21	+ fields
		22	+ end
		23	+
		24	+ def self.create_public_institution name, acronym, country, state, city, juridical_nature, gov_p, gov_s, cnpj
		25	+ institution = PublicInstitution.new
		26	+ institution.community = institution_community(name, country, state, city)
		27	+ institution.name = name
		28	+ institution.juridical_nature = juridical_nature
		29	+ institution.acronym = acronym
		30	+ institution.governmental_power = gov_p
		31	+ institution.governmental_sphere = gov_s
		32	+ institution.cnpj = cnpj
		33	+ institution.corporate_name = "corporate default"
		34	+ institution.save
		35	+ institution
		36	+ end
		37	+
		38	+ def self.create_private_institution name, acronym, country, state, city, cnpj
		39	+ institution = PrivateInstitution.new
		40	+ institution.community = institution_community(name, country, state, city)
		41	+ institution.name = name
		42	+ institution.acronym = acronym
		43	+ institution.cnpj = cnpj
		44	+ institution.corporate_name = "corporate default"
		45	+ institution.save
		46	+
		47	+ institution
		48	+ end
		49	+
		50	+ def self.institution_community name, country, state, city
		51	+ institution_community = Community::new
		52	+ institution_community.name = name
		53	+ institution_community.country = country
		54	+ institution_community.state = state
		55	+ institution_community.city = city
		56	+ institution_community.save
		57	+ institution_community
		58	+ end
		59	+end
0	\ No newline at end of file	60	\ No newline at end of file
	@@ -13,6 +13,8 @@ class DatabaseValidationTest < ActiveSupport::TestCase		@@ -13,6 +13,8 @@ class DatabaseValidationTest < ActiveSupport::TestCase
13		13
14	def teardown	14	def teardown
15	@database = nil	15	@database = nil
		16	+ DatabaseDescription.destroy_all
		17	+ SoftwareDatabase.destroy_all
16	end	18	end
17		19
18	should "Save database if all fields are filled" do	20	should "Save database if all fields are filled" do
	@@ -8,7 +8,7 @@ class InstitutionTest < ActiveSupport::TestCase		@@ -8,7 +8,7 @@ class InstitutionTest < ActiveSupport::TestCase
8	@gov_sphere = GovernmentalSphere.create(:name=>"Some Gov Sphere")	8	@gov_sphere = GovernmentalSphere.create(:name=>"Some Gov Sphere")
9	@juridical_nature = JuridicalNature.create(:name => "Autarquia")	9	@juridical_nature = JuridicalNature.create(:name => "Autarquia")
10		10
11	- @institution = create_public_institution("Ministerio Publico da Uniao", "MPU", "BR", "DF", "Gama", @juridical_nature, @gov_power, @gov_sphere)	11	+ @institution = create_public_institution("Ministerio Publico da Uniao", "MPU", "BR", "DF", "Gama", @juridical_nature, @gov_power, @gov_sphere, "11.222.333/4444-55")
12	end	12	end
13		13
14	should "not save institutions without name" do	14	should "not save institutions without name" do
	@@ -25,7 +25,7 @@ class InstitutionsBlockTest < ActiveSupport::TestCase		@@ -25,7 +25,7 @@ class InstitutionsBlockTest < ActiveSupport::TestCase
25	should 'list institutions' do	25	should 'list institutions' do
26	user = create_person("Jose_Augusto", "jose_augusto@email.com", "aaaaaaa", "aaaaaaa", "jose_silva@email.com", "DF", "Gama")	26	user = create_person("Jose_Augusto", "jose_augusto@email.com", "aaaaaaa", "aaaaaaa", "jose_silva@email.com", "DF", "Gama")
27		27
28	- institution = create_private_institution "inst", "00000000000000", "country", "state", "city"	28	+ institution = create_private_institution "inst name", "IN", "country", "state", "city", "00.111.222/3333-44"
29	institution.community.add_member(user)	29	institution.community.add_member(user)
30		30
31	block = InstitutionsBlock.new	31	block = InstitutionsBlock.new
@@ -0,0 +1,127 @@		@@ -0,0 +1,127 @@
	1	+require File.dirname(__FILE__) + '/../../../../test/test_helper'
	2	+require File.dirname(__FILE__) + '/plugin_test_helper'
	3	+
	4	+class MpogSoftwarePluginUserTest < ActiveSupport::TestCase
	5	+ include PluginTestHelper
	6	+
	7	+ should 'not save user whose both email and secondary email are the same' do
	8	+
	9	+ user = fast_create(User)
	10	+ user.email = "test@email.com"
	11	+ user.secondary_email = "test@email.com"
	12	+
	13	+ assert !user.save
	14	+ end
	15	+
	16	+ should 'not save user whose both email and secondary email have already been used' do
	17	+ user1 = create_default_user
	18	+ user2 = fast_create(User)
	19	+
	20	+ user2.email = "primary@email.com"
	21	+ user2.secondary_email = "secondary@email.com"
	22	+ assert !user2.save
	23	+ end
	24	+
	25	+ should 'not save user whose email has already been used' do
	26	+ user1 = create_default_user
	27	+ user2 = fast_create(User)
	28	+
	29	+ user2.email = "primary@email.com"
	30	+ user2.secondary_email = "noosfero@email.com"
	31	+ assert !user2.save
	32	+ end
	33	+
	34	+ should 'not save user whose email has already been used in another users secondary email' do
	35	+ user1 = create_default_user
	36	+ user2 = fast_create(User)
	37	+
	38	+ user2.login = "another-login"
	39	+ user2.email = "secondary@email.com"
	40	+ user2.secondary_email = "noosfero@email.com"
	41	+ assert !user2.save
	42	+ end
	43	+
	44	+ should 'not save user whose secondary email has already been used in another users email' do
	45	+ user1 = create_default_user
	46	+ user2 = fast_create(User)
	47	+
	48	+ user2.login = "another-login"
	49	+ user2.email = "noosfero@email.com"
	50	+ user2.secondary_email = "primary@email.com"
	51	+ assert !user2.save
	52	+ end
	53	+
	54	+ should 'not save user whose secondary email has already been used in another users secondary email' do
	55	+ user1 = create_default_user
	56	+ user2 = fast_create(User)
	57	+
	58	+ user2.login = "another-login"
	59	+ user2.email = "noosfero@email.com"
	60	+ user2.secondary_email = "secondary@email.com"
	61	+ assert !user2.save
	62	+ end
	63	+
	64	+ should 'not save user whose secondary email is in the wrong format' do
	65	+ user = fast_create(User)
	66	+ user.email = "test@email.com"
	67	+ user.secondary_email = "notarightformat.com"
	68	+
	69	+ assert !user.save
	70	+
	71	+ user.secondary_email = "not@arightformatcom"
	72	+
	73	+ assert !user.save
	74	+ end
	75	+
	76	+ should 'save more than one user without secondary email' do
	77	+ user = fast_create(User)
	78	+ user.email = "test@email.com"
	79	+ user.secondary_email = ""
	80	+ user.save
	81	+
	82	+ user2 = fast_create(User)
	83	+ user2.email = "test2@email.com"
	84	+ user2.secondary_email = ""
	85	+ assert user2.save
	86	+ end
	87	+ should 'return an error if secondary email is governmental and primary is not' do
	88	+ user = fast_create(User)
	89	+
	90	+ user.email = "test@email.com"
	91	+ user.secondary_email = "test@gov.br"
	92	+
	93	+ assert !user.save
	94	+ assert user.errors.full_messages.include?("The governamental email must be the primary one.")
	95	+ end
	96	+
	97	+ should 'have institution if email is governmental' do
	98	+ user = fast_create(User)
	99	+
	100	+ user.email = "testtest@gov.br"
	101	+
	102	+ user.institutions = []
	103	+ assert !user.save, "this should not save"
	104	+
	105	+ gov_power = GovernmentalPower.create(:name=>"Some Gov Power")
	106	+ gov_sphere = GovernmentalSphere.create(:name=>"Some Gov Sphere")
	107	+ juridical_nature = JuridicalNature.create(:name => "Autarquia")
	108	+ institution = create_public_institution("Ministerio Publico da Uniao", "MPU", "BR", "DF", "Gama", juridical_nature, gov_power, gov_sphere, "44.555.666/7777-88")
	109	+ institution.save!
	110	+
	111	+ user.institutions << institution
	112	+ assert user.save, "this should save"
	113	+ end
	114	+
	115	+ private
	116	+
	117	+ def create_default_user
	118	+ user = fast_create(User)
	119	+ user.login = "a-login"
	120	+ user.email = "primary@email.com"
	121	+ user.secondary_email = "secondary@email.com"
	122	+ user.save
	123	+
	124	+ return user
	125	+ end
	126	+
	127	+end
	@@ -1,127 +0,0 @@	@@ -1,127 +0,0 @@
1	-require File.dirname(__FILE__) + '/../../../../test/test_helper'
2	-require File.dirname(__FILE__) + '/plugin_test_helper'
3	-
4	-class MpogSoftwarePluginUserTest < ActiveSupport::TestCase
5	- include PluginTestHelper
6	-
7	- should 'not save user whose both email and secondary email are the same' do
8	-
9	- user = fast_create(User)
10	- user.email = "test@email.com"
11	- user.secondary_email = "test@email.com"
12	-
13	- assert !user.save
14	- end
15	-
16	- should 'not save user whose both email and secondary email have already been used' do
17	- user1 = create_default_user
18	- user2 = fast_create(User)
19	-
20	- user2.email = "primary@email.com"
21	- user2.secondary_email = "secondary@email.com"
22	- assert !user2.save
23	- end
24	-
25	- should 'not save user whose email has already been used' do
26	- user1 = create_default_user
27	- user2 = fast_create(User)
28	-
29	- user2.email = "primary@email.com"
30	- user2.secondary_email = "noosfero@email.com"
31	- assert !user2.save
32	- end
33	-
34	- should 'not save user whose email has already been used in another users secondary email' do
35	- user1 = create_default_user
36	- user2 = fast_create(User)
37	-
38	- user2.login = "another-login"
39	- user2.email = "secondary@email.com"
40	- user2.secondary_email = "noosfero@email.com"
41	- assert !user2.save
42	- end
43	-
44	- should 'not save user whose secondary email has already been used in another users email' do
45	- user1 = create_default_user
46	- user2 = fast_create(User)
47	-
48	- user2.login = "another-login"
49	- user2.email = "noosfero@email.com"
50	- user2.secondary_email = "primary@email.com"
51	- assert !user2.save
52	- end
53	-
54	- should 'not save user whose secondary email has already been used in another users secondary email' do
55	- user1 = create_default_user
56	- user2 = fast_create(User)
57	-
58	- user2.login = "another-login"
59	- user2.email = "noosfero@email.com"
60	- user2.secondary_email = "secondary@email.com"
61	- assert !user2.save
62	- end
63	-
64	- should 'not save user whose secondary email is in the wrong format' do
65	- user = fast_create(User)
66	- user.email = "test@email.com"
67	- user.secondary_email = "notarightformat.com"
68	-
69	- assert !user.save
70	-
71	- user.secondary_email = "not@arightformatcom"
72	-
73	- assert !user.save
74	- end
75	-
76	- should 'save more than one user without secondary email' do
77	- user = fast_create(User)
78	- user.email = "test@email.com"
79	- user.secondary_email = ""
80	- user.save
81	-
82	- user2 = fast_create(User)
83	- user2.email = "test2@email.com"
84	- user2.secondary_email = ""
85	- assert user2.save
86	- end
87	- should 'return an error if secondary email is governmental and primary is not' do
88	- user = fast_create(User)
89	-
90	- user.email = "test@email.com"
91	- user.secondary_email = "test@gov.br"
92	-
93	- assert !user.save
94	- assert user.errors.full_messages.include?("The governamental email must be the primary one.")
95	- end
96	-
97	- should 'have institution if email is governmental' do
98	- user = fast_create(User)
99	-
100	- user.email = "testtest@gov.br"
101	-
102	- user.institutions = []
103	- assert !user.save, "this should not save"
104	-
105	- gov_power = GovernmentalPower.create(:name=>"Some Gov Power")
106	- gov_sphere = GovernmentalSphere.create(:name=>"Some Gov Sphere")
107	- juridical_nature = JuridicalNature.create(:name => "Autarquia")
108	- institution = create_public_institution("Ministerio Publico da Uniao", "MPU", "BR", "DF", "Gama", juridical_nature, gov_power, gov_sphere)
109	- institution.save!
110	-
111	- user.institutions << institution
112	- assert user.save, "this should save"
113	- end
114	-
115	- private
116	-
117	- def create_default_user
118	- user = fast_create(User)
119	- user.login = "a-login"
120	- user.email = "primary@email.com"
121	- user.secondary_email = "secondary@email.com"
122	- user.save
123	-
124	- return user
125	- end
126	-
127	-end
		1	+require File.dirname(__FILE__) + '/../helpers/institution_test_helper'
		2	+
1	module PluginTestHelper	3	module PluginTestHelper
2		4
		5	+ def create_public_institution *params
		6	+ InstitutionTestHelper.create_public_institution *params
		7	+ end
		8	+
3	def create_community name	9	def create_community name
4	community = fast_create(Community)	10	community = fast_create(Community)
5	community.name = name	11	community.name = name
	@@ -15,29 +21,8 @@ module PluginTestHelper		@@ -15,29 +21,8 @@ module PluginTestHelper
15	software_info	21	software_info
16	end	22	end
17		23
18	- def create_public_institution name, acronym, country, state, city, juridical_nature, gov_p, gov_s
19	- institution = PublicInstitution.new
20	- institution.community = create_community_institution(name, country, state, city)
21	- institution.name = name
22	- institution.juridical_nature = juridical_nature
23	- institution.sisp = false
24	- institution.acronym = acronym
25	- institution.governmental_power = gov_p
26	- institution.governmental_sphere = gov_s
27	- institution.save
28	-
29	- institution
30	- end
31	-
32	- def create_private_institution name, cnpj, country, state, city
33	- institution = PrivateInstitution.new
34	- institution.community = create_community_institution(name, country, state, city)
35	- institution.name = name
36	- institution.sisp = false
37	- institution.cnpj = cnpj
38	- institution.save
39	-
40	- institution	24	+ def create_private_institution *params
		25	+ InstitutionTestHelper.create_private_institution *params
41	end	26	end
42		27
43	def create_community_institution name, country, state, city	28	def create_community_institution name, country, state, city