Fixing namespaces, requires and tests

Signed-off-by: Alexandre Barbosa <alexandreab@live.com> Signed-off-by: Arthur Jahn <stutrzbecher@gmail.com> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

Fixing namespaces, requires and tests
Signed-off-by: Alexandre Barbosa <alexandreab@live.com> Signed-off-by: Arthur Jahn <stutrzbecher@gmail.com> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
Marcos Pereira
1 parent 2cb76293
Showing 38 changed files with 574 additions and 566 deletions Show diff stats
src/noosfero-spb/gov_user/db/migrate/20151019174219_rename_tables_with_plugin_namespace.rb
src/noosfero-spb/gov_user/db/migrate/20151029193551_update_namespace_types_on_database.rb
src/noosfero-spb/gov_user/db/migrate/20151105174601_create_institutions_organization_ratings_table.rb
src/noosfero-spb/gov_user/db/migrate/20151105175611_move_institutions_relation_with_organization_ratings.rb
src/noosfero-spb/gov_user/db/migrate/20151105175646_remove_old_institution_relation_from_organization_ratings.rb
src/noosfero-spb/gov_user/db/migrate/20160302185631_rename_tables_with_plugin_namespace.rb
src/noosfero-spb/gov_user/db/migrate/20160302185632_update_namespace_types_on_database.rb
src/noosfero-spb/gov_user/db/migrate/20160302185634_create_institutions_organization_ratings_table.rb
src/noosfero-spb/gov_user/db/migrate/20160302185635_move_institutions_relation_with_organization_ratings.rb
src/noosfero-spb/gov_user/db/migrate/20160302185636_remove_old_institution_relation_from_organization_ratings.rb
src/noosfero-spb/gov_user/lib/gov_user_plugin/governmental_power.rb
src/noosfero-spb/gov_user/lib/gov_user_plugin/governmental_sphere.rb
src/noosfero-spb/gov_user/lib/gov_user_plugin/institution.rb
src/noosfero-spb/gov_user/lib/gov_user_plugin/institutions_organization_ratings.rb
src/noosfero-spb/gov_user/lib/gov_user_plugin/institutions_users.rb
src/noosfero-spb/gov_user/lib/gov_user_plugin/juridical_nature.rb
src/noosfero-spb/gov_user/lib/gov_user_plugin/private_institution.rb
src/noosfero-spb/gov_user/test/unit/gov_user_person_test.rb
src/noosfero-spb/gov_user/test/unit/gov_user_plugin/gov_user_person_test.rb
src/noosfero-spb/gov_user/test/unit/gov_user_plugin/governmental_power_test.rb
@@ -1,9 +0,0 @@
-class RenameTablesWithPluginNamespace < ActiveRecord::Migration
-  def change
-    rename_table :institutions, :gov_user_plugin_institutions
-    rename_table :governmental_spheres, :gov_user_plugin_governmental_spheres
-    rename_table :governmental_powers, :gov_user_plugin_governmental_powers
-    rename_table :juridical_natures, :gov_user_plugin_juridical_natures
-    rename_table :institutions_users, :gov_user_plugin_institutions_users
-  end
-end
@@ -1,13 +0,0 @@
-class UpdateNamespaceTypesOnDatabase < ActiveRecord::Migration
-  def up
-    execute("UPDATE blocks SET type = 'GovUserPlugin::InstitutionsBlock' WHERE type = 'InstitutionsBlock'")
-    execute("UPDATE gov_user_plugin_institutions SET type = 'GovUserPlugin::PublicInstitution' WHERE type = 'PublicInstitution'")
-    execute("UPDATE gov_user_plugin_institutions SET type = 'GovUserPlugin::PrivateInstitution' WHERE type = 'PrivateInstitution'")
-  end
-
-  def down
-    execute("UPDATE blocks SET type = 'InstitutionsBlock' WHERE type = 'GovUserPlugin::InstitutionsBlock'")
-    execute("UPDATE gov_user_plugin_institutions SET type = 'PublicInstitution' WHERE type = 'GovUserPlugin::PublicInstitution'")
-    execute("UPDATE gov_user_plugin_institutions SET type = 'PrivateInstitution' WHERE type = 'GovUserPlugin::PrivateInstitution'")
-  end
-end
@@ -1,12 +0,0 @@
-class CreateInstitutionsOrganizationRatingsTable < ActiveRecord::Migration
-  def up
-    create_table :gov_user_plugin_institutions_organization_ratings, {:id => false, :force => true} do |t|
-      t.references :institution
-      t.references :organization_rating
-    end
-  end
-
-  def down
-    drop_table :gov_user_plugin_institutions_organization_ratings
-  end
-end
@@ -1,9 +0,0 @@
-class MoveInstitutionsRelationWithOrganizationRatings < ActiveRecord::Migration
-  def up
-    execute('INSERT INTO gov_user_plugin_institutions_organization_ratings (institution_id,organization_rating_id) SELECT institution_id, id from organization_ratings where institution_id IS NOT NULL;')
-  end
-
-  def down
-    execute('DELETE FROM gov_user_plugin_institutions_organization_ratings;')
-  end
-end
@@ -1,10 +0,0 @@
-class RemoveOldInstitutionRelationFromOrganizationRatings < ActiveRecord::Migration
-  def up
-    remove_column :organization_ratings, :institution_id
-  end
-
-  def down
-    add_column :organization_ratings, :institution_id, :integer
-    execute('UPDATE organization_ratings AS oratings SET institution_id = (SELECT institution_id FROM gov_user_plugin_institutions_organization_ratings AS g WHERE g.organization_rating_id = oratings.id);')
-  end
-end
@@ -0,0 +1,9 @@
+class RenameTablesWithPluginNamespace < ActiveRecord::Migration
+  def change
+    rename_table :institutions, :gov_user_plugin_institutions
+    rename_table :governmental_spheres, :gov_user_plugin_governmental_spheres
+    rename_table :governmental_powers, :gov_user_plugin_governmental_powers
+    rename_table :juridical_natures, :gov_user_plugin_juridical_natures
+    rename_table :institutions_users, :gov_user_plugin_institutions_users
+  end
+end
@@ -0,0 +1,13 @@
+class UpdateNamespaceTypesOnDatabase < ActiveRecord::Migration
+  def up
+    execute("UPDATE blocks SET type = 'GovUserPlugin::InstitutionsBlock' WHERE type = 'InstitutionsBlock'")
+    execute("UPDATE gov_user_plugin_institutions SET type = 'GovUserPlugin::PublicInstitution' WHERE type = 'PublicInstitution'")
+    execute("UPDATE gov_user_plugin_institutions SET type = 'GovUserPlugin::PrivateInstitution' WHERE type = 'PrivateInstitution'")
+  end
+
+  def down
+    execute("UPDATE blocks SET type = 'InstitutionsBlock' WHERE type = 'GovUserPlugin::InstitutionsBlock'")
+    execute("UPDATE gov_user_plugin_institutions SET type = 'PublicInstitution' WHERE type = 'GovUserPlugin::PublicInstitution'")
+    execute("UPDATE gov_user_plugin_institutions SET type = 'PrivateInstitution' WHERE type = 'GovUserPlugin::PrivateInstitution'")
+  end
+end
@@ -0,0 +1,12 @@
+class CreateInstitutionsOrganizationRatingsTable < ActiveRecord::Migration
+  def up
+    create_table :gov_user_plugin_institutions_organization_ratings, {:id => false, :force => true} do |t|
+      t.references :institution
+      t.references :organization_rating
+    end
+  end
+
+  def down
+    drop_table :gov_user_plugin_institutions_organization_ratings
+  end
+end
@@ -0,0 +1,9 @@
+class MoveInstitutionsRelationWithOrganizationRatings < ActiveRecord::Migration
+  def up
+    execute('INSERT INTO gov_user_plugin_institutions_organization_ratings (institution_id,organization_rating_id) SELECT institution_id, id from organization_ratings where institution_id IS NOT NULL;')
+  end
+
+  def down
+    execute('DELETE FROM gov_user_plugin_institutions_organization_ratings;')
+  end
+end
@@ -0,0 +1,10 @@
+class RemoveOldInstitutionRelationFromOrganizationRatings < ActiveRecord::Migration
+  def up
+    remove_column :organization_ratings, :institution_id
+  end
+
+  def down
+    add_column :organization_ratings, :institution_id, :integer
+    execute('UPDATE organization_ratings AS oratings SET institution_id = (SELECT institution_id FROM gov_user_plugin_institutions_organization_ratings AS g WHERE g.organization_rating_id = oratings.id);')
+  end
+end
-class GovUserPlugin::GovernmentalPower < Noosfero::Plugin::ActiveRecord
+class GovUserPlugin::GovernmentalPower < ActiveRecord::Base
   attr_accessible :name
   validates :name, :presence=>true, :uniqueness=>true
