Download as
Browse Code »

Commit 764f2771d067dd1004eb8a9e6c1c744424683aab

Authored by Rodrigo Souto
1 parent e80da508
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

clone-block: replace enabled=false by display=:never

Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
app/models/block.rb
  Diff comments   View file @764f277
... ... @@ -170,7 +170,7 @@ class Block < ActiveRecord::Base
170 170  
171 171 def duplicate
172 172 duplicated_block = self.clone
173   - duplicated_block.enabled = false
  173 + duplicated_block.display = 'never'
174 174 duplicated_block.created_at = nil
175 175 duplicated_block.updated_at = nil
176 176 duplicated_block.save!
... ...
test/unit/block_test.rb
  Diff comments   View file @764f277
... ... @@ -2,7 +2,6 @@ require File.dirname(__FILE__) + '/../test_helper'
2 2  
3 3 class BlockTest < ActiveSupport::TestCase
4 4  
5   - DUPLICATABLE_FIELDS = [:settings, :title, :box_id, :type]
6 5  
7 6 should 'describe itself' do
8 7 assert_kind_of String, Block.description
... ... @@ -179,9 +178,10 @@ class BlockTest &lt; ActiveSupport::TestCase
179 178 box = fast_create(Box, :owner_id => fast_create(Profile).id)
180 179 block = TagsBlock.create!(:title => 'test 1', :box_id => box.id, :settings => {:test => 'test'})
181 180 duplicated = block.duplicate
182   - DUPLICATABLE_FIELDS.each do |f|
  181 + [:title, :box_id, :type].each do |f|
183 182 assert_equal duplicated.send(f), block.send(f)
184 183 end
  184 + assert 'test', duplicated[:settings][:test]
185 185 end
186 186  
187 187 should 'clone block and set fields' do
... ... @@ -191,7 +191,7 @@ class BlockTest &lt; ActiveSupport::TestCase
191 191 duplicated = block.duplicate
192 192 block2.reload
193 193 block.reload
194   - assert_equal false, duplicated.enabled
  194 + assert_equal 'never', duplicated.display
195 195 assert_equal 1, block.position
196 196 assert_equal 2, duplicated.position
197 197 assert_equal 3, block2.position
... ...