diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index f423cc5..6f37bd7 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -2318,8 +2318,7 @@ class IssuesControllerTest < ActionController::TestCase :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}} assert_redirected_to :action => 'show', :id => '1' assert_equal '1 file(s) could not be saved.', flash[:warning] - - end if Object.const_defined?(:Mocha) + end def test_put_update_with_no_change issue = Issue.find(1) diff --git a/test/integration/account_test.rb b/test/integration/account_test.rb index 8cf105f..11afd2b 100644 --- a/test/integration/account_test.rb +++ b/test/integration/account_test.rb @@ -144,8 +144,6 @@ class AccountTest < ActionController::IntegrationTest log_user('newuser', 'newpass') end - if Object.const_defined?(:Mocha) - def test_onthefly_registration # disable registration Setting.self_registration = '0' @@ -199,8 +197,4 @@ class AccountTest < ActionController::IntegrationTest assert_not_equal sid, session[:session_id], "logout should reset session" assert_nil session[:user_id] end - - else - puts 'Mocha is missing. Skipping tests.' - end end