-class GovUserPlugin::GovernmentalSphere < Noosfero::Plugin::ActiveRecord
+class GovUserPlugin::GovernmentalSphere < ActiveRecord::Base
   attr_accessible :name
   validates :name, :presence=>true, :uniqueness=>true
 #encoding: utf-8
-class GovUserPlugin::Institution < Noosfero::Plugin::ActiveRecord
+class GovUserPlugin::Institution < ActiveRecord::Base
   has_many :comments
   SEARCH_FILTERS = {
@@ -35,15 +35,13 @@ class GovUserPlugin::Institution &lt; Noosfero::Plugin::ActiveRecord
   validates :name, :presence=>true, :uniqueness=>true
   validates :cnpj, :length=>{maximum: 18}
-  before_save :verify_institution_type
-
   belongs_to :community
   scope :search_institution, lambda{ |value, env|
     joins(:community).where("(profiles.name ilike ? OR institutions.acronym ilike ?) AND profiles.environment_id = ?", "%#{value}%", "%#{value}%", env.id)
   }
-  scope :public, :conditions => { :type => "GovUserPlugin::PublicInstitution" }
-  scope :private, :conditions => { :type => "GovUserPlugin::PrivateInstitution" }
+  scope :public_institutions, :conditions => { :type => "GovUserPlugin::PublicInstitution" }
+  scope :private_institutions, :conditions => { :type => "GovUserPlugin::PrivateInstitution" }
   validate :validate_country, :validate_state, :validate_city,
            :verify_institution_type
-class GovUserPlugin::InstitutionsOrganizationRatings < Noosfero::Plugin::ActiveRecord
+class GovUserPlugin::InstitutionsOrganizationRatings < ActiveRecord::Base
   self.primary_key = :institution_id
   attr_accessible :institution, :organization_rating
-class GovUserPlugin::InstitutionsUsers < Noosfero::Plugin::ActiveRecord
+class GovUserPlugin::InstitutionsUsers < ActiveRecord::Base
   belongs_to :user
   belongs_to :institution, :class_name => 'GovUserPlugin::Institution'
 end
-class GovUserPlugin::JuridicalNature < Noosfero::Plugin::ActiveRecord
+class GovUserPlugin::JuridicalNature < ActiveRecord::Base
   self.record_timestamps = false
   attr_accessible :name
 class GovUserPlugin::PrivateInstitution < GovUserPlugin::Institution
+  validates :cnpj,
+    :format => {with: CNPJ_FORMAT},
+    :if => :is_a_brazilian_institution?
+
+  validates :cnpj,
+    :uniqueness => true, :unless => 'cnpj.blank?'
+
+  private
+  def is_a_brazilian_institution?
+    self.community.country == "BR"
+  end
 end
@@ -0,0 +1,57 @@
+# encoding: utf-8
+
+require_relative '../helpers/plugin_test_helper'
+require 'test_helper'
+
+class SoftwareCommunitiesPluginPersonTest < ActiveSupport::TestCase
+  include PluginTestHelper
+
+  def setup
+    @plugin = GovUserPlugin.new
+
+    @user = fast_create(User)
+    @person = create_person(
+                "My Name",
+                "user@email.com",
+                "123456",
+                "user2@email.com",
+                "Any State",
+                "Some City"
+              )
+  end
+
+  def teardown
+    @plugin = nil
+  end
+
+  should 'be a noosfero plugin' do
+    assert_kind_of Noosfero::Plugin, @plugin
+  end
+
+  should 'save person with a valid full name' do
+    p = Person::new :name=>"S1mpl3 0f N4m3", :identifier=>"simple-name"
+    p.user = fast_create(:user)
+
+    assert_equal true, p.save
+  end
+
+  should 'save person with a valid full name with accents' do
+    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
+  end
+
+  should 'not save person whose name has not capital letter' do
+    p = Person::new :name=>"simple name"
+    assert !p.save, _("Name Should begin with a capital letter and no special characters")
+  end
+
+  should 'not save person whose name has special characters' do
+    p = Person::new :name=>"Simple N@me"
+
+    assert !p.save , _("Name Should begin with a capital letter and no special characters")
+  end
+end
@@ -1,57 +0,0 @@
-# encoding: utf-8
-
-require_relative '../../../../../test/test_helper'
-require_relative '../../helpers/plugin_test_helper'
-
-class SoftwareCommunitiesPluginPersonTest < ActiveSupport::TestCase
-  include PluginTestHelper
-
-  def setup
-    @plugin = GovUserPlugin.new
-
-    @user = fast_create(User)
-    @person = create_person(
-                "My Name",
-                "user@email.com",
-                "123456",
-                "user2@email.com",
-                "Any State",
-                "Some City"
-              )
-  end
-
-  def teardown
-    @plugin = nil
-  end
-
-  should 'be a noosfero plugin' do
-    assert_kind_of Noosfero::Plugin, @plugin
-  end
-
-  should 'save person with a valid full name' do
-    p = Person::new :name=>"S1mpl3 0f N4m3", :identifier=>"simple-name"
-    p.user = fast_create(:user)
-
-    assert_equal true, p.save
-  end
-
-  should 'save person with a valid full name with accents' do
-    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
-  end
-
-  should 'not save person whose name has not capital letter' do
-    p = Person::new :name=>"simple name"
-    assert !p.save, _("Name Should begin with a capital letter and no special characters")
-  end
-
-  should 'not save person whose name has special characters' do
-    p = Person::new :name=>"Simple N@me"
-
-    assert !p.save , _("Name Should begin with a capital letter and no special characters")
-  end
-end
@@ -1,33 +0,0 @@
-require_relative '../../../../../test/test_helper'
-require_relative '../../helpers/institution_test_helper'
-
-class GovUserPlugin::GovernmentalPowerTest < ActiveSupport::TestCase
-
-  def setup
-    @gov_sphere = GovUserPlugin::GovernmentalSphere.create(:name=>"Some Gov Sphere")
-    @juridical_nature = GovUserPlugin::JuridicalNature.create(:name => "Autarquia")
-  end
-
-  def teardown
-    GovUserPlugin::Institution.destroy_all
-  end
-
-  should "get public institutions" do
-    inst_name = "Ministerio Publico da Uniao"
-    inst_cnpj = "12.345.678/9012-45"
-    gov_power = GovUserPlugin::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.institutions.public.count, GovUserPlugin::PublicInstitution.count
-  end
-end
@@ -1,76 +0,0 @@
-require_relative '../../../../../test/test_helper'
-require_relative '../../helpers/plugin_test_helper'
-
-class GovUserPlugin::InstitutionTest < ActiveSupport::TestCase
-  include PluginTestHelper
-  def setup
-    @gov_power = GovUserPlugin::GovernmentalPower.create(:name=>"Some Gov Power")
-    @gov_sphere = GovUserPlugin::GovernmentalSphere.create(:name=>"Some Gov Sphere")
-    @juridical_nature = GovUserPlugin::JuridicalNature.create(:name => "Autarquia")
-
-    @institution = create_public_institution(
-                      "Ministerio Publico da Uniao",
-                      "MPU",
-                      "BR",
-                      "Distrito Federal",
-                      "Gama",
-                      @juridical_nature,
-                      @gov_power,
-                      @gov_sphere,
-                      "11.222.333/4444-55"
-                    )
-  end
-
-  def teardown
-    GovUserPlugin::GovernmentalPower.destroy_all
-    GovUserPlugin::GovernmentalSphere.destroy_all
-    GovUserPlugin::JuridicalNature.destroy_all
-    @institution = nil
-  end
-
-  should "not save institutions without name" do
-    @institution.name = nil
-    assert_equal false, @institution.save
-    assert_equal true, @institution.errors.messages.keys.include?(:name)
-  end
-
-  should "not save if institution has invalid type" do
-    invalid_msg = "Type invalid, only public and private institutions are allowed."
-    @institution.type = "Other type"
-    assert_equal false, @institution.save
-    assert_equal true, @institution.errors.messages.keys.include?(:type)
-  end
-
-  should "not save without country" do
-    @institution.community.country = nil
-    assert_equal false, @institution.save
-    assert_equal true, @institution.errors.messages.keys.include?(:country)
-  end
-
-  should "not save without state" do
-    @institution.community.state = nil
-
-    assert_equal false, @institution.save
-    assert_equal true, @institution.errors.messages.keys.include?(:state)
-  end
-
-  should "not save without city" do
-    @institution.community.city = nil
-    @institution.community.state = "DF"
-
-    assert_equal false, @institution.save
-    assert_equal true, @institution.errors.messages.keys.include?(:city)
-  end
-
-  should "only return institutions of a specific environment" do
-    env1 = Environment.create(:name => "Environment One")
-    env2 = Environment.create(:name => "Environment Two")
-
-    env1.communities << @institution.community
-    search_result_env1 = Institution.search_institution("Ministerio", env1).collect{ |i| i.id }
-    search_result_env2 = Institution.search_institution("Ministerio", env2).collect{ |i| i.id }
-
-    assert_includes search_result_env1, @institution.id
-    assert_not_includes search_result_env2, @institution.id
-  end
-end
@@ -1,78 +0,0 @@
-require_relative '../../../../../test/test_helper'
-require_relative '../../helpers/plugin_test_helper'
-
-class GovUserPlugin::InstitutionsBlockTest < ActiveSupport::TestCase
-  def setup
-    environment = Environment.default
-    environment.enable_plugin(GovUserPlugin)
-  end
-
-  include PluginTestHelper
-  should 'inherit from Block' do
-    assert_kind_of Block, GovUserPlugin::InstitutionsBlock.new
-  end
-
-  should 'declare its default title' do
-    GovUserPlugin::InstitutionsBlock.any_instance.stubs(:profile_count).returns(0)
-    assert_not_equal Block.new.default_title, GovUserPlugin::InstitutionsBlock.new.default_title
-  end
-
-  should 'describe itself' do
-    assert_not_equal Block.description, GovUserPlugin::InstitutionsBlock.description
-  end
-
-  should 'give empty footer on unsupported owner type' do
-    block = GovUserPlugin::InstitutionsBlock.new
-    block.expects(:owner).returns(1)
-    assert_equal '', block.footer
-  end
-
-  should 'list institutions' do
-    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([GovUserPlugin.new])
-    user = create_person("Jose_Augusto",
-            "jose_augusto@email.com",
-            "aaaaaaa",
-            "aaaaaaa",
-            "DF",
-            "Gama"
-          )
-
-    institution  = create_private_institution(
-                    "inst name",
-                    "IN",
-                    "country",
-                    "state",
-                    "city",
-                    "00.111.222/3333-44"
-                   )
-    institution.community.add_member(user)
-
-    block = GovUserPlugin::InstitutionsBlock.new
-    block.expects(:owner).at_least_once.returns(user)
-
-    assert_equivalent [institution.community], block.profiles
-  end
-
-
-  should 'not list communities' do
-    user = create_person("Jose_Augusto",
-            "jose_augusto@email.com",
-            "aaaaaaa",
-            "aaaaaaa",
-            'jose@secondary.com',
-            "DF",
-            "Gama"
-          )
-    institution  = InstitutionTestHelper.create_private_institution("inst name", "IN", "country", "state",
-      "city", "00.111.222/3333-44")
-    community = fast_create(Community)
-    institution.community.add_member(user)
-    community.add_member(user)
-
-    block = GovUserPlugin::InstitutionsBlock.new
-    block.expects(:owner).at_least_once.returns(user)
-
-    assert_equivalent block.profiles, [institution.community]
-  end
-
-end
@@ -1,50 +0,0 @@
-require_relative '../../../../../test/test_helper'
-require_relative '../../helpers/plugin_test_helper'
-
-class GovUserPlugin::InstitutionsOrganizationRatingsTest < ActiveSupport::TestCase
-  include PluginTestHelper
-
-  def setup
-    @environment = Environment.default
-    @environment.enabled_plugins = ['SoftwareCommunitiesPlugin', 'GovUserPlugin']
-    @environment.save!
-  end
-
-  should 'validate presence of institution' do
-    relation = GovUserPlugin::InstitutionsOrganizationRatings.new
-    relation.valid?
-    assert relation.errors[:institution].present?
-  end
-
-  should 'validate presence of organization_rating' do
-    relation = GovUserPlugin::InstitutionsOrganizationRatings.new
-    relation.valid?
-    assert relation.errors[:organization_rating].present?
-  end
-
-  should "validate institution if there is an institution_id" do
-    private_institution = build_private_institution "huehue", "hue", "11.222.333/4444-55"
-    relation = GovUserPlugin::InstitutionsOrganizationRatings.new(:institution => private_institution)
-    assert !relation.valid?
-    assert relation.errors[:institution].include?("not found")
-
-    private_institution.save
-    relation.institution = private_institution
-    relation.valid?
-    assert !relation.errors[:institution].include?("not found")
-  end
-
-  private
-
-  def build_private_institution name, corporate_name, cnpj, country="AR"
-    community = Community.new :name => name
-    community.country = country
-
-    institution = GovUserPlugin::PrivateInstitution.new :name=> name
-    institution.corporate_name = corporate_name
-    institution.cnpj = cnpj
-    institution.community = community
-
-    institution
-  end
-end
@@ -1,23 +0,0 @@
-require_relative '../../../../../test/test_helper'
-require_relative '../../helpers/plugin_test_helper'
-
-class GovUserPlugin::JuridicalNatureTest < ActiveSupport::TestCase
-
-  include PluginTestHelper
-
-  def setup
-    @govPower = GovUserPlugin::GovernmentalPower.create(:name=>"Some Gov Power")
-    @govSphere = GovUserPlugin::GovernmentalSphere.create(:name=>"Some Gov Sphere")
-  end
-
-  def teardown
-    GovUserPlugin::Institution.destroy_all
-  end
-
-  should "get public institutions" do
-    juridical_nature = GovUserPlugin::JuridicalNature.create(:name => "Autarquia")
-    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.institutions.public.count == GovUserPlugin::PublicInstitution.count
-  end
-end
@@ -1,36 +0,0 @@
-require_relative '../../../../../test/test_helper'
-require_relative '../../helpers/plugin_test_helper'
-
-class SoftwareCommunitiesPluginPersonTest < ActiveSupport::TestCase
-  include PluginTestHelper
-  def setup
-    @plugin = GovUserPlugin.new
-
-    @user = fast_create(User)
-    @person = create_person(
-                "My Name",
-                "user@email.com",
-                "123456",
-                "123456",
-                "Any State",
-                "Some City"
-              )
-  end
-
-  should 'calculate the percentege of person incomplete fields' do
-    @person.cell_phone = "76888919"
-    @person.contact_phone = "987654321"
-
-    assert_equal(64, @plugin.calc_percentage_registration(@person))
-
-    @person.comercial_phone = "11223344"
-    @person.country = "I dont know"
-    @person.state = "I dont know"
-    @person.city = "I dont know"
-    @person.organization_website = "www.whatever.com"
-    @person.image = Image::new :uploaded_data=>fixture_file_upload('/files/rails.png', 'image/png')
-    @person.save
-
-    assert_equal(100, @plugin.calc_percentage_registration(@person))
-  end
-end
@@ -1,43 +0,0 @@
-require_relative '../../../../../test/test_helper'
-require_relative '../../helpers/plugin_test_helper'
-
-class GovUserPlugin::PrivateInstitutionTest < ActiveSupport::TestCase
-  include PluginTestHelper
-  def setup
-    @institution = create_private_institution(
-                      "Simple Private Institution",
-                      "SPI",
-                      "BR",
-                      "Distrito Federal",
-                      "Gama",
-                      "00.000.000/0001-00"
-                    )
-  end
-
-  def teardown
-    @institution = nil
-    GovUserPlugin::Institution.destroy_all
-  end
-
-  should "not save without a cnpj" do
-    @institution.cnpj = nil
-
-    assert_equal false, @institution.save
-
-    @institution.cnpj = "11.111.111/1111-11"
-    assert_equal true, @institution.save
-  end
-
-  should "save without fantasy name" do
-    @institution.acronym = nil
-    @institution.community.save
-
-    assert @institution.save
-  end
-
-  should "not verify cnpj if it isnt a brazilian institution" do
-    @institution.cnpj = nil
-    @institution.community.country = "AR"
-    assert_equal true, @institution.save
-  end
-end
@@ -1,79 +0,0 @@
-require_relative '../../../../../test/test_helper'
-require_relative '../../helpers/plugin_test_helper'
-
-class GovUserPlugin::PublicInstitutionTest < ActiveSupport::TestCase
-  include PluginTestHelper
-  def setup
-    @gov_power = GovUserPlugin::GovernmentalPower.create(:name=>"Some Gov Power")
-    @gov_sphere = GovUserPlugin::GovernmentalSphere.create(:name=>"Some Gov Sphere")
-    @juridical_nature = GovUserPlugin::JuridicalNature.create(:name => "Autarquia")
-
-    @institution = create_public_institution(
-                    "Ministerio Publico da Uniao",
-                    "MPU",
-                    "BR",
-                    "Distrito Federal",
-                    "Gama",
-                    @juridical_nature,
-                    @gov_power,
-                    @gov_sphere,
-                    "11.222.333/4444-55"
-                  )
-  end
-
-  def teardown
-    GovUserPlugin::GovernmentalPower.destroy_all
-    GovUserPlugin::GovernmentalSphere.destroy_all
-    GovUserPlugin::JuridicalNature.destroy_all
-    GovUserPlugin::Institution.destroy_all
-    @gov_power = nil
-    @gov_sphere = nil
-    @juridical_nature = nil
-    @institution = nil
-  end
-
-  should "save without a cnpj" do
-    @institution.cnpj = nil
-    assert @institution.save
-  end
-
-  should "save institution without an acronym" do
-    @institution.acronym = nil
-    assert @institution.save
-  end
-
-  should "Not save institution without a governmental_power" do
-    invalid_msg = "Governmental power can't be blank"
-    @institution.governmental_power = nil
-
-    assert !@institution.save
-    assert @institution.errors.full_messages.include? invalid_msg
-  end
-
-  should "Not save institution without a governmental_sphere" do
-    invalid_msg = "Governmental sphere can't be blank"
-    @institution.governmental_sphere = nil
-
-    assert !@institution.save
-    assert @institution.errors.full_messages.include? invalid_msg
-  end
-
-  should "not save institution without juridical nature" do
-    invalid_msg = "Juridical nature can't be blank"
-    @institution.juridical_nature = nil
-
-    assert !@institution.save
-    assert @institution.errors.full_messages.include? invalid_msg
-  end
-
-
-  should "verify cnpj format if it is filled" do
-    @institution.cnpj = "123456789"
-
-    assert_equal false, @institution.save
-
-    @institution.cnpj = "11.222.333/4444-55"
-
-    assert_equal true, @institution.save
-  end
-end
@@ -1,25 +0,0 @@
-require_relative '../../../../../test/test_helper'
-require_relative '../../helpers/plugin_test_helper'
-
-class UserTest < ActiveSupport::TestCase
-  include PluginTestHelper
-
-  should 'not save user whose email has already been used' do
-    user1 = create_default_user
-    user2 = fast_create(User)
-
-    user2.email = "primary@email.com"
-    assert !user2.save
-  end
-
-  private
-
-  def create_default_user
-    user = fast_create(User)
-    user.login = "a-login"
-    user.email = "primary@email.com"
-    user.save
-
-    return user
-  end
-end
@@ -9,9 +9,9 @@ class GovUserPlugin::ApiTest &lt; ActiveSupport::TestCase
     login_api
     environment = Environment.default
     environment.enable_plugin(GovUserPlugin)
-    @gov_power = GovernmentalPower.create(:name=>"Some Gov Power")
-    @gov_sphere = GovernmentalSphere.create(:name=>"Some Gov Sphere")
-    @juridical_nature = JuridicalNature.create(:name => "Autarquia")
+    @gov_power = GovUserPlugin::GovernmentalPower.create(:name=>"Some Gov Power")
+    @gov_sphere = GovUserPlugin::GovernmentalSphere.create(:name=>"Some Gov Sphere")
+    @juridical_nature = GovUserPlugin::JuridicalNature.create(:name => "Autarquia")
     @institution = create_public_institution(
                       "Ministerio Publico da Uniao",
                       "MPU",
@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../helpers/institution_test_helper'
+
+class GovUserPlugin::GovernmentalPowerTest < ActiveSupport::TestCase
+
+  def setup
+    @gov_sphere = GovUserPlugin::GovernmentalSphere.create(:name=>"Some Gov Sphere")
+    @juridical_nature = GovUserPlugin::JuridicalNature.create(:name => "Autarquia")
+  end
+
+  def teardown
+    GovUserPlugin::Institution.destroy_all
+  end
+
+  should "get public institutions" do
+    inst_name = "Ministerio Publico da Uniao"
+    inst_cnpj = "12.345.678/9012-45"
+    gov_power = GovUserPlugin::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.institutions.public_institutions.count, GovUserPlugin::PublicInstitution.count
+  end
+end
@@ -0,0 +1,76 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
+
+class GovUserPlugin::InstitutionTest < ActiveSupport::TestCase
+  include PluginTestHelper
+  def setup
+    @gov_power = GovUserPlugin::GovernmentalPower.create(:name=>"Some Gov Power")
+    @gov_sphere = GovUserPlugin::GovernmentalSphere.create(:name=>"Some Gov Sphere")
+    @juridical_nature = GovUserPlugin::JuridicalNature.create(:name => "Autarquia")
+
+    @institution = create_public_institution(
+                      "Ministerio Publico da Uniao",
+                      "MPU",
+                      "BR",
+                      "Distrito Federal",
+                      "Gama",
+                      @juridical_nature,
+                      @gov_power,
+                      @gov_sphere,
+                      "11.222.333/4444-55"
+                    )
+  end
+
+  def teardown
+    GovUserPlugin::GovernmentalPower.destroy_all
+    GovUserPlugin::GovernmentalSphere.destroy_all
+    GovUserPlugin::JuridicalNature.destroy_all
+    @institution = nil
+  end
+
+  should "not save institutions without name" do
+    @institution.name = nil
+    assert_equal false, @institution.save
+    assert_equal true, @institution.errors.messages.keys.include?(:name)
+  end
+
+  should "not save if institution has invalid type" do
+    invalid_msg = "Type invalid, only public and private institutions are allowed."
+    @institution.type = "Other type"
+    assert_equal false, @institution.save
+    assert_equal true, @institution.errors.messages.keys.include?(:type)
+  end
+
+  should "not save without country" do
+    @institution.community.country = nil
+    assert_equal false, @institution.save
+    assert_equal true, @institution.errors.messages.keys.include?(:country)
+  end
+
+  should "not save without state" do
+    @institution.community.state = nil
+
+    assert_equal false, @institution.save
+    assert_equal true, @institution.errors.messages.keys.include?(:state)
+  end
+
+  should "not save without city" do
+    @institution.community.city = nil
+    @institution.community.state = "DF"
+
+    assert_equal false, @institution.save
+    assert_equal true, @institution.errors.messages.keys.include?(:city)
+  end
+
+  should "only return institutions of a specific environment" do
+    env1 = Environment.create(:name => "Environment One")
+    env2 = Environment.create(:name => "Environment Two")
+
+    env1.communities << @institution.community
+    search_result_env1 = GovUserPlugin::Institution.search_institution("Ministerio", env1).collect{ |i| i.id }
+    search_result_env2 = GovUserPlugin::Institution.search_institution("Ministerio", env2).collect{ |i| i.id }
+
+    assert_includes search_result_env1, @institution.id
+    assert_not_includes search_result_env2, @institution.id
+  end
+end
@@ -0,0 +1,77 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
+
+class GovUserPlugin::InstitutionsBlockTest < ActiveSupport::TestCase
+  def setup
+    environment = Environment.default
+    environment.enable_plugin(GovUserPlugin)
+  end
+
+  include PluginTestHelper
+  should 'inherit from Block' do
+    assert_kind_of Block, GovUserPlugin::InstitutionsBlock.new
+  end
+
+  should 'declare its default title' do
+    GovUserPlugin::InstitutionsBlock.any_instance.stubs(:profile_count).returns(0)
+    assert_not_equal Block.new.default_title, GovUserPlugin::InstitutionsBlock.new.default_title
+  end
+
+  should 'describe itself' do
+    assert_not_equal Block.description, GovUserPlugin::InstitutionsBlock.description
+  end
+
+  should 'give empty footer on unsupported owner type' do
+    block = GovUserPlugin::InstitutionsBlock.new
+    block.expects(:owner).returns(1)
+    assert_equal '', block.footer
+  end
+
+  should 'list institutions' do
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([GovUserPlugin.new])
+    user = create_person("Jose_Augusto",
+            "jose_augusto@email.com",
+            "aaaaaaa",
+            "aaaaaaa",
+            "DF",
+            "Gama"
+          )
+
+    institution  = create_private_institution(
+                    "inst name",
+                    "IN",
+                    "country",
+                    "state",
+                    "city",
+                    "00.111.222/3333-44"
+                   )
+    institution.community.add_member(user)
+
+    block = GovUserPlugin::InstitutionsBlock.new
+    block.expects(:owner).at_least_once.returns(user)
+
+    assert_equivalent [institution.community], block.profiles
+  end
+
+
+  should 'not list communities' do
+    user = create_person("Jose_Augusto",
+            "jose_augusto@email.com",
+            "aaaaaaa",
+            "aaaaaaa",
+            "DF",
+            "Gama"
+          )
+    institution  = InstitutionTestHelper.create_private_institution("inst name", "IN", "country", "state",
+      "city", "00.111.222/3333-44")
+    community = fast_create(Community)
+    institution.community.add_member(user)
+    community.add_member(user)
+
+    block = GovUserPlugin::InstitutionsBlock.new
+    block.expects(:owner).at_least_once.returns(user)
+
+    assert_equivalent block.profiles, [institution.community]
+  end
+
+end
@@ -0,0 +1,50 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
+
+class GovUserPlugin::InstitutionsOrganizationRatingsTest < ActiveSupport::TestCase
+  include PluginTestHelper
+
+  def setup
+    @environment = Environment.default
+    @environment.enabled_plugins = ['SoftwareCommunitiesPlugin', 'GovUserPlugin']
+    @environment.save!
+  end
+
+  should 'validate presence of institution' do
+    relation = GovUserPlugin::InstitutionsOrganizationRatings.new
+    relation.valid?
+    assert relation.errors[:institution].present?
+  end
+
+  should 'validate presence of organization_rating' do
+    relation = GovUserPlugin::InstitutionsOrganizationRatings.new
+    relation.valid?
+    assert relation.errors[:organization_rating].present?
+  end
+
+  should "validate institution if there is an institution_id" do
+    private_institution = build_private_institution "huehue", "hue", "11.222.333/4444-55"
+    relation = GovUserPlugin::InstitutionsOrganizationRatings.new(:institution => private_institution)
+    assert !relation.valid?
+    assert relation.errors[:institution].include?("not found")
+
+    private_institution.save
+    relation.institution = private_institution
+    relation.valid?
+    assert !relation.errors[:institution].include?("not found")
+  end
+
+  private
+
+  def build_private_institution name, corporate_name, cnpj, country="AR"
+    community = Community.new :name => name
+    community.country = country
+
+    institution = GovUserPlugin::PrivateInstitution.new :name=> name
+    institution.corporate_name = corporate_name
+    institution.cnpj = cnpj
+    institution.community = community
+
+    institution
+  end
+end
@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
+
+class GovUserPlugin::JuridicalNatureTest < ActiveSupport::TestCase
+
+  include PluginTestHelper
+
+  def setup
+    @govPower = GovUserPlugin::GovernmentalPower.create(:name=>"Some Gov Power")
+    @govSphere = GovUserPlugin::GovernmentalSphere.create(:name=>"Some Gov Sphere")
+  end
+
+  def teardown
+    GovUserPlugin::Institution.destroy_all
+  end
+
+  should "get public institutions" do
+    juridical_nature = GovUserPlugin::JuridicalNature.create(:name => "Autarquia")
+    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.institutions.public_institutions.count == GovUserPlugin::PublicInstitution.count
+  end
+end
@@ -0,0 +1,36 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
+
+class SoftwareCommunitiesPluginPersonTest < ActiveSupport::TestCase
+  include PluginTestHelper
+  def setup
+    @plugin = GovUserPlugin.new
+
+    @user = fast_create(User)
+    @person = create_person(
+                "My Name",
+                "user@email.com",
+                "123456",
+                "123456",
+                "Any State",
+                "Some City"
+              )
+  end
+
+  should 'calculate the percentege of person incomplete fields' do
+    @person.cell_phone = "76888919"
+    @person.contact_phone = "987654321"
+
+    assert_equal(64, @plugin.calc_percentage_registration(@person))
+
+    @person.comercial_phone = "11223344"
+    @person.country = "I dont know"
+    @person.state = "I dont know"
+    @person.city = "I dont know"
+    @person.organization_website = "www.whatever.com"
+    @person.image = Image::new :uploaded_data=>fixture_file_upload('/files/rails.png', 'image/png')
+    @person.save
+
+    assert_equal(100, @plugin.calc_percentage_registration(@person))
+  end
+end
@@ -0,0 +1,43 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
+
+class GovUserPlugin::PrivateInstitutionTest < ActiveSupport::TestCase
+  include PluginTestHelper
+  def setup
+    @institution = create_private_institution(
+                      "Simple Private Institution",
+                      "SPI",
+                      "BR",
+                      "Distrito Federal",
+                      "Gama",
+                      "00.000.000/0001-00"
+                    )
+  end
+
+  def teardown
+    @institution = nil
+    GovUserPlugin::Institution.destroy_all
+  end
+
+  should "not save without a cnpj" do
+    @institution.cnpj = nil
+
+    assert_equal false, @institution.save
+
+    @institution.cnpj = "11.111.111/1111-11"
+    assert_equal true, @institution.save
+  end
+
+  should "save without fantasy name" do
+    @institution.acronym = nil
+    @institution.community.save
+
+    assert @institution.save
+  end
+
+  should "not verify cnpj if it isnt a brazilian institution" do
+    @institution.cnpj = nil
+    @institution.community.country = "AR"
+    assert_equal true, @institution.save
+  end
+end
@@ -0,0 +1,79 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
+
+class GovUserPlugin::PublicInstitutionTest < ActiveSupport::TestCase
+  include PluginTestHelper
+  def setup
+    @gov_power = GovUserPlugin::GovernmentalPower.create(:name=>"Some Gov Power")
+    @gov_sphere = GovUserPlugin::GovernmentalSphere.create(:name=>"Some Gov Sphere")
+    @juridical_nature = GovUserPlugin::JuridicalNature.create(:name => "Autarquia")
+
+    @institution = create_public_institution(
+                    "Ministerio Publico da Uniao",
+                    "MPU",
+                    "BR",
+                    "Distrito Federal",
+                    "Gama",
+                    @juridical_nature,
+                    @gov_power,
+                    @gov_sphere,
+                    "11.222.333/4444-55"
+                  )
+  end
+
+  def teardown
+    GovUserPlugin::GovernmentalPower.destroy_all
+    GovUserPlugin::GovernmentalSphere.destroy_all
+    GovUserPlugin::JuridicalNature.destroy_all
+    GovUserPlugin::Institution.destroy_all
+    @gov_power = nil
+    @gov_sphere = nil
+    @juridical_nature = nil
+    @institution = nil
+  end
+
+  should "save without a cnpj" do
+    @institution.cnpj = nil
+    assert @institution.save
+  end
+
+  should "save institution without an acronym" do
+    @institution.acronym = nil
+    assert @institution.save
+  end
+
+  should "Not save institution without a governmental_power" do
+    invalid_msg = "Governmental power can't be blank"
+    @institution.governmental_power = nil
+
+    assert !@institution.save
+    assert @institution.errors.full_messages.include? invalid_msg
+  end
+
+  should "Not save institution without a governmental_sphere" do
+    invalid_msg = "Governmental sphere can't be blank"
+    @institution.governmental_sphere = nil
+
+    assert !@institution.save
+    assert @institution.errors.full_messages.include? invalid_msg
+  end
+
+  should "not save institution without juridical nature" do
+    invalid_msg = "Juridical nature can't be blank"
+    @institution.juridical_nature = nil
+
+    assert !@institution.save
+    assert @institution.errors.full_messages.include? invalid_msg
+  end
+
+
+  should "verify cnpj format if it is filled" do
+    @institution.cnpj = "123456789"
+
+    assert_equal false, @institution.save
+
+    @institution.cnpj = "11.222.333/4444-55"
+
+    assert_equal true, @institution.save
+  end
+end
@@ -0,0 +1,25 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
+
+class UserTest < ActiveSupport::TestCase
+  include PluginTestHelper
+
+  should 'not save user whose email has already been used' do
+    user1 = create_default_user
+    user2 = fast_create(User)
+
+    user2.email = "primary@email.com"
+    assert !user2.save
+  end
+
+  private
+
+  def create_default_user
+    user = fast_create(User)
+    user.login = "a-login"
+    user.email = "primary@email.com"
+    user.save
+
+    return user
+  end
+end
	@@ -1,9 +0,0 @@	@@ -1,9 +0,0 @@
1	-class RenameTablesWithPluginNamespace < ActiveRecord::Migration
2	- def change
3	- rename_table :institutions, :gov_user_plugin_institutions
4	- rename_table :governmental_spheres, :gov_user_plugin_governmental_spheres
5	- rename_table :governmental_powers, :gov_user_plugin_governmental_powers
6	- rename_table :juridical_natures, :gov_user_plugin_juridical_natures
7	- rename_table :institutions_users, :gov_user_plugin_institutions_users
8	- end
9	-end
	@@ -1,13 +0,0 @@	@@ -1,13 +0,0 @@
1	-class UpdateNamespaceTypesOnDatabase < ActiveRecord::Migration
2	- def up
3	- execute("UPDATE blocks SET type = 'GovUserPlugin::InstitutionsBlock' WHERE type = 'InstitutionsBlock'")
4	- execute("UPDATE gov_user_plugin_institutions SET type = 'GovUserPlugin::PublicInstitution' WHERE type = 'PublicInstitution'")
5	- execute("UPDATE gov_user_plugin_institutions SET type = 'GovUserPlugin::PrivateInstitution' WHERE type = 'PrivateInstitution'")
6	- end
7	-
8	- def down
9	- execute("UPDATE blocks SET type = 'InstitutionsBlock' WHERE type = 'GovUserPlugin::InstitutionsBlock'")
10	- execute("UPDATE gov_user_plugin_institutions SET type = 'PublicInstitution' WHERE type = 'GovUserPlugin::PublicInstitution'")
11	- execute("UPDATE gov_user_plugin_institutions SET type = 'PrivateInstitution' WHERE type = 'GovUserPlugin::PrivateInstitution'")
12	- end
13	-end
	@@ -1,12 +0,0 @@	@@ -1,12 +0,0 @@
1	-class CreateInstitutionsOrganizationRatingsTable < ActiveRecord::Migration
2	- def up
3	- create_table :gov_user_plugin_institutions_organization_ratings, {:id => false, :force => true} do \|t\|
4	- t.references :institution
5	- t.references :organization_rating
6	- end
7	- end
8	-
9	- def down
10	- drop_table :gov_user_plugin_institutions_organization_ratings
11	- end
12	-end
	@@ -1,9 +0,0 @@	@@ -1,9 +0,0 @@
1	-class MoveInstitutionsRelationWithOrganizationRatings < ActiveRecord::Migration
2	- def up
3	- execute('INSERT INTO gov_user_plugin_institutions_organization_ratings (institution_id,organization_rating_id) SELECT institution_id, id from organization_ratings where institution_id IS NOT NULL;')
4	- end
5	-
6	- def down
7	- execute('DELETE FROM gov_user_plugin_institutions_organization_ratings;')
8	- end
9	-end
	@@ -1,10 +0,0 @@	@@ -1,10 +0,0 @@
1	-class RemoveOldInstitutionRelationFromOrganizationRatings < ActiveRecord::Migration
2	- def up
3	- remove_column :organization_ratings, :institution_id
4	- end
5	-
6	- def down
7	- add_column :organization_ratings, :institution_id, :integer
8	- execute('UPDATE organization_ratings AS oratings SET institution_id = (SELECT institution_id FROM gov_user_plugin_institutions_organization_ratings AS g WHERE g.organization_rating_id = oratings.id);')
9	- end
10	-end
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+class RenameTablesWithPluginNamespace < ActiveRecord::Migration
	2	+ def change
	3	+ rename_table :institutions, :gov_user_plugin_institutions
	4	+ rename_table :governmental_spheres, :gov_user_plugin_governmental_spheres
	5	+ rename_table :governmental_powers, :gov_user_plugin_governmental_powers
	6	+ rename_table :juridical_natures, :gov_user_plugin_juridical_natures
	7	+ rename_table :institutions_users, :gov_user_plugin_institutions_users
	8	+ end
	9	+end
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+class UpdateNamespaceTypesOnDatabase < ActiveRecord::Migration
	2	+ def up
	3	+ execute("UPDATE blocks SET type = 'GovUserPlugin::InstitutionsBlock' WHERE type = 'InstitutionsBlock'")
	4	+ execute("UPDATE gov_user_plugin_institutions SET type = 'GovUserPlugin::PublicInstitution' WHERE type = 'PublicInstitution'")
	5	+ execute("UPDATE gov_user_plugin_institutions SET type = 'GovUserPlugin::PrivateInstitution' WHERE type = 'PrivateInstitution'")
	6	+ end
	7	+
	8	+ def down
	9	+ execute("UPDATE blocks SET type = 'InstitutionsBlock' WHERE type = 'GovUserPlugin::InstitutionsBlock'")
	10	+ execute("UPDATE gov_user_plugin_institutions SET type = 'PublicInstitution' WHERE type = 'GovUserPlugin::PublicInstitution'")
	11	+ execute("UPDATE gov_user_plugin_institutions SET type = 'PrivateInstitution' WHERE type = 'GovUserPlugin::PrivateInstitution'")
	12	+ end
	13	+end
@@ -0,0 +1,12 @@		@@ -0,0 +1,12 @@
	1	+class CreateInstitutionsOrganizationRatingsTable < ActiveRecord::Migration
	2	+ def up
	3	+ create_table :gov_user_plugin_institutions_organization_ratings, {:id => false, :force => true} do \|t\|
	4	+ t.references :institution
	5	+ t.references :organization_rating
	6	+ end
	7	+ end
	8	+
	9	+ def down
	10	+ drop_table :gov_user_plugin_institutions_organization_ratings
	11	+ end
	12	+end
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+class MoveInstitutionsRelationWithOrganizationRatings < ActiveRecord::Migration
	2	+ def up
	3	+ execute('INSERT INTO gov_user_plugin_institutions_organization_ratings (institution_id,organization_rating_id) SELECT institution_id, id from organization_ratings where institution_id IS NOT NULL;')
	4	+ end
	5	+
	6	+ def down
	7	+ execute('DELETE FROM gov_user_plugin_institutions_organization_ratings;')
	8	+ end
	9	+end
@@ -0,0 +1,10 @@		@@ -0,0 +1,10 @@
	1	+class RemoveOldInstitutionRelationFromOrganizationRatings < ActiveRecord::Migration
	2	+ def up
	3	+ remove_column :organization_ratings, :institution_id
	4	+ end
	5	+
	6	+ def down
	7	+ add_column :organization_ratings, :institution_id, :integer
	8	+ execute('UPDATE organization_ratings AS oratings SET institution_id = (SELECT institution_id FROM gov_user_plugin_institutions_organization_ratings AS g WHERE g.organization_rating_id = oratings.id);')
	9	+ end
	10	+end