Merge branch 'fix_validations_and_tests' into 'master'

Fix institution validation and tests Correções na validação de instituição e nos testes do gov_user - Correção da validação na criação de Instituições Públicas sem Esfera e Poder Governamental e Natureza Jurídica para outros países (Gov User) - Adição do botão "Add Institution" - Correção dos testes Cucumber e Selenium do gov_user See merge request !120

Merge branch 'fix_validations_and_tests' into 'master'
Fix institution validation and tests Correções na validação de instituição e nos testes do gov_user - Correção da validação na criação de Instituições Públicas sem Esfera e Poder Governamental e Natureza Jurídica para outros países (Gov User) - Adição do botão "Add Institution" - Correção dos testes Cucumber e Selenium do gov_user See merge request !120
Daniela Feitosa
2 parents 315a6dfd 76e5cf98
Showing 14 changed files with 81 additions and 71 deletions Show diff stats
src/noosfero-spb/gov_user/controllers/gov_user_plugin_controller.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/rating_institution_registration.feature
src/noosfero-spb/gov_user/features/user_profile_edition.feature
src/noosfero-spb/gov_user/lib/private_institution.rb
src/noosfero-spb/gov_user/lib/public_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/unit/gov_user_person_test.rb
src/noosfero-spb/gov_user/test/unit/organization_rating_test.rb
src/noosfero-spb/gov_user/views/person_editor_extras.html.erb
src/noosfero-spb/software_communities/features/step_definitions/software_communities_steps.rb
src/noosfero-spb/software_communities/test/unit/software_info_test.rb
@@ -65,7 +65,9 @@ class GovUserPluginController &lt; ApplicationController
   def get_institutions
     redirect_to "/" if !request.xhr? || params[:query].blank?
+    selected_institutions = Institution.where(id: params[:selected_institutions]).select([:id, :name])
     institutions = Institution.search_institution(params[:query]).select([:id, :name])
+    institutions -= selected_institutions
     institutions_list = institutions.map { |institution|
       {:value=>institution.name, :id=>institution.id}
     }
@@ -5,9 +5,12 @@ Feature: Institution Field
   Background:
     Given "GovUserPlugin" plugin is enabled
+    And "SoftwareCommunitiesPlugin" plugin is enabled
     And I am logged in as mpog_admin
+    And I go to /admin/environment_themes/set/noosfero-spb-theme
     And I go to /admin/plugins
     And I check "GovUserPlugin"
+    And I check "SoftwareCommunitiesPlugin"
     And I press "Save changes"
     And Institutions has initial default values on database
     And I am logged in as mpog_admin
@@ -27,6 +30,6 @@ Feature: Institution Field
     And I should see "CNPJ"
     And I should see "Acronym"
     And I choose "Public Institution"
-    Then I should see "Governmental Sphere:"
-    And I should see "Governmental Power:"
-    And I should see "Juridical Nature:"
+    Then I should see "Governmental Sphere"
+    And I should see "Governmental Power"
+    And I should see "Juridical Nature"
@@ -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 instiution 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
@@ -8,6 +8,7 @@ Feature: Create institution on user report
     And "SoftwareCommunitiesPlugin" plugin is enabled
     And "OrganizationRatings" plugin is enabled
     And I am logged in as mpog_admin
+    And I go to /admin/environment_themes/set/noosfero-spb-theme
     And I go to /admin/plugins
     And I check "GovUserPlugin"
     And I check "SoftwareCommunitiesPlugin"
@@ -23,20 +24,20 @@ Feature: Create institution on user report
     And I should not see "Number of Beneficiaries"
     And I should not see "Saved resources"
     And I should not see "Organization name or Enterprise name"
-    When I click on anything with selector "#comments-additional-information"
-    Then I should see "Number of Beneficiaries"
-    And I should see "Organization name or Enterprise name"
-    And I should see "Saved resources"
+    When I click on anything with selector "comments-additional-information"
+    Then I should see "Número de beneficiados"
+    And I should see "Nome do órgão ou empresa"
+    And I should see "Recursos economizados"
   @selenium
   Scenario: Show new institution fields when clicked in add new institution
     Given I go to /profile/noosfero/plugin/organization_ratings/new_rating
