diff --git a/test/functional/environment_design_controller_test.rb b/test/functional/environment_design_controller_test.rb index 86e07a5..0bea99e 100644 --- a/test/functional/environment_design_controller_test.rb +++ b/test/functional/environment_design_controller_test.rb @@ -233,61 +233,10 @@ 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) - refute @controller.instance_variable_get('@center_block_types').include?(CustomBlock4) - refute @controller.instance_variable_get('@center_block_types').include?(CustomBlock5) - refute @controller.instance_variable_get('@center_block_types').include?(CustomBlock6) - refute @controller.instance_variable_get('@center_block_types').include?(CustomBlock7) - refute @controller.instance_variable_get('@center_block_types').include?(CustomBlock8) - refute @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 - - 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 - refute @controller.instance_variable_get('@side_block_types').include?(CustomBlock1) - refute @controller.instance_variable_get('@side_block_types').include?(CustomBlock2) - refute @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) + (1..9).each {|i| assert_tag :tag => 'div', :attributes => { 'data-block-type' => "EnvironmentDesignControllerTest::CustomBlock#{i}" }} end should 'a block plugin cannot be listed for unspecified types' do @@ -320,14 +269,8 @@ class EnvironmentDesignControllerTest < ActionController::TestCase get :index assert_response :success - refute @controller.instance_variable_get('@center_block_types').include?(CustomBlock1) - refute @controller.instance_variable_get('@center_block_types').include?(CustomBlock2) - refute @controller.instance_variable_get('@center_block_types').include?(CustomBlock3) - assert @controller.instance_variable_get('@center_block_types').include?(CustomBlock4) - refute @controller.instance_variable_get('@side_block_types').include?(CustomBlock5) - refute @controller.instance_variable_get('@side_block_types').include?(CustomBlock6) - refute @controller.instance_variable_get('@side_block_types').include?(CustomBlock7) - assert @controller.instance_variable_get('@side_block_types').include?(CustomBlock8) + [4, 8].each {|i| assert_tag :tag => 'div', :attributes => { 'data-block-type' => "EnvironmentDesignControllerTest::CustomBlock#{i}" }} + [1, 2, 3, 5, 6, 7].each {|i| assert_no_tag :tag => 'div', :attributes => { 'data-block-type' => "EnvironmentDesignControllerTest::CustomBlock#{i}" }} end should 'clone a block' do -- libgit2 0.21.2