Fixes institution states

Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com> Signed-off-by: Eduardo Vital <vitaldu@gmail.com> Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com> Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com> Signed-off-by: Daniela Feitosa <danielafeitosa@colivre.coop.br>

Fixes institution states
Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com> Signed-off-by: Eduardo Vital <vitaldu@gmail.com> Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com> Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com> Signed-off-by: Daniela Feitosa <danielafeitosa@colivre.coop.br>
Gabriel Silva · Daniela Feitosa
1 parent 1b7ba1f1
Showing 17 changed files with 158 additions and 237 deletions Show diff stats
src/noosfero-spb/gov_user/db/migrate/20160120185910_fix_communities_with_wrong_state.rb
src/noosfero-spb/gov_user/features/institution_registration.feature
src/noosfero-spb/gov_user/features/rate_community.feature
src/noosfero-spb/gov_user/features/steps_definitions/gov_user_steps_backup.rb
src/noosfero-spb/gov_user/features/user_profile_edition.feature
src/noosfero-spb/gov_user/lib/institution.rb
src/noosfero-spb/gov_user/public/views/create-institution.js
src/noosfero-spb/gov_user/test/functional/gov_user_plugin_controller_test.rb
src/noosfero-spb/gov_user/test/functional/gov_user_plugin_myprofile_controller.rb
src/noosfero-spb/gov_user/test/functional/profile_editor_controller_test.rb
src/noosfero-spb/gov_user/test/unit/api_test.rb
src/noosfero-spb/gov_user/test/unit/gov_user_plugin_api_test.rb
src/noosfero-spb/gov_user/test/unit/private_institution_test.rb
src/noosfero-spb/gov_user/test/unit/public_institution_test.rb
src/noosfero-spb/gov_user/views/gov_user_plugin/_institution.html.erb
src/noosfero-spb/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb
src/noosfero-spb/software_communities/features/step_definitions/software_communities_steps.rb
@@ -0,0 +1,18 @@
+class FixCommunitiesWithWrongState < ActiveRecord::Migration
+  def up
+    select_all("SELECT id, data FROM profiles WHERE type = 'Community'").each do |community|
+      settings = YAML.load(community['data'] || {}.to_yaml)
+      new_state = Institution::VALID_STATES[settings[:state].upcase] if settings[:state].present?
+
+      if new_state.present?
+        settings[:state] = new_state
+        assignments = ActiveRecord::Base.send(:sanitize_sql_for_assignment, {:data => settings.to_yaml})
+        update("UPDATE profiles SET %s WHERE id = %d" % [assignments, community['id']])
+      end
+    end
+  end
+
+  def down
+    say "This migration can't be reverted."
+  end
+end
@@ -33,3 +33,16 @@ Feature: Institution Field
     Then I should see "Governmental Sphere"
     And I should see "Governmental Power"
     And I should see "Juridical Nature"
+
+  @selenium
+  Scenario: Clean state and city values when country is diferent of Brazil
+    Given I follow "Edit Profile"
+    When I follow "Create new institution"
+    And I select "Brazil" from "community_country"
+    And I select "Distrito Federal" from "community_state"
+    And I fill in "community_city" with "Gama"
+    And I select "United States" from "community_country"
+    Then I should not see "community_state"
+    And I should not see "community_city"
+    And I select "Brazil" from "community_country"
+    Then I should not see "Gama"
@@ -27,8 +27,8 @@ Feature: rate_community
     And Institutions has initial default values on database
     And the following public institutions
       | name                       | acronym | country | state | city       | cnpj               | juridical_nature | governmental_power | governmental_sphere | corporate_name |
-      | Ministerio das Cidades     | MC      | BR      | DF    | Gama       | 58.745.189/0001-21 | Autarquia        | Executivo          | Federal             | Ministerio das Cidades |
-      | Ministerio do Planejamento | MP      | BR      | DF    | Brasilia   | 41.769.591/0001-43 | Autarquia        | Judiciario         | Federal             | Ministerio do Planejamento |
+      | Ministerio das Cidades     | MC      | BR      | Distrito Federal    | Gama       | 58.745.189/0001-21 | Autarquia        | Executivo          | Federal             | Ministerio das Cidades |
+      | Ministerio do Planejamento | MP      | BR      | Distrito Federal    | Brasilia   | 41.769.591/0001-43 | Autarquia        | Judiciario         | Federal             | Ministerio do Planejamento |
   Scenario: display message on task when a rating with the same institution exists on the same software
     Given the following organization ratings
@@ -38,7 +38,7 @@ Feature: rate_community
     And I go to mycommunity's control panel
     And I follow "Process requests" within ".pending-tasks"
     And I choose "Accept" within ".task_decisions"
-    Then I should see "This institution already has an accepted rating." in the page
+    Then I should see "This institution already has an accepted rating" in the page
   Scenario: do not display message on task when a rating with the same institution does not exist on the same software
     Given the following organization ratings