-    And I click on anything with selector "#comments-additional-information"
+    And I sleep for 1 seconds
+    And I click on anything with selector "comments-additional-information"
     And I fill in "input_institution" with "None institution"
     And I sleep for 2 seconds
     When I follow "Add"
-    Then I should see "New Institution"
-    And I should see "Public Institution"
+    Then I should see "Public Institution"
     And I should see "Private Institution"
     And I should see "Corporate Name"
     And I should see "Name"
@@ -46,33 +47,30 @@ Feature: Create institution on user report
     And I should see "CNPJ"
     And I should see "Acronym"
     And I choose "Public Institution"
-    And I should see "Governmental Sphere:"
-    And I should see "Governmental Power:"
-    And I should see "Juridical Nature:"
+    And I should see "Governmental Sphere"
+    And I should see "Governmental Power"
+    And I should see "Juridical Nature"
   @selenium
   Scenario: Create new institution with name changed in the modal
     Given I go to /profile/noosfero/plugin/organization_ratings/new_rating
-    And I click on anything with selector "#comments-additional-information"
+    And I sleep for 1 seconds
+    And I click on anything with selector "comments-additional-information"
     And I fill in "input_institution" with "None institution"
     And I sleep for 2 seconds
-    When I click on anything with selector "#create_institution_link"
+    When I click on anything with selector "create_institution_link"
     And I fill in "community_name" with "Noosfero Institution"
-    And I select "United States" from "#community_country"
-    And I follow "#save_institution_button"
+    And I select "United States" from "Country"
+    And I sleep for 1 seconds
+    And I follow "Save"
     Then I should see "Noosfero Institution"
   @selenium
   Scenario: Check new institution name in the modal
     Given I go to /profile/noosfero/plugin/organization_ratings/new_rating
-    And I click on anything with selector "#comments-additional-information"
+    And I sleep for 1 seconds
+    And I click on anything with selector "comments-additional-information"
     And I fill in "input_institution" with "None institution"
     And I sleep for 2 seconds
-    When I click on anything with selector "#create_institution_link"
-    Then I should see "None Institution" within "community_name"
-
-
-
-
-
-
+    When I click on anything with selector "create_institution_link"
+    Then I should see "None institution" in "Corporate Name" field
@@ -5,12 +5,15 @@ Feature: Institution Field
   Background:
     Given "GovUserPlugin" plugin is enabled
+    And "SoftwareCommunitiesPlugin" plugin is enabled
     And the following users
       | login | name        |
       | joao  | Joao Silva  |
     And I am logged in as admin
+    And I go to /admin/environment_themes/set/noosfero-spb-theme
     And I go to /admin/plugins
     And I check "GovUserPlugin"
+    And I check "SoftwareCommunitiesPlugin"
     And I press "Save changes"
     And feature "skip_new_user_email_confirmation" is enabled on environment
     And I go to /admin/features/manage_fields
@@ -25,12 +28,12 @@ Feature: Institution Field
       | 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 |
+	@selenium
   Scenario: Go to control panel when clicked on 'Complete your profile' link
     Given I am logged in as "joao"
     And I am on joao's control panel
     When I follow "Complete your profile"
     Then I should see "Profile settings for "
-    And I should see "Personal information"
   @selenium
   Scenario: Verify text information to use governmental e-mail
@@ -44,13 +47,12 @@ Feature: Institution Field
     Given I am logged in as "joao"
     And I am on joao's control panel
     When I follow "Edit Profile"
-    And I follow "Add new institution"
     And I type in "Minis" in autocomplete list "#input_institution" and I choose "Ministerio do Planejamento"
-    And I follow "Add new institution"
+    And I follow "Add institution"
     And I type in "Gover" in autocomplete list "#input_institution" and I choose "Governo do DF"
-    And I follow "Add new institution"
-    Then I should see "Ministerio do Planejamento" within ".institutions_added"
-    And I should see "Governo do DF" within ".institutions_added"
+    And I follow "Add institution"
+    Then I should see "Ministerio do Planejamento"
+    And I should see "Governo do DF"
   @selenium
   Scenario: Verify if field 'city' is shown when Brazil is selected
