Download as
Browse Code »

Commit 54342a3022f377b0680eee157cf37d8435fb339b

Authored by Antonio Terceiro
1 parent 6ebe7a2a
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Fixing blocks test

Showing 1 changed file with 3 additions and 6 deletions   Show diff stats
test/functional/application_controller_test.rb
  Diff comments   View file @54342a3
@@ -160,16 +160,13 @@ class ApplicationControllerTest < ActionController::TestCase @@ -160,16 +160,13 @@ class ApplicationControllerTest < ActionController::TestCase
160 assert !DoesNotUsesBlocksTestController.new.uses_design_blocks? 160 assert !DoesNotUsesBlocksTestController.new.uses_design_blocks?
161 end 161 end
162 162
163 - should 'use design plugin to generate blocks' do 163 + should 'generate blocks' do
164 get :index 164 get :index
165 assert_tag :tag => 'div', :attributes => { :id => 'boxes', :class => 'boxes' } 165 assert_tag :tag => 'div', :attributes => { :id => 'boxes', :class => 'boxes' }
166 end 166 end
167 167
168 - should 'not use design plugin when tells so' do  
169 - class NoDesignBlocksTestController < ApplicationController  
170 - no_design_blocks  
171 - end  
172 - @controller = NoDesignBlocksTestController.new 168 + should 'not generate blocks when told not to do so' do
  169 + @controller.stubs(:uses_design_blocks?).returns(false)
173 get :index 170 get :index
174 assert_no_tag :tag => 'div', :attributes => { :id => 'boxes', :class => 'boxes' } 171 assert_no_tag :tag => 'div', :attributes => { :id => 'boxes', :class => 'boxes' }
175 end 172 end