Download as
Browse Code »

Commit 680a9d88feb21fd5dd8a1c9a8e0ba34ec7ced129

Authored by Daniela Feitosa
2 parents 5f1ae765 748f7e32
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Merge branch 'merge-requests/23' 

(ActionItem2053)
Showing 2 changed files with 39 additions and 1 deletions   Show diff stats
app/views/profile_editor/_organization.rhtml
  Diff comments   View file @680a9d8
@@ -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 @680a9d8
@@ -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 the "#identifier-change-confirmation" should not be visible
  68 + When I fill in "Address" with "banda-o-rappa"
  69 + Then the "#identifier-change-confirmation" should be visible
  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 the "#identifier-change-confirmation" should be visible
  81 + When I follow "Yes"
  82 + Then the "#identifier-change-confirmation" should not be visible
  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 the "#identifier-change-confirmation" should be visible
  94 + When I follow "No"
  95 + Then the "#identifier-change-confirmation" should not be visible