@@ -75,3 +77,14 @@ Feature: Institution Field
     And I fill in "input_institution" with "Some Nonexistent Institution"
     And I sleep for 1 seconds
     Then I should see "No institution found"
+
+  @selenium
+  Scenario: Does not suggest institution that already exists
+    Given I am logged in as "joao"
+    And I am on joao's control panel
+    When I follow "Edit Profile"
+    And I type in "Minis" in autocomplete list "#input_institution" and I choose "Ministerio do Planejamento"
+    And I follow "Add institution"
+    And I fill in "input_institution" with "Minis"
+    And I sleep for 1 seconds
+    Then I should not see "Ministerio do Planejamento" within "ul.ui-autocomplete"
 class PrivateInstitution < Institution
   validates :cnpj,
-            :presence=>true,
             :format => {with: CNPJ_FORMAT},
             :if => :is_a_brazilian_institution?
   validates :cnpj,
-            :uniqueness=>true, :unless => 'cnpj.blank?'
+            :uniqueness => true, :unless => 'cnpj.blank?'
   private
     def is_a_brazilian_institution?
 class PublicInstitution < Institution
   validates :governmental_power, :governmental_sphere, :juridical_nature,
-            :presence=>true
+            :presence=>true, :unless=>lambda{self.community.country != "BR"}
   validates :cnpj,
             :format => {with: CNPJ_FORMAT},
@@ -202,12 +202,13 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
         $.ajax({
           type: "GET",
           url: AJAX_URL.get_institutions,
-          data: {query: request.term},
+          data: {query: request.term, selected_institutions: get_selected_institutions()},
           success: function(result){
             response(result);
             if( result.length === 0 ) {
               $('#institution_empty_ajax_message').switchClass("hide-field", "show-field");
+              $('#add_institution_link').hide();
               toggle_extra_fields_style_status(true);
               $("#institution_modal").css({display: "none"});
             }
@@ -222,12 +223,22 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
       select : function (event, selected) {
         $('#institution_empty_ajax_message').switchClass("show-field", "hide-field");
-        //$("#create_institution_link").remove();
+        $('#add_institution_link').show();
         toggle_extra_fields_style_status(false);
         $("#institution_selected").val(selected.item.id).attr("data-name", selected.item.label);
       }
     });
   }
+
+  function get_selected_institutions() {
+    var selected_institutions = []
+    $('.institutions_added').find('li').each(function() {
+      selected_institutions.push($(this).attr('data-institution'));
+    });
+
+    return selected_institutions;
+  }
+
   function add_selected_institution_to_list(id, name) {
     var selected_institution = "<li data-institution='"+id+"'>"+name;
         selected_institution += "<a href='#' class='button without-text icon-remove remove-institution'></a></li>";
@@ -246,6 +257,7 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
       // Visualy add the selected institution to the list
       add_selected_institution_to_list(selected.val(), selected.attr("data-name"));
+      $(this).hide();
       // clean the institution flag
       selected.val("").attr("data-name", "");
@@ -311,7 +323,6 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
     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();
@@ -323,6 +334,10 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
       $('#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());
@@ -379,7 +394,7 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
     $("#community_name").keyup(institution_already_exists);
-    $("#add_new_institution").click(add_new_institution);
+    $("#add_institution_link").click(add_new_institution);
     $(".remove-institution").click(remove_institution);
@@ -105,9 +105,9 @@ class GovUserPluginControllerTest &lt; ActionController::TestCase
     fields = InstitutionTestHelper.generate_form_fields(
       "Some Private Institution",
-      "BR",
-      "DF",
-      "Brasilia",
+      "EN",
+      "NY",
+      "New York",
       "",
       "PrivateInstitution"
     )
@@ -14,7 +14,6 @@ class SoftwareCommunitiesPluginPersonTest &lt; ActiveSupport::TestCase
                 "My Name",
                 "user@email.com",
                 "123456",
-                "123456",
                 "user2@email.com",
                 "Any State",
                 "Some City"
@@ -16,15 +16,14 @@ class OrganizationRatingTest &lt; ActiveSupport::TestCase
     private_institution = build_private_institution "huehue", "hue", "11.222.333/4444-55"
     community_rating = OrganizationRating.new(:person => person, :value => 3, :organization => community, :institution => private_institution)
-    assert_equal false, community_rating.valid?
-    assert_equal true, community_rating.errors[:institution].include?("not found")
+    assert_equal false, community_rating.valid?
     private_institution.save
     community_rating.institution = private_institution
     assert_equal true, community_rating.valid?
-    assert_equal false, community_rating.errors[:institution].include?("not found")
+    assert_equal false, community_rating.errors[:institution].include?("institution not found")
   end
   private
@@ -3,6 +3,7 @@
   <div class="institution_container">
     <%= text_field_tag(:institution, "", :id=>"input_institution") %>
+    <%= link_to(_("Add institution"), "#", :class=>'button with-text icon-add', :id => 'add_institution_link') %>
     <% context.profile.user.institutions.each do |institution| %>
     <%= hidden_field_tag("user[institution_ids][]", institution.id, :class => 'user_institutions') %>
@@ -18,29 +18,6 @@ Given /^SoftwareInfo has initial default values on database$/ do
   OperatingSystemName.create(:name=>"CentOS")
 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 /^I type in "([^"]*)" in autocomplete list "([^"]*)" and I choose "([^"]*)"$/ do |typed, input_field_selector, should_select|
   # Wait the page javascript load
   sleep 1
