Fix method extension of container block that return a list of blocks (profile and environment)

Victor Costa
1 parent 3c42961d
Showing 2 changed files with 2 additions and 3 deletions Show diff stats
plugins/container_block/lib/container_block_array.rb
plugins/container_block/test/functional/container_block_environment_design_controller_test.rb
 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
@@ -21,7 +21,6 @@ class EnvironmentDesignControllerTest &lt; 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
1	module ContainerBlockArray	1	module ContainerBlockArray
2		2
3	- def blocks_with_container_block_plugin
4	- blocks = blocks_without_container_block_plugin	3	+ def blocks_with_container_block_plugin(reload = false)
		4	+ blocks = blocks_without_container_block_plugin(reload)
5	blocks.each { \|block\| blocks.concat(block.blocks) if block.kind_of?(ContainerBlock) }	5	blocks.each { \|block\| blocks.concat(block.blocks) if block.kind_of?(ContainerBlock) }
6	end	6	end
7		7
	@@ -21,7 +21,6 @@ class EnvironmentDesignControllerTest < ActionController::TestCase		@@ -21,7 +21,6 @@ class EnvironmentDesignControllerTest < ActionController::TestCase
21	login_as(user.login)	21	login_as(user.login)
22		22
23	@block = ContainerBlock.create!(:box => @environment.boxes.first)	23	@block = ContainerBlock.create!(:box => @environment.boxes.first)
24	- @environment = Environment.find(@environment.id)
25	end	24	end
26		25
27	should 'be able to edit ContainerBlock' do	26	should 'be able to edit ContainerBlock' do