Commit c52e1229246860d8cb05f06980378528fc3fb9c2

Authored by Fabio Teixeira
1 parent 5f21a0f0
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

Remove role's traces from plugin

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
features/user_registration.feature
@@ -91,7 +91,6 @@ Feature: User Registration @@ -91,7 +91,6 @@ Feature: User Registration
91 | State | Bahia | 91 | State | Bahia |
92 | City | Salvador | 92 | City | Salvador |
93 | Secondary e-Mail | josesilva@example.com | 93 | Secondary e-Mail | josesilva@example.com |
94 - | Role | TI analist |  
95 And I select "Brazil" from "profile_data[country]" 94 And I select "Brazil" from "profile_data[country]"
96 And I type in "MP" into autocomplete list "input_institution" and I choose "Ministerio do Planejamento" 95 And I type in "MP" into autocomplete list "input_institution" and I choose "Ministerio do Planejamento"
97 And wait for the captcha signup time 96 And wait for the captcha signup time
@@ -194,7 +193,6 @@ Feature: User Registration @@ -194,7 +193,6 @@ Feature: User Registration
194 And I select "Brazil" from "profile_data[country]" 193 And I select "Brazil" from "profile_data[country]"
195 And wait for the captcha signup time 194 And wait for the captcha signup time
196 When I press "Create my account" 195 When I press "Create my account"
197 - Then I should see "Role can't be blank if e-mail has governamental sulfixes."  
198 And I should see "Institution is obligatory if user has a government email." 196 And I should see "Institution is obligatory if user has a government email."
199 And I should see "State can't be blank" 197 And I should see "State can't be blank"
200 And I should see "City can't be blank" 198 And I should see "City can't be blank"
@@ -226,7 +224,6 @@ Feature: User Registration @@ -226,7 +224,6 @@ Feature: User Registration
226 | State | Bahia | 224 | State | Bahia |
227 | City | Salvador | 225 | City | Salvador |
228 | Secondary e-Mail | josesilva@example.com | 226 | Secondary e-Mail | josesilva@example.com |
229 - | Role | TI analist |  
230 And I select "Brazil" from "profile_data[country]" 227 And I select "Brazil" from "profile_data[country]"
231 And I fill in "Username" with "josesilva" 228 And I fill in "Username" with "josesilva"
232 And wait for the captcha signup time 229 And wait for the captcha signup time
@@ -249,7 +246,6 @@ Feature: User Registration @@ -249,7 +246,6 @@ Feature: User Registration
249 | State | Bahia | 246 | State | Bahia |
250 | City | Salvador | 247 | City | Salvador |
251 | Secondary e-Mail | josesilva@example.com | 248 | Secondary e-Mail | josesilva@example.com |
252 - | Role | TI analist |  
253 And I select "Brazil" from "profile_data[country]" 249 And I select "Brazil" from "profile_data[country]"
254 And I fill in "Username" with "josesilva" 250 And I fill in "Username" with "josesilva"
255 And wait for the captcha signup time 251 And wait for the captcha signup time
public/mpog-user-validations.js
@@ -55,9 +55,6 @@ jQuery(document).ready(function(){ @@ -55,9 +55,6 @@ jQuery(document).ready(function(){
55 jQuery('#secondary_email_field').focus(function() { jQuery('#secondary-email-balloon').fadeIn('slow'); }); 55 jQuery('#secondary_email_field').focus(function() { jQuery('#secondary-email-balloon').fadeIn('slow'); });
56 jQuery('#secondary_email_field').blur(function() { jQuery('#secondary-email-balloon').fadeOut('slow'); }); 56 jQuery('#secondary_email_field').blur(function() { jQuery('#secondary-email-balloon').fadeOut('slow'); });
57 57
58 - jQuery('#role_field').focus(function() { jQuery('#role-balloon').fadeIn('slow'); });  
59 - jQuery('#role_field').blur(function() { jQuery('#role-balloon').fadeOut('slow'); });  
60 -  
61 jQuery('#area_interest_field').focus(function() { jQuery('#area-interest-balloon').fadeIn('slow'); }); 58 jQuery('#area_interest_field').focus(function() { jQuery('#area-interest-balloon').fadeIn('slow'); });
62 jQuery('#area_interest_field').blur(function() { jQuery('#area-interest-balloon').fadeOut('slow'); }); 59 jQuery('#area_interest_field').blur(function() { jQuery('#area-interest-balloon').fadeOut('slow'); });
63 }); 60 });
public/style.css
@@ -3,9 +3,7 @@ @@ -3,9 +3,7 @@
3 } 3 }
4 4
5 #signup-form small#secondary-email-balloon , 5 #signup-form small#secondary-email-balloon ,
6 -#signup-form small#role-balloon,  
7 -#signup-form small#area-interest-balloon  
8 -{ 6 +#signup-form small#area-interest-balloon {
9 display: none; 7 display: none;
10 width: 142px; 8 width: 142px;
11 height: 69px; 9 height: 69px;
@@ -22,16 +20,12 @@ @@ -22,16 +20,12 @@
22 } 20 }
23 21
24 #signup-form #signup-secondary-email, 22 #signup-form #signup-secondary-email,
25 -#signup-form #signup-role,  
26 -#signup-form #signup-area-interest  
27 -{ 23 +#signup-form #signup-area-interest {
28 position: relative; 24 position: relative;
29 } 25 }
30 26
31 #signup-form small#secondary-email-balloon, 27 #signup-form small#secondary-email-balloon,
32 -#signup-form small#role-balloon,  
33 -#signup-form small#area-interest-balloon  
34 -{ 28 +#signup-form small#area-interest-balloon {
35 top: -80px; 29 top: -80px;
36 } 30 }
37 31
test/unit/mpog_software_plugin_test.rb
@@ -22,7 +22,7 @@ class MpogSoftwarePluginTest &lt; ActiveSupport::TestCase @@ -22,7 +22,7 @@ class MpogSoftwarePluginTest &lt; ActiveSupport::TestCase
22 @person.name = "Person Name" 22 @person.name = "Person Name"
23 @person.cell_phone = "76888919" 23 @person.cell_phone = "76888919"
24 24
25 - required_list = ["cell_phone","contact_phone","institution","comercial_phone","country","city","state","organization_website","role","area_interest","image"] 25 + required_list = ["cell_phone","contact_phone","institution","comercial_phone","country","city","state","organization_website","area_interest","image"]
26 26
27 empty_fields = required_list.count - 1 27 empty_fields = required_list.count - 1
28 test_percentege = (empty_fields * 100) / required_list.count 28 test_percentege = (empty_fields * 100) / required_list.count