kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed mocha availability checks in tests. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8783 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-02-05 12:20:41 +00:00
parent 9f6496b0bc
commit 4128a8bfd0
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/functional/issues_controller_test.rb
View File

@ -2318,8 +2318,7 @@ class IssuesControllerTest < ActionController::TestCase
:attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}} :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
assert_redirected_to :action => 'show', :id => '1' assert_redirected_to :action => 'show', :id => '1'
assert_equal '1 file(s) could not be saved.', flash[:warning] assert_equal '1 file(s) could not be saved.', flash[:warning]
end
end if Object.const_defined?(:Mocha)
def test_put_update_with_no_change def test_put_update_with_no_change
issue = Issue.find(1) issue = Issue.find(1)

6
test/integration/account_test.rb
View File

@ -144,8 +144,6 @@ class AccountTest < ActionController::IntegrationTest
log_user('newuser', 'newpass') log_user('newuser', 'newpass')
end end
if Object.const_defined?(:Mocha)
def test_onthefly_registration def test_onthefly_registration
# disable registration # disable registration
Setting.self_registration = '0' Setting.self_registration = '0'
@ -199,8 +197,4 @@ class AccountTest < ActionController::IntegrationTest
assert_not_equal sid, session[:session_id], "logout should reset session" assert_not_equal sid, session[:session_id], "logout should reset session"
assert_nil session[:user_id] assert_nil session[:user_id]
end end
else
puts 'Mocha is missing. Skipping tests.'
end
end end