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:
Felix Niklas 2016-03-15 16:44:05 +01:00
commit f2a54bdddc
3 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
test/browser/agent_organization_profile_test.rb
View file

@ -33,12 +33,12 @@ class AgentOrganizationProfileTest < TestCase
css: '.active .profile [data-name="note"]',
value: note,
)
click( css: '.empty-search' )
empty_search()
sleep 2
# check and change note again in edit screen
click( css: '.active .js-action .icon-arrow-down', fast: true )
click( css: '.active .js-action [data-type="edit"]' )
click(css: '.active .js-action .icon-arrow-down', fast: true)
click(css: '.active .js-action [data-type="edit"]')
watch_for(
css: '.active .modal',
@ -53,7 +53,7 @@ class AgentOrganizationProfileTest < TestCase
css: '.active .modal [data-name="note"]',
value: 'some note abc',
)
click( css: '.active .modal button.js-submit' )
click(css: '.active .modal button.js-submit')
watch_for(
css: '.active .profile-window',
@ -112,9 +112,8 @@ class AgentOrganizationProfileTest < TestCase
css: '.active .profile [data-name="note"]',
value: message,
)
click(
empty_search(
browser: browser1,
css: '.empty-search',
)
# verify

15
test/browser/agent_user_profile_test.rb
View file

@ -14,7 +14,7 @@ class AgentUserProfileTest < TestCase
tasks_close_all()
# search and open user
user_open_by_search( value: 'Braun' )
user_open_by_search(value: 'Braun')
watch_for(
css: '.active .profile-window',
@ -30,12 +30,12 @@ class AgentUserProfileTest < TestCase
css: '.active [data-name="note"]',
value: 'some note 123',
)
click( css: '.empty-search' )
empty_search()
sleep 2
# check and change note again in edit screen
click( css: '.active .js-action .icon-arrow-down' )
click( css: '.active .js-action [data-type="edit"]' )
click(css: '.active .js-action .icon-arrow-down')
click(css: '.active .js-action [data-type="edit"]')
watch_for(
css: '.active .modal',
@ -50,7 +50,7 @@ class AgentUserProfileTest < TestCase
css: '.modal [data-name="note"]',
value: 'some note abc',
)
click( css: '.active .modal button.js-submit' )
click(css: '.active .modal button.js-submit')
watch_for(
css: '.active .profile-window',
@ -68,7 +68,7 @@ class AgentUserProfileTest < TestCase
)
# switch to org tab, verify if ticket is shown
user_open_by_search( value: 'Braun' )
user_open_by_search(value: 'Braun')
watch_for(
css: '.active .profile-window',
value: 'user profile check ' + message,
@ -107,9 +107,8 @@ class AgentUserProfileTest < TestCase
css: '.active [data-name="note"]',
value: message,
)
click(
empty_search(
browser: browser1,
css: '.empty-search',
)
watch_for(

6
test/browser_test_helper.rb
View file

@ -1891,6 +1891,7 @@ wait untill text in selector disabppears
# open ticket
#instance.find_element(partial_link_text: params[:number] } ).click
instance.execute_script("$(\"#global-search-result a:contains('#{params[:value]}') .nav-tab-icon\").click()")
sleep 1
number = instance.find_elements(css: '.active .ticketZoom-header .ticket-number')[0].text
if number !~ /#{params[:number]}/
screenshot(browser: instance, comment: 'ticket_open_by_search_failed')
@ -1925,6 +1926,7 @@ wait untill text in selector disabppears
# open ticket
#instance.find_element(partial_link_text: params[:title] } ).click
instance.execute_script("$(\"#global-search-result a:contains('#{params[:title]}') .nav-tab-icon\").click()")
sleep 1
title = instance.find_elements(css: '.active .ticketZoom-header .ticket-title-update')[0].text
if title !~ /#{params[:title]}/
screenshot(browser: instance, comment: 'ticket_open_by_title_failed')
@ -2012,6 +2014,7 @@ wait untill text in selector disabppears
sleep 2
#instance.find_element(partial_link_text: params[:value] } ).click
instance.execute_script("$(\"#global-search-result a:contains('#{params[:value]}') .nav-tab-icon\").click()")
sleep 1
name = instance.find_elements(css: '.active h1')[0].text
if name !~ /#{params[:value]}/
screenshot(browser: instance, comment: 'organization_open_by_search_failed')
@ -2044,6 +2047,7 @@ wait untill text in selector disabppears
sleep 3
#instance.find_element(partial_link_text: params[:value]).click
instance.execute_script("$(\"#global-search-result a:contains('#{params[:value]}') .nav-tab-icon\").click()")
sleep 1
name = instance.find_elements(css: '.active h1')[0].text
if name !~ /#{params[:value]}/
screenshot(browser: instance, comment: 'user_open_by_search_failed')
@ -2353,7 +2357,7 @@ wait untill text in selector disabppears
@last_used_browser = instance
end
def log(method, params)
def log(method, params = {})
return if !@@debug
return if params[:mute_log]
puts "#{Time.zone.now}/#{method}: #{params.inspect}"