Fixes unit and integration tests

- Fix validations Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com> Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com> Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com> Signed-off-by: Omar Junior <omarroinuj@gmail.com> Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br> Signed-off-by: Thiago Ribeiro <thiagitosouza@gmail.com>

Fixes unit and integration tests
- Fix validations Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com> Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com> Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com> Signed-off-by: Omar Junior <omarroinuj@gmail.com> Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br> Signed-off-by: Thiago Ribeiro <thiagitosouza@gmail.com>
Tallys Martins
1 parent c550c104
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
...	...	@@ -65,7 +65,9 @@ class GovUserPluginController < ApplicationController
65	65	def get_institutions
66	66	redirect_to "/" if !request.xhr? \|\| params[:query].blank?
67	67
	68	+ selected_institutions = Institution.where(id: params[:selected_institutions]).select([:id, :name])
68	69	institutions = Institution.search_institution(params[:query]).select([:id, :name])
	70	+ institutions -= selected_institutions
69	71	institutions_list = institutions.map { \|institution\|
70	72	{:value=>institution.name, :id=>institution.id}
71	73	}
...	...
...	...	@@ -5,9 +5,12 @@ Feature: Institution Field
5	5
6	6	Background:
7	7	Given "GovUserPlugin" plugin is enabled
	8	+ And "SoftwareCommunitiesPlugin" plugin is enabled
8	9	And I am logged in as mpog_admin
	10	+ And I go to /admin/environment_themes/set/noosfero-spb-theme
9	11	And I go to /admin/plugins
10	12	And I check "GovUserPlugin"
	13	+ And I check "SoftwareCommunitiesPlugin"
11	14	And I press "Save changes"
12	15	And Institutions has initial default values on database
13	16	And I am logged in as mpog_admin
...	...	@@ -27,6 +30,6 @@ Feature: Institution Field
27	30	And I should see "CNPJ"
28	31	And I should see "Acronym"
29	32	And I choose "Public Institution"
30		- Then I should see "Governmental Sphere:"
31		- And I should see "Governmental Power:"
32		- And I should see "Juridical Nature:"
	33	+ Then I should see "Governmental Sphere"
	34	+ And I should see "Governmental Power"
	35	+ And I should see "Juridical Nature"
...	...
...	...	@@ -38,7 +38,7 @@ Feature: rate_community
38	38	And I go to mycommunity's control panel
39	39	And I follow "Process requests" within ".pending-tasks"
40	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	43	Scenario: do not display message on task when a rating with the same institution does not exist on the same software
44	44	Given the following organization ratings
...	...
...	...	@@ -8,6 +8,7 @@ Feature: Create institution on user report
8	8	And "SoftwareCommunitiesPlugin" plugin is enabled
9	9	And "OrganizationRatings" plugin is enabled
10	10	And I am logged in as mpog_admin
	11	+ And I go to /admin/environment_themes/set/noosfero-spb-theme
11	12	And I go to /admin/plugins
12	13	And I check "GovUserPlugin"
13	14	And I check "SoftwareCommunitiesPlugin"
...	...	@@ -23,20 +24,20 @@ Feature: Create institution on user report
23	24	And I should not see "Number of Beneficiaries"
24	25	And I should not see "Saved resources"
25	26	And I should not see "Organization name or Enterprise name"
26		- When I click on anything with selector "#comments-additional-information"
27		- Then I should see "Number of Beneficiaries"
28		- And I should see "Organization name or Enterprise name"
29		- And I should see "Saved resources"
	27	+ When I click on anything with selector "comments-additional-information"
	28	+ Then I should see "Número de beneficiados"
	29	+ And I should see "Nome do órgão ou empresa"
	30	+ And I should see "Recursos economizados"
30	31
31	32	@selenium
32	33	Scenario: Show new institution fields when clicked in add new institution
33	34	Given I go to /profile/noosfero/plugin/organization_ratings/new_rating
34		- And I click on anything with selector "#comments-additional-information"
	35	+ And I sleep for 1 seconds
	36	+ And I click on anything with selector "comments-additional-information"
35	37	And I fill in "input_institution" with "None institution"
36	38	And I sleep for 2 seconds
37	39	When I follow "Add"
38		- Then I should see "New Institution"
39		- And I should see "Public Institution"
	40	+ Then I should see "Public Institution"
40	41	And I should see "Private Institution"
41	42	And I should see "Corporate Name"
42	43	And I should see "Name"
...	...	@@ -46,33 +47,30 @@ Feature: Create institution on user report
46	47	And I should see "CNPJ"
47	48	And I should see "Acronym"
48	49	And I choose "Public Institution"
49		- And I should see "Governmental Sphere:"
50		- And I should see "Governmental Power:"
51		- And I should see "Juridical Nature:"
	50	+ And I should see "Governmental Sphere"
	51	+ And I should see "Governmental Power"
	52	+ And I should see "Juridical Nature"
