From 5179b71b83b1626b3c0f5ba25e280b8adf39d88e Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Fri, 1 Nov 2013 13:59:41 -0300 Subject: [PATCH] Fix method extension of container block that return a list of blocks (profile and environment) --- plugins/container_block/lib/container_block_array.rb | 4 ++-- plugins/container_block/test/functional/container_block_environment_design_controller_test.rb | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/container_block/lib/container_block_array.rb b/plugins/container_block/lib/container_block_array.rb index 637a2d5..576012d 100644 --- a/plugins/container_block/lib/container_block_array.rb +++ b/plugins/container_block/lib/container_block_array.rb @@ -1,7 +1,7 @@ module ContainerBlockArray - def blocks_with_container_block_plugin - blocks = blocks_without_container_block_plugin + def blocks_with_container_block_plugin(reload = false) + blocks = blocks_without_container_block_plugin(reload) blocks.each { |block| blocks.concat(block.blocks) if block.kind_of?(ContainerBlock) } end diff --git a/plugins/container_block/test/functional/container_block_environment_design_controller_test.rb b/plugins/container_block/test/functional/container_block_environment_design_controller_test.rb index fbcfbe6..c004aec 100644 --- a/plugins/container_block/test/functional/container_block_environment_design_controller_test.rb +++ b/plugins/container_block/test/functional/container_block_environment_design_controller_test.rb @@ -21,7 +21,6 @@ class EnvironmentDesignControllerTest < ActionController::TestCase login_as(user.login) @block = ContainerBlock.create!(:box => @environment.boxes.first) - @environment = Environment.find(@environment.id) end should 'be able to edit ContainerBlock' do -- libgit2 0.21.2