diff --git a/app/assets/javascripts/app/controllers/agent_ticket_merge.coffee b/app/assets/javascripts/app/controllers/agent_ticket_merge.coffee index f894767b9..46ac8e447 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_merge.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_merge.coffee @@ -23,17 +23,26 @@ class App.TicketMerge extends App.ControllerModal @render() ) + onShown: (e) => + super + later = => + if @tableCustomerTickets + @tableCustomerTickets.show() + if @tableRecentViewedTickets + @tableRecentViewedTickets.show() + @delay(later, 300) + content: => content = $( App.view('agent_ticket_merge')() ) - new App.TicketList( + @tableCustomerTickets = new App.TicketList( tableId: 'ticket-merge-customer-tickets' el: content.find('#ticket-merge-customer-tickets') ticket_ids: @ticket_ids_by_customer radio: true ) - new App.TicketList( + @tableRecentViewedTickets = new App.TicketList( tableId: 'ticket-merge-recent-tickets' el: content.find('#ticket-merge-recent-tickets') ticket_ids: @ticket_ids_recent_viewed diff --git a/test/browser/agent_ticket_tag_test.rb b/test/browser/agent_ticket_tag_test.rb index beee9cde9..d1686cdc2 100644 --- a/test/browser/agent_ticket_tag_test.rb +++ b/test/browser/agent_ticket_tag_test.rb @@ -103,6 +103,9 @@ class AgentTicketTagTest < TestCase browser: browser2, number: ticket3[:number], ) + empty_search( + browser: browser2, + ) # set tag #1 click( @@ -272,6 +275,9 @@ class AgentTicketTagTest < TestCase browser: browser2, number: ticket3[:number], ) + empty_search( + browser: browser2, + ) # verify tags tags_verify( diff --git a/test/browser_test_helper.rb b/test/browser_test_helper.rb index e96499073..891a92dc6 100644 --- a/test/browser_test_helper.rb +++ b/test/browser_test_helper.rb @@ -2719,18 +2719,9 @@ wait untill text in selector disabppears element.send_keys(params[:number]) sleep 3 - empty_search(browser: instance) - - # search by number again - element = instance.find_elements(css: '#global-search')[0] - element.click - element.clear - element.send_keys(params[:number]) - sleep 1 - # open ticket #instance.find_element(partial_link_text: params[:number] } ).click - instance.execute_script("$(\".js-global-search-result a:contains('#{params[:number]}') .nav-tab-icon\").first().click()") + instance.execute_script("$(\".js-global-search-result a:contains('#{params[:number]}') .nav-tab-name\").first().click()") watch_for( browser: instance, css: '.content.active .ticketZoom-header .ticket-number' @@ -2767,7 +2758,7 @@ wait untill text in selector disabppears # open ticket #instance.find_element(partial_link_text: params[:title] } ).click - instance.execute_script("$(\".js-global-search-result a:contains('#{params[:title]}') .nav-tab-icon\").click()") + instance.execute_script("$(\".js-global-search-result a:contains('#{params[:title]}') .nav-tab-name\").first().click()") sleep 1 title = instance.find_elements(css: '.content.active .ticketZoom-header .js-objectTitle')[0].text if !title.match?(/#{params[:title]}/) @@ -2854,7 +2845,7 @@ wait untill text in selector disabppears element.send_keys(params[:value]) sleep 2 #instance.find_element(partial_link_text: params[:value] } ).click - instance.execute_script("$(\".js-global-search-result a:contains('#{params[:value]}') .nav-tab-icon\").click()") + instance.execute_script("$(\".js-global-search-result a:contains('#{params[:value]}') .nav-tab-name\").first().click()") watch_for( browser: instance, css: '.content.active h1' @@ -2890,7 +2881,7 @@ wait untill text in selector disabppears sleep 3 #instance.find_element(partial_link_text: params[:value]).click - instance.execute_script("$(\".js-global-search-result a:contains('#{params[:value]}') .nav-tab-icon\").click()") + instance.execute_script("$(\".js-global-search-result a:contains('#{params[:value]}') .nav-tab-name\").first().click()") watch_for( browser: instance, css: '.content.active h1'