@@ -297,6 +274,10 @@ Then /^there should be (\d+) divs? with class &quot;([^&quot;]*)&quot;$/ do |count, klass|
   should have_selector("div.#{klass}", :count => count)
 end
+Then /^I should see "([^"]*)" in "([^"]*)" field$/ do |content, field|
+  should have_field(field, :with => content)
+end
+
 Given /^I should see "([^"]*)" in the page/ do |message|
   assert_match message, page.body
 end
@@ -52,7 +52,7 @@ class SoftwareInfoValidationTest &lt; ActiveSupport::TestCase
     assert_equal 1, SoftwareInfo.search_by_query("", Environment.default).count
     assert_equal software_info, SoftwareInfo.search_by_query("", Environment.default).first
     assert_equal 1, SoftwareInfo.search_by_query("", other_env).count
-    assert_equal true, SoftwareInfo.search_by_query("", other_env).include?(another_software_info)
+    assert_equal true, SoftwareInfo.search_by_query("", other_env).all.include?(another_software_info)
   end
   should "start another license with default values" do
	@@ -38,7 +38,7 @@ Feature: rate_community		@@ -38,7 +38,7 @@ Feature: rate_community
38	And I go to mycommunity's control panel	38	And I go to mycommunity's control panel
39	And I follow "Process requests" within ".pending-tasks"	39	And I follow "Process requests" within ".pending-tasks"
40	And I choose "Accept" within ".task_decisions"	40	And I choose "Accept" within ".task_decisions"
41	- Then I should see "This instiution already has an accepted rating" in the page	41	+ Then I should see "This institution already has an accepted rating." in the page
42		42
43	Scenario: do not display message on task when a rating with the same institution does not exist on the same software	43	Scenario: do not display message on task when a rating with the same institution does not exist on the same software
44	Given the following organization ratings	44	Given the following organization ratings
1	class PublicInstitution < Institution	1	class PublicInstitution < Institution
2	validates :governmental_power, :governmental_sphere, :juridical_nature,	2	validates :governmental_power, :governmental_sphere, :juridical_nature,
3	- :presence=>true	3	+ :presence=>true, :unless=>lambda{self.community.country != "BR"}
4		4
5	validates :cnpj,	5	validates :cnpj,
6	:format => {with: CNPJ_FORMAT},	6	:format => {with: CNPJ_FORMAT},
	@@ -3,6 +3,7 @@		@@ -3,6 +3,7 @@
3		3
4	<div class="institution_container">	4	<div class="institution_container">
5	<%= text_field_tag(:institution, "", :id=>"input_institution") %>	5	<%= text_field_tag(:institution, "", :id=>"input_institution") %>
		6	+ <%= link_to(_("Add institution"), "#", :class=>'button with-text icon-add', :id => 'add_institution_link') %>
