Merge branch 'develop' of github.com:martini/zammad into develop
This commit is contained in:
commit
af2488f4d7
1 changed files with 37 additions and 13 deletions
|
@ -1199,6 +1199,39 @@ wait untill text in selector disabppears
|
||||||
assert(true, 'all tasks closed')
|
assert(true, 'all tasks closed')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
=begin
|
||||||
|
|
||||||
|
empty_search(
|
||||||
|
browser: browser1,
|
||||||
|
)
|
||||||
|
|
||||||
|
=end
|
||||||
|
|
||||||
|
def empty_search(params = {})
|
||||||
|
switch_window_focus(params)
|
||||||
|
log('empty_search', params)
|
||||||
|
|
||||||
|
instance = params[:browser] || @browser
|
||||||
|
|
||||||
|
# empty search box by x
|
||||||
|
begin
|
||||||
|
instance.find_elements(css: '.search .empty-search')[0].click
|
||||||
|
rescue
|
||||||
|
|
||||||
|
# in issues with ff & selenium, sometimes exeption appears
|
||||||
|
# "Element is not currently visible and so may not be interacted with"
|
||||||
|
log('empty_search via js')
|
||||||
|
instance.execute_script('$(".search .empty-search").click()')
|
||||||
|
end
|
||||||
|
sleep 0.5
|
||||||
|
text = instance.find_elements(css: '#global-search')[0].attribute('value')
|
||||||
|
if !text
|
||||||
|
raise '#global-search is not empty!'
|
||||||
|
end
|
||||||
|
|
||||||
|
true
|
||||||
|
end
|
||||||
|
|
||||||
=begin
|
=begin
|
||||||
|
|
||||||
ticket_customer_select(
|
ticket_customer_select(
|
||||||
|
@ -1846,13 +1879,7 @@ wait untill text in selector disabppears
|
||||||
element.send_keys(params[:number])
|
element.send_keys(params[:number])
|
||||||
sleep 3
|
sleep 3
|
||||||
|
|
||||||
# empty search box by x
|
empty_search(browser: instance)
|
||||||
instance.find_elements(css: '.search .empty-search .icon')[0].click
|
|
||||||
sleep 0.5
|
|
||||||
text = instance.find_elements(css: '#global-search')[0].attribute('value')
|
|
||||||
if !text
|
|
||||||
raise '#global-search is not empty!'
|
|
||||||
end
|
|
||||||
|
|
||||||
# search by number again
|
# search by number again
|
||||||
element = instance.find_elements(css: '#global-search')[0]
|
element = instance.find_elements(css: '#global-search')[0]
|
||||||
|
@ -1975,12 +2002,9 @@ wait untill text in selector disabppears
|
||||||
element.clear
|
element.clear
|
||||||
element.send_keys(params[:value])
|
element.send_keys(params[:value])
|
||||||
sleep 3
|
sleep 3
|
||||||
instance.find_elements(css: '.search .empty-search .icon')[0].click
|
|
||||||
sleep 0.5
|
empty_search(browser: instance)
|
||||||
text = instance.find_elements(css: '#global-search')[0].attribute('value')
|
|
||||||
if !text
|
|
||||||
raise '#global-search is not empty!'
|
|
||||||
end
|
|
||||||
element = instance.find_elements(css: '#global-search')[0]
|
element = instance.find_elements(css: '#global-search')[0]
|
||||||
element.click
|
element.click
|
||||||
element.clear
|
element.clear
|
||||||
|
|
Loading…
Reference in a new issue