@@ -1,93 +0,0 @@
-Given /^Institutions has initial default values on database$/ do
-  GovernmentalPower.create(:name => "Executivo")
-  GovernmentalPower.create(:name => "Legislativo")
-  GovernmentalPower.create(:name => "Judiciario")
-
-  GovernmentalSphere.create(:name => "Federal")
-
-  JuridicalNature.create(:name => "Autarquia")
-  JuridicalNature.create(:name => "Administracao Direta")
-  JuridicalNature.create(:name => "Empresa Publica")
-  JuridicalNature.create(:name => "Fundacao")
-  JuridicalNature.create(:name => "Orgao Autonomo")
-  JuridicalNature.create(:name => "Sociedade")
-  JuridicalNature.create(:name => "Sociedade Civil")
-  JuridicalNature.create(:name => "Sociedade de Economia Mista")
-
-  national_region = NationalRegion.new
-  national_region.name = "Distrito Federal"
-  national_region.national_region_code = '35'
-  national_region.national_region_type_id = NationalRegionType::STATE
-  national_region.save
-end
-
-Given /^I type in "([^"]*)" in autocomplete list "([^"]*)" and I choose "([^"]*)"$/ do |typed, input_field_selector, should_select|
-# Wait the page javascript load
-sleep 1
-# Basicaly it, search for the input field, type something, wait for ajax end select an item
-page.driver.browser.execute_script %Q{
-  var search_query = "#{input_field_selector}.ui-autocomplete-input";
-  var input = jQuery(search_query).first();
-
-  input.trigger('click');
-  input.val('#{typed}');
-  input.trigger('keydown');
-
-  window.setTimeout(function(){
-    search_query = ".ui-menu-item a:contains('#{should_select}')";
-    var typed = jQuery(search_query).first();
-
-    typed.trigger('mouseenter').trigger('click');
-    console.log(jQuery('#license_info_id'));
-    }, 1000);
-  }
-  sleep 1
-end
-
-Given /^the following public institutions?$/ do |table|
-  # table is a Cucumber::Ast::Table
-  table.hashes.each do |item|
-    community = Community.new
-    community.name = item[:name]
-    community.country = item[:country]
-    community.state = item[:state]
-    community.city = item[:city]
-    community.save!
-
-    governmental_power = GovernmentalPower.where(:name => item[:governmental_power]).first
-    governmental_sphere = GovernmentalSphere.where(:name => item[:governmental_sphere]).first
-
-    juridical_nature = JuridicalNature.create(:name => item[:juridical_nature])
-
-    institution = PublicInstitution.new(:name => item[:name], :type => "PublicInstitution", :acronym => item[:acronym], :cnpj => item[:cnpj], :juridical_nature => juridical_nature, :governmental_power => governmental_power, :governmental_sphere => governmental_sphere)
-    institution.community = community
-    institution.corporate_name = item[:corporate_name]
-    institution.save!
-  end
-end
-
-Given /^I sleep for (\d+) seconds$/ do |time|
-  sleep time.to_i
-end
-
-Given /^I am logged in as mpog_admin$/ do
-  visit('/account/logout')
-
-  user = User.new(:login => 'admin_user', :password => '123456', :password_confirmation => '123456', :email => 'admin_user@example.com')
-  person = Person.new :name=>"Mpog Admin", :identifier=>"mpog-admin"
-  user.person = person
-  user.save!
-
-  user.activate
-  e = Environment.default
-  e.add_admin(user.person)
-
-  visit('/account/login')
-  fill_in("Username", :with => user.login)
-  fill_in("Password", :with => '123456')
-  click_button("Log in")
-end
-
-Given /^I click on anything with selector "([^"]*)"$/ do |selector|
-  evaluate_script "jQuery('#{selector}').trigger('click') && true"
-end
@@ -24,9 +24,9 @@ Feature: Institution Field
     And Institutions has initial default values on database
     And the following public institutions
       | name                       | acronym | country | state | city       | cnpj               | juridical_nature | governmental_power | governmental_sphere | corporate_name |
-      | Ministerio das Cidades     | MC      | BR      | DF    | Gama       | 58.745.189/0001-21 | Autarquia        | Executivo          | Federal             | Ministerio das Cidades |
-      | Governo do DF              | GDF     | BR      | DF    | Taguatinga | 12.645.166/0001-44 | Autarquia        | Legislativo        | Federal             | Governo do DF |
-      | Ministerio do Planejamento | MP      | BR      | DF    | Brasilia   | 41.769.591/0001-43 | Autarquia        | Judiciario         | Federal             | Ministerio do Planejamento |
+      | Ministerio das Cidades     | MC      | BR      | Distrito Federal    | Gama       | 58.745.189/0001-21 | Autarquia        | Executivo          | Federal             | Ministerio das Cidades |
+      | Governo do DF              | GDF     | BR      | Distrito Federal    | Taguatinga | 12.645.166/0001-44 | Autarquia        | Legislativo        | Federal             | Governo do DF |
+      | Ministerio do Planejamento | MP      | BR      | Distrito Federal    | Brasilia   | 41.769.591/0001-43 | Autarquia        | Judiciario         | Federal             | Ministerio do Planejamento |
 	@selenium
   Scenario: Go to control panel when clicked on 'Complete your profile' link
+#encoding: utf-8
+
 class Institution < ActiveRecord::Base
   has_many :comments
@@ -8,6 +10,12 @@ class Institution &lt; ActiveRecord::Base
   CNPJ_FORMAT = /^\d{2}\.\d{3}\.\d{3}\/\d{4}\-\d{2}$/
