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

# Conflicts:
#	app/assets/javascripts/app/controllers/widget/online_notification.coffee

Gemfile.lock

@@ -43,7 +43,7 @@ GEM
     addressable (2.4.0)
     arel (6.0.3)
     ast (2.2.0)
-    autoprefixer-rails (6.3.3.1)
+    autoprefixer-rails (6.3.4)
       execjs
     biz (1.4.0)
       clavius (~> 1.0)
@@ -76,7 +76,7 @@ GEM
     diffy (3.1.0)
     dnsruby (1.59.2)
     docile (1.1.5)
-    domain_name (0.5.20160309)
+    domain_name (0.5.20160310)
       unf (>= 0.0.5, < 1.0.0)
     eco (1.0.0)
       coffee-script
@@ -115,7 +115,7 @@ GEM
       multi_json (~> 1.8)
     hashie (3.4.3)
     htmlentities (4.3.4)
-    http (1.0.2)
+    http (1.0.4)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
       http-form_data (~> 1.0.1)
@@ -199,7 +199,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    puma (3.1.0)
+    puma (3.2.0)
     rack (1.6.4)
     rack-livereload (0.3.16)
       rack
@@ -277,7 +277,7 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.11)
-    test-unit (3.1.7)
+    test-unit (3.1.8)
       power_assert
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)

app/assets/javascripts/app/controllers/_application_controller.coffee

@@ -542,7 +542,7 @@ class App.Controller extends Spine.Controller
         el.html App.view('generic/page_loading')()
       else
         @html App.view('generic/page_loading')()
-    @initLoadingDoneDelay = @delay(later, 2800)
+    @initLoadingDoneDelay = @delay(later, 1800)
 
   stopLoading: =>
     return if !@initLoadingDoneDelay

app/assets/javascripts/app/controllers/_application_controller_generic.coffee

@@ -124,7 +124,10 @@ class App.ControllerGenericIndex extends App.Controller
 
     # fetch all
     if !@disableInitFetch
-      App[ @genericObject ].fetch()
+      App[ @genericObject ].fetchFull(
+        ->
+        clear: true
+      )
 
   release: =>
     if @subscribeId

app/assets/javascripts/app/controllers/_channel/form.coffee

@@ -12,7 +12,7 @@ class App.ChannelForm extends App.Controller
   constructor: ->
     super
     @title 'Form'
-    @subscribeId = App.Setting.subscribe(@render, initFetch: true)
+    @subscribeId = App.Setting.subscribe(@render, initFetch: true, clear: false)
 
   render: =>
     App.Setting.unsubscribe(@subscribeId)

app/assets/javascripts/app/controllers/_settings/area.coffee

@@ -5,20 +5,7 @@ class App.SettingsArea extends App.Controller
     # check authentication
     return if !@authenticate()
 
-    @load()
+    @subscribeId = App.Setting.subscribe(@render, initFetch: true, clear: false)
-
-  load: ->
-    @startLoading()
-    @ajax(
-      id:    "setting_area_#{@area}"
-      type:  'GET'
-      url:   "#{@apiPath}/settings/area/#{@area}"
-      processData: true
-      success: (data, status, xhr) =>
-        @stopLoading()
-        App.Collection.load( sessionStorage: false, type: 'Setting', data: data )
-        @render()
-    )
 
   render: =>
 

app/assets/javascripts/app/controllers/calendar.coffee

@@ -12,26 +12,17 @@ class Index extends App.ControllerContent
     # check authentication
     return if !@authenticate(false, 'Admin')
 
-    @interval(@load, 60000)
+    @subscribeId = App.Calendar.subscribe(@render)
-    #@load()
-
-  load: =>
-    @startLoading()
-    @ajax(
-      id:   'calendar_index'
-      type: 'GET'
-      url:  @apiPath + '/calendars'
-      processData: true
-      success: (data, status, xhr) =>
 
+    callback = (data) =>
       App.Config.set('ical_feeds', data.ical_feeds)
       App.Config.set('timezones', data.timezones)
-
-        # load assets
-        App.Collection.loadAssets(data.assets)
-
       @stopLoading()
-        @render(data)
+      @render()
+    @startLoading()
+    App.Calendar.fetchFull(
+      callback
+      clear: true
     )
 
   render: =>

app/assets/javascripts/app/controllers/navigation.coffee

@@ -465,8 +465,8 @@ class App.Navigation extends App.ControllerWidgetPermanent
     @Config.set('NavBarRight', NavBarRight)
 
   fetchRecentView: =>
-    load = (items) =>
+    load = (data) =>
-      App.RecentView.refresh( items, { clear: true } )
+      App.RecentView.refresh(data.stream, clear: true)
       @renderPersonal()
     App.RecentView.fetchFull(load)
 

app/assets/javascripts/app/controllers/sla.coffee

@@ -11,20 +11,16 @@ class Index extends App.ControllerContent
     # check authentication
     return if !@authenticate(false, 'Admin')
 
-    @interval(@load, 60000)
+    @subscribeCalendarId = App.Calendar.subscribe(@render)
-    #@load()
+    @subscribeSlaId = App.Sla.subscribe(@render)
 
-  load: =>
+    callback = =>
-    @startLoading()
-    @ajax(
-      id:   'sla_index'
-      type: 'GET'
-      url:  @apiPath + '/slas'
-      processData: true
-      success: (data, status, xhr) =>
-        App.Collection.loadAssets(data.assets)
       @stopLoading()
-        @render(data)
+      @render()
+    @startLoading()
+    App.Sla.fetchFull(
+      callback
+      clear: true
     )
 
   render: =>
@@ -56,8 +52,10 @@ class Index extends App.ControllerContent
     )
 
   release: =>
-    if @subscribeId
+    if @subscribeCalendarId
-      App.Calendar.unsubscribe(@subscribeId)
+      App.Calendar.unsubscribe(@subscribeCalendarId)
+    if @subscribeSlaId
+      App.Sla.unsubscribe(@subscribeSlaId)
 
   new: (e) ->
     e.preventDefault()

app/assets/javascripts/app/controllers/widget/online_notification.coffee

@@ -1,7 +1,7 @@
 class App.OnlineNotificationWidget extends App.Controller
   alreadyShown: {}
   shown: false
-  className: 'popover popover--notifications right'
+  className: 'popover popover--notifications right js-notificationsContainer'
   attributes:
     role: 'tooltip'
 
@@ -10,13 +10,13 @@ class App.OnlineNotificationWidget extends App.Controller
     'click .js-item': 'hide'
     'click .js-remove': 'removeItem'
     'click .js-locationVerify': 'onItemClick'
-    'keydown': 'listNavigate'
+    'click': 'stopPropagation'
 
   elements:
-    '.js-notificationsContainer': 'container'
     '.js-mark': 'mark'
     '.js-item': 'item'
     '.js-content': 'content'
+    '.js-header': 'header'
 
   constructor: ->
     super
@@ -50,7 +50,7 @@ class App.OnlineNotificationWidget extends App.Controller
           return
 
     if @access()
-      @subscribeId = App.OnlineNotification.subscribe(@show)
+      @subscribeId = App.OnlineNotification.subscribe(@updateContent)
 
     @bind('ui:reshow', =>
       @show()
@@ -58,9 +58,13 @@ class App.OnlineNotificationWidget extends App.Controller
     )
 
     $(window).on 'click.notifications', @hide
+    $(window).on 'keydown.notifications', @listNavigate
+
+    @updateContent()
 
   release: ->
     $(window).off 'click.notifications'
+    $(window).off 'keydown.notifications'
     App.OnlineNotification.unsubscribe(@subscribeId)
     super
 
@@ -97,7 +101,7 @@ class App.OnlineNotificationWidget extends App.Controller
         current.removeClass('is-hover')
         next.addClass('is-hover')
     else
-      prev = current.prev('.is-item')
+      prev = current.prev('.js-item')
       if prev.size()
         current.removeClass('is-hover')
         prev.addClass('is-hover')
@@ -131,29 +135,29 @@ class App.OnlineNotificationWidget extends App.Controller
     )
 
   updateHeight: ->
