Fix HighlightsBlock unit test

Leandro Santos
1 parent 56703bf0
Showing 4 changed files with 9 additions and 5 deletions Show diff stats
app/models/block.rb
app/models/highlights_block.rb
app/models/link_list_block.rb
test/unit/highlights_block_test.rb
 class Block < ActiveRecord::Base
-  attr_accessible :title
+  attr_accessible :title, :display
   # to be able to generate HTML
   include ActionView::Helpers::UrlHelper
 class HighlightsBlock < Block
+  attr_accessible :images
+
   settings_items :images, :type => Array, :default => []
   settings_items :interval, :type => 'integer', :default => 4
   settings_items :shuffle, :type => 'boolean', :default => false
@@ -30,7 +32,7 @@ class HighlightsBlock &lt; Block
   def content(args={})
     block = self
-    lambda do
+    proc do
       render :file => 'blocks/highlights', :locals => { :block => block }
     end
   end
 class LinkListBlock < Block
-  attr_accessible :links, :display
+  attr_accessible :links
   ICONS = [
     ['no-icon', _('(No icon)')],
@@ -60,7 +60,9 @@ class HighlightsBlockTest &lt; ActiveSupport::TestCase
   should 'be able to update display setting' do
     user = create_user('testinguser').person
     box = fast_create(Box, :owner_id => user.id)
-    block = HighlightsBlock.create!(:display => 'never', :box => box)
+    block = HighlightsBlock.create!(:display => 'never').tap do |b|
+      b.box = box
+    end
     assert block.update_attributes!(:display => 'always')
     block.reload
     assert_equal 'always', block.display
@@ -143,7 +145,7 @@ class HighlightsBlockTest &lt; ActiveSupport::TestCase
       block = HighlightsBlock.new
       block.stubs(:owner).returns(owner)
-      assert_kind_of Array, block.folder_choices
+      assert_equal [], block.folder_choices
     end
   end
1	class Block < ActiveRecord::Base	1	class Block < ActiveRecord::Base
2		2
3	- attr_accessible :title	3	+ attr_accessible :title, :display
4		4
5	# to be able to generate HTML	5	# to be able to generate HTML
6	include ActionView::Helpers::UrlHelper	6	include ActionView::Helpers::UrlHelper
1	class LinkListBlock < Block	1	class LinkListBlock < Block
2		2
3	- attr_accessible :links, :display	3	+ attr_accessible :links
4		4
5	ICONS = [	5	ICONS = [
6	['no-icon', _('(No icon)')],	6	['no-icon', _('(No icon)')],