Download as
Browse Code »

Commit 227eddb3d3cd51bdec1b5eba3e4f5f1ae933c670

Authored by Antonio Terceiro
1 parent 5aa92367
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem953: adapting tests

Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
test/functional/application_controller_test.rb
  Diff comments   View file @227eddb
... ... @@ -298,7 +298,7 @@ class ApplicationControllerTest < Test::Unit::TestCase
298 298 end
299 299  
300 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 302 @request.expects(:ssl?).returns(false).at_least_once
303 303 get :sslonly
304 304 assert_response :success
... ... @@ -334,7 +334,7 @@ class ApplicationControllerTest < Test::Unit::TestCase
334 334 assert_response :success
335 335 end
336 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 338 @request.expects(:ssl?).returns(true).at_least_once
339 339 get :nossl
340 340 assert_response :success
... ...