fixed and test for node images (publiclab#905)

xssc · Oct 18, 2016 · e9a5925 · e9a5925
1 parent a058b6c
commit e9a5925
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
@@ -122,9 +122,9 @@ def image
     params[:size] = params[:size] || :large
     node = DrupalNode.find(params[:id])
     if node.main_image
-      redirect_to image.path(params[:size])
+      redirect_to node.main_image.path(params[:size])
     else
-      return "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7"
+      redirect_to "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7"
     end
   end
 

diff --git a/test/functional/notes_controller_test.rb b/test/functional/notes_controller_test.rb
@@ -83,6 +83,15 @@ def teardown
     assert_response :success
   end
 
+  test "should show main image for node, returning blank image if it has none" do
+    node = node(:one)
+
+    get :image, id: node.id
+
+    assert_response :redirect
+    assert_redirected_to "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7"
+  end
+
   test "should get tools" do
     get :tools
 
@@ -398,4 +407,5 @@ def teardown
         assert_equal I18n.t('notes_controller.research_note_published'), flash[:notice]
     end
   end
+
 end