Commit 54342a3022f377b0680eee157cf37d8435fb339b
1 parent
6ebe7a2a
Exists in
master
and in
28 other branches
Fixing blocks test
Showing
1 changed file
with
3 additions
and
6 deletions
Show diff stats
test/functional/application_controller_test.rb
@@ -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 |