52	53
53	54	@selenium
54	55	Scenario: Create new institution with name changed in the modal
55	56	Given I go to /profile/noosfero/plugin/organization_ratings/new_rating
56		- And I click on anything with selector "#comments-additional-information"
	57	+ And I sleep for 1 seconds
	58	+ And I click on anything with selector "comments-additional-information"
57	59	And I fill in "input_institution" with "None institution"
58	60	And I sleep for 2 seconds
59		- When I click on anything with selector "#create_institution_link"
	61	+ When I click on anything with selector "create_institution_link"
60	62	And I fill in "community_name" with "Noosfero Institution"
61		- And I select "United States" from "#community_country"
62		- And I follow "#save_institution_button"
	63	+ And I select "United States" from "Country"
	64	+ And I sleep for 1 seconds
	65	+ And I follow "Save"
63	66	Then I should see "Noosfero Institution"
64	67
65	68	@selenium
66	69	Scenario: Check new institution name in the modal
67	70	Given I go to /profile/noosfero/plugin/organization_ratings/new_rating
68		- And I click on anything with selector "#comments-additional-information"
	71	+ And I sleep for 1 seconds
	72	+ And I click on anything with selector "comments-additional-information"
69	73	And I fill in "input_institution" with "None institution"
70	74	And I sleep for 2 seconds
71		- When I click on anything with selector "#create_institution_link"
72		- Then I should see "None Institution" within "community_name"
73		-
74		-
75		-
76		-
77		-
78		-
	75	+ When I click on anything with selector "create_institution_link"
	76	+ Then I should see "None institution" in "Corporate Name" field
...	...
...	...	@@ -5,12 +5,15 @@ Feature: Institution Field
5	5
6	6	Background:
7	7	Given "GovUserPlugin" plugin is enabled
	8	+ And "SoftwareCommunitiesPlugin" plugin is enabled
8	9	And the following users
9	10	\| login \| name \|
10	11	\| joao \| Joao Silva \|
11	12	And I am logged in as admin
	13	+ And I go to /admin/environment_themes/set/noosfero-spb-theme
12	14	And I go to /admin/plugins
13	15	And I check "GovUserPlugin"
	16	+ And I check "SoftwareCommunitiesPlugin"
14	17	And I press "Save changes"
15	18	And feature "skip_new_user_email_confirmation" is enabled on environment
16	19	And I go to /admin/features/manage_fields
...	...	@@ -25,12 +28,12 @@ Feature: Institution Field
25	28	\| Governo do DF \| GDF \| BR \| DF \| Taguatinga \| 12.645.166/0001-44 \| Autarquia \| Legislativo \| Federal \| Governo do DF \|
26	29	\| Ministerio do Planejamento \| MP \| BR \| DF \| Brasilia \| 41.769.591/0001-43 \| Autarquia \| Judiciario \| Federal \| Ministerio do Planejamento \|
27	30
	31	+ @selenium
28	32	Scenario: Go to control panel when clicked on 'Complete your profile' link
29	33	Given I am logged in as "joao"
30	34	And I am on joao's control panel
31	35	When I follow "Complete your profile"
32	36	Then I should see "Profile settings for "
33		- And I should see "Personal information"
34	37
35	38	@selenium
36	39	Scenario: Verify text information to use governmental e-mail
...	...	@@ -44,13 +47,12 @@ Feature: Institution Field
44	47	Given I am logged in as "joao"
45	48	And I am on joao's control panel
46	49	When I follow "Edit Profile"
47		- And I follow "Add new institution"
48	50	And I type in "Minis" in autocomplete list "#input_institution" and I choose "Ministerio do Planejamento"
49		- And I follow "Add new institution"
	51	+ And I follow "Add institution"
50	52	And I type in "Gover" in autocomplete list "#input_institution" and I choose "Governo do DF"
51		- And I follow "Add new institution"
52		- Then I should see "Ministerio do Planejamento" within ".institutions_added"
53		- And I should see "Governo do DF" within ".institutions_added"
	53	+ And I follow "Add institution"
	54	+ Then I should see "Ministerio do Planejamento"
	55	+ And I should see "Governo do DF"
54	56
55	57	@selenium
56	58	Scenario: Verify if field 'city' is shown when Brazil is selected
...	...	@@ -75,3 +77,14 @@ Feature: Institution Field
75	77	And I fill in "input_institution" with "Some Nonexistent Institution"
76	78	And I sleep for 1 seconds
77	79	Then I should see "No institution found"
	80	+
	81	+ @selenium
	82	+ Scenario: Does not suggest institution that already exists
	83	+ Given I am logged in as "joao"
	84	+ And I am on joao's control panel
	85	+ When I follow "Edit Profile"
	86	+ And I type in "Minis" in autocomplete list "#input_institution" and I choose "Ministerio do Planejamento"
	87	+ And I follow "Add institution"
	88	+ And I fill in "input_institution" with "Minis"
	89	+ And I sleep for 1 seconds
	90	+ Then I should not see "Ministerio do Planejamento" within "ul.ui-autocomplete"
