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

Merge branch 'develop' of github.com:martini/zammad into develop

Browse source
This commit is contained in:
Martin Edenhofer 2015-07-16 20:10:45 +02:00
commit a8505ed5dd
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/browser/agent_ticket_actions_level3_test.rb
View file

@ -206,7 +206,7 @@ class AgentTicketActionsLevel3Test < TestCase
css: '.content.active .js-reset', css: '.content.active .js-reset',
browser: browser2, browser: browser2,
) )
sleep 2 sleep 5
ticket_verify( ticket_verify(
browser: browser2, browser: browser2,
data: { data: {

5
test/browser_test_helper.rb
View file

@ -20,7 +20,7 @@ class TestCase < Test::Unit::TestCase
elsif browser == 'chrome' elsif browser == 'chrome'
browser_profile = Selenium::WebDriver::Chrome::Profile.new browser_profile = Selenium::WebDriver::Chrome::Profile.new
browser_profile["intl.accept_languages"] = "en" browser_profile['intl.accept_languages'] = 'en'
end end
browser_profile browser_profile
end end
@ -1242,7 +1242,7 @@ wait untill text in selector disabppears
found = nil found = nil
(1..10).each { (1..10).each {
next if found break if found
begin begin
text = instance.find_elements( { css: '.content.active .js-reset' } )[0].text text = instance.find_elements( { css: '.content.active .js-reset' } )[0].text
@ -1256,6 +1256,7 @@ wait untill text in selector disabppears
} }
if !found if !found
screenshot( browser: instance, comment: 'ticket_update_discard_message_failed' ) screenshot( browser: instance, comment: 'ticket_update_discard_message_failed' )
fail 'no discard message found' fail 'no discard message found'
end end
end end