6		7
7	<% context.profile.user.institutions.each do \|institution\| %>	8	<% context.profile.user.institutions.each do \|institution\| %>
8	<%= hidden_field_tag("user[institution_ids][]", institution.id, :class => 'user_institutions') %>	9	<%= hidden_field_tag("user[institution_ids][]", institution.id, :class => 'user_institutions') %>
	@@ -18,29 +18,6 @@ Given /^SoftwareInfo has initial default values on database$/ do		@@ -18,29 +18,6 @@ Given /^SoftwareInfo has initial default values on database$/ do
18	OperatingSystemName.create(:name=>"CentOS")	18	OperatingSystemName.create(:name=>"CentOS")
19	end	19	end
20		20
21	-Given /^Institutions has initial default values on database$/ do
22	- GovernmentalPower.create(:name => "Executivo")
23	- GovernmentalPower.create(:name => "Legislativo")
24	- GovernmentalPower.create(:name => "Judiciario")
25	-
26	- GovernmentalSphere.create(:name => "Federal")
27	-
28	- JuridicalNature.create(:name => "Autarquia")
29	- JuridicalNature.create(:name => "Administracao Direta")
30	- JuridicalNature.create(:name => "Empresa Publica")
31	- JuridicalNature.create(:name => "Fundacao")
32	- JuridicalNature.create(:name => "Orgao Autonomo")
33	- JuridicalNature.create(:name => "Sociedade")
34	- JuridicalNature.create(:name => "Sociedade Civil")
35	- JuridicalNature.create(:name => "Sociedade de Economia Mista")
36	-
37	- national_region = NationalRegion.new
38	- national_region.name = "Distrito Federal"
39	- national_region.national_region_code = '35'
40	- national_region.national_region_type_id = NationalRegionType::STATE
41	- national_region.save
42	-end
43	-
44	Given /^I type in "([^"])" in autocomplete list "([^"])" and I choose "([^"]*)"$/ do \|typed, input_field_selector, should_select\|	21	Given /^I type in "([^"])" in autocomplete list "([^"])" and I choose "([^"]*)"$/ do \|typed, input_field_selector, should_select\|
45	# Wait the page javascript load	22	# Wait the page javascript load
46	sleep 1	23	sleep 1
	@@ -297,6 +274,10 @@ Then /^there should be (\d+) divs? with class "([^"]*)"$/ do \|count, klass\|		@@ -297,6 +274,10 @@ Then /^there should be (\d+) divs? with class "([^"]*)"$/ do \|count, klass\|
297	should have_selector("div.#{klass}", :count => count)	274	should have_selector("div.#{klass}", :count => count)
298	end	275	end
299		276
		277	+Then /^I should see "([^"])" in "([^"])" field$/ do \|content, field\|
		278	+ should have_field(field, :with => content)
		279	+end
		280	+
300	Given /^I should see "([^"]*)" in the page/ do \|message\|	281	Given /^I should see "([^"]*)" in the page/ do \|message\|
301	assert_match message, page.body	282	assert_match message, page.body
302	end	283	end
	@@ -52,7 +52,7 @@ class SoftwareInfoValidationTest < ActiveSupport::TestCase		@@ -52,7 +52,7 @@ class SoftwareInfoValidationTest < ActiveSupport::TestCase
52	assert_equal 1, SoftwareInfo.search_by_query("", Environment.default).count	52	assert_equal 1, SoftwareInfo.search_by_query("", Environment.default).count
53	assert_equal software_info, SoftwareInfo.search_by_query("", Environment.default).first	53	assert_equal software_info, SoftwareInfo.search_by_query("", Environment.default).first
54	assert_equal 1, SoftwareInfo.search_by_query("", other_env).count	54	assert_equal 1, SoftwareInfo.search_by_query("", other_env).count
55	- assert_equal true, SoftwareInfo.search_by_query("", other_env).include?(another_software_info)	55	+ assert_equal true, SoftwareInfo.search_by_query("", other_env).all.include?(another_software_info)
56	end	56	end
57		57
58	should "start another license with default values" do	58	should "start another license with default values" do