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