+  VALID_STATES = { "AC"=>"Acre", "AL"=>"Alagoas", "AM"=>"Amazonas", "AP"=>"Amapá", "BA"=>"Bahia", "CE"=>"Ceará",
+                   "DF"=>"Distrito Federal", "ES"=>"Espírito Santo", "GO"=>"Goiás", "MA"=>"Maranhão", "MT"=>"Mato Grosso",
+                   "MS"=>"Mato Grosso do Sul", "MG"=>"Minas Gerais", "PA"=>"Pará", "PB"=>"Paraíba", "PR"=>"Paraná",
+                   "PE"=>"Pernambuco", "PI"=>"Piauí", "RJ"=>"Rio de Janeiro", "RN"=>"Rio Grande do Norte", "RO"=>"Rondônia",
+                   "RS"=>"Rio Grande do Sul", "RR"=>"Roraima", "SC"=>"Santa Catarina", "SE"=>"Sergipe", "SP"=>"São Paulo", "TO"=>"Tocantins" }
+
   def self.default_search_display
     'compact'
   end
@@ -76,12 +84,12 @@ class Institution &lt; ActiveRecord::Base
   end
   def validate_state
-    unless self.community.blank?
-      if self.community.country == "BR" &&
-        (self.community.state.blank? || self.community.state == "-1") &&
-        self.errors[:state].blank?
-
-        self.errors.add(:state, _("can't be blank"))
+    if self.community.present? && self.community.country == "BR"
+      if self.community.state.blank?
+        self.errors.add(:state, _("can't be blank")) if self.errors[:state].blank?
+        return false
+      elsif !VALID_STATES.values.include?(self.community.state)
+        self.errors.add(:state, _("invalid state")) if self.errors[:state].blank?
         return false
       end
     end
@@ -284,9 +284,10 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
   function show_hide_cnpj_city(country) {
     var cnpj = $("#institutions_cnpj").parent().parent();
-    var city = $("#community_city").parent();
+    var city = $("#community_city");
     var city_label = $('label[for="community_city"]');
-    var state = $("#community_state").parent();
+    var state = $("#community_state");
+    var state_label = $('label[for="community_state"]');
     var inst_type = $("input[name='institutions[type]']:checked").val();
     institution_type_actions(inst_type);
@@ -298,13 +299,17 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
     if ( country !== "BR" ) {
       cnpj.hide();
-      city.find('input').val(''); city.hide();
+      city.val('');
+      city.hide();
       city_label.hide();
+      state.val("");
       state.hide();
+      state_label.hide();
     } else {
       cnpj.show();
       city.show();
       city_label.show();
+      state_label.show();
       state.show();
     }
   }
@@ -318,33 +323,6 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
     }
   }
