Download as
Browse Code »

Commit b924e05f77591aa126e5e0009f87ddaa2429c689

Authored by Moises Machado
Committed by Antonio Terceiro
1 parent 475bffce
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

ActionItem929: fixed commenting on images

Showing 2 changed files with 20 additions and 2 deletions   Show diff stats
app/views/content_viewer/_comment_form.rhtml
  Diff comments   View file @b924e05
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 17
18 <h4><%= content_tag('a', '', :name => 'comment_form') + _('Post a comment') %></h4> 18 <h4><%= content_tag('a', '', :name => 'comment_form') + _('Post a comment') %></h4>
19 19
20 -<% form_tag( @page.url, { :id => comment_form_id } ) do %> 20 +<% form_tag( @page.url.merge(:view => params[:view]), { :id => comment_form_id } ) do %>
21 21
22 <%= required_fields_message %> 22 <%= required_fields_message %>
23 23
test/functional/content_viewer_controller_test.rb
  Diff comments   View file @b924e05
@@ -250,7 +250,7 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase @@ -250,7 +250,7 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase
250 250
251 should "point to article's url in comment form" do 251 should "point to article's url in comment form" do
252 page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text') 252 page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text')
253 - Article.any_instance.stubs(:url).returns('http://www.mysite.com/person/article') 253 + Article.any_instance.stubs(:url).returns({:host => 'www.mysite.com', :controller => 'content_viewer', :action => 'view_page', :profile => 'person', :page => ['article']})
254 254
255 get :view_page, :profile => profile.identifier, :page => [ 'myarticle' ] 255 get :view_page, :profile => profile.identifier, :page => [ 'myarticle' ]
256 256
@@ -699,4 +699,22 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase @@ -699,4 +699,22 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase
699 699
700 assert_tag :tag => 'a', :content => 'Upload files', :attributes => {:href => /parent_id=#{folder.id}/} 700 assert_tag :tag => 'a', :content => 'Upload files', :attributes => {:href => /parent_id=#{folder.id}/}
701 end 701 end
  702 +
  703 + should 'have a link to properly post a comment' do
  704 + login_as(profile.identifier)
  705 + file = UploadedFile.create!(:profile => profile, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
  706 + get :view_page, :profile => profile.identifier, :page => file.explode_path, :view => true
  707 +
  708 + assert_tag :tag => 'input', :attributes => {:type => 'submit', :value => 'Post comment'}, :ancestor => {:tag => 'form', :attributes => {:action => /#{file.slug}.*view=true/}}
  709 + end
  710 +
  711 + should 'post comment in a image' do
  712 + login_as(profile.identifier)
  713 + image = UploadedFile.create!(:profile => profile, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
  714 + comment_count = image.comments.count
  715 + post :view_page, :profile => profile.identifier, :page => image.explode_path, :view => true
  716 + assert_equal comment_count, image.reload.comments.count
  717 + assert_template 'view_page'
  718 + end
  719 +
702 end 720 end