...	...
1	1	class PrivateInstitution < Institution
2	2	validates :cnpj,
3		- :presence=>true,
4	3	:format => {with: CNPJ_FORMAT},
5	4	:if => :is_a_brazilian_institution?
6	5
7	6	validates :cnpj,
8		- :uniqueness=>true, :unless => 'cnpj.blank?'
	7	+ :uniqueness => true, :unless => 'cnpj.blank?'
9	8
10	9	private
11	10	def is_a_brazilian_institution?
...	...
1	1	class PublicInstitution < Institution
2	2	validates :governmental_power, :governmental_sphere, :juridical_nature,
3		- :presence=>true
	3	+ :presence=>true, :unless=>lambda{self.community.country != "BR"}
4	4
5	5	validates :cnpj,
6	6	:format => {with: CNPJ_FORMAT},
...	...
...	...	@@ -202,12 +202,13 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']
202	202	$.ajax({
203	203	type: "GET",
204	204	url: AJAX_URL.get_institutions,
205		- data: {query: request.term},
	205	+ data: {query: request.term, selected_institutions: get_selected_institutions()},
206	206	success: function(result){
207	207	response(result);
208	208
209	209	if( result.length === 0 ) {
210	210	$('#institution_empty_ajax_message').switchClass("hide-field", "show-field");
	211	+ $('#add_institution_link').hide();
211	212	toggle_extra_fields_style_status(true);
212	213	$("#institution_modal").css({display: "none"});
213	214	}
...	...	@@ -222,12 +223,22 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']
222	223
223	224	select : function (event, selected) {
224	225	$('#institution_empty_ajax_message').switchClass("show-field", "hide-field");
225		- //$("#create_institution_link").remove();
	226	+ $('#add_institution_link').show();
226	227	toggle_extra_fields_style_status(false);
227	228	$("#institution_selected").val(selected.item.id).attr("data-name", selected.item.label);
228	229	}
229	230	});
230	231	}
	232	+
	233	+ function get_selected_institutions() {
	234	+ var selected_institutions = []
	235	+ $('.institutions_added').find('li').each(function() {
	236	+ selected_institutions.push($(this).attr('data-institution'));
	237	+ });
	238	+
	239	+ return selected_institutions;
	240	+ }
	241	+
231	242	function add_selected_institution_to_list(id, name) {
232	243	var selected_institution = "<li data-institution='"+id+"'>"+name;
233	244	selected_institution += "<a href='#' class='button without-text icon-remove remove-institution'></a></li>";
...	...	@@ -246,6 +257,7 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']
246	257
247	258	// Visualy add the selected institution to the list
248	259	add_selected_institution_to_list(selected.val(), selected.attr("data-name"));
	260	+ $(this).hide();
249	261
250	262	// clean the institution flag
251	263	selected.val("").attr("data-name", "");
...	...	@@ -311,7 +323,6 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']
311	323	var divisor_option = SelectElement.generateOption("-1", "--------------------------------");
312	324	var default_option = SelectElement.generateOption("BR", "Brazil");
313	325
314		-
315	326	var inst_type = $("input[name='institutions[type]']:checked").val();
316	327	var country = $("#community_country").val();
317	328
...	...	@@ -323,6 +334,10 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']
323	334	$('#community_country').prepend(divisor_option);
324	335	$('#community_country').prepend(default_option);
325	336
	337	+ if ($('#add_institution_link').length > 0) {
	338	+ $('#add_institution_link').hide();
	339	+ }
	340	+
326	341	if($("#edit_institution_page").val() === "false") {
327	342	$('#community_country').val("BR");
328	343	show_hide_cnpj_city($('#community_country').val());
...	...	@@ -379,7 +394,7 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']
379	394
380	395	$("#community_name").keyup(institution_already_exists);
381	396
382		- $("#add_new_institution").click(add_new_institution);
	397	+ $("#add_institution_link").click(add_new_institution);
383	398
384	399	$(".remove-institution").click(remove_institution);
385	400
...	...
...	...	@@ -105,9 +105,9 @@ class GovUserPluginControllerTest < ActionController::TestCase
105	105
106	106	fields = InstitutionTestHelper.generate_form_fields(
107	107	"Some Private Institution",
108		- "BR",
109		- "DF",
110		- "Brasilia",
	108	+ "EN",
	109	+ "NY",
	110	+ "New York",
111	111	"",
112	112	"PrivateInstitution"
113	113	)
...	...
...	...	@@ -14,7 +14,6 @@ class SoftwareCommunitiesPluginPersonTest < ActiveSupport::TestCase
14	14	"My Name",
15	15	"user@email.com",
16	16	"123456",
17		- "123456",
18	17	"user2@email.com",
19	18	"Any State",
20	19	"Some City"
...	...