Fixes unit and integration tests

- Removes selenium and cucmber tests (Gov User and Software Communities) - Removes secondary email tests - Fixes institution CNPJ validation 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>

Fixes unit and integration tests
- Removes selenium and cucmber tests (Gov User and Software Communities) - Removes secondary email tests - Fixes institution CNPJ validation 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>
Luciano Prestes · Gabriel Silva
1 parent e03cd10d
Showing 16 changed files with 65 additions and 88 deletions Show diff stats
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/test/functional/gov_user_plugin_controller_test.rb
src/noosfero-spb/gov_user/test/unit/institutions_block_test.rb
src/noosfero-spb/gov_user/test/unit/organization_rating_test.rb
src/noosfero-spb/gov_user/test/unit/person_test.rb
src/noosfero-spb/gov_user/views/person_editor_extras.html.erb
src/noosfero-spb/software_communities/features/public_software_validation.feature
src/noosfero-spb/software_communities/features/software_block.feature
src/noosfero-spb/software_communities/features/software_catalog.feature
src/noosfero-spb/software_communities/features/step_definitions/software_communities_steps.rb
src/noosfero-spb/software_communities/features/use_report.feature
src/noosfero-spb/software_communities/views/search/_catalog_filter.html.erb
@@ -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
@@ -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 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"
+    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
 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?
@@ -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"
     )
@@ -27,7 +27,6 @@ class InstitutionsBlockTest &lt; ActiveSupport::TestCase
             "jose_augusto@email.com",
             "aaaaaaa",
             "aaaaaaa",
-            'jose@secondary.com',
             "DF",
             "Gama"
           )
@@ -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
@@ -12,7 +12,6 @@ class SoftwareCommunitiesPluginPersonTest &lt; ActiveSupport::TestCase
                 "user@email.com",
                 "123456",
                 "123456",
-                "user@secondaryemail.com",
                 "Any State",
                 "Some City"
               )
@@ -22,7 +21,7 @@ class SoftwareCommunitiesPluginPersonTest &lt; ActiveSupport::TestCase
     @person.cell_phone = "76888919"
     @person.contact_phone = "987654321"
-    assert_equal(67, @plugin.calc_percentage_registration(@person))
+    assert_equal(64, @plugin.calc_percentage_registration(@person))
     @person.comercial_phone = "11223344"
     @person.country = "I dont know"
@@ -12,6 +12,7 @@
   <%= content_tag(:div, _("No institution found"), :id=>"institution_empty_ajax_message", :class=>"errorExplanation hide-field") %>
   <%= InstitutionModalHelper.modal_button %>
+  <%= link_to(_("Add new institution"), "#", :class=>'button with-text icon-add', :id => 'add_new_institution') %>
   <%= hidden_field_tag("user[institution_ids][]", "", :class => 'user_institutions') %>
   <%= hidden_field_tag("institution_selected", "") %>
@@ -22,13 +22,13 @@ Feature: edit adherent fields
     Given I am logged in as "joaosilva"
     And I go to /myprofile/basic-software/plugin/software_communities/edit_software
     And I follow "Specifications"
-    Then I should see "Public software" within ".public_software_disabled"
+    Then the "#software_public_software" button should be disabled
   Scenario: Enable public software checkbox to admin users
     Given I am logged in as mpog_admin
     And I go to /myprofile/basic-software/plugin/software_communities/edit_software
     And I follow "Specifications"
-    Then I should see "Public software" within ".public_software_enabled"
+    Then the "#software_public_software" button should be enabled
   @selenium
   Scenario: Show adherent fields when checkbox are checked
@@ -15,8 +15,7 @@ Feature: edit adherent fields
     | Generic Software | false           | some finality |
   Scenario: Add software block
-    Given I am logged in as mpog_admin
-    And I follow "Control panel"
+    Given I follow "Control panel"
     And I follow "Edit sideboxes"
     When I follow "Add a block"
     And I choose "Softwares"
@@ -24,9 +23,7 @@ Feature: edit adherent fields
     Then I should see "softwares"
   Scenario: Change software block to generic software block
-    Given I am logged in as mpog_admin
-    And I go to /myprofile/mpog_admin
-    And I follow "Control panel"
+    Given I follow "Control panel"
     And I follow "Edit sideboxes"
     When I follow "Add a block"
     And I choose "Softwares"
@@ -37,8 +34,7 @@ Feature: edit adherent fields
     Then I should see "generic software"
   Scenario: Change software block to generic software block
-    Given I am logged in as mpog_admin
-    And I follow "Control panel"
+    Given I follow "Control panel"
     And I follow "Edit sideboxes"
     When I follow "Add a block"
     And I choose "Softwares"
@@ -59,7 +59,7 @@ Feature: Search software
   @selenium
   Scenario: Show only "Software Two" when searching for "Education" category
     Given I go to /search/software_infos
-    And I click on anything with selector "#filter-option-catalog-software"
+    And I click on anything with selector "filter-option-catalog-software"
     And I check "Education"
     Then I should see "Software Two"
     And I should not see "Software One"
@@ -67,7 +67,7 @@ Feature: Search software
   @selenium
   Scenario: Show both Software "One" and "Two" when searching for "Health" category
     Given I go to /search/software_infos
-    And I click on anything with selector "#filter-option-catalog-software"
+    And I click on anything with selector "filter-option-catalog-software"
     And I check "Health"
     Then I should see "Software One"
     And I should see "Software Two"
@@ -75,8 +75,7 @@ Feature: Search software
   @selenium
   Scenario: Show not "public_software" when "Include in results" is checked
     Given I go to /search/software_infos
