From 76b22ac68ab7e4689692f9ce2d5a4d914e094254 Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Tue, 16 Dec 2014 12:52:11 -0300 Subject: [PATCH] Fix tests for box_design --- test/functional/environment_design_controller_test.rb | 34 +++++++++++++++++----------------- test/functional/profile_design_controller_test.rb | 34 +++++++++++++++++----------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/test/functional/environment_design_controller_test.rb b/test/functional/environment_design_controller_test.rb index fc43c78..1f03c75 100644 --- a/test/functional/environment_design_controller_test.rb +++ b/test/functional/environment_design_controller_test.rb @@ -244,15 +244,15 @@ class EnvironmentDesignControllerTest < ActionController::TestCase get :index assert_response :success - 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) + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock1) + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock2) + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock3) + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock4) + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock5) + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock6) + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock7) + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock8) + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock9) end should 'a block plugin cannot be listed for unspecified types' do @@ -285,14 +285,14 @@ class EnvironmentDesignControllerTest < ActionController::TestCase get :index assert_response :success - 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('@available_blocks').include?(CustomBlock1) + assert !@controller.instance_variable_get('@available_blocks').include?(CustomBlock2) + assert !@controller.instance_variable_get('@available_blocks').include?(CustomBlock3) + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock4) + assert !@controller.instance_variable_get('@available_blocks').include?(CustomBlock5) + assert !@controller.instance_variable_get('@available_blocks').include?(CustomBlock6) + assert !@controller.instance_variable_get('@available_blocks').include?(CustomBlock7) + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock8) end should 'clone a block' do diff --git a/test/functional/profile_design_controller_test.rb b/test/functional/profile_design_controller_test.rb index fff158e..6187edd 100644 --- a/test/functional/profile_design_controller_test.rb +++ b/test/functional/profile_design_controller_test.rb @@ -216,15 +216,15 @@ class ProfileDesignControllerTest < ActionController::TestCase get :index, :profile => 'designtestuser' assert_response :success - 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) + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock1) + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock2) + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock3) + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock4) + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock5) + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock6) + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock7) + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock8) + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock9) end should 'a block plugin cannot be listed for unspecified types' do @@ -256,14 +256,14 @@ class ProfileDesignControllerTest < ActionController::TestCase get :index, :profile => 'designtestuser' assert_response :success - 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('@available_blocks').include?(CustomBlock1) + assert !@controller.instance_variable_get('@available_blocks').include?(CustomBlock2) + assert !@controller.instance_variable_get('@available_blocks').include?(CustomBlock3) + assert !@controller.instance_variable_get('@available_blocks').include?(CustomBlock4) + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock5) + assert !@controller.instance_variable_get('@available_blocks').include?(CustomBlock6) + assert !@controller.instance_variable_get('@available_blocks').include?(CustomBlock7) + assert !@controller.instance_variable_get('@available_blocks').include?(CustomBlock8) end should 'not edit main block with never option' do -- libgit2 0.21.2