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

app/assets/javascripts/app/controllers/ticket_overview.coffee

@@ -128,6 +128,7 @@ class Navbar extends App.Controller
     items = App.OverviewIndexCollection.get()
     @html App.view("agent_ticket_view/navbar#{ if @vertical then '_vertical' }")
       items: items
+      isAgent: @isRole('Agent')
 
     while @clone.width() > @tabsHolder.width()
       @tabClone.not('.hide').last().addClass('hide')

app/assets/javascripts/app/views/agent_ticket_view/navbar_vertical.jst.eco

@@ -21,9 +21,11 @@
     <% end %>
   </div>
 </div>
+<% if @isAgent: %>
 <a class="btn btn--success btn--quad" href="#ticket/create">
   <%- @Icon('plus') %>
 </a>
+<% end %>
 <% if @items: %>
 <div class="tabs tabs--inline tabs--big tabs-clone u-invisible js-tabsClone">
   <% for item in @items: %>

test/browser/agent_ticket_actions_level5_test.rb

@@ -265,7 +265,6 @@ class AgentTicketActionLevel5Test < TestCase
     )
 
     # execute reply
-    click_catcher_remove
     sleep 5 # time to recognice form changes
     click(
       css: '.active [data-type="reply"]',

test/browser/agent_ticket_actions_level7_test.rb

@@ -32,8 +32,13 @@ class AgentTicketActionLevel7Test < TestCase
       do_not_submit: true,
     )
 
+    # scroll to reply - needed for chrome
+    scroll_to(
+      position: 'botton',
+      css:      '.content.active [data-type="reply"]',
+    )
+
     # click reply
-    click_catcher_remove
     click( css: '.content.active [data-type="reply"]' )
 
     # check body
@@ -50,8 +55,13 @@ class AgentTicketActionLevel7Test < TestCase
       },
     )
 
+    # scroll to reply - needed for chrome
+    scroll_to(
+      position: 'botton',
+      css:      '.content.active [data-type="reply"]',
+    )
+
     # click reply
-    click_catcher_remove
     click( css: '.content.active [data-type="reply"]' )
 
     # check body

test/browser/agent_ticket_overview_level0_test.rb

@@ -45,6 +45,12 @@ class AgentTicketOverviewLevel0Test < TestCase
       css: '.active table tr td input[value="' + ticket1[:id] + '"] + .icon-checkbox.icon-unchecked',
       fast: true,
     )
+
+    # scroll to reply - needed for chrome
+    scroll_to(
+      position: 'top',
+      css:      '.active table tr td input[value="' + ticket2[:id] + '"] + .icon-checkbox.icon-unchecked',
+    )
     click(
       css: '.active table tr td input[value="' + ticket2[:id] + '"] + .icon-checkbox.icon-unchecked',
       fast: true,

test/browser_test_helper.rb

@@ -254,14 +254,9 @@ class TestCase < Test::Unit::TestCase
     instance = params[:browser] || @browser
     if params[:css]
 
-      scroll_to(
-        browser:  instance,
-        css:      params[:css],
-        mute_log: true,
-      )
-
       element = instance.find_elements( { css: params[:css] } )[0]
       instance.mouse.move_to(element)
+      sleep 0.2
       element.click
 
       # trigger also focus on input/select and textarea fields
@@ -279,6 +274,7 @@ class TestCase < Test::Unit::TestCase
 
   scroll_to(
     browser:  browser1,
+    position: 'top', # botton
     css:      '.some_class',
   )
 
@@ -289,12 +285,17 @@ class TestCase < Test::Unit::TestCase
 
     instance = params[:browser] || @browser
 
+    position = 'true'
+    if params[:position] == 'botton'
+      position = 'false'
+    end
+
     execute(
       browser:  instance,
-      js:       "\$('#{params[:css]}').get(0).scrollIntoView(false)",
+      js:       "\$('#{params[:css]}').get(0).scrollIntoView(#{position})",
       mute_log: params[:mute_log]
     )
-    sleep 0.4
+    sleep 0.2
   end
 
 =begin
@@ -1467,6 +1468,10 @@ wait untill text in selector disabppears
     )
     instance.find_elements( { css: ".content.active .sidebar a[href=\"#{params[:link]}\"]" } )[0].click
     sleep 1
+    execute(
+      browser: instance,
+      js: '$(".content.active .sidebar").css("display", "none")',
+    )
     instance.find_elements( { partial_link_text: params[:number] } )[0].click
     sleep 1
     number = instance.find_elements( { css: '.active .ticketZoom-header .ticket-number' } )[0].text