Download as
Browse Code »

Commit 434324462144aa9178fe920975c235e6160e6198

Authored by Francisco Marcelo de Araújo Lima Júnior
1 parent 86affbef
Exists in staging and in 7 other branches angular_poc, api-article-archived, api-homepage, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email

adapt functional test to new proposal to add blocks

Showing 1 changed file with 23 additions and 66 deletions   Show diff stats
test/functional/environment_design_controller_test.rb
  Diff comments   View file @4343244
... ... @@ -179,12 +179,12 @@ class EnvironmentDesignControllerTest < ActionController::TestCase
179 179 assert_tag :tag => 'a', :attributes => {:href => '/admin'}, :child => {:tag => 'span', :content => "Back to control panel"}
180 180 end
181 181  
182   - should 'render add a new block functionality' do
  182 + should 'render block types container to add/move block functionality' do
183 183 login_as(create_admin_user(Environment.default))
184   - get :add_block
  184 + get :index
185 185  
186 186 assert_response :success
187   - assert_template 'add_block'
  187 + assert_tag :tag => 'div', :attributes => {:id => 'block-types-container'}
188 188 end
189 189  
190 190 should 'a environment block plugin add new blocks for environments' do
... ... @@ -226,7 +226,7 @@ class EnvironmentDesignControllerTest < ActionController::TestCase
226 226 assert !@controller.available_blocks.include?(CustomBlock4)
227 227 end
228 228  
229   - should 'a block plugin with center position add new blocks only in this position' do
  229 + should 'a block plugin add new blocks in any position' do
230 230 class CustomBlock1 < Block; end;
231 231 class CustomBlock2 < Block; end;
232 232 class CustomBlock3 < Block; end;
... ... @@ -255,61 +255,18 @@ class EnvironmentDesignControllerTest &lt; ActionController::TestCase
255 255  
256 256 Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([TestBlockPlugin.new])
257 257 login_as(create_admin_user(Environment.default))
258   - get :add_block
259   -
260   - assert_response :success
261   - assert @controller.instance_variable_get('@center_block_types').include?(CustomBlock1)
262   - assert @controller.instance_variable_get('@center_block_types').include?(CustomBlock2)
263   - assert @controller.instance_variable_get('@center_block_types').include?(CustomBlock3)
264   - assert !@controller.instance_variable_get('@center_block_types').include?(CustomBlock4)
265   - assert !@controller.instance_variable_get('@center_block_types').include?(CustomBlock5)
266   - assert !@controller.instance_variable_get('@center_block_types').include?(CustomBlock6)
267   - assert !@controller.instance_variable_get('@center_block_types').include?(CustomBlock7)
268   - assert !@controller.instance_variable_get('@center_block_types').include?(CustomBlock8)
269   - assert !@controller.instance_variable_get('@center_block_types').include?(CustomBlock9)
270   - end
271   -
272   - should 'a block plugin with side position add new blocks only in this position' do
273   - class CustomBlock1 < Block; end;
274   - class CustomBlock2 < Block; end;
275   - class CustomBlock3 < Block; end;
276   - class CustomBlock4 < Block; end;
277   - class CustomBlock5 < Block; end;
278   - class CustomBlock6 < Block; end;
279   - class CustomBlock7 < Block; end;
280   - class CustomBlock8 < Block; end;
281   - class CustomBlock9 < Block; end;
282   -
283   - class TestBlockPlugin < Noosfero::Plugin
284   - def self.extra_blocks
285   - {
286   - CustomBlock1 => {:type => Environment, :position => [1]},
287   - CustomBlock2 => {:type => Environment, :position => 1},
288   - CustomBlock3 => {:type => Environment, :position => '1'},
289   - CustomBlock4 => {:type => Environment, :position => [2]},
290   - CustomBlock5 => {:type => Environment, :position => 2},
291   - CustomBlock6 => {:type => Environment, :position => '2'},
292   - CustomBlock7 => {:type => Environment, :position => [3]},
293   - CustomBlock8 => {:type => Environment, :position => 3},
294   - CustomBlock9 => {:type => Environment, :position => '3'},
295   - }
296   - end
297   - end
  258 + get :index