-
-  function set_form_count_custom_data() {
-    var divisor_option = SelectElement.generateOption("-1", "--------------------------------");
-    var default_option = SelectElement.generateOption("BR", "Brazil");
-
-    var inst_type = $("input[name='institutions[type]']:checked").val();
-    var country = $("#community_country").val();
-
-    institution_type_actions(inst_type);
-    show_hide_cnpj_city(country);
-
-    if( $('#community_country').find("option[value='']").length === 1 ) {
-      $('#community_country').find("option[value='']").remove();
-      $('#community_country').prepend(divisor_option);
-      $('#community_country').prepend(default_option);
-
-      if ($('#add_institution_link').length > 0) {
-        $('#add_institution_link').hide();
-      }
-
-      if($("#edit_institution_page").val() === "false") {
-        $('#community_country').val("BR");
-        show_hide_cnpj_city($('#community_country').val());
-      }
-    }
-  }
-
   function autoCompleteCity() {
     var country_selected = $('#community_country').val();
@@ -416,7 +394,7 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
   function init_module() {
-    set_form_count_custom_data();
+    show_hide_cnpj_city($('#community_country').val());
     set_events();
   }
@@ -26,7 +26,7 @@ class GovUserPluginControllerTest &lt; ActionController::TestCase
       "Ministerio Publico da Uniao",
       "MPU",
       "BR",
-      "DF",
+      "Distrito Federal",
       "Gama",
       @juridical_nature,
       @gov_power,
@@ -37,7 +37,7 @@ class GovUserPluginControllerTest &lt; ActionController::TestCase
       "Tribunal Regional da Uniao",
       "TRU",
       "BR",
-      "DF",
+      "Distrito Federal",
       "Brasilia",
       @juridical_nature,
       @gov_power,
@@ -84,7 +84,7 @@ class GovUserPluginControllerTest &lt; ActionController::TestCase
     fields = InstitutionTestHelper.generate_form_fields(
       "foo bar",
       "BR",
-      "DF",
+      "Distrito Federal",
       "Brasilia",
       "12.234.567/8900-10",
       "PublicInstitution"
@@ -100,14 +100,14 @@ class GovUserPluginControllerTest &lt; ActionController::TestCase
     assert json_response["success"]
   end
-  should "create a institution without cnpj" do
+  should "not create a private institution without cnpj" do
     @controller.stubs(:verify_recaptcha).returns(true)
     fields = InstitutionTestHelper.generate_form_fields(
       "Some Private Institution",
-      "EN",
-      "NY",
-      "New York",
+      "BR",
+      "Distrito Federal",
+      "Brasilia",
       "",
       "PrivateInstitution"
     )
@@ -117,6 +117,29 @@ class GovUserPluginControllerTest &lt; ActionController::TestCase
     json_response = ActiveSupport::JSON.decode(@response.body)
+    assert_false json_response["success"]
+    assert json_response["errors"].include? "Cnpj can't be blank"
+  end
+
+  should "create public institution without cnpj" do
+    @controller.stubs(:verify_recaptcha).returns(true)
+
+    fields = InstitutionTestHelper.generate_form_fields(
+      "Some Private Institution",
+      "BR",
+      "Distrito Federal",
+      "Brasilia",
+      "56.366.790/0001-88",
+      "PublicInstitution"
+    )
+    fields[:institutions][:governmental_power] = @gov_power.id
+    fields[:institutions][:governmental_sphere] = @gov_sphere.id
+    fields[:institutions][:juridical_nature] = @juridical_nature.id
+
+    xhr :get, :new_institution, fields
+
+    json_response = ActiveSupport::JSON.decode(@response.body)
+
     assert json_response["success"]
   end
@@ -144,7 +167,7 @@ class GovUserPluginControllerTest &lt; ActionController::TestCase
     fields = InstitutionTestHelper.generate_form_fields(
       "Some Private Institution",
       "BR",
-      "DF",
+      "Distrito Federal",
       "Brasilia",
       "12.345.567/8900-10",
       "PrivateInstitution"
@@ -162,7 +185,7 @@ class GovUserPluginControllerTest &lt; ActionController::TestCase
     fields = InstitutionTestHelper.generate_form_fields(
       "Some Private Institution",
       "BR",
-      "DF",
+      "Distrito Federal",
       "Brasilia",
       "56.366.790/0001-88",
       "PrivateInstitution"
@@ -221,7 +244,7 @@ class GovUserPluginControllerTest &lt; ActionController::TestCase
     fields = InstitutionTestHelper.generate_form_fields(
       "Private Institution",
       "BR",
-      "DF",
+      "Distrito Federal",
       "Brasilia",
       "12.323.557/8900-10",
       "PrivateInstitution"
@@ -25,7 +25,7 @@ class GovUserPluginMyprofileControllerTest &lt; ActionController::TestCase
       "Ministerio Publico da Uniao",
       "MPU",
       "BR",
-      "DF",
+      "Distrito Federal",
       "Gama",
       juridical_nature,
       gov_power,
@@ -46,7 +46,7 @@ class GovUserPluginMyprofileControllerTest &lt; ActionController::TestCase
     fields = InstitutionTestHelper.generate_form_fields(
       "institution new name",
       "BR",
-      "DF",
+      "Distrito Federal",
       "Gama",
       "12.345.678/9012-45",
       "PrivateInstitution"
@@ -68,7 +68,7 @@ class GovUserPluginMyprofileControllerTest &lt; ActionController::TestCase
     fields = InstitutionTestHelper.generate_form_fields(
       "institution new name",
       "BR",
-      "DF",
+      "Distrito Federal",
       "Gama",
       "12.345.678/9012-45",
       "PrivateInstitution"
@@ -91,7 +91,7 @@ class GovUserPluginMyprofileControllerTest &lt; ActionController::TestCase
     fields = InstitutionTestHelper.generate_form_fields(
       "",
       "BR",
-      "DF",
+      "Distrito Federal",
       "Gama",
       "6465465465",
       "PrivateInstitution"
@@ -38,7 +38,7 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
       "Ministerio Publico da Uniao",
       "MPU",
       "BR",
-      "DF",
+      "Distrito Federal",
       "Gama",
       @juridical_nature,
       @govPower,
@@ -50,7 +50,7 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
       "Tribunal Regional da Uniao",
       "TRU",
       "BR",
-      "DF",
+      "Distrito Federal",
       "Brasilia",
       @juridical_nature,
       @govPower,
@@ -1,51 +0,0 @@
-require File.dirname(__FILE__) + '/../../../../test/unit/api/test_helper'
-require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
-
-class GovUserApiTest < ActiveSupport::TestCase
-
-  include PluginTestHelper
-
-  def setup
-    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")
-    @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 'list all institutions' do
-    @institution1 = create_public_institution(
-                      "Instituicao bacana",
-                      "IB",
-                      "BR",
-                      "DF",
-                      "Gama",
-                      @juridical_nature,
-                      @gov_power,
-                      @gov_sphere,
-                      "11.222.333/4444-56"
-                    )
-
-    get "/api/v1/gov_user/institutions?#{params.to_query}"
-    json = JSON.parse(last_response.body)
-    assert_equivalent [@institution.id, @institution1.id], json['institutions'].map {|c| c['id']}
-  end
-
-  should 'get institution by id' do
-    get "/api/v1/gov_user/institutions/#{@institution.id}?#{params.to_query}"
-    json = JSON.parse(last_response.body)
-    assert_equal @institution.id, json["institution"]["id"]
-  end
-
-end
@@ -0,0 +1,51 @@
+require File.dirname(__FILE__) + '/../../../../test/unit/api/test_helper'
+require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
+
+class GovUserPlugin::ApiTest < ActiveSupport::TestCase
+
+  include PluginTestHelper
+
+  def setup
+    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")
+    @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
+
+  should 'list all institutions' do
+    @institution1 = create_public_institution(
+                      "Instituicao bacana",
+                      "IB",
+                      "BR",
+                      "Distrito Federal",
+                      "Gama",
+                      @juridical_nature,
+                      @gov_power,
+                      @gov_sphere,
+                      "11.222.333/4444-56"
+                    )
+
+    get "/api/v1/gov_user/institutions?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equivalent [@institution.id, @institution1.id], json['institutions'].map {|c| c['id']}
+  end
+
+  should 'get institution by id' do
+    get "/api/v1/gov_user/institutions/#{@institution.id}?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal @institution.id, json["institution"]["id"]
+  end
+
+end
@@ -8,7 +8,7 @@ class PrivateInstitutionTest &lt; ActiveSupport::TestCase
                       "Simple Private Institution",
                       "SPI",
                       "BR",
-                      "DF",
+                      "Distrito Federal",
                       "Gama",
                       "00.000.000/0001-00"
                     )
@@ -12,7 +12,7 @@ class PublicInstitutionTest &lt; ActiveSupport::TestCase
                     "Ministerio Publico da Uniao",
                     "MPU",
                     "BR",
-                    "DF",
+                    "Distrito Federal",
                     "Gama",
                     @juridical_nature,
                     @gov_power,
@@ -80,7 +80,7 @@
           <span class="required-field">(*)</span>
         </label>
-        <%= select("community", "country", [[_('Select a country'), nil]] + country_helper.countries, {:class => "type-select #{flash[:error_community_country]}"}) %>
+        <%= select("community", "country", [[_('Select a country'), -1]] + country_helper.countries, {:class => "type-select #{flash[:error_community_country]}"}) %>
       </div>
       <div class="spb-col spb-col-2">
@@ -89,7 +89,7 @@
           <span class="required-field">(*)</span>
         </label>
-        <%= f.select(:state, @state_options, {:selected => params[:community][:state]}, {:class => flash[:error_community_state]}) %>
+        <%= select("community", "state", [[_('Select a state'), '']] + @state_options,  {:class => "type-select #{flash[:error_community_state]}"}) %>
       </div>
       <div class="spb-col spb-col-5">
@@ -44,14 +44,11 @@
       <%= labelled_form_field(_('Fantasy name'), inst.text_field(:corporate_name, :value => @institution.corporate_name)) %>
-      <%= required select_country(_('Country'), 'community', 'country', {:class => 'type-select', :id => "community_country"}, :selected => @institution.community.country) %>
+      <%= required labelled_form_field(_('Country'), select("community", "country", [[_('Select a country'), -1]] + country_helper.countries,
+                                                            {:selected => @institution.community.country, :class => "type-select #{flash[:error_community_country]}"})) %>
-      <span class='required-field'>
-        <div class="formfield">
-          <label for="community_state" class="formlabel"><%= _("State") %></label>
-          <%= f.select(:state, @state_list.collect {|state| [state.name, state.name]}, :selected => @institution.community.state) %>
-        </div>
-      </span>
+      <%= required labelled_form_field(_('State'), select("community", "state", [[_('Select a state'), '']] + @state_list.collect {|state| [state.name, state.name]},
+                                                          {:selected => @institution.community.state, :class => "type-select #{flash[:error_community_state]}"})) %>
       <%= required f.text_field(:city, :value => @institution.community.city) %>
@@ -41,29 +41,6 @@ Given /^I type in &quot;([^&quot;]*)&quot; in autocomplete list &quot;([^&quot;]*)&quot; and I choose &quot;([^&quot;]*)
   sleep 1
 end
-Given /^Institutions has initial default values on database$/ do
-  GovernmentalPower.create(:name => "Executivo")
-  GovernmentalPower.create(:name => "Legislativo")
-  GovernmentalPower.create(:name => "Judiciario")
-
-  GovernmentalSphere.create(:name => "Federal")
-
-  JuridicalNature.create(:name => "Autarquia")
-  JuridicalNature.create(:name => "Administracao Direta")
-  JuridicalNature.create(:name => "Empresa Publica")
-  JuridicalNature.create(:name => "Fundacao")
-  JuridicalNature.create(:name => "Orgao Autonomo")
-  JuridicalNature.create(:name => "Sociedade")
-  JuridicalNature.create(:name => "Sociedade Civil")
-  JuridicalNature.create(:name => "Sociedade de Economia Mista")
-
-  national_region = NationalRegion.new
-  national_region.name = "Distrito Federal"
-  national_region.national_region_code = '35'
-  national_region.national_region_type_id = NationalRegionType::STATE
-  national_region.save
-end
-
 Given /^the following organization ratings$/ do |table|
   table.hashes.each do |item|
     person = User.where(login: item[:user_login]).first.person
@@ -0,0 +1,18 @@		@@ -0,0 +1,18 @@
	1	+class FixCommunitiesWithWrongState < ActiveRecord::Migration
	2	+ def up
	3	+ select_all("SELECT id, data FROM profiles WHERE type = 'Community'").each do \|community\|
	4	+ settings = YAML.load(community['data'] \|\| {}.to_yaml)
	5	+ new_state = Institution::VALID_STATES[settings[:state].upcase] if settings[:state].present?
	6	+
	7	+ if new_state.present?
	8	+ settings[:state] = new_state
	9	+ assignments = ActiveRecord::Base.send(:sanitize_sql_for_assignment, {:data => settings.to_yaml})
	10	+ update("UPDATE profiles SET %s WHERE id = %d" % [assignments, community['id']])
	11	+ end
	12	+ end
	13	+ end
	14	+
	15	+ def down
	16	+ say "This migration can't be reverted."
	17	+ end
	18	+end
	@@ -33,3 +33,16 @@ Feature: Institution Field		@@ -33,3 +33,16 @@ Feature: Institution Field
33	Then I should see "Governmental Sphere"	33	Then I should see "Governmental Sphere"
34	And I should see "Governmental Power"	34	And I should see "Governmental Power"
35	And I should see "Juridical Nature"	35	And I should see "Juridical Nature"
		36	+
		37	+ @selenium
		38	+ Scenario: Clean state and city values when country is diferent of Brazil
		39	+ Given I follow "Edit Profile"
		40	+ When I follow "Create new institution"
		41	+ And I select "Brazil" from "community_country"
		42	+ And I select "Distrito Federal" from "community_state"
		43	+ And I fill in "community_city" with "Gama"
		44	+ And I select "United States" from "community_country"
		45	+ Then I should not see "community_state"
		46	+ And I should not see "community_city"
		47	+ And I select "Brazil" from "community_country"
		48	+ Then I should not see "Gama"
	@@ -1,93 +0,0 @@	@@ -1,93 +0,0 @@
1	-Given /^Institutions has initial default values on database$/ do
2	- GovernmentalPower.create(:name => "Executivo")
3	- GovernmentalPower.create(:name => "Legislativo")
4	- GovernmentalPower.create(:name => "Judiciario")
5	-
6	- GovernmentalSphere.create(:name => "Federal")
7	-
8	- JuridicalNature.create(:name => "Autarquia")
9	- JuridicalNature.create(:name => "Administracao Direta")
10	- JuridicalNature.create(:name => "Empresa Publica")
11	- JuridicalNature.create(:name => "Fundacao")
12	- JuridicalNature.create(:name => "Orgao Autonomo")
13	- JuridicalNature.create(:name => "Sociedade")
14	- JuridicalNature.create(:name => "Sociedade Civil")
15	- JuridicalNature.create(:name => "Sociedade de Economia Mista")
16	-
17	- national_region = NationalRegion.new
18	- national_region.name = "Distrito Federal"
19	- national_region.national_region_code = '35'
20	- national_region.national_region_type_id = NationalRegionType::STATE
21	- national_region.save
22	-end
23	-
24	-Given /^I type in "([^"])" in autocomplete list "([^"])" and I choose "([^"]*)"$/ do \|typed, input_field_selector, should_select\|
25	-# Wait the page javascript load
26	-sleep 1
27	-# Basicaly it, search for the input field, type something, wait for ajax end select an item
28	-page.driver.browser.execute_script %Q{
29	- var search_query = "#{input_field_selector}.ui-autocomplete-input";
30	- var input = jQuery(search_query).first();
31	-
32	- input.trigger('click');
33	- input.val('#{typed}');
34	- input.trigger('keydown');
35	-
36	- window.setTimeout(function(){
37	- search_query = ".ui-menu-item a:contains('#{should_select}')";
38	- var typed = jQuery(search_query).first();
39	-
40	- typed.trigger('mouseenter').trigger('click');
41	- console.log(jQuery('#license_info_id'));
42	- }, 1000);
43	- }
44	- sleep 1
45	-end
46	-
47	-Given /^the following public institutions?$/ do \|table\|
48	- # table is a Cucumber::Ast::Table
49	- table.hashes.each do \|item\|
50	- community = Community.new
51	- community.name = item[:name]
52	- community.country = item[:country]
53	- community.state = item[:state]
54	- community.city = item[:city]
55	- community.save!
56	-
57	- governmental_power = GovernmentalPower.where(:name => item[:governmental_power]).first
58	- governmental_sphere = GovernmentalSphere.where(:name => item[:governmental_sphere]).first
59	-
60	- juridical_nature = JuridicalNature.create(:name => item[:juridical_nature])
61	-
62	- institution = PublicInstitution.new(:name => item[:name], :type => "PublicInstitution", :acronym => item[:acronym], :cnpj => item[:cnpj], :juridical_nature => juridical_nature, :governmental_power => governmental_power, :governmental_sphere => governmental_sphere)
63	- institution.community = community
64	- institution.corporate_name = item[:corporate_name]
65	- institution.save!
66	- end
67	-end
68	-
69	-Given /^I sleep for (\d+) seconds$/ do \|time\|
70	- sleep time.to_i
71	-end
72	-
73	-Given /^I am logged in as mpog_admin$/ do
74	- visit('/account/logout')
75	-
76	- user = User.new(:login => 'admin_user', :password => '123456', :password_confirmation => '123456', :email => 'admin_user@example.com')
77	- person = Person.new :name=>"Mpog Admin", :identifier=>"mpog-admin"
78	- user.person = person
79	- user.save!
80	-
81	- user.activate
82	- e = Environment.default
83	- e.add_admin(user.person)
84	-
85	- visit('/account/login')
86	- fill_in("Username", :with => user.login)
87	- fill_in("Password", :with => '123456')
88	- click_button("Log in")
89	-end
90	-
91	-Given /^I click on anything with selector "([^"]*)"$/ do \|selector\|
92	- evaluate_script "jQuery('#{selector}').trigger('click') && true"
93	-end
	@@ -25,7 +25,7 @@ class GovUserPluginMyprofileControllerTest < ActionController::TestCase		@@ -25,7 +25,7 @@ class GovUserPluginMyprofileControllerTest < ActionController::TestCase
25	"Ministerio Publico da Uniao",	25	"Ministerio Publico da Uniao",
26	"MPU",	26	"MPU",
27	"BR",	27	"BR",
28	- "DF",	28	+ "Distrito Federal",
29	"Gama",	29	"Gama",
30	juridical_nature,	30	juridical_nature,
31	gov_power,	31	gov_power,
	@@ -46,7 +46,7 @@ class GovUserPluginMyprofileControllerTest < ActionController::TestCase		@@ -46,7 +46,7 @@ class GovUserPluginMyprofileControllerTest < ActionController::TestCase
46	fields = InstitutionTestHelper.generate_form_fields(	46	fields = InstitutionTestHelper.generate_form_fields(
47	"institution new name",	47	"institution new name",
48	"BR",	48	"BR",
49	- "DF",	49	+ "Distrito Federal",
50	"Gama",	50	"Gama",
51	"12.345.678/9012-45",	51	"12.345.678/9012-45",
52	"PrivateInstitution"	52	"PrivateInstitution"
	@@ -68,7 +68,7 @@ class GovUserPluginMyprofileControllerTest < ActionController::TestCase		@@ -68,7 +68,7 @@ class GovUserPluginMyprofileControllerTest < ActionController::TestCase
68	fields = InstitutionTestHelper.generate_form_fields(	68	fields = InstitutionTestHelper.generate_form_fields(
69	"institution new name",	69	"institution new name",
70	"BR",	70	"BR",
71	- "DF",	71	+ "Distrito Federal",
72	"Gama",	72	"Gama",
73	"12.345.678/9012-45",	73	"12.345.678/9012-45",
74	"PrivateInstitution"	74	"PrivateInstitution"
	@@ -91,7 +91,7 @@ class GovUserPluginMyprofileControllerTest < ActionController::TestCase		@@ -91,7 +91,7 @@ class GovUserPluginMyprofileControllerTest < ActionController::TestCase
91	fields = InstitutionTestHelper.generate_form_fields(	91	fields = InstitutionTestHelper.generate_form_fields(
92	"",	92	"",
93	"BR",	93	"BR",
94	- "DF",	94	+ "Distrito Federal",
95	"Gama",	95	"Gama",
96	"6465465465",	96	"6465465465",
97	"PrivateInstitution"	97	"PrivateInstitution"
	@@ -38,7 +38,7 @@ class ProfileEditorControllerTest < ActionController::TestCase		@@ -38,7 +38,7 @@ class ProfileEditorControllerTest < ActionController::TestCase
38	"Ministerio Publico da Uniao",	38	"Ministerio Publico da Uniao",
39	"MPU",	39	"MPU",
40	"BR",	40	"BR",
41	- "DF",	41	+ "Distrito Federal",
42	"Gama",	42	"Gama",
43	@juridical_nature,	43	@juridical_nature,
44	@govPower,	44	@govPower,
	@@ -50,7 +50,7 @@ class ProfileEditorControllerTest < ActionController::TestCase		@@ -50,7 +50,7 @@ class ProfileEditorControllerTest < ActionController::TestCase
50	"Tribunal Regional da Uniao",	50	"Tribunal Regional da Uniao",
51	"TRU",	51	"TRU",
52	"BR",	52	"BR",
53	- "DF",	53	+ "Distrito Federal",
54	"Brasilia",	54	"Brasilia",
55	@juridical_nature,	55	@juridical_nature,
56	@govPower,	56	@govPower,
	@@ -1,51 +0,0 @@	@@ -1,51 +0,0 @@
1	-require File.dirname(__FILE__) + '/../../../../test/unit/api/test_helper'
2	-require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
3	-
4	-class GovUserApiTest < ActiveSupport::TestCase
5	-
6	- include PluginTestHelper
7	-
8	- def setup
9	- login_api
10	- environment = Environment.default
11	- environment.enable_plugin(GovUserPlugin)
12	- @gov_power = GovernmentalPower.create(:name=>"Some Gov Power")
13	- @gov_sphere = GovernmentalSphere.create(:name=>"Some Gov Sphere")
14	- @juridical_nature = JuridicalNature.create(:name => "Autarquia")
15	- @institution = create_public_institution(
16	- "Ministerio Publico da Uniao",
17	- "MPU",
18	- "BR",
19	- "DF",
20	- "Gama",
21	- @juridical_nature,
22	- @gov_power,
23	- @gov_sphere,
24	- "11.222.333/4444-55")
25	- end
26	-
27	- should 'list all institutions' do
28	- @institution1 = create_public_institution(
29	- "Instituicao bacana",
30	- "IB",
31	- "BR",
32	- "DF",
33	- "Gama",
34	- @juridical_nature,
35	- @gov_power,
36	- @gov_sphere,
37	- "11.222.333/4444-56"
38	- )
39	-
40	- get "/api/v1/gov_user/institutions?#{params.to_query}"
41	- json = JSON.parse(last_response.body)
42	- assert_equivalent [@institution.id, @institution1.id], json['institutions'].map {\|c\| c['id']}
43	- end
44	-
45	- should 'get institution by id' do
46	- get "/api/v1/gov_user/institutions/#{@institution.id}?#{params.to_query}"
47	- json = JSON.parse(last_response.body)
48	- assert_equal @institution.id, json["institution"]["id"]
49	- end
50	-
51	-end
@@ -0,0 +1,51 @@		@@ -0,0 +1,51 @@
	1	+require File.dirname(__FILE__) + '/../../../../test/unit/api/test_helper'
	2	+require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
	3	+
	4	+class GovUserPlugin::ApiTest < ActiveSupport::TestCase
	5	+
	6	+ include PluginTestHelper
	7	+
	8	+ def setup
	9	+ login_api
	10	+ environment = Environment.default
	11	+ environment.enable_plugin(GovUserPlugin)
	12	+ @gov_power = GovernmentalPower.create(:name=>"Some Gov Power")
	13	+ @gov_sphere = GovernmentalSphere.create(:name=>"Some Gov Sphere")
	14	+ @juridical_nature = JuridicalNature.create(:name => "Autarquia")
	15	+ @institution = create_public_institution(
	16	+ "Ministerio Publico da Uniao",
	17	+ "MPU",
	18	+ "BR",
	19	+ "Distrito Federal",
	20	+ "Gama",
	21	+ @juridical_nature,
	22	+ @gov_power,
	23	+ @gov_sphere,
	24	+ "11.222.333/4444-55")
	25	+ end
	26	+
	27	+ should 'list all institutions' do
	28	+ @institution1 = create_public_institution(
	29	+ "Instituicao bacana",
	30	+ "IB",
	31	+ "BR",
	32	+ "Distrito Federal",
	33	+ "Gama",
	34	+ @juridical_nature,
	35	+ @gov_power,
	36	+ @gov_sphere,
	37	+ "11.222.333/4444-56"
	38	+ )
	39	+
	40	+ get "/api/v1/gov_user/institutions?#{params.to_query}"
	41	+ json = JSON.parse(last_response.body)
	42	+ assert_equivalent [@institution.id, @institution1.id], json['institutions'].map {\|c\| c['id']}
	43	+ end
	44	+
	45	+ should 'get institution by id' do
	46	+ get "/api/v1/gov_user/institutions/#{@institution.id}?#{params.to_query}"
	47	+ json = JSON.parse(last_response.body)
	48	+ assert_equal @institution.id, json["institution"]["id"]
	49	+ end
	50	+
	51	+end
	@@ -8,7 +8,7 @@ class PrivateInstitutionTest < ActiveSupport::TestCase		@@ -8,7 +8,7 @@ class PrivateInstitutionTest < ActiveSupport::TestCase
8	"Simple Private Institution",	8	"Simple Private Institution",
9	"SPI",	9	"SPI",
10	"BR",	10	"BR",
11	- "DF",	11	+ "Distrito Federal",
12	"Gama",	12	"Gama",
13	"00.000.000/0001-00"	13	"00.000.000/0001-00"
14	)	14	)
	@@ -12,7 +12,7 @@ class PublicInstitutionTest < ActiveSupport::TestCase		@@ -12,7 +12,7 @@ class PublicInstitutionTest < ActiveSupport::TestCase
12	"Ministerio Publico da Uniao",	12	"Ministerio Publico da Uniao",
13	"MPU",	13	"MPU",
14	"BR",	14	"BR",
15	- "DF",	15	+ "Distrito Federal",
16	"Gama",	16	"Gama",
17	@juridical_nature,	17	@juridical_nature,
18	@gov_power,	18	@gov_power,
	@@ -80,7 +80,7 @@		@@ -80,7 +80,7 @@
80	<span class="required-field">(*)</span>	80	<span class="required-field">(*)</span>
81	</label>	81	</label>
82		82
83	- <%= select("community", "country", [[_('Select a country'), nil]] + country_helper.countries, {:class => "type-select #{flash[:error_community_country]}"}) %>	83	+ <%= select("community", "country", [[_('Select a country'), -1]] + country_helper.countries, {:class => "type-select #{flash[:error_community_country]}"}) %>
84	</div>	84	</div>
85		85
86	<div class="spb-col spb-col-2">	86	<div class="spb-col spb-col-2">
	@@ -89,7 +89,7 @@		@@ -89,7 +89,7 @@
89	<span class="required-field">(*)</span>	89	<span class="required-field">(*)</span>
90	</label>	90	</label>
91		91
92	- <%= f.select(:state, @state_options, {:selected => params[:community][:state]}, {:class => flash[:error_community_state]}) %>	92	+ <%= select("community", "state", [[_('Select a state'), '']] + @state_options, {:class => "type-select #{flash[:error_community_state]}"}) %>
93	</div>	93	</div>
94		94
95	<div class="spb-col spb-col-5">	95	<div class="spb-col spb-col-5">