+
     # set height of notification popover
     heightApp               = $('#app').height()
     heightPopoverSpacer     = 22
     heightPopoverHeader     = @header.outerHeight(true)
-    heightPopoverContent    = 0
     isOverflowing           = false
-    @item.each ->
+    @item.each (i, el) =>
       # accumulate height of items
-      heightPopoverContent += @clientHeight
+      heightPopoverContent += el.clientHeight
 
       if (heightPopoverHeader + heightPopoverContent + heightPopoverSpacer) > heightApp
-        heightPopoverContent = heightApp - heightPopoverHeader - heightPopoverSpacer
+        @content.css 'height', heightApp - heightPopoverHeader - heightPopoverSpacer
         isOverflowing = true
         return false # exit .each loop
 
-    @container.toggleClass('is-overflowing', isOverflowing)
+    @el.toggleClass('is-overflowing', isOverflowing)
-    @content.css('height', heightPopoverContent)
+    @content.css 'height', '' if !isOverflowing
 
   fetch: =>
-    load = (items) =>
+    load = (data) =>
       @fetchedData = true
-      App.OnlineNotification.refresh(items, { clear: true })
+      App.OnlineNotification.refresh(data.stream, clear: true)
-      @show()
+      @updateContent()
     App.OnlineNotification.fetchFull(load)
 
   toggle: =>
@@ -162,8 +166,7 @@ class App.OnlineNotificationWidget extends App.Controller
     else
       @show()
 
-  show: =>
+  updateContent: =>
-    @shown = true
     if !@Session.get()
       @content.html('')
       return
@@ -195,23 +198,33 @@ class App.OnlineNotificationWidget extends App.Controller
           )
           App.OnlineNotification.play()
 
-    @html App.view('widget/online_notification')
+    @html App.view('widget/online_notification')(
       items: items
       count: @count
+    )
 
+    return if !@shown
+    @show()
+
+  show: =>
+    @shown = true
     @el.show()
+    @updateHeight()
 
   hide: =>
     @shown = false
     @el.hide()
 
-  onItemClick: (event) ->
+  onItemClick: (e) ->
-    @locationVerify(event)
+    @locationVerify(e)
     @hide()
 
-  removeItem: (event) ->
+  stopPropagation: (e) ->
-    event.preventDefault()
+    e.stopPropagation()
-    event.stopPropagation()
+
+  removeItem: (e) =>
+    e.preventDefault()
+    e.stopPropagation()
     row = $(e.target).closest('.js-item')
     id = row.data('id')
     App.OnlineNotification.destroy(id)

app/assets/javascripts/app/lib/app_post/collection.coffee

@@ -85,16 +85,23 @@ class _collectionSingleton extends Spine.Module
       return
 
     # load data from object
+    listToRefresh = []
     for key, object of params.data
       if !params.refresh && appObject
+        @log 'debug', 'refrest try', params.type, key
 
         # check if new object is newer, just load newer objects
         if object.updated_at && appObject.exists(key)
           exists = appObject.find(key)
           if exists.updated_at
             if exists.updated_at < object.updated_at
-              appObject.refresh(object)
+              listToRefresh.push object
+              @log 'debug', 'refrest newser', params.type, key
           else
-            appObject.refresh(object)
+            listToRefresh.push object
+            @log 'debug', 'refrest try no updated_at', params.type, key
         else
-          appObject.refresh(object)
+          listToRefresh.push object
+          @log 'debug', 'refrest new', params.type, key
+    return if _.isEmpty(listToRefresh)
+    appObject.refresh(listToRefresh)

app/assets/javascripts/app/lib/app_post/user_organization_autocompletion.coffee

@@ -155,6 +155,7 @@ class App.UserOrganizationAutocompletion extends App.Controller
         # enter / take item
         if e.keyCode is 13
           e.preventDefault()
+          e.stopPropagation()
           userId = @$('.recipientList').find('li.is-active').data('user-id')
           if !userId
             organizationId = @$('.recipientList').find('li.is-active').data('organization-id')

app/assets/javascripts/app/models/_application_model.coffee

@@ -302,6 +302,8 @@ class App.Model extends Spine.Model
   ###
 
   @subscribe: (callback, param = {}) ->
+
+    # global bind to changes
     if !@SUBSCRIPTION_COLLECTION
       @SUBSCRIPTION_COLLECTION = {}
 
@@ -320,7 +322,10 @@ class App.Model extends Spine.Model
         events
         =>
           App.Log.debug('Model', "server notify collection change #{@className}")
-          @fetch( {}, { clear: true } )
+          @fetchFull(
+            ->
+            clear: true
+          )
 
         'Collection::Subscribe::' + @className
       )
@@ -330,11 +335,17 @@ class App.Model extends Spine.Model
 
     # fetch init collection
     if param.initFetch is true
+      clear = true
+      if param.clear is true || param.clear is false
+        clear = param.clear
       if !@initFetchActive
         @one 'refresh', (collection) =>
           @initFetchActive = true
           callback(collection)