298 259  
299   - Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([TestBlockPlugin.new])
300   - login_as(create_admin_user(Environment.default))
301   - get :add_block
302 260 assert_response :success
303   -
304   - assert !@controller.instance_variable_get('@side_block_types').include?(CustomBlock1)
305   - assert !@controller.instance_variable_get('@side_block_types').include?(CustomBlock2)
306   - assert !@controller.instance_variable_get('@side_block_types').include?(CustomBlock3)
307   - assert @controller.instance_variable_get('@side_block_types').include?(CustomBlock4)
308   - assert @controller.instance_variable_get('@side_block_types').include?(CustomBlock5)
309   - assert @controller.instance_variable_get('@side_block_types').include?(CustomBlock6)
310   - assert @controller.instance_variable_get('@side_block_types').include?(CustomBlock7)
311   - assert @controller.instance_variable_get('@side_block_types').include?(CustomBlock8)
312   - assert @controller.instance_variable_get('@side_block_types').include?(CustomBlock9)
  261 + assert @controller.instance_variable_get('@blocks').include?(CustomBlock1)
  262 + assert @controller.instance_variable_get('@blocks').include?(CustomBlock2)
  263 + assert @controller.instance_variable_get('@blocks').include?(CustomBlock3)
  264 + assert @controller.instance_variable_get('@blocks').include?(CustomBlock4)
  265 + assert @controller.instance_variable_get('@blocks').include?(CustomBlock5)
  266 + assert @controller.instance_variable_get('@blocks').include?(CustomBlock6)
  267 + assert @controller.instance_variable_get('@blocks').include?(CustomBlock7)
  268 + assert @controller.instance_variable_get('@blocks').include?(CustomBlock8)
  269 + assert @controller.instance_variable_get('@blocks').include?(CustomBlock9)
313 270 end
314 271  
315 272 should 'a block plugin cannot be listed for unspecified types' do
... ... @@ -339,17 +296,17 @@ class EnvironmentDesignControllerTest &lt; ActionController::TestCase
339 296  
340 297 Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([TestBlockPlugin.new])
341 298 login_as(create_admin_user(Environment.default))
342   - get :add_block
  299 + get :index
343 300 assert_response :success
344 301  
345   - assert !@controller.instance_variable_get('@center_block_types').include?(CustomBlock1)
346   - assert !@controller.instance_variable_get('@center_block_types').include?(CustomBlock2)
347   - assert !@controller.instance_variable_get('@center_block_types').include?(CustomBlock3)
348   - assert @controller.instance_variable_get('@center_block_types').include?(CustomBlock4)
349   - assert !@controller.instance_variable_get('@side_block_types').include?(CustomBlock5)
350   - assert !@controller.instance_variable_get('@side_block_types').include?(CustomBlock6)
351   - assert !@controller.instance_variable_get('@side_block_types').include?(CustomBlock7)
352   - assert @controller.instance_variable_get('@side_block_types').include?(CustomBlock8)
  302 + assert !@controller.instance_variable_get('@blocks').include?(CustomBlock1)
  303 + assert !@controller.instance_variable_get('@blocks').include?(CustomBlock2)
  304 + assert !@controller.instance_variable_get('@blocks').include?(CustomBlock3)
  305 + assert @controller.instance_variable_get('@blocks').include?(CustomBlock4)
  306 + assert !@controller.instance_variable_get('@blocks').include?(CustomBlock5)
  307 + assert !@controller.instance_variable_get('@blocks').include?(CustomBlock6)
  308 + assert !@controller.instance_variable_get('@blocks').include?(CustomBlock7)
  309 + assert @controller.instance_variable_get('@blocks').include?(CustomBlock8)
353 310 end
354 311  
355 312 should 'clone a block' do
... ...