Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed test.

Browse source
This commit is contained in:
Martin Edenhofer 2017-01-16 01:43:44 +01:00
parent a1a56f49c0
commit 62af5fb2ca
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
test/integration/user_agent_test.rb
View file

@ -6,10 +6,11 @@ class UserAgentTest < ActiveSupport::TestCase
#host = 'http://127.0.0.1:3003'
setup do
return if ENV['ZAMMAD_PROXY_TEST'] != 'true'
Setting.set('proxy', ENV['ZAMMAD_PROXY'])
Setting.set('proxy_username', ENV['ZAMMAD_PROXY_USERNAME'])
Setting.set('proxy_password', ENV['ZAMMAD_PROXY_PASSWORD'])
if ENV['ZAMMAD_PROXY_TEST'] == 'true'
Setting.set('proxy', ENV['ZAMMAD_PROXY'])
Setting.set('proxy_username', ENV['ZAMMAD_PROXY_USERNAME'])
Setting.set('proxy_password', ENV['ZAMMAD_PROXY_PASSWORD'])
end
end
# check