From 434324462144aa9178fe920975c235e6160e6198 Mon Sep 17 00:00:00 2001 From: Francisco Marcelo de Araújo Lima Júnior Date: Mon, 4 Aug 2014 14:59:54 -0300 Subject: [PATCH] adapt functional test to new proposal to add blocks --- test/functional/environment_design_controller_test.rb | 89 +++++++++++++++++++++++------------------------------------------------------------------ 1 file changed, 23 insertions(+), 66 deletions(-) diff --git a/test/functional/environment_design_controller_test.rb b/test/functional/environment_design_controller_test.rb index 674c476..2d838d5 100644 --- a/test/functional/environment_design_controller_test.rb +++ b/test/functional/environment_design_controller_test.rb @@ -179,12 +179,12 @@ class EnvironmentDesignControllerTest < ActionController::TestCase assert_tag :tag => 'a', :attributes => {:href => '/admin'}, :child => {:tag => 'span', :content => "Back to control panel"} end - should 'render add a new block functionality' do + should 'render block types container to add/move block functionality' do login_as(create_admin_user(Environment.default)) - get :add_block + get :index assert_response :success - assert_template 'add_block' + assert_tag :tag => 'div', :attributes => {:id => 'block-types-container'} end should 'a environment block plugin add new blocks for environments' do @@ -226,7 +226,7 @@ class EnvironmentDesignControllerTest < ActionController::TestCase assert !@controller.available_blocks.include?(CustomBlock4) end - should 'a block plugin with center position add new blocks only in this position' do + should 'a block plugin add new blocks in any position' do class CustomBlock1 < Block; end; class CustomBlock2 < Block; end; class CustomBlock3 < Block; end; @@ -255,61 +255,18 @@ class EnvironmentDesignControllerTest < ActionController::TestCase Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([TestBlockPlugin.new]) login_as(create_admin_user(Environment.default)) - get :add_block - - assert_response :success - assert @controller.instance_variable_get('@center_block_types').include?(CustomBlock1) - assert @controller.instance_variable_get('@center_block_types').include?(CustomBlock2) - assert @controller.instance_variable_get('@center_block_types').include?(CustomBlock3) - assert !@controller.instance_variable_get('@center_block_types').include?(CustomBlock4) - assert !@controller.instance_variable_get('@center_block_types').include?(CustomBlock5) - assert !@controller.instance_variable_get('@center_block_types').include?(CustomBlock6) - assert !@controller.instance_variable_get('@center_block_types').include?(CustomBlock7) - assert !@controller.instance_variable_get('@center_block_types').include?(CustomBlock8) - assert !@controller.instance_variable_get('@center_block_types').include?(CustomBlock9) - end - - should 'a block plugin with side position add new blocks only in this position' do - class CustomBlock1 < Block; end; - class CustomBlock2 < Block; end; - class CustomBlock3 < Block; end; - class CustomBlock4 < Block; end; - class CustomBlock5 < Block; end; - class CustomBlock6 < Block; end; - class CustomBlock7 < Block; end; - class CustomBlock8 < Block; end; - class CustomBlock9 < Block; end; - - class TestBlockPlugin < Noosfero::Plugin - def self.extra_blocks - { - CustomBlock1 => {:type => Environment, :position => [1]}, - CustomBlock2 => {:type => Environment, :position => 1}, - CustomBlock3 => {:type => Environment, :position => '1'}, - CustomBlock4 => {:type => Environment, :position => [2]}, - CustomBlock5 => {:type => Environment, :position => 2}, - CustomBlock6 => {:type => Environment, :position => '2'}, - CustomBlock7 => {:type => Environment, :position => [3]}, - CustomBlock8 => {:type => Environment, :position => 3}, - CustomBlock9 => {:type => Environment, :position => '3'}, - } - end - end + get :index - Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([TestBlockPlugin.new]) - login_as(create_admin_user(Environment.default)) - get :add_block assert_response :success - - assert !@controller.instance_variable_get('@side_block_types').include?(CustomBlock1) - assert !@controller.instance_variable_get('@side_block_types').include?(CustomBlock2) - assert !@controller.instance_variable_get('@side_block_types').include?(CustomBlock3) - assert @controller.instance_variable_get('@side_block_types').include?(CustomBlock4) - assert @controller.instance_variable_get('@side_block_types').include?(CustomBlock5) - assert @controller.instance_variable_get('@side_block_types').include?(CustomBlock6) - assert @controller.instance_variable_get('@side_block_types').include?(CustomBlock7) - assert @controller.instance_variable_get('@side_block_types').include?(CustomBlock8) - assert @controller.instance_variable_get('@side_block_types').include?(CustomBlock9) + assert @controller.instance_variable_get('@blocks').include?(CustomBlock1) + assert @controller.instance_variable_get('@blocks').include?(CustomBlock2) + assert @controller.instance_variable_get('@blocks').include?(CustomBlock3) + assert @controller.instance_variable_get('@blocks').include?(CustomBlock4) + assert @controller.instance_variable_get('@blocks').include?(CustomBlock5) + assert @controller.instance_variable_get('@blocks').include?(CustomBlock6) + assert @controller.instance_variable_get('@blocks').include?(CustomBlock7) + assert @controller.instance_variable_get('@blocks').include?(CustomBlock8) + assert @controller.instance_variable_get('@blocks').include?(CustomBlock9) end should 'a block plugin cannot be listed for unspecified types' do @@ -339,17 +296,17 @@ class EnvironmentDesignControllerTest < ActionController::TestCase Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([TestBlockPlugin.new]) login_as(create_admin_user(Environment.default)) - get :add_block + get :index assert_response :success - assert !@controller.instance_variable_get('@center_block_types').include?(CustomBlock1) - assert !@controller.instance_variable_get('@center_block_types').include?(CustomBlock2) - assert !@controller.instance_variable_get('@center_block_types').include?(CustomBlock3) - assert @controller.instance_variable_get('@center_block_types').include?(CustomBlock4) - assert !@controller.instance_variable_get('@side_block_types').include?(CustomBlock5) - assert !@controller.instance_variable_get('@side_block_types').include?(CustomBlock6) - assert !@controller.instance_variable_get('@side_block_types').include?(CustomBlock7) - assert @controller.instance_variable_get('@side_block_types').include?(CustomBlock8) + assert !@controller.instance_variable_get('@blocks').include?(CustomBlock1) + assert !@controller.instance_variable_get('@blocks').include?(CustomBlock2) + assert !@controller.instance_variable_get('@blocks').include?(CustomBlock3) + assert @controller.instance_variable_get('@blocks').include?(CustomBlock4) + assert !@controller.instance_variable_get('@blocks').include?(CustomBlock5) + assert !@controller.instance_variable_get('@blocks').include?(CustomBlock6) + assert !@controller.instance_variable_get('@blocks').include?(CustomBlock7) + assert @controller.instance_variable_get('@blocks').include?(CustomBlock8) end should 'clone a block' do -- libgit2 0.21.2