-    And I click on anything with selector "#filter-option-catalog-software"
-    And I check "include_non_public"
+    And I choose "all_radio_button"
     Then I should see "Software One"
     And I should see "Software Two"
     And I should see "Software Three"
@@ -107,6 +106,5 @@ Feature: Search software
     When I select "Favorites" from "sort"
     And I sleep for 3 seconds
     Then I should see "Software Two" before "Software One"
-    And there should be 1 div with class "small-star-positive"
-    And there should be 4 divs with class "small-star-negative"
-
+    And I should see "1" of this selector "div.medium-star-positive"
+    And I should see "4" of this selector "div.medium-star-negative"
@@ -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
@@ -291,6 +268,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
@@ -34,10 +34,10 @@ Feature: Use report
   Scenario: Test Additional Fields JavaScript
     Given I go to /profile/noosfero/plugin/organization_ratings/new_rating
     Then I should not see "Number of Beneficiaries"
-    And I should not see "Saved Resources"
+    And I should not see "Saved resources"
     When I click on anything with selector "comments-additional-information"
     Then I should see "Number of Beneficiaries"
-    And I should see "Saved Resources"
+    And I should see "Saved resources"
    @selenium
    Scenario: Validate Use Report fields format
@@ -49,8 +49,8 @@ Feature: Use report
     And I am on Noosfero's homepage
     And I follow "Rate Community"
     When I click on anything with selector "comments-additional-information"
-    And I fill in "organization_rating_people_benefited" with "123123"
-    And I fill in "organization_rating_saved_value" with "7654321"
+    And I fill in "people_benefited_tmp" with "123123"
+    And I fill in "saved_value_tmp" with "7654321"
     And I press "Save"
-    Then I should see "Benefited People: 123.123"
-    And I should see "Saved Resources: $ 76,543.21"
+    Then I should see "Benefited People: 123,123"
+    And I should see "Saved Resources: $76,543.21"
@@ -6,8 +6,10 @@
       <ul>
         <% @categories.each do |category| %>
         <li>
-          <%= check_box_tag("selected_categories_id[]", category.id, @selected_categories_id.include?(category.id), :class => "categories-catalog", @enabled_check_box[category] => "true") %>
-          <span><%= _("#{category.name}") %></span>
+          <label>
+            <%= check_box_tag("selected_categories_id[]", category.id, @selected_categories_id.include?(category.id), :class => "categories-catalog", @enabled_check_box[category] => "true") %>
+            <span><%= _("#{category.name}") %></span>
+          </label>
         </li>
         <% end %>
       </ul>
	@@ -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
	@@ -12,6 +12,7 @@		@@ -12,6 +12,7 @@
12	<%= content_tag(:div, _("No institution found"), :id=>"institution_empty_ajax_message", :class=>"errorExplanation hide-field") %>	12	<%= content_tag(:div, _("No institution found"), :id=>"institution_empty_ajax_message", :class=>"errorExplanation hide-field") %>
13		13
14	<%= InstitutionModalHelper.modal_button %>	14	<%= InstitutionModalHelper.modal_button %>
		15	+ <%= link_to(_("Add new institution"), "#", :class=>'button with-text icon-add', :id => 'add_new_institution') %>
15		16
16	<%= hidden_field_tag("user[institution_ids][]", "", :class => 'user_institutions') %>	17	<%= hidden_field_tag("user[institution_ids][]", "", :class => 'user_institutions') %>
17	<%= hidden_field_tag("institution_selected", "") %>	18	<%= hidden_field_tag("institution_selected", "") %>
	@@ -22,13 +22,13 @@ Feature: edit adherent fields		@@ -22,13 +22,13 @@ Feature: edit adherent fields
22	Given I am logged in as "joaosilva"	22	Given I am logged in as "joaosilva"
23	And I go to /myprofile/basic-software/plugin/software_communities/edit_software	23	And I go to /myprofile/basic-software/plugin/software_communities/edit_software
24	And I follow "Specifications"	24	And I follow "Specifications"
25	- Then I should see "Public software" within ".public_software_disabled"	25	+ Then the "#software_public_software" button should be disabled
26		26
27	Scenario: Enable public software checkbox to admin users	27	Scenario: Enable public software checkbox to admin users
28	Given I am logged in as mpog_admin	28	Given I am logged in as mpog_admin
29	And I go to /myprofile/basic-software/plugin/software_communities/edit_software	29	And I go to /myprofile/basic-software/plugin/software_communities/edit_software
30	And I follow "Specifications"	30	And I follow "Specifications"
31	- Then I should see "Public software" within ".public_software_enabled"	31	+ Then the "#software_public_software" button should be enabled
32		32
33	@selenium	33	@selenium
34	Scenario: Show adherent fields when checkbox are checked	34	Scenario: Show adherent fields when checkbox are checked
	@@ -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
	@@ -291,6 +268,10 @@ Then /^there should be (\d+) divs? with class "([^"]*)"$/ do \|count, klass\|		@@ -291,6 +268,10 @@ Then /^there should be (\d+) divs? with class "([^"]*)"$/ do \|count, klass\|
291	should have_selector("div.#{klass}", :count => count)	268	should have_selector("div.#{klass}", :count => count)
292	end	269	end
293		270
		271	+Then /^I should see "([^"])" in "([^"])" field$/ do \|content, field\|
		272	+ should have_field(field, :with => content)
		273	+end
		274	+
294	Given /^I should see "([^"]*)" in the page/ do \|message\|	275	Given /^I should see "([^"]*)" in the page/ do \|message\|
295	assert_match message, page.body	276	assert_match message, page.body
296	end	277	end