Download as
Browse Code »

Commit ef4cb47fd60a5db1641a4a906816d7097322a603

Authored by Rodrigo Souto
2 parents a2d83d73 f31f2d99
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

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

…into merge-requests/344
Showing 3 changed files with 19 additions and 7 deletions   Show diff stats
features/comment.feature
  Diff comments   View file @ef4cb47
... ... @@ -84,3 +84,10 @@ Feature: comment
84 84 When I press "Post comment"
85 85 Then the "Title" field should contain "Joey Ramone"
86 86 And I should see "Body can't be blank"
  87 +
  88 + @selenium
  89 + Scenario: wrong comment doesn't increment comment counter
  90 + Given I am on /booking/article-with-comment
  91 + And I follow "Post a comment"
  92 + When I press "Post comment"
  93 + And I should see "2 comments"
... ...
features/step_definitions/noosfero_steps.rb
  Diff comments   View file @ef4cb47
... ... @@ -287,8 +287,8 @@ end
287 287 Given /^I am logged in as "(.+)"$/ do |username|
288 288 Given %{I go to logout page}
289 289 And %{I go to login page}
290   - And %{I fill in "Username" with "#{username}"}
291   - And %{I fill in "Password" with "123456"}
  290 + And %{I fill in "main_user_login" with "#{username}"}
  291 + And %{I fill in "user_password" with "123456"}
292 292 When %{I press "Log in"}
293 293 # FIXME:
294 294 # deveria apenas verificar que esta no myprofile do usuario
... ...
public/javascripts/comment_form.js
  Diff comments   View file @ef4cb47
... ... @@ -54,6 +54,7 @@ function save_comment(button) {
54 54 $('#'+ data.render_target).replaceWith(data.html);
55 55 $('#' + data.render_target).effect("highlight", {}, 3000);
56 56 $.colorbox.close();
  57 + update_comment_count();
57 58 } else {
58 59 //New comment of article
59 60 comment_div.find('.article-comments-list').append(data.html);
... ... @@ -64,13 +65,9 @@ function save_comment(button) {
64 65  
65 66 page_comment_form.find('.errorExplanation').remove();
66 67 $.colorbox.close();
  68 + update_comment_count();
67 69 }
68 70  
69   - comment_div.find('.comment-count').add('#article-header .comment-count').each(function() {
70   - var count = parseInt($(this).html());
71   - update_comment_count($(this), count + 1);
72   - });
73   -
74 71 if(jQuery('#recaptcha_response_field').val()){
75 72 Recaptcha.reload();
76 73 }
... ... @@ -86,6 +83,14 @@ function save_comment(button) {
86 83 }, 'json');
87 84 }
88 85  
  86 +function update_comment_count() {
  87 + comment_div.find('.comment-count').add('#article-header .comment-count').each(function() {
  88 + var count = parseInt($(this).html());
  89 + update_comment_count($(this), count + 1);
  90 + });
  91 +
  92 +}
  93 +
89 94 function show_display_comment_button() {
90 95 if(jQuery('.post_comment_box.opened').length==0)
91 96 jQuery('.display-comment-form').show();
... ...