Download as
Browse Code »

Commit 503946eef3e96e1c0b28379395ff297ae503aeae

Authored by Thiago Ribeiro
2 parents 617cf061 49d77327
Exists in master and in 3 other branches gov_user_refactory, r4, stable

Merge branch 'fix_institution_registration' into 'master' 

Fix institution registration

See merge request !4
Showing 2 changed files with 10 additions and 10 deletions   Show diff stats
public/views/create-institution.js
  Diff comments   View file @503946e
@@ -126,13 +126,15 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement'] @@ -126,13 +126,15 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']
126 var error_keys = Object.keys(errors); 126 var error_keys = Object.keys(errors);
127 127
128 // (field)|(field)|... 128 // (field)|(field)|...
129 - var verify_error = new RegExp("(" + error_keys.join(")|(") + ")" ); 129 + var verify_error = new RegExp("(\\[" + error_keys.join("\\])|(\\[") + "\\])" );
130 130
131 var fields_with_errors = $("#institution_dialog .formfield input").filter(function(index, field) { 131 var fields_with_errors = $("#institution_dialog .formfield input").filter(function(index, field) {
  132 + $(field).removeClass("highlight-error");
132 return verify_error.test(field.getAttribute("name")); 133 return verify_error.test(field.getAttribute("name"));
133 }); 134 });
134 135
135 var selects_with_errors = $("#institution_dialog .formfield select").filter(function(index, field) { 136 var selects_with_errors = $("#institution_dialog .formfield select").filter(function(index, field) {
  137 + $(field).removeClass("highlight-error");
136 return verify_error.test(field.getAttribute("name")); 138 return verify_error.test(field.getAttribute("name"));
137 }); 139 });
138 140
@@ -396,7 +398,7 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement'] @@ -396,7 +398,7 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']
396 set_form_count_custom_data(); 398 set_form_count_custom_data();
397 set_events(); 399 set_events();
398 }, 400 },
399 - 401 +
400 institution_autocomplete: function(){ 402 institution_autocomplete: function(){
401 institution_autocomplete(); 403 institution_autocomplete();
402 } 404 }
test/functional/gov_user_plugin_controller_test.rb
  Diff comments   View file @503946e
@@ -100,26 +100,24 @@ class GovUserPluginControllerTest < ActionController::TestCase @@ -100,26 +100,24 @@ class GovUserPluginControllerTest < ActionController::TestCase
100 assert json_response["success"] 100 assert json_response["success"]
101 end 101 end
102 102
103 - should "not create a institution that already exists" do 103 + should "create a institution without cnpj" do
104 @controller.stubs(:verify_recaptcha).returns(true) 104 @controller.stubs(:verify_recaptcha).returns(true)
105 105
106 fields = InstitutionTestHelper.generate_form_fields( 106 fields = InstitutionTestHelper.generate_form_fields(
107 - "Ministerio Publico da Uniao", 107 + "Some Private Institution",
108 "BR", 108 "BR",
109 "DF", 109 "DF",
110 "Brasilia", 110 "Brasilia",
111 - "12.234.567/8900-10",  
112 - "PublicInstitution" 111 + "",
  112 + "PrivateInstitution"
113 ) 113 )
114 - fields[:institutions][:governmental_power] = @gov_power.id  
115 - fields[:institutions][:governmental_sphere] = @gov_sphere.id  
116 - fields[:institutions][:juridical_nature] = @juridical_nature.id 114 + fields[:institutions][:acronym] = "SPI"
117 115
118 xhr :get, :new_institution, fields 116 xhr :get, :new_institution, fields
119 117
120 json_response = ActiveSupport::JSON.decode(@response.body) 118 json_response = ActiveSupport::JSON.decode(@response.body)
121 119
122 - assert !json_response["success"] 120 + assert json_response["success"]
123 end 121 end
124 122
125 should "verify if institution name already exists" do 123 should "verify if institution name already exists" do