Commit 227eddb3d3cd51bdec1b5eba3e4f5f1ae933c670
1 parent
5aa92367
Exists in
master
and in
29 other branches
ActionItem953: adapting tests
Showing
1 changed file
with
2 additions
and
2 deletions
Show diff stats
test/functional/application_controller_test.rb
@@ -298,7 +298,7 @@ class ApplicationControllerTest < Test::Unit::TestCase | @@ -298,7 +298,7 @@ class ApplicationControllerTest < Test::Unit::TestCase | ||
298 | end | 298 | end |
299 | 299 | ||
300 | should 'not force ssl in development mode' do | 300 | should 'not force ssl in development mode' do |
301 | - ENV.expects(:[]).with('RAILS_ENV').returns('development') | 301 | + ENV.expects(:[]).with('RAILS_ENV').returns('development').at_least_once |
302 | @request.expects(:ssl?).returns(false).at_least_once | 302 | @request.expects(:ssl?).returns(false).at_least_once |
303 | get :sslonly | 303 | get :sslonly |
304 | assert_response :success | 304 | assert_response :success |
@@ -334,7 +334,7 @@ class ApplicationControllerTest < Test::Unit::TestCase | @@ -334,7 +334,7 @@ class ApplicationControllerTest < Test::Unit::TestCase | ||
334 | assert_response :success | 334 | assert_response :success |
335 | end | 335 | end |
336 | should 'not refuse ssl while in development mode' do | 336 | should 'not refuse ssl while in development mode' do |
337 | - ENV.expects(:[]).with('RAILS_ENV').returns('development') | 337 | + ENV.expects(:[]).with('RAILS_ENV').returns('development').at_least_once |
338 | @request.expects(:ssl?).returns(true).at_least_once | 338 | @request.expects(:ssl?).returns(true).at_least_once |
339 | get :nossl | 339 | get :nossl |
340 | assert_response :success | 340 | assert_response :success |