correcoes_aderencia: Add text information to use governmental e-mail

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>

correcoes_aderencia: Add text information to use governmental e-mail
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Fabio Teixeira
1 parent 34ab0d8e
Showing 4 changed files with 27 additions and 2 deletions Show diff stats
features/step_definitions/mpog_steps.rb
features/user_profile_edition.feature
public/mpog-user-validations.js
views/person_editor_extras.html.erb
@@ -168,3 +168,21 @@ end
 Given /^I sleep for (\d+) seconds$/ do |time|
   sleep time.to_i
 end
+
+Given /^I am logged in as mpog_admin$/ do
+  visit('/account/logout')
+
+  user = User.new(:login => 'admin_user', :password => '123456', :password_confirmation => '123456', :email => 'admin_user@example.com')
+  person = Person.new :name=>"Mpog Admin", :identifier=>"mpog-admin"
+  user.person = person
+  user.save!
+
+  user.activate
+  e = Environment.default
+  e.add_admin(user.person)
+
+  visit('/account/login')
+  fill_in("Username", :with => user.login)
+  fill_in("Password", :with => '123456')
+  click_button("Log in")
+end
@@ -5,7 +5,7 @@ Feature: Institution Field
   Background:
     Given "MpogSoftwarePlugin" plugin is enabled
-    And I am logged in as admin
+    And I am logged in as mpog_admin
     And I go to /admin/plugins
     And I check "MpogSoftwarePlugin"
     And I press "Save changes"
@@ -43,3 +43,8 @@ Feature: Institution Field
     Then I should see "Ministerio do Planejamento" within ".institutions_added"
     And I should see "Governo do DF" within ".institutions_added"
+  @selenium
+  Scenario: Verify text information to use governmental e-mail
+    Given I am on josesilva's control panel
+    And I follow "Edit Profile"
+    Then I should see "If you work in a public agency use your government e-Mail"
 \ No newline at end of file
@@ -60,6 +60,7 @@
   function set_initial_form_custom_data(selectFieldChoices) {
     jQuery('#profile_data_country').val("BR");
     jQuery("#password-balloon").html(jQuery("#user_password_menssage").val());
+    jQuery("#profile_data_email").parent().append(jQuery("#email_public_message").remove());
     selectFieldChoices.setSelect();
   }
@@ -35,4 +35,5 @@
 <%= hidden_field_tag("full_name_error", _("Should begin with a capital letter and no special characters")) %>
 <%= hidden_field_tag("email_error", _("Email should have the following format: name@host.br")) %>
-<%= hidden_field_tag("site_error", _("Site should have a valid format: http://name.hosts")) %>
 \ No newline at end of file
+<%= hidden_field_tag("site_error", _("Site should have a valid format: http://name.hosts")) %>
+<div id="email_public_message"><%= _("If you work in a public agency use your government e-Mail") %> </div>
 \ No newline at end of file
	@@ -168,3 +168,21 @@ end		@@ -168,3 +168,21 @@ end
168	Given /^I sleep for (\d+) seconds$/ do \|time\|	168	Given /^I sleep for (\d+) seconds$/ do \|time\|
169	sleep time.to_i	169	sleep time.to_i
170	end	170	end
		171	+
		172	+Given /^I am logged in as mpog_admin$/ do
		173	+ visit('/account/logout')
		174	+
		175	+ user = User.new(:login => 'admin_user', :password => '123456', :password_confirmation => '123456', :email => 'admin_user@example.com')
		176	+ person = Person.new :name=>"Mpog Admin", :identifier=>"mpog-admin"
		177	+ user.person = person
		178	+ user.save!
		179	+
		180	+ user.activate
		181	+ e = Environment.default
		182	+ e.add_admin(user.person)
		183	+
		184	+ visit('/account/login')
		185	+ fill_in("Username", :with => user.login)
		186	+ fill_in("Password", :with => '123456')
		187	+ click_button("Log in")
		188	+end
	@@ -60,6 +60,7 @@		@@ -60,6 +60,7 @@
60	function set_initial_form_custom_data(selectFieldChoices) {	60	function set_initial_form_custom_data(selectFieldChoices) {
61	jQuery('#profile_data_country').val("BR");	61	jQuery('#profile_data_country').val("BR");
62	jQuery("#password-balloon").html(jQuery("#user_password_menssage").val());	62	jQuery("#password-balloon").html(jQuery("#user_password_menssage").val());
		63	+ jQuery("#profile_data_email").parent().append(jQuery("#email_public_message").remove());
63		64
64	selectFieldChoices.setSelect();	65	selectFieldChoices.setSelect();
65	}	66	}