video plugin: Set default thumbnail dimensions to avoid crash with nil value on gallery page

Larissa Reis
1 parent 12db0abc
Showing 2 changed files with 9 additions and 4 deletions Show diff stats
plugins/video/lib/video_plugin/video.rb
plugins/video/test/unit/video_test.rb
@@ -12,8 +12,8 @@ class VideoPlugin::Video &lt; Article
   settings_items :video_format,      :type => :string
   settings_items :video_id,          :type => :string
   settings_items :video_thumbnail_url,    :type => :string, :default => '/plugins/video/images/video_generic_thumbnail.jpg'
-  settings_items :video_thumbnail_width,  :type=> :integer
-  settings_items :video_thumbnail_height, :type=> :integer
+  settings_items :video_thumbnail_width,  :type=> :integer, :default => 239
+  settings_items :video_thumbnail_height, :type=> :integer, :default => 210
   settings_items :video_duration, :type=> :integer, :default => 0
   attr_accessible :video_url
@@ -35,14 +35,14 @@ class VideoPlugin::Video &lt; Article
   def self.description
     _('Display embedded videos.')
   end
-  
+
   def is_youtube?
     VideoPlugin::Video.is_youtube?(self.video_url)
   end
   def is_vimeo?
     VideoPlugin::Video.is_vimeo?(self.video_url)
-  end  
+  end
   include ActionView::Helpers::TagHelper
   def to_html(options={})
@@ -46,6 +46,11 @@ class VideoTest &lt; ActiveSupport::TestCase
     assert_equal thumbnail_fitted_height, @video.thumbnail_fitted_height
   end
+  should "have dimensions of default thumbnail" do
+    assert @video.video_thumbnail_height.present? && @video.video_thumbnail_height > 0
+    assert @video.video_thumbnail_width.present? && @video.video_thumbnail_width > 0
+  end
+
   should "show a no_browser_support_message" do
     assert_equal @video.no_browser_support_message, '<p class="vjs-no-js">To view this video please enable JavaScript, and consider upgrading to a web browser that <a href="http://videojs.com/html5-video-support/" target="_blank">supports HTML5 video</a></p>'
   end