-        @fetch( {}, { clear: true } )
+        @fetchFull(
+          ->
+          clear: clear
+        )
       else
         callback(@all())
 
@@ -423,7 +434,6 @@ class App.Model extends Spine.Model
               if !genericObject || new Date(item.updated_at) >= new Date(genericObject.updated_at)
                 App.Log.debug('Model', "request #{@className}.find(#{item.id}) from server")
                 @full(item.id, false, true)
-
             App.Delay.set(callback, 500, item.id, "full-#{@className}")
 
         'Item::Subscribe::' + @className
@@ -462,8 +472,14 @@ class App.Model extends Spine.Model
 
   App.Model.fetchFull(@callback)
 
+  App.Model.fetchFull(
+    @callback
+    clear: true
+  )
+
+
   ###
-  @fetchFull: (callback) ->
+  @fetchFull: (callback, params = {}) ->
     url = "#{@url}/?full=true"
     App.Log.debug('Model', "fetchFull collection #{@className}", url)
     App.Ajax.request(
@@ -474,6 +490,10 @@ class App.Model extends Spine.Model
 
         App.Log.debug('Model', "got fetchFull collection #{@className}", data)
 
+        # clear collection
+        if params.clear
+          App[@className].deleteAll()
+
         # full / load assets
         if data.assets
           App.Collection.loadAssets(data.assets)
@@ -482,8 +502,8 @@ class App.Model extends Spine.Model
         else
           App[@className].refresh(data)
 
-        # execute callbacks
+        if callback
-        callback(data.stream)
+          callback(data)
 
       error: (xhr, statusText, error) ->
         App.Log.error('Model', statusText, error, url)

app/controllers/application_controller.rb

@@ -378,6 +378,21 @@ class ApplicationController < ActionController::Base
 
   def model_index_render (object, _params)
     generic_objects = object.all
+
+    if params[:full]
+      assets = {}
+      item_ids = []
+      generic_objects.each {|item|
+        item_ids.push item.id
+        assets = item.assets(assets)
+      }
+      render json: {
+        record_ids: item_ids,
+        assets: assets,
+      }, status: :ok
+      return
+    end
+
     generic_objects_with_associations = []
     generic_objects.each {|item|
       generic_objects_with_associations.push item.attributes_with_associations

app/controllers/calendars_controller.rb

@@ -6,9 +6,8 @@ class CalendarsController < ApplicationController
   def index
     return if deny_if_not_role(Z_ROLENAME_ADMIN)
 
-    assets = {}
-
     # calendars
+    assets = {}
     calendar_ids = []
     Calendar.all.order(:name, :created_at).each {|calendar|
       calendar_ids.push calendar.id

app/controllers/settings_controller.rb

@@ -6,14 +6,6 @@ class SettingsController < ApplicationController
   # GET /settings
   def index
     return if deny_if_not_role(Z_ROLENAME_ADMIN)
-
-    # only serve requested items
-    if params[:area]
-      model_index_render_result( Setting.where(area: params[:area]) )
-      return
-    end
-
-    # serve all items
     model_index_render(Setting, params)
   end
 

app/controllers/slas_controller.rb

@@ -49,51 +49,29 @@ curl http://localhost/api/v1/slas.json -v -u #{login}:#{password}
   def index
     return if deny_if_not_role(Z_ROLENAME_ADMIN)
 
-    assets = {}
+    if params[:full]
 
       # calendars
+      assets = {}
       calendar_ids = []
-    Calendar.all.order(:name, :created_at).each {|calendar|
+      Calendar.all.each {|calendar|
-      calendar_ids.push calendar.id
         assets = calendar.assets(assets)
       }
 
       # slas
       sla_ids = []
-    models = Models.all
+      Sla.all.each {|item|
-    Sla.all.order(:name, :created_at).each {|sla|
+        sla_ids.push item.id
-      sla_ids.push sla.id
+        assets = item.assets(assets)
-      assets = sla.assets(assets)
-
-      # get assets of condition
-      sla.condition.each {|item, content|
-        attribute = item.split(/\./)
-        next if !attribute[1]
-        attribute_class = attribute[0].to_classname.constantize
-        reflection = attribute[1].sub(/_id$/, '')
-        reflection = reflection.to_sym
-        next if !models[attribute_class]
-        next if !models[attribute_class][:reflections]
-        next if !models[attribute_class][:reflections][reflection]
-        next if !models[attribute_class][:reflections][reflection].klass
-        attribute_ref_class = models[attribute_class][:reflections][reflection].klass
-        if content['value'].class == Array
-          content['value'].each {|item_id|
-            attribute_object = attribute_ref_class.find_by(id: item_id)
-            assets = attribute_object.assets(assets)
       }
-        else
-          attribute_object = attribute_ref_class.find_by(id: content['value'])
-          assets = attribute_object.assets(assets)
-        end
-      }
-    }
-
       render json: {
-      calendar_ids: calendar_ids,
+        record_ids: sla_ids,
-      sla_ids: sla_ids,
         assets: assets,
       }, status: :ok
+      return
+    end
+
+    model_index_render(Sla, params)
   end
 
 =begin

app/models/application_model.rb

@@ -1131,6 +1131,48 @@ get assets of object list
     assets
   end
 
+=begin
+
+get assets and record_ids of selector
+
+  model = Model.find(123)
+
+  assets = model.assets_of_selector('attribute_name_of_selector', assets)
+
+=end
+
+  def assets_of_selector(selector, assets = {})
+
+    # get assets of condition
+    models = Models.all
+    send(selector).each {|item, content|
+      attribute = item.split(/\./)
+      next if !attribute[1]
+      attribute_class = attribute[0].to_classname.constantize
+      reflection = attribute[1].sub(/_id$/, '')
+      #reflection = reflection.to_sym
+      next if !models[attribute_class]
+      next if !models[attribute_class][:reflections]
+      next if !models[attribute_class][:reflections][reflection]
+      next if !models[attribute_class][:reflections][reflection].klass
+      attribute_ref_class = models[attribute_class][:reflections][reflection].klass
+      if content['value'].class == Array
+        content['value'].each {|item_id|
+          attribute_object = attribute_ref_class.find_by(id: item_id)
+          if attribute_object
+            assets = attribute_object.assets(assets)
+          end
+        }
+      else
+        attribute_object = attribute_ref_class.find_by(id: content['value'])
+        if attribute_object
+          assets = attribute_object.assets(assets)
+        end
+      end
+    }
+    assets
+  end
+
   private
 
   def attachments_buffer

app/models/calendar.rb

@@ -10,6 +10,8 @@ class Calendar < ApplicationModel
   after_update   :sync_default, :min_one_check
   after_destroy  :min_one_check
 
+  notify_clients_support
+
 =begin
 
 set inital default calendar

app/models/job.rb

@@ -1,6 +1,9 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
 
 class Job < ApplicationModel
+  load 'job/assets.rb'
+  include Job::Assets
+
   store     :timeplan
   store     :condition
   store     :perform

app/models/job/assets.rb

@@ -0,0 +1,47 @@
+# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
+
+class Job
+  module Assets
+
+=begin
+
+get all assets / related models for this job
+
+  job = Job.find(123)
+  result = job.assets(assets_if_exists)
+
+returns
+
+  result = {
+    :jobs => {
+      123  => job_model_123,
+      1234 => job_model_1234,
+    }
+  }
+
+=end
+
+    def assets (data)
+
+      if !data[ Job.to_app_model ]
+        data[ Job.to_app_model ] = {}
+      end
+      if !data[ User.to_app_model ]
+        data[ User.to_app_model ] = {}
+      end
+      if !data[ Job.to_app_model ][ id ]
+        data[ Job.to_app_model ][ id ] = attributes_with_associations
+        data = assets_of_selector('condition', data)
+        data = assets_of_selector('perform', data)
+      end
+      %w(created_by_id updated_by_id).each {|local_user_id|
+        next if !self[ local_user_id ]
+        next if data[ User.to_app_model ][ self[ local_user_id ] ]
+        user = User.lookup(id: self[ local_user_id ])
+        next if !user
+        data = user.assets(data)
+      }
+      data
+    end
+  end
+end

app/models/overview.rb

@@ -1,6 +1,9 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
 
 class Overview < ApplicationModel
+  load 'overview/assets.rb'
+  include Overview::Assets
+
   has_and_belongs_to_many :users, after_add: :cache_update, after_remove: :cache_update
   store     :condition
   store     :order

app/models/overview/assets.rb

@@ -0,0 +1,56 @@
+# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
+
+class Overview
+  module Assets
+
+=begin
+
+get all assets / related models for this overview
+
+  overview = Overview.find(123)
+  result = overview.assets(assets_if_exists)
+
+returns
+
+  result = {
+    :overviews => {
+      123  => overview_model_123,
+      1234 => overview_model_1234,
+    }
+  }
+
+=end
+
+    def assets (data)
+
+      if !data[ Overview.to_app_model ]
+        data[ Overview.to_app_model ] = {}
+      end
+      if !data[ User.to_app_model ]
+        data[ User.to_app_model ] = {}
+      end
+      if !data[ Overview.to_app_model ][ id ]
+        data[ Overview.to_app_model ][ id ] = attributes_with_associations
+        if user_ids
+          user_ids.each {|local_user_id|
+            next if data[ User.to_app_model ][ local_user_id ]
+            user = User.lookup(id: local_user_id)
+            next if !user
+            data = user.assets(data)
+          }
+        end
+
+        data = assets_of_selector('condition', data)
+
+      end
+      %w(created_by_id updated_by_id).each {|local_user_id|
+        next if !self[ local_user_id ]
+        next if data[ User.to_app_model ][ self[ local_user_id ] ]
+        user = User.lookup(id: self[ local_user_id ])
+        next if !user
+        data = user.assets(data)
+      }
+      data
+    end
+  end
+end

app/models/sla.rb

@@ -1,8 +1,14 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
 
 class Sla < ApplicationModel
+  load 'sla/assets.rb'
+  include Sla::Assets
+
   store      :condition
   store      :data
   validates  :name, presence: true
   belongs_to :calendar
+
+  notify_clients_support
+
 end

app/models/sla/assets.rb

@@ -0,0 +1,52 @@
+# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
+
+class Sla
+  module Assets
+
+=begin
+
+get all assets / related models for this sla
+
+  sla = Sla.find(123)
+  result = sla.assets(assets_if_exists)
+
+returns
+
+  result = {
+    :slas => {
+      123  => sla_model_123,
+      1234 => sla_model_1234,
+    }
+  }
+
+=end
+
+    def assets (data)
+
+      if !data[ Sla.to_app_model ]
+        data[ Sla.to_app_model ] = {}
+      end
+      if !data[ User.to_app_model ]
+        data[ User.to_app_model ] = {}
+      end
+      if !data[ Sla.to_app_model ][ id ]
+        data[ Sla.to_app_model ][ id ] = attributes_with_associations
+        data = assets_of_selector('condition', data)
+        if calendar_id
+          calendar = Calendar.lookup(id: calendar_id)
+          if calendar
+            data = calendar.assets(data)
+          end
+        end
+      end
+      %w(created_by_id updated_by_id).each {|local_user_id|
+        next if !self[ local_user_id ]
+        next if data[ User.to_app_model ][ self[ local_user_id ] ]
+        user = User.lookup(id: self[ local_user_id ])
+        next if !user
+        data = user.assets(data)
+      }
+      data
+    end
+  end
+end

test/browser_test_helper.rb

@@ -70,6 +70,7 @@ class TestCase < Test::Unit::TestCase
     rescue
       # just try again
       sleep 10
+      log('browser_instance', { rescure: true })
       browser_instance_preferences(local_browser)
     end
 
@@ -213,9 +214,17 @@ class TestCase < Test::Unit::TestCase
 
     instance = params[:browser] || @browser
 
-    instance.find_elements(css: 'a[href="#current_user"]')[0].click
+    click(
-    sleep 0.1
+      browser: instance,
-    instance.find_elements(css: 'a[href="#logout"]')[0].click
+      css:  'a[href="#current_user"]',
+      mute_log: true,
+    )
+    click(
+      browser: instance,
+      css:  'a[href="#logout"]',
+      mute_log: true,
+    )
+
     (1..6).each {
       sleep 1
       login = instance.find_elements(css: '#login')[0]
@@ -349,16 +358,26 @@ class TestCase < Test::Unit::TestCase
     instance = params[:browser] || @browser
     if params[:css]
 
+      begin
         element = instance.find_elements(css: params[:css])[0]
+        #if element
         #  instance.mouse.move_to(element)
-      #sleep 0.2
-      element.click
-
-      # trigger also focus on input/select and textarea fields
-      #if params[:css] =~ /(input|select|textarea)/
-      #  instance.execute_script("$('#{params[:css]}').trigger('focus')")
-      #  sleep 0.2
         #end
+        sleep 0.2
+        element.click
+      rescue => e
+        sleep 0.5
+
+        # just try again
+        log('click', { rescure: true })
+        element = instance.find_elements(css: params[:css])[0]
+        #if element
+        #  instance.mouse.move_to(element)
+        #end
+        sleep 0.2
+        element.click
+      end
+
     else
       sleep 1
       instance.find_elements(partial_link_text: params[:text])[0].click
@@ -507,6 +526,7 @@ class TestCase < Test::Unit::TestCase
     browser:      browser1,
     css:          '.some_class',
     value:        'Some Value',
+    deselect_all: false, # default false
   )
 
 =end
@@ -535,15 +555,25 @@ class TestCase < Test::Unit::TestCase
     begin
       element  = instance.find_elements(css: params[:css])[0]
       dropdown = Selenium::WebDriver::Support::Select.new(element)
+      if params[:deselect_all]
+        dropdown.deselect_all
+      end
       dropdown.select_by(:text, params[:value])
-      puts "select - #{params.inspect}"
+      #puts "select - #{params.inspect}"
     rescue
+      sleep 0.5
+
       # just try again
+      log('select', { rescure: true })
       element  = instance.find_elements(css: params[:css])[0]
       dropdown = Selenium::WebDriver::Support::Select.new(element)
-      dropdown.select_by(:text, params[:value])
+      if params[:deselect_all]
-      puts "select2 - #{params.inspect}"
+        dropdown.deselect_all
       end
+      dropdown.select_by(:text, params[:value])
+      #puts "select2 - #{params.inspect}"
+    end
+    sleep 0.8
   end
 
 =begin
@@ -1290,41 +1320,65 @@ wait untill text in selector disabppears
     instance = params[:browser] || @browser
     data     = params[:data]
 
-    instance.find_elements(css: 'a[href="#manage"]')[0].click
+    click(
-    sleep 0.2
+      browser: instance,
-    instance.find_elements(css: 'a[href="#manage/overviews"]')[0].click
+      css:  'a[href="#manage"]',
-    sleep 0.2
+      mute_log: true,
-    instance.find_elements(css: '#content a[data-type="new"]')[0].click
+    )
-    sleep 2
+    click(
+      browser: instance,
+      css:  'a[href="#manage/overviews"]',
+      mute_log: true,
+    )
+    click(
+      browser: instance,
+      css:  '#content a[data-type="new"]',
+      mute_log: true,
+    )
 
     if data[:name]
-      element = instance.find_elements(css: '.modal input[name=name]')[0]
+      set(
-      element.clear
+        browser:  instance,
-      element.send_keys(data[:name])
+        css:      '.modal input[name=name]',
+        value:    data[:name],
+        mute_log: true,
+      )
     end
     if data[:role]
-      element = instance.find_elements(css: '.modal select[name="role_id"]')[0]
+      select(
-      dropdown = Selenium::WebDriver::Support::Select.new(element)
+        browser:  instance,
-      dropdown.select_by(:text, data[:role])
+        css:      '.modal select[name="role_id"]',
+        value:    data[:role],
+        mute_log: true,
+      )
     end
 
     if data[:selector]
       data[:selector].each {|key, value|
-        element = instance.find_elements(css: '.modal .ticket_selector .js-attributeSelector select')[0]
+        select(
-        dropdown = Selenium::WebDriver::Support::Select.new(element)
+          browser:  instance,
-        dropdown.select_by(:text, key)
+          css:      '.modal .ticket_selector .js-attributeSelector select',
+          value:    key,
+          mute_log: true,
+        )
         sleep 0.5
-        element = instance.find_elements(css: '.modal .ticket_selector .js-value select')[0]
+        select(
-        dropdown = Selenium::WebDriver::Support::Select.new(element)
+          browser:      instance,
-        dropdown.deselect_all
+          css:          '.modal .ticket_selector .js-value select',
-        dropdown.select_by(:text, value)
+          value:        value,
+          deselect_all: true,
+          mute_log:     true,
+        )
       }
     end
 
     if data['order::direction']
-      element = instance.find_elements(css: '.modal select[name="order::direction"]')[0]
+      select(
-      dropdown = Selenium::WebDriver::Support::Select.new(element)
+        browser:  instance,
-      dropdown.select_by(:text, data['order::direction'])
+        css:      '.modal select[name="order::direction"]',
+        value:    data['order::direction'],
+        mute_log: true,
+      )
     end
 
     instance.find_elements(css: '.modal button.js-submit')[0].click
@@ -1368,44 +1422,63 @@ wait untill text in selector disabppears
     instance = params[:browser] || @browser
     data     = params[:data]
 
-    instance.find_elements(css: 'a[href="#manage"]')[0].click
+    click(
-    sleep 0.2
+      browser: instance,
-    instance.find_elements(css: 'a[href="#manage/overviews"]')[0].click
+      css:  'a[href="#manage"]',
-    sleep 1
+      mute_log: true,
-    #instance.find_elements(css: '#content a[data-type="new"]')[0].click
+    )
-    #sleep 2
+    click(
+      browser: instance,
+      css:  'a[href="#manage/overviews"]',
+      mute_log: true,
+    )
 
     instance.execute_script("$(\"#content td:contains('#{data[:name]}')\").first().click()")
     sleep 2
 
     if data[:name]
-      element = instance.find_elements(css: '.modal input[name=name]')[0]
+      set(
-      element.clear
+        browser:  instance,
-      element.send_keys(data[:name])
+        css:      '.modal input[name=name]',
+        value:    data[:name],
+        mute_log: true,
+      )
     end
     if data[:role]
-      element = instance.find_elements(css: '.modal select[name="role_id"]')[0]
+      select(
-      dropdown = Selenium::WebDriver::Support::Select.new(element)
+        browser:  instance,
-      dropdown.select_by(:text, data[:role])
+        css:      '.modal select[name="role_id"]',
+        value:    data[:role],
+        mute_log: true,
+      )
     end
 
     if data[:selector]
       data[:selector].each {|key, value|
-        element = instance.find_elements(css: '.modal .ticket_selector .js-attributeSelector select')[0]
+        select(
-        dropdown = Selenium::WebDriver::Support::Select.new(element)
+          browser:  instance,
-        dropdown.select_by(:text, key)
+          css:      '.modal .ticket_selector .js-attributeSelector select',
-        instance.execute_script("$('#content .modal .ticket_selector .js-attributeSelector select').first().trigger('change')")
+          value:    key,
-        element = instance.find_elements(css: '.modal .ticket_selector .js-value select')[0]
+          mute_log: true,
-        dropdown = Selenium::WebDriver::Support::Select.new(element)
+        )
-        dropdown.deselect_all
+        sleep 0.5
-        dropdown.select_by(:text, value)
+        select(
+          browser:      instance,
+          css:          '.modal .ticket_selector .js-value select',
+          value:        value,
+          deselect_all: true,
+          mute_log:     true,
+        )
       }
     end
 
     if data['order::direction']
-      element = instance.find_elements(css: '.modal select[name="order::direction"]')[0]
+      select(
-      dropdown = Selenium::WebDriver::Support::Select.new(element)
+        browser:  instance,
-      dropdown.select_by(:text, data['order::direction'])
+        css:      '.modal select[name="order::direction"]',
+        value:    data['order::direction'],
+        mute_log: true,
+      )
     end
 
     instance.find_elements(css: '.modal button.js-submit')[0].click
@@ -1456,8 +1529,17 @@ wait untill text in selector disabppears
     instance = params[:browser] || @browser
     data     = params[:data]
 
-    instance.find_elements(css: 'a[href="#new"]')[0].click
+    click(
-    instance.find_elements(css: 'a[href="#ticket/create"]')[0].click
+      browser: instance,
+      css:  'a[href="#new"]',
+      mute_log: true,
+    )
+    click(
+      browser: instance,
+      css:  'a[href="#ticket/create"]',
+      mute_log: true,
+    )
+
     element = instance.find_elements(css: '.active .newTicket')[0]
     if !element
       screenshot(browser: instance, comment: 'ticket_create_failed')
@@ -1481,31 +1563,40 @@ wait untill text in selector disabppears
         # check count of agents, should be only 1 / - selection on init screen
         count = instance.find_elements(css: '.active .newTicket select[name="owner_id"] option').count
         assert_equal(1, count, 'check if owner selection is empty per default')
-
+        select(
-        element = instance.find_elements(css: '.active .newTicket select[name="group_id"]')[0]
+          browser:  instance,
-        dropdown = Selenium::WebDriver::Support::Select.new(element)
+          css:      '.active .newTicket select[name="group_id"]',
-        dropdown.select_by(:text, data[:group])
+          value:    data[:group],
+          mute_log: true,
+        )
         sleep 0.2
       end
     end
     if data[:priority]
-      element = instance.find_elements(css: '.active .newTicket select[name="priority_id"]')[0]
+      select(
-      dropdown = Selenium::WebDriver::Support::Select.new(element)
+        browser:  instance,
-      dropdown.select_by(:text, data[:priority])
+        css:      '.active .newTicket select[name="priority_id"]',
-      sleep 0.2
+        value:    data[:priority],
+        mute_log: true,
+      )
     end
     if data[:title]
-      element = instance.find_elements(css: '.active .newTicket input[name="title"]')[0]
+      set(
-      element.clear
+        browser:  instance,
-      element.send_keys(data[:title])
+        css:      '.active .newTicket input[name="title"]',
-      sleep 0.2
+        value:    data[:title],
+        clear:    true,
+        mute_log: true,
+      )
     end
     if data[:body]
-      #instance.execute_script('$(".active .newTicket div[data-name=body]").focus()')
+      set(
-      sleep 0.5
+        browser:  instance,
-      element = instance.find_elements(css: '.active .newTicket div[data-name=body]')[0]
+        css:      '.active .newTicket div[data-name=body]',
-      element.clear
+        value:    data[:body],
-      element.send_keys(data[:body])
+        clear:    true,
+        mute_log: true,
+      )
 
       # it's not working stable via selenium, use js
       value = instance.find_elements(css: '.content .newTicket div[data-name=body]')[0].text
@@ -1546,9 +1637,14 @@ wait untill text in selector disabppears
       assert(true, 'ticket created without submit')
       return
     end
-    sleep 0.8
+    sleep 0.5
     #instance.execute_script('$(".content.active .newTicket form").submit();')
-    instance.find_elements(css: '.active .newTicket button.js-submit')[0].click
+    click(
+      browser: instance,
+      css:  '.active .newTicket button.js-submit',
+      mute_log: true,
+    )
+
     sleep 1
     (1..10).each {
       if instance.current_url =~ /#{Regexp.quote('#ticket/zoom/')}/
@@ -1675,11 +1771,13 @@ wait untill text in selector disabppears
 
     end
     if data[:body]
-      #instance.execute_script('$(".content.active div[data-name=body]").focus()')
+      set(
-      sleep 0.5
+        browser:  instance,
-      element = instance.find_elements(css: '.content.active div[data-name=body]')[0]
+        css:      '.content.active div[data-name=body]',
-      element.clear
+        value:    data[:body],
-      element.send_keys(data[:body])
+        no_click: true,
+        mute_log: true,
+      )
 
       # it's not working stable via selenium, use js
       value = instance.find_elements(css: '.content.active div[data-name=body]')[0].text
@@ -1702,26 +1800,32 @@ wait untill text in selector disabppears
         assert_equal(3, count, 'check if owner selection is - selection + master + agent per default')
 
       else
-
+        select(
-        element = instance.find_elements(css: '.active .sidebar select[name="group_id"]')[0]
+          browser:  instance,
-        dropdown = Selenium::WebDriver::Support::Select.new(element)
+          css:      '.active .sidebar select[name="group_id"]',
-        dropdown.select_by(:text, data[:group])
+          value:    data[:group],
+          mute_log: true,
+        )
         sleep 0.2
       end
     end
 
     if data[:priority]
-      element = instance.find_elements(css: '.active .sidebar select[name="priority_id"]')[0]
+      select(
-      dropdown = Selenium::WebDriver::Support::Select.new(element)
+        browser:  instance,
-      dropdown.select_by(:text, data[:priority])
+        css:      '.active .sidebar select[name="priority_id"]',
-      sleep 0.2
+        value:    data[:priority],
+        mute_log: true,
+      )
     end
 
     if data[:state]
-      element = instance.find_elements(css: '.active .sidebar select[name="state_id"]')[0]
+      select(
-      dropdown = Selenium::WebDriver::Support::Select.new(element)
+        browser:  instance,
-      dropdown.select_by(:text, data[:state])
+        css:      '.active .sidebar select[name="state_id"]',
-      sleep 0.2
+        value:    data[:state],
+        mute_log: true,
+      )
     end
 
     if data[:state] || data[:group] || data[:body]
@@ -2080,11 +2184,22 @@ wait untill text in selector disabppears
     instance = params[:browser] || @browser
     data     = params[:data]
 
-    instance.find_elements(css: 'a[href="#manage"]')[0].click
+    click(
-    sleep 1
+      browser: instance,
-    instance.find_elements(css: 'a[href="#manage/users"]')[0].click
+      css:  'a[href="#manage"]',
-    sleep 2
+      mute_log: true,
-    instance.find_elements(css: 'a[data-type="new"]')[0].click
+    )
+    click(
+      browser: instance,
+      css:  'a[href="#manage/users"]',
+      mute_log: true,
+    )
+    click(
+      browser: instance,
+      css:  'a[data-type="new"]',
+      mute_log: true,
+    )
+
     sleep 2
     element = instance.find_elements(css: '.modal input[name=firstname]')[0]
     element.clear
@@ -2140,11 +2255,22 @@ wait untill text in selector disabppears
     instance = params[:browser] || @browser
     data     = params[:data]
 
-    instance.find_elements(css: 'a[href="#manage"]')[0].click
+    click(
-    sleep 1
+      browser: instance,
-    instance.find_elements(css: 'a[href="#manage/slas"]')[0].click
+      css:  'a[href="#manage"]',
-    sleep 2
+      mute_log: true,
-    instance.find_elements(css: 'a.js-new')[0].click
+    )
+    click(
+      browser: instance,
+      css:  'a[href="#manage/slas"]',
+      mute_log: true,
+    )
+    click(
+      browser: instance,
+      css:  'a.js-new',
+      mute_log: true,
+    )
+
     sleep 2
     element = instance.find_elements(css: '.modal input[name=name]')[0]
     element.clear
@@ -2187,11 +2313,22 @@ wait untill text in selector disabppears
     instance = params[:browser] || @browser
     data     = params[:data]
 
-    instance.find_elements(css: 'a[href="#manage"]')[0].click
+    click(
-    sleep 1
+      browser: instance,
-    instance.find_elements(css: 'a[href="#manage/text_modules"]')[0].click
+      css:  'a[href="#manage"]',
-    sleep 2
+      mute_log: true,
-    instance.find_elements(css: 'a[data-type="new"]')[0].click
+    )
+    click(
+      browser: instance,
+      css:  'a[href="#manage/text_modules"]',
+      mute_log: true,
+    )
+    click(
+      browser: instance,
+      css:  'a[data-type="new"]',
+      mute_log: true,
+    )
+
     sleep 2
     element = instance.find_elements(css: '.modal input[name=name]')[0]
     element.clear
@@ -2236,13 +2373,28 @@ wait untill text in selector disabppears
     instance = params[:browser] || @browser
     data     = params[:data]
 
-    instance.find_elements(css: 'a[href="#manage"]')[0].click
+    click(
-    sleep 1
+      browser: instance,
-    instance.find_elements(css: 'a[href="#channels/email"]')[0].click
+      css:  'a[href="#manage"]',
-    sleep 1
+      mute_log: true,
-    instance.find_elements(css: 'a[href="#c-signature"]')[0].click
+    )
-    sleep 8
+    click(
-    instance.find_elements(css: '#content #c-signature a[data-type="new"]')[0].click
+      browser: instance,
+      css:  'a[href="#channels/email"]',
+      mute_log: true,
+    )
+    click(
+      browser: instance,
+      css:  'a[href="#c-signature"]',
+      mute_log: true,
+    )
+    sleep 4
+    click(
+      browser: instance,
+      css:  '#content #c-signature a[data-type="new"]',
+      mute_log: true,
+    )
+
     sleep 2
     element = instance.find_elements(css: '.modal input[name=name]')[0]
     element.clear
@@ -2287,11 +2439,22 @@ wait untill text in selector disabppears
     instance = params[:browser] || @browser
     data     = params[:data]
 
-    instance.find_elements(css: 'a[href="#manage"]')[0].click
+    click(
-    sleep 0.5
+      browser: instance,
-    instance.find_elements(css: 'a[href="#manage/groups"]')[0].click
+      css:  'a[href="#manage"]',
-    sleep 2
+      mute_log: true,
-    instance.find_elements(css: 'a[data-type="new"]')[0].click
+    )
+    click(
+      browser: instance,
+      css:  'a[href="#manage/groups"]',
+      mute_log: true,
+    )
+    click(
+      browser: instance,
+      css:  'a[data-type="new"]',
+      mute_log: true,
+    )
+
     sleep 2
     element = instance.find_elements(css: '.modal input[name=name]')[0]
     element.clear

test/unit/assets_test.rb

@@ -278,4 +278,263 @@ class AssetsTest < ActiveSupport::TestCase
     #puts "ERROR: difference \n1: #{o1.inspect}\n2: #{o2.inspect}\ndiff: #{(o1.to_a - o2.to_a).inspect}"
     false
   end
+
+  test 'overview' do
+
+    UserInfo.current_user_id = 1
+    roles = Role.where(name: %w(Customer))
+
+    user1 = User.create_or_update(
+      login: 'assets_overview1@example.org',
+      firstname: 'assets_overview1',
+      lastname: 'assets_overview1',
+      email: 'assets_overview1@example.org',
+      password: 'some_pass',
+      active: true,
+      roles: roles,
+    )
+    user2 = User.create_or_update(
+      login: 'assets_overview2@example.org',
+      firstname: 'assets_overview2',
+      lastname: 'assets_overview2',
+      email: 'assets_overview2@example.org',
+      password: 'some_pass',
+      active: true,
+      roles: roles,
+    )
+    user3 = User.create_or_update(
+      login: 'assets_overview3@example.org',
+      firstname: 'assets_overview3',
+      lastname: 'assets_overview3',
+      email: 'assets_overview3@example.org',
+      password: 'some_pass',
+      active: true,
+      roles: roles,
+    )
+    user4 = User.create_or_update(
+      login: 'assets_overview4@example.org',
+      firstname: 'assets_overview4',
+      lastname: 'assets_overview4',
+      email: 'assets_overview4@example.org',
+      password: 'some_pass',
+      active: true,
+      roles: roles,
+    )
+    user5 = User.create_or_update(
+      login: 'assets_overview5@example.org',
+      firstname: 'assets_overview5',
+      lastname: 'assets_overview5',
+      email: 'assets_overview5@example.org',
+      password: 'some_pass',
+      active: true,
+      roles: roles,
+    )
+
+    ticket_state1 = Ticket::State.find_by(name: 'new')
+    ticket_state2 = Ticket::State.find_by(name: 'open')
+    overview_role = Role.find_by(name: 'Agent')
+    overview = Overview.create_or_update(
+      name: 'my asset test',
+      link: 'my_asset_test',
+      prio: 1000,
+      role_id: overview_role.id,
+      user_ids: [ user4.id, user5.id ],
+      condition: {
+        'ticket.state_id' => {
+          operator: 'is',
+          value: [ ticket_state1.id, ticket_state2.id ],
+        },
+        'ticket.owner_id' => {
+          operator: 'is',
+          pre_condition: 'specific',
+          value: user1.id,
+          value_completion: 'John Smith <john.smith@example.com>'
+        },
+      },
+      order: {
+        by: 'created_at',
+        direction: 'ASC',
+      },
+      view: {
+        d: %w(title customer group created_at),
+        s: %w(title customer group created_at),
+        m: %w(number title customer group created_at),
+        view_mode_default: 's',
+      },
+    )
+    assets = overview.assets({})
+    assert(assets[:User][user1.id], 'check assets')
+    assert_not(assets[:User][user2.id], 'check assets')
+    assert_not(assets[:User][user3.id], 'check assets')
+    assert(assets[:User][user4.id], 'check assets')
+    assert(assets[:User][user5.id], 'check assets')
+    assert(assets[:TicketState][ticket_state1.id], 'check assets')
+    assert(assets[:TicketState][ticket_state2.id], 'check assets')
+
+    overview = Overview.create_or_update(
+      name: 'my asset test',
+      link: 'my_asset_test',
+      prio: 1000,
+      role_id: overview_role.id,
+      user_ids: [ user4.id ],
+      condition: {
+        'ticket.state_id' => {
+          operator: 'is',
+          value: ticket_state1.id,
+        },
+        'ticket.owner_id' => {
+          operator: 'is',
+          pre_condition: 'specific',
+          value: [user1.id, user2.id],
+        },
+      },
+      order: {
+        by: 'created_at',
+        direction: 'ASC',
+      },
+      view: {
+        d: %w(title customer group created_at),
+        s: %w(title customer group created_at),
+        m: %w(number title customer group created_at),
+        view_mode_default: 's',
+      },
+    )
+    assets = overview.assets({})
+    assert(assets[:User][user1.id], 'check assets')
+    assert(assets[:User][user2.id], 'check assets')
+    assert_not(assets[:User][user3.id], 'check assets')
+    assert(assets[:User][user4.id], 'check assets')
+    assert_not(assets[:User][user5.id], 'check assets')
+    assert(assets[:TicketState][ticket_state1.id], 'check assets')
+    assert_not(assets[:TicketState][ticket_state2.id], 'check assets')
+
+  end
+
+  test 'sla' do
+
+    UserInfo.current_user_id = 1
+    roles = Role.where(name: %w(Customer))
+
+    user1 = User.create_or_update(
+      login: 'assets_sla1@example.org',
+      firstname: 'assets_sla1',
+      lastname: 'assets_sla1',
+      email: 'assets_sla1@example.org',
+      password: 'some_pass',
+      active: true,
+      roles: roles,
+    )
+    user2 = User.create_or_update(
+      login: 'assets_sla2@example.org',
+      firstname: 'assets_sla2',
+      lastname: 'assets_sla2',
+      email: 'assets_sla2@example.org',
+      password: 'some_pass',
+      active: true,
+      roles: roles,
+    )
+
+    calendar1 = Calendar.first
+    ticket_state1 = Ticket::State.find_by(name: 'new')
+    ticket_state2 = Ticket::State.find_by(name: 'open')
+    sla = Sla.create_or_update(
+      name: 'my asset test',
+      calendar_id: calendar1.id,
+      condition: {
+        'ticket.state_id' => {
+          operator: 'is',
+          value: [ ticket_state1.id, ticket_state2.id ],
+        },
+        'ticket.owner_id' => {
+          operator: 'is',
+          pre_condition: 'specific',
+          value: user1.id,
+          value_completion: 'John Smith <john.smith@example.com>'
+        },
+      },
+    )
+    assets = sla.assets({})
+    assert(assets[:User][user1.id], 'check assets')
+    assert_not(assets[:User][user2.id], 'check assets')
+    assert(assets[:TicketState][ticket_state1.id], 'check assets')
+    assert(assets[:TicketState][ticket_state2.id], 'check assets')
+    assert(assets[:Calendar][calendar1.id], 'check assets')
+
+  end
+
+  test 'job' do
+
+    UserInfo.current_user_id = 1
+    roles = Role.where(name: %w(Customer))
+
+    user1 = User.create_or_update(
+      login: 'assets_job1@example.org',
+      firstname: 'assets_job1',
+      lastname: 'assets_job1',
+      email: 'assets_job1@example.org',
+      password: 'some_pass',
+      active: true,
+      roles: roles,
+    )
+    user2 = User.create_or_update(
+      login: 'assets_job2@example.org',
+      firstname: 'assets_job2',
+      lastname: 'assets_job2',
+      email: 'assets_job2@example.org',
+      password: 'some_pass',
+      active: true,
+      roles: roles,
+    )
+    user3 = User.create_or_update(
+      login: 'assets_job3@example.org',
+      firstname: 'assets_job3',
+      lastname: 'assets_job3',
+      email: 'assets_job3@example.org',
+      password: 'some_pass',
+      active: true,
+      roles: roles,
+    )
+
+    ticket_state1 = Ticket::State.find_by(name: 'new')
+    ticket_state2 = Ticket::State.find_by(name: 'open')
+    ticket_priority2 = Ticket::Priority.find_by(name: '2 normal')
+    job = Job.create_or_update(
+      name: 'my job',
+      timeplan: {
+        mon: true,
+      },
+      condition: {
+        'ticket.state_id' => {
+          operator: 'is',
+          value: [ ticket_state1.id, ticket_state2.id ],
+        },
+        'ticket.owner_id' => {
+          operator: 'is',
+          pre_condition: 'specific',
+          value: user1.id,
+          value_completion: 'John Smith <john.smith@example.com>'
+        },
+      },
+      perform: {
+        'ticket.priority_id' => {
+          value: ticket_priority2.id,
+        },
+        'ticket.owner_id' => {
+          pre_condition: 'specific',
+          value: user2.id,
+          value_completion: 'metest123@znuny.com <metest123@znuny.com>'
+        },
+      },
+      disable_notification: true,
+    )
+    assets = job.assets({})
+    assert(assets[:User][user1.id], 'check assets')
+    assert(assets[:User][user2.id], 'check assets')
+    assert_not(assets[:User][user3.id], 'check assets')
+    assert(assets[:TicketState][ticket_state1.id], 'check assets')
+    assert(assets[:TicketState][ticket_state2.id], 'check assets')
+    assert(assets[:TicketPriority][ticket_priority2.id], 'check assets')
+
+  end
+
 end