Commit 76b22ac68ab7e4689692f9ce2d5a4d914e094254

Authored by Victor Costa
1 parent 7b1a306f

Fix tests for box_design

test/functional/environment_design_controller_test.rb
@@ -244,15 +244,15 @@ class EnvironmentDesignControllerTest < ActionController::TestCase @@ -244,15 +244,15 @@ class EnvironmentDesignControllerTest < ActionController::TestCase
244 get :index 244 get :index
245 245
246 assert_response :success 246 assert_response :success
247 - assert @controller.instance_variable_get('@blocks').include?(CustomBlock1)  
248 - assert @controller.instance_variable_get('@blocks').include?(CustomBlock2)  
249 - assert @controller.instance_variable_get('@blocks').include?(CustomBlock3)  
250 - assert @controller.instance_variable_get('@blocks').include?(CustomBlock4)  
251 - assert @controller.instance_variable_get('@blocks').include?(CustomBlock5)  
252 - assert @controller.instance_variable_get('@blocks').include?(CustomBlock6)  
253 - assert @controller.instance_variable_get('@blocks').include?(CustomBlock7)  
254 - assert @controller.instance_variable_get('@blocks').include?(CustomBlock8)  
255 - assert @controller.instance_variable_get('@blocks').include?(CustomBlock9) 247 + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock1)
  248 + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock2)
  249 + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock3)
  250 + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock4)
  251 + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock5)
  252 + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock6)
  253 + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock7)
  254 + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock8)
  255 + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock9)
256 end 256 end
257 257
258 should 'a block plugin cannot be listed for unspecified types' do 258 should 'a block plugin cannot be listed for unspecified types' do
@@ -285,14 +285,14 @@ class EnvironmentDesignControllerTest < ActionController::TestCase @@ -285,14 +285,14 @@ class EnvironmentDesignControllerTest < ActionController::TestCase
285 get :index 285 get :index
286 assert_response :success 286 assert_response :success
287 287
288 - assert !@controller.instance_variable_get('@blocks').include?(CustomBlock1)  
289 - assert !@controller.instance_variable_get('@blocks').include?(CustomBlock2)  
290 - assert !@controller.instance_variable_get('@blocks').include?(CustomBlock3)  
291 - assert @controller.instance_variable_get('@blocks').include?(CustomBlock4)  
292 - assert !@controller.instance_variable_get('@blocks').include?(CustomBlock5)  
293 - assert !@controller.instance_variable_get('@blocks').include?(CustomBlock6)  
294 - assert !@controller.instance_variable_get('@blocks').include?(CustomBlock7)  
295 - assert @controller.instance_variable_get('@blocks').include?(CustomBlock8) 288 + assert !@controller.instance_variable_get('@available_blocks').include?(CustomBlock1)
  289 + assert !@controller.instance_variable_get('@available_blocks').include?(CustomBlock2)
  290 + assert !@controller.instance_variable_get('@available_blocks').include?(CustomBlock3)
  291 + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock4)
  292 + assert !@controller.instance_variable_get('@available_blocks').include?(CustomBlock5)
  293 + assert !@controller.instance_variable_get('@available_blocks').include?(CustomBlock6)
  294 + assert !@controller.instance_variable_get('@available_blocks').include?(CustomBlock7)
  295 + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock8)
296 end 296 end
297 297
298 should 'clone a block' do 298 should 'clone a block' do
test/functional/profile_design_controller_test.rb
@@ -216,15 +216,15 @@ class ProfileDesignControllerTest < ActionController::TestCase @@ -216,15 +216,15 @@ class ProfileDesignControllerTest < ActionController::TestCase
216 get :index, :profile => 'designtestuser' 216 get :index, :profile => 'designtestuser'
217 assert_response :success 217 assert_response :success
218 218
219 - assert @controller.instance_variable_get('@blocks').include?(CustomBlock1)  
220 - assert @controller.instance_variable_get('@blocks').include?(CustomBlock2)  
221 - assert @controller.instance_variable_get('@blocks').include?(CustomBlock3)  
222 - assert @controller.instance_variable_get('@blocks').include?(CustomBlock4)  
223 - assert @controller.instance_variable_get('@blocks').include?(CustomBlock5)  
224 - assert @controller.instance_variable_get('@blocks').include?(CustomBlock6)  
225 - assert @controller.instance_variable_get('@blocks').include?(CustomBlock7)  
226 - assert @controller.instance_variable_get('@blocks').include?(CustomBlock8)  
227 - assert @controller.instance_variable_get('@blocks').include?(CustomBlock9) 219 + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock1)
  220 + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock2)
  221 + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock3)
  222 + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock4)
  223 + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock5)
  224 + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock6)
  225 + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock7)
  226 + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock8)
  227 + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock9)
228 end 228 end
229 229
230 should 'a block plugin cannot be listed for unspecified types' do 230 should 'a block plugin cannot be listed for unspecified types' do
@@ -256,14 +256,14 @@ class ProfileDesignControllerTest < ActionController::TestCase @@ -256,14 +256,14 @@ class ProfileDesignControllerTest < ActionController::TestCase
256 get :index, :profile => 'designtestuser' 256 get :index, :profile => 'designtestuser'
257 assert_response :success 257 assert_response :success
258 258
259 - assert @controller.instance_variable_get('@blocks').include?(CustomBlock1)  
260 - assert !@controller.instance_variable_get('@blocks').include?(CustomBlock2)  
261 - assert !@controller.instance_variable_get('@blocks').include?(CustomBlock3)  
262 - assert !@controller.instance_variable_get('@blocks').include?(CustomBlock4)  
263 - assert @controller.instance_variable_get('@blocks').include?(CustomBlock5)  
264 - assert !@controller.instance_variable_get('@blocks').include?(CustomBlock6)  
265 - assert !@controller.instance_variable_get('@blocks').include?(CustomBlock7)  
266 - assert !@controller.instance_variable_get('@blocks').include?(CustomBlock8) 259 + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock1)
  260 + assert !@controller.instance_variable_get('@available_blocks').include?(CustomBlock2)
  261 + assert !@controller.instance_variable_get('@available_blocks').include?(CustomBlock3)
  262 + assert !@controller.instance_variable_get('@available_blocks').include?(CustomBlock4)
  263 + assert @controller.instance_variable_get('@available_blocks').include?(CustomBlock5)
  264 + assert !@controller.instance_variable_get('@available_blocks').include?(CustomBlock6)
  265 + assert !@controller.instance_variable_get('@available_blocks').include?(CustomBlock7)
  266 + assert !@controller.instance_variable_get('@available_blocks').include?(CustomBlock8)
267 end 267 end
268 268
269 should 'not edit main block with never option' do 269 should 'not edit main block with never option' do