Download as
Browse Code »

Commit 2a92f5916c79ac061c427deab9ee98a1439ab6f2

Authored by Daniela Feitosa
2 parents 074dd190 a5524c66
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge commit 'refs/merge-requests/23' of git://gitorious.org/noosfero/noosfero i… 

…nto merge-requests/23
Showing 2 changed files with 39 additions and 1 deletions   Show diff stats
app/views/profile_editor/_organization.rhtml
  Diff comments   View file @2a92f59
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 <% if @environment.enabled?('enable_organization_url_change') %> 17 <% if @environment.enabled?('enable_organization_url_change') %>
18 <script type="text/javascript"> 18 <script type="text/javascript">
19 function submit_button() { 19 function submit_button() {
20 - return $("profile_data_identifier").form.select("input.submit")[0]; 20 + return $("profile-data").select("input.submit")[0];
21 } 21 }
22 function warn_value_change() { 22 function warn_value_change() {
23 show_warning('profile-identifier-formitem', "identifier-change-confirmation"); 23 show_warning('profile-identifier-formitem', "identifier-change-confirmation");
features/edit_profile.feature
  Diff comments   View file @2a92f59
@@ -55,3 +55,41 @@ Feature: edit profile @@ -55,3 +55,41 @@ Feature: edit profile
55 And I press "Save" 55 And I press "Save"
56 Then I should not see "Birth date is invalid" 56 Then I should not see "Birth date is invalid"
57 And I should not see "Birth date is mandatory" 57 And I should not see "Birth date is mandatory"
  58 +
  59 + @selenium
  60 + Scenario: Alert about url change
  61 + Given the following community
  62 + | identifier | name | owner |
  63 + | o-rappa | O Rappa | joao |
  64 + And feature "enable_organization_url_change" is enabled on environment
  65 + When I go to O Rappa's control panel
  66 + And I follow "Community Info and settings" and wait
  67 + Then I should not see "WARNING! You are about to change the address"
  68 + When I fill in "Address" with "banda-o-rappa"
  69 + Then I should see "WARNING! You are about to change the address"
  70 +
  71 + @selenium
  72 + Scenario: Confirm url change
  73 + Given the following community
  74 + | identifier | name | owner |
  75 + | o-rappa | O Rappa | joao |
  76 + And feature "enable_organization_url_change" is enabled on environment
  77 + When I go to O Rappa's control panel
  78 + And I follow "Community Info and settings" and wait
  79 + When I fill in "Address" with "banda-o-rappa"
  80 + Then I should see "WARNING! You are about to change the address"
  81 + When I follow "Yes"
  82 + Then I should not see "WARNING! You are about to change the address"
  83 +
  84 + @selenium
  85 + Scenario: Cancel url change
  86 + Given the following community
  87 + | identifier | name | owner |
  88 + | o-rappa | O Rappa | joao |
  89 + And feature "enable_organization_url_change" is enabled on environment
  90 + When I go to O Rappa's control panel
  91 + And I follow "Community Info and settings" and wait
  92 + When I fill in "Address" with "banda-o-rappa"
  93 + Then I should see "WARNING! You are about to change the address"
  94 + When I follow "No"
  95 + Then I should not see "WARNING! You are about to change the address"