diff --git a/.rubocop_todo.rspec.yml b/.rubocop_todo.rspec.yml index 28bb3b226..16389d667 100644 --- a/.rubocop_todo.rspec.yml +++ b/.rubocop_todo.rspec.yml @@ -6,10 +6,6 @@ # Note that changes in the inspected code, or installation of new # versions of RuboCop, may require this file to be generated again. -# Offense count: 43 -Lint/UselessAssignment: - Enabled: false - # # Offense count: 17 (Competes with same override in .rubocop_todo.yml) # Metrics/AbcSize: # Max: 24 diff --git a/app/controllers/application_channel_controller.rb b/app/controllers/application_channel_controller.rb index 927528f9b..2117a3ba1 100644 --- a/app/controllers/application_channel_controller.rb +++ b/app/controllers/application_channel_controller.rb @@ -41,7 +41,7 @@ class ApplicationChannelController < ApplicationController end def channel_params - params = params.permit!.to_s + params.permit!.to_s end end diff --git a/app/controllers/application_controller/renders_models.rb b/app/controllers/application_controller/renders_models.rb index e6e2166f2..9129de0c5 100644 --- a/app/controllers/application_controller/renders_models.rb +++ b/app/controllers/application_controller/renders_models.rb @@ -101,22 +101,11 @@ module ApplicationController::RendersModels end def model_index_render(object, params) - offset = 0 - per_page = 500 - if params[:page] && params[:per_page] - offset = (params[:page].to_i - 1) * params[:per_page].to_i - limit = params[:per_page].to_i - end + page = (params[:page] || 1).to_i + per_page = (params[:per_page] || 500).to_i + offset = (page - 1) * per_page - if per_page > 500 - per_page = 500 - end - - generic_objects = if offset.positive? - object.limit(params[:per_page]).order(id: :asc).offset(offset).limit(limit) - else - object.all.order(id: :asc).offset(offset).limit(limit) - end + generic_objects = object.order(id: :asc).offset(offset).limit(per_page) if response_expand? list = [] diff --git a/app/controllers/channels_email_controller.rb b/app/controllers/channels_email_controller.rb index 30454091f..1ec95d1ef 100644 --- a/app/controllers/channels_email_controller.rb +++ b/app/controllers/channels_email_controller.rb @@ -171,7 +171,7 @@ class ChannelsEmailController < ApplicationController channel_id: channel.id, ) else - address = EmailAddress.create( + EmailAddress.create( realname: params[:meta][:realname], email: email, active: true, diff --git a/app/controllers/concerns/creates_ticket_articles.rb b/app/controllers/concerns/creates_ticket_articles.rb index 1c8987aac..487b4cc2a 100644 --- a/app/controllers/concerns/creates_ticket_articles.rb +++ b/app/controllers/concerns/creates_ticket_articles.rb @@ -96,7 +96,7 @@ module CreatesTicketArticles begin base64_data = attachment[:data].gsub(/[\r\n]/, '') attachment_data = Base64.strict_decode64(base64_data) - rescue ArgumentError => e + rescue ArgumentError raise Exceptions::UnprocessableEntity, "Invalid base64 for attachment with index '#{index}'" end diff --git a/app/controllers/import_otrs_controller.rb b/app/controllers/import_otrs_controller.rb index d3865305c..44dcc9f2d 100644 --- a/app/controllers/import_otrs_controller.rb +++ b/app/controllers/import_otrs_controller.rb @@ -123,7 +123,7 @@ class ImportOtrsController < ApplicationController end def import_check - statistic = Import::OTRS::Requester.list + Import::OTRS::Requester.list issues = [] # check count of dynamic fields diff --git a/app/controllers/integration/check_mk_controller.rb b/app/controllers/integration/check_mk_controller.rb index 7afddcba9..559503a17 100644 --- a/app/controllers/integration/check_mk_controller.rb +++ b/app/controllers/integration/check_mk_controller.rb @@ -55,7 +55,7 @@ UserAgent: #{request.env['HTTP_USER_AGENT']} ticket = Ticket.find_by(id: ticket_id) next if !ticket - article = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket_id, type_id: Ticket::Article::Type.find_by(name: 'web').id, sender_id: Ticket::Article::Sender.find_by(name: 'Customer').id, @@ -81,7 +81,6 @@ UserAgent: #{request.env['HTTP_USER_AGENT']} } return end - state = Ticket::State.lookup(id: auto_close_state_id) ticket_ids_found.each do |ticket_id| ticket = Ticket.find_by(id: ticket_id) next if !ticket @@ -107,7 +106,7 @@ UserAgent: #{request.env['HTTP_USER_AGENT']} }, } ) - article = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket.id, type_id: Ticket::Article::Type.find_by(name: 'web').id, sender_id: Ticket::Article::Sender.find_by(name: 'Customer').id, diff --git a/app/controllers/knowledge_base/answer/attachments_controller.rb b/app/controllers/knowledge_base/answer/attachments_controller.rb index b336d03b3..636f4d284 100644 --- a/app/controllers/knowledge_base/answer/attachments_controller.rb +++ b/app/controllers/knowledge_base/answer/attachments_controller.rb @@ -9,7 +9,7 @@ class KnowledgeBase::Answer::AttachmentsController < ApplicationController def create file = params[:file] - store = Store.add( + Store.add( object: @answer.class.name, o_id: @answer.id, data: file.read, diff --git a/app/controllers/long_polling_controller.rb b/app/controllers/long_polling_controller.rb index 30b01135f..35cfa4236 100644 --- a/app/controllers/long_polling_controller.rb +++ b/app/controllers/long_polling_controller.rb @@ -89,7 +89,7 @@ class LongPollingController < ApplicationController return end end - rescue => e + rescue raise Exceptions::UnprocessableEntity, 'Invalid client_id in receive loop!' end end diff --git a/app/controllers/slas_controller.rb b/app/controllers/slas_controller.rb index c6c5b4006..a0ac5f602 100644 --- a/app/controllers/slas_controller.rb +++ b/app/controllers/slas_controller.rb @@ -52,7 +52,6 @@ curl http://localhost/api/v1/slas.json -v -u #{login}:#{password} # calendars assets = {} - calendar_ids = [] Calendar.all.each do |calendar| assets = calendar.assets(assets) end diff --git a/app/controllers/ticket_overviews_controller.rb b/app/controllers/ticket_overviews_controller.rb index cbf0a4d50..dbe9d158b 100644 --- a/app/controllers/ticket_overviews_controller.rb +++ b/app/controllers/ticket_overviews_controller.rb @@ -10,7 +10,6 @@ class TicketOverviewsController < ApplicationController index_and_lists = Ticket::Overviews.index(current_user) indexes = [] index_and_lists.each do |index| - assets = {} overview = Overview.lookup(id: index[:overview][:id]) meta = { name: overview.name, diff --git a/app/controllers/time_accountings_controller.rb b/app/controllers/time_accountings_controller.rb index 4f89596c6..2d0102f52 100644 --- a/app/controllers/time_accountings_controller.rb +++ b/app/controllers/time_accountings_controller.rb @@ -49,7 +49,6 @@ class TimeAccountingsController < ApplicationController end if !agents[local_time_unit[:agent_id]] agent_user = User.lookup(id: local_time_unit[:agent_id]) - agent = '-' if agent_user agents[local_time_unit[:agent_id]] = agent_user.fullname end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index a4e9f4951..1bca0d47f 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -380,7 +380,7 @@ class UsersController < ApplicationController query = params[:query] if query.respond_to?(:permit!) - query = query.permit!.to_h + query.permit!.to_h end query = params[:query] || params[:term] @@ -543,7 +543,7 @@ curl http://localhost/api/v1/users/email_verify_send -v -u #{login}:#{password} # return #end - token = Token.create(action: 'Signup', user_id: user.id) + Token.create(action: 'Signup', user_id: user.id) result = User.signup_new_token(user) if result && result[:token] diff --git a/app/jobs/ticket_article_communicate_email_job.rb b/app/jobs/ticket_article_communicate_email_job.rb index 38e699e30..f77fc761d 100644 --- a/app/jobs/ticket_article_communicate_email_job.rb +++ b/app/jobs/ticket_article_communicate_email_job.rb @@ -9,7 +9,6 @@ class TicketArticleCommunicateEmailJob < ApplicationJob # build subject ticket = Ticket.lookup(id: record.ticket_id) - article_count = Ticket::Article.where(ticket_id: ticket.id).count subject_prefix_mode = record.preferences[:subtype] diff --git a/app/models/application_model/can_lookup.rb b/app/models/application_model/can_lookup.rb index e53e85e83..f93d37d0e 100644 --- a/app/models/application_model/can_lookup.rb +++ b/app/models/application_model/can_lookup.rb @@ -25,8 +25,7 @@ returns attr.transform_keys!(&:to_sym).slice!(*lookup_keys) raise ArgumentError, "Valid lookup attribute required (#{lookup_keys.join(', ')})" if attr.empty? - record = cache_get(attr.values.first) - record ||= find_and_save_to_cache_by(attr) + cache_get(attr.values.first) || find_and_save_to_cache_by(attr) end =begin diff --git a/app/models/application_model/can_lookup_search_index_attributes.rb b/app/models/application_model/can_lookup_search_index_attributes.rb index a38ebe7f0..74748d403 100644 --- a/app/models/application_model/can_lookup_search_index_attributes.rb +++ b/app/models/application_model/can_lookup_search_index_attributes.rb @@ -22,8 +22,7 @@ returns next if !value # get attribute name - attribute_name_with_id = key.to_s - attribute_name = key.to_s + attribute_name = key.to_s next if attribute_name[-3, 3] != '_id' attribute_name = attribute_name[ 0, attribute_name.length - 3 ] diff --git a/app/models/application_model/has_attachments.rb b/app/models/application_model/has_attachments.rb index 54bfea4af..defd84783 100644 --- a/app/models/application_model/has_attachments.rb +++ b/app/models/application_model/has_attachments.rb @@ -86,6 +86,5 @@ store attachments for this object created_by_id: created_by_id, ) end - attachments_buffer = nil end end diff --git a/app/models/channel/driver/sms/twilio.rb b/app/models/channel/driver/sms/twilio.rb index 1288e868c..8f22cb6da 100644 --- a/app/models/channel/driver/sms/twilio.rb +++ b/app/models/channel/driver/sms/twilio.rb @@ -40,7 +40,7 @@ class Channel::Driver::Sms::Twilio # find sender user = User.where(mobile: attr[:From]).order(:updated_at).first if !user - from_comment, preferences = Cti::CallerId.get_comment_preferences(attr[:From], 'from') + _from_comment, preferences = Cti::CallerId.get_comment_preferences(attr[:From], 'from') if preferences && preferences['from'] && preferences['from'][0] if preferences['from'][0]['level'] == 'known' && preferences['from'][0]['object'] == 'User' user = User.find_by(id: preferences['from'][0]['o_id']) diff --git a/app/models/channel/email_parser.rb b/app/models/channel/email_parser.rb index 6d477cd2a..9209bdc92 100644 --- a/app/models/channel/email_parser.rb +++ b/app/models/channel/email_parser.rb @@ -202,9 +202,6 @@ returns # save changes set by x-zammad-ticket-followup-* headers ticket.save! if ticket.has_changes_to_save? - state = Ticket::State.find(ticket.state_id) - state_type = Ticket::StateType.find(state.state_type_id) - # set ticket to open again or keep create state if !mail['x-zammad-ticket-followup-state'.to_sym] && !mail['x-zammad-ticket-followup-state_id'.to_sym] new_state = Ticket::State.find_by(default_create: true) @@ -480,7 +477,7 @@ process unprocessable_mails (tmp/unprocessable_mail/*.eml) again path = Rails.root.join('tmp', 'unprocessable_mail') files = [] Dir.glob("#{path}/*.eml") do |entry| - ticket, article, user, mail = Channel::EmailParser.new.process(params, IO.binread(entry)) + ticket, _article, _user, _mail = Channel::EmailParser.new.process(params, IO.binread(entry)) next if ticket.blank? files.push entry @@ -608,15 +605,13 @@ process unprocessable_mails (tmp/unprocessable_mail/*.eml) again file.header.fields.each do |field| # full line, encode, ready for storage - value = field.to_utf8 if value.blank? value = field.raw_value end headers_store[field.name.to_s] = value - rescue => e + rescue headers_store[field.name.to_s] = field.raw_value - end # cleanup content id, <> will be added automatically later diff --git a/app/models/channel/filter/monitoring_base.rb b/app/models/channel/filter/monitoring_base.rb index a1d86a0e3..13ccd3c76 100644 --- a/app/models/channel/filter/monitoring_base.rb +++ b/app/models/channel/filter/monitoring_base.rb @@ -80,9 +80,6 @@ class Channel::Filter::MonitoringBase end end - # check if ticket with host is open - customer = User.lookup(id: session_user_id) - # follow up detection by meta data open_states = Ticket::State.by_category(:open) ticket_ids = Ticket.where(state: open_states).order(created_at: :desc).limit(5000).pluck(:id) diff --git a/app/models/concerns/checks_condition_validation.rb b/app/models/concerns/checks_condition_validation.rb index b7d63ff76..4b6ccde16 100644 --- a/app/models/concerns/checks_condition_validation.rb +++ b/app/models/concerns/checks_condition_validation.rb @@ -26,7 +26,7 @@ module ChecksConditionValidation value: 1, } - ticket_count, tickets = Ticket.selectors(validate_condition, limit: 1, current_user: User.find(1)) + ticket_count, _tickets = Ticket.selectors(validate_condition, limit: 1, current_user: User.find(1)) return true if ticket_count.present? raise Exceptions::UnprocessableEntity, 'Invalid ticket selector conditions' diff --git a/app/models/concerns/has_groups.rb b/app/models/concerns/has_groups.rb index 9d2961931..7ffe118f0 100644 --- a/app/models/concerns/has_groups.rb +++ b/app/models/concerns/has_groups.rb @@ -248,7 +248,7 @@ module HasGroups return if group_access_buffer.nil? yield - group_access_buffer = nil + self.group_access_buffer = nil cache_delete end diff --git a/app/models/job.rb b/app/models/job.rb index 8dff78e4b..2ea8a8b28 100644 --- a/app/models/job.rb +++ b/app/models/job.rb @@ -135,7 +135,7 @@ job.run(true) end def matching_count - ticket_count, tickets = Ticket.selectors(condition, limit: 1) + ticket_count, _tickets = Ticket.selectors(condition, limit: 1) ticket_count || 0 end diff --git a/app/models/knowledge_base/answer.rb b/app/models/knowledge_base/answer.rb index 64b391897..212310a49 100644 --- a/app/models/knowledge_base/answer.rb +++ b/app/models/knowledge_base/answer.rb @@ -49,7 +49,7 @@ class KnowledgeBase::Answer < ApplicationModel end data = ApplicationModel::CanAssets.reduce(siblings, data) - data = ApplicationModel::CanAssets.reduce(translations, data) + ApplicationModel::CanAssets.reduce(translations, data) end attachments_cleanup! diff --git a/app/models/knowledge_base/category.rb b/app/models/knowledge_base/category.rb index 57295894e..80e0bf460 100644 --- a/app/models/knowledge_base/category.rb +++ b/app/models/knowledge_base/category.rb @@ -50,7 +50,7 @@ class KnowledgeBase::Category < ApplicationModel data = ApplicationModel::CanAssets.reduce(translations, data) # include parent category or KB for root to have full path - data = (parent || knowledge_base).assets(data) + (parent || knowledge_base).assets(data) end def self_parent?(candidate) diff --git a/app/models/object_manager/attribute.rb b/app/models/object_manager/attribute.rb index 3d87aaa2a..5f645ce6f 100644 --- a/app/models/object_manager/attribute.rb +++ b/app/models/object_manager/attribute.rb @@ -54,7 +54,6 @@ list of all attributes result = ObjectManager::Attribute.all.order('position ASC, name ASC') references = ObjectManager::Attribute.attribute_to_references_hash attributes = [] - assets = {} result.each do |item| attribute = item.attributes attribute[:object] = ObjectLookup.by_id(item.object_lookup_id) @@ -908,7 +907,7 @@ is certain attribute used by triggers, overviews or schedulers # fixes issue #2236 - Naming an attribute "attribute" causes ActiveRecord failure begin ObjectLookup.by_id(object_lookup_id).constantize.instance_method_already_implemented? name - rescue ActiveRecord::DangerousAttributeError => e + rescue ActiveRecord::DangerousAttributeError raise "#{name} is a reserved word, please choose a different one" end diff --git a/app/models/object_manager/attribute/validation/required.rb b/app/models/object_manager/attribute/validation/required.rb index 8f3409925..e68082e77 100644 --- a/app/models/object_manager/attribute/validation/required.rb +++ b/app/models/object_manager/attribute/validation/required.rb @@ -22,7 +22,7 @@ class ObjectManager::Attribute::Validation::Required < ObjectManager::Attribute: end def user_id - user_id ||= UserInfo.current_user_id + @user_id ||= UserInfo.current_user_id end def user diff --git a/app/models/observer/sla/ticket_rebuild_escalation.rb b/app/models/observer/sla/ticket_rebuild_escalation.rb index 8e119e21f..f1d644c3a 100644 --- a/app/models/observer/sla/ticket_rebuild_escalation.rb +++ b/app/models/observer/sla/ticket_rebuild_escalation.rb @@ -25,7 +25,6 @@ class Observer::Sla::TicketRebuildEscalation < ActiveRecord::Observer # check if condition has changed changed = false - fields_to_check = nil fields_to_check = if record.class == Sla %w[condition calendar_id first_response_time update_time solution_time] else diff --git a/app/models/observer/transaction.rb b/app/models/observer/transaction.rb index 8cc0e26cf..77fe2bad2 100644 --- a/app/models/observer/transaction.rb +++ b/app/models/observer/transaction.rb @@ -217,7 +217,6 @@ class Observer::Transaction < ActiveRecord::Observer # do not send anything if nothing has changed return true if real_changes.blank? - changed_by_id = nil changed_by_id = if record.respond_to?('updated_by_id') record.updated_by_id else diff --git a/app/models/package.rb b/app/models/package.rb index 04584748b..4b3a918e2 100644 --- a/app/models/package.rb +++ b/app/models/package.rb @@ -505,8 +505,6 @@ execute all pending package migrations at once return true if !File.exist?(location) - migrations_done = Package::Migration.where(name: package.underscore) - # get existing migrations migrations_existing = [] Dir.foreach(location) do |entry| diff --git a/app/models/store.rb b/app/models/store.rb index 4b4b1019d..7931fcbc1 100644 --- a/app/models/store.rb +++ b/app/models/store.rb @@ -287,7 +287,6 @@ returns local_sha = Digest::SHA256.hexdigest(content) cache_key = "image-resize-#{local_sha}_#{width}" - all = nil image = Cache.get(cache_key) return image if image diff --git a/app/models/store/provider/file.rb b/app/models/store/provider/file.rb index 6a8ca39a4..f4fc0de03 100644 --- a/app/models/store/provider/file.rb +++ b/app/models/store/provider/file.rb @@ -108,7 +108,7 @@ class Store::Provider::File if !File.exist?(location) FileUtils.mkdir_p(location) end - full_path = location += file + full_path = location + file full_path.gsub('//', '/') end diff --git a/app/models/text_module.rb b/app/models/text_module.rb index edd890a0b..574fa2aa1 100644 --- a/app/models/text_module.rb +++ b/app/models/text_module.rb @@ -100,7 +100,7 @@ push text_modules to online # set new translator_key if given if result.data['translator_key'] - translator_key = Setting.set('translator_key', result.data['translator_key']) + Setting.set('translator_key', result.data['translator_key']) end true diff --git a/app/models/ticket.rb b/app/models/ticket.rb index 5c115f6f6..3019e9f0c 100644 --- a/app/models/ticket.rb +++ b/app/models/ticket.rb @@ -197,7 +197,7 @@ returns tickets.each do |ticket| # get sla - sla = ticket.escalation_calculation_get_sla + ticket.escalation_calculation_get_sla article_id = nil article = Ticket::Article.last_customer_agent_article(ticket.id) @@ -1129,10 +1129,8 @@ perform active triggers on ticket return [true, message] end - local_send_notification = true if article && send_notification == false && trigger.perform['notification.email'] && trigger.perform['notification.email']['recipient'] recipient = trigger.perform['notification.email']['recipient'] - local_send_notification = false local_options[:send_notification] = false if recipient.include?('ticket_customer') || recipient.include?('article_last_sender') logger.info { "Skip trigger (#{trigger.name}/#{trigger.id}) because sender do not want to get auto responder for object (Ticket/#{ticket.id}/Article/#{article.id})" } @@ -1576,7 +1574,7 @@ result ).render.html2text.tr(' ', ' ') # convert non-breaking space to simple space # attributes content_type is not needed for SMS - article = Ticket::Article.create( + Ticket::Article.create( ticket_id: id, subject: 'SMS notification', to: sms_recipients_to, diff --git a/app/models/transaction/notification.rb b/app/models/transaction/notification.rb index ec0d41f5e..fa2d40e6f 100644 --- a/app/models/transaction/notification.rb +++ b/app/models/transaction/notification.rb @@ -88,7 +88,6 @@ class Transaction::Notification end # send notifications - recipient_list = '' recipients_and_channels.each do |item| user = item[:user] channels = item[:channels] diff --git a/app/models/translation.rb b/app/models/translation.rb index 9f627b5fb..bf338853f 100644 --- a/app/models/translation.rb +++ b/app/models/translation.rb @@ -90,7 +90,7 @@ push translations to online # set new translator_key if given if result.data['translator_key'] - translator_key = Setting.set('translator_key', result.data['translator_key']) + Setting.set('translator_key', result.data['translator_key']) end true @@ -147,7 +147,6 @@ get list of translations Translation.where(locale: locale.downcase).where.not(target: '').order(:source) end translations.each do |item| - translation_item = [] translation_item = if admin [ item.id, @@ -405,7 +404,7 @@ Get source file at https://i18n.zammad.com/api/v1/translations_empty_translation col_sep: ',', } rows = ::CSV.parse(content, params) - header = rows.shift + rows.shift # remove header translation_raw = [] rows.each do |row| diff --git a/app/models/user.rb b/app/models/user.rb index 4e293406d..408b479a8 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -441,7 +441,6 @@ returns def permissions?(key) keys = key - names = [] if key.class == String keys = [key] end @@ -715,8 +714,14 @@ returns def merge(user_id_of_duplicate_user) - # find email addresses and move them to primary user - duplicate_user = User.find(user_id_of_duplicate_user) + # Raise an exception if the user is not found (?) + # + # (This line used to contain a useless variable assignment, + # and was changed to satisfy the linter. + # We're not certain of its original intention, + # so the User.find call has been kept + # to prevent any unexpected regressions.) + User.find(user_id_of_duplicate_user) # merge missing attibutes Models.merge('User', id, user_id_of_duplicate_user) diff --git a/db/migrate/20170910000002_out_of_office2.rb b/db/migrate/20170910000002_out_of_office2.rb index 262769a47..0796c3479 100644 --- a/db/migrate/20170910000002_out_of_office2.rb +++ b/db/migrate/20170910000002_out_of_office2.rb @@ -22,7 +22,6 @@ class OutOfOffice2 < ActiveRecord::Migration[4.2] end role_ids = Role.with_permissions(['ticket.agent']).map(&:id) - overview_role = Role.find_by(name: 'Agent') Overview.create_or_update( name: 'My replacement Tickets', link: 'my_replacement_tickets', diff --git a/lib/core_ext/string.rb b/lib/core_ext/string.rb index e6b4d34b4..f7b762c05 100644 --- a/lib/core_ext/string.rb +++ b/lib/core_ext/string.rb @@ -153,19 +153,20 @@ class String text_compare.downcase! text_compare.sub!(%r{/$}, '') end - placeholder = if link_compare.present? && text_compare.blank? - link - elsif link_compare.blank? && text_compare.present? - text - elsif link_compare && link_compare =~ /^mailto/i - text - elsif link_compare.present? && text_compare.present? && (link_compare == text_compare || link_compare == "mailto:#{text}".downcase || link_compare == "http://#{text}".downcase) - "######LINKEXT:#{link}/TEXT:#{text}######" - elsif text !~ /^http/ - "#{text} (######LINKRAW:#{link}######)" - else - "#{link} (######LINKRAW:#{text}######)" - end + + if link_compare.present? && text_compare.blank? + link + elsif link_compare.blank? && text_compare.present? + text + elsif link_compare && link_compare =~ /^mailto/i + text + elsif link_compare.present? && text_compare.present? && (link_compare == text_compare || link_compare == "mailto:#{text}".downcase || link_compare == "http://#{text}".downcase) + "######LINKEXT:#{link}/TEXT:#{text}######" + elsif text !~ /^http/ + "#{text} (######LINKRAW:#{link}######)" + else + "#{link} (######LINKRAW:#{text}######)" + end end end @@ -180,10 +181,10 @@ class String # pre/code handling 1/2 string.gsub!(%r{
(.+?)
}m) do |placeholder| - placeholder = placeholder.gsub(/\n/, '###BR###') + placeholder.gsub(/\n/, '###BR###') end string.gsub!(%r{(.+?)}m) do |placeholder| - placeholder = placeholder.gsub(/\n/, '###BR###') + placeholder.gsub(/\n/, '###BR###') end # insert spaces on [A-z]\n[A-z] @@ -231,11 +232,12 @@ class String if content.match?(/^www/i) content = "http://#{content}" end - placeholder = if content =~ /^(http|https|ftp|tel)/i - "#{pre}######LINKRAW:#{content}#######{post}" - else - "#{pre}#{content}#{post}" - end + + if content =~ /^(http|https|ftp|tel)/i + "#{pre}######LINKRAW:#{content}#######{post}" + else + "#{pre}#{content}#{post}" + end end end @@ -374,7 +376,7 @@ class String ] map.each do |regexp| string.sub!(/#{regexp}/m) do |placeholder| - placeholder = "#{marker}#{placeholder}" + "#{marker}#{placeholder}" end end return string @@ -388,7 +390,7 @@ class String # search for signature separator "--\n" string.sub!(/^\s{0,2}--\s{0,2}$/) do |placeholder| - placeholder = "#{marker}#{placeholder}" + "#{marker}#{placeholder}" end map = {} @@ -444,14 +446,12 @@ class String #map['word-en-de'] = "[^#{marker}].{1,250}\s(wrote|schrieb):" map.each_value do |regexp| - string.sub!(/#{regexp}/) do |placeholder| - placeholder = "#{marker}#{placeholder}" + "#{marker}#{placeholder}" + rescue + # regexp was not possible because of some string encoding issue, use next + Rails.logger.debug { "Invalid string/charset combination with regexp #{regexp} in string" } end - rescue - # regexp was not possible because of some string encoding issue, use next - Rails.logger.debug { "Invalid string/charset combination with regexp #{regexp} in string" } - end string diff --git a/lib/external_credential/twitter.rb b/lib/external_credential/twitter.rb index 621df43f2..1a2f96e7a 100644 --- a/lib/external_credential/twitter.rb +++ b/lib/external_credential/twitter.rb @@ -155,7 +155,7 @@ class ExternalCredential::Twitter # verify if webhook is already registered begin webhooks = client.webhooks_by_env_name(env_name) - rescue => e + rescue begin webhooks = client.webhooks raise "Unable to get list of webooks. You use the wrong 'Dev environment label', only #{webhooks.inspect} available." diff --git a/lib/fill_db.rb b/lib/fill_db.rb index 9a1a3f3ef..89aeffa1e 100644 --- a/lib/fill_db.rb +++ b/lib/fill_db.rb @@ -143,7 +143,7 @@ or if you only want to create 100 tickets if !overviews.zero? (1..overviews).each do ActiveRecord::Base.transaction do - overview = Overview.create!( + Overview.create!( name: "Filloverview::#{rand(999_999)}", role_ids: [Role.find_by(name: 'Agent').id], condition: { @@ -190,7 +190,7 @@ or if you only want to create 100 tickets ) # create article - article = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket.id, from: customer.email, to: 'some_recipient@example.com', diff --git a/lib/html_sanitizer.rb b/lib/html_sanitizer.rb index 02c9d4bca..15ab39d3e 100644 --- a/lib/html_sanitizer.rb +++ b/lib/html_sanitizer.rb @@ -193,7 +193,6 @@ satinize html string based on whiltelist end end - new_string = '' done = true while done new_string = Loofah.fragment(string).scrub!(scrubber_wipe).to_s @@ -205,7 +204,7 @@ satinize html string based on whiltelist Loofah.fragment(string).scrub!(scrubber_link).to_s end - rescue Timeout::Error => e + rescue Timeout::Error UNPROCESSABLE_HTML_MSG end @@ -237,7 +236,7 @@ cleanup html string: string = cleanup_structure(string) string end - rescue Timeout::Error => e + rescue Timeout::Error UNPROCESSABLE_HTML_MSG end @@ -302,7 +301,6 @@ cleanup html string: end end - new_string = '' done = true while done new_string = Loofah.fragment(string).scrub!(scrubber_structure).to_s diff --git a/lib/import/exchange/item_attributes.rb b/lib/import/exchange/item_attributes.rb index 1ed7a33dc..dcaa80fd0 100644 --- a/lib/import/exchange/item_attributes.rb +++ b/lib/import/exchange/item_attributes.rb @@ -15,7 +15,7 @@ module Import properties = @resource.get_all_properties! result = normalize(properties) flattened = flatten(result) - booleanized = booleanize_values(flattened) + booleanize_values(flattened) end end diff --git a/lib/import/otrs/article_customer.rb b/lib/import/otrs/article_customer.rb index 31f3c5cdc..f0bc15d25 100644 --- a/lib/import/otrs/article_customer.rb +++ b/lib/import/otrs/article_customer.rb @@ -5,7 +5,7 @@ module Import def initialize(article) import(article) - rescue Exceptions::UnprocessableEntity => e + rescue Exceptions::UnprocessableEntity log "ERROR: Can't extract customer from Article #{article[:id]}" end diff --git a/lib/import/zendesk/object_attribute/base.rb b/lib/import/zendesk/object_attribute/base.rb index e429715e6..9c39ff913 100644 --- a/lib/import/zendesk/object_attribute/base.rb +++ b/lib/import/zendesk/object_attribute/base.rb @@ -18,7 +18,7 @@ module Import def add(object, name, attribute) ObjectManager::Attribute.add( attribute_config(object, name, attribute) ) ObjectManager::Attribute.migration_execute(false) - rescue => e + rescue # rubocop:disable Style/SpecialGlobalVars raise $!, "Problem with ObjectManager Attribute '#{name}': #{$!}", $!.backtrace # rubocop:enable Style/SpecialGlobalVars diff --git a/lib/report/article_by_type_sender.rb b/lib/report/article_by_type_sender.rb index 84aa66678..ecd4714a3 100644 --- a/lib/report/article_by_type_sender.rb +++ b/lib/report/article_by_type_sender.rb @@ -22,11 +22,6 @@ returns def self.aggs(params_origin) params = params_origin.dup - interval = params[:interval] - if params[:interval] == 'week' - interval = 'day' - end - result = [] if params[:interval] == 'month' stop_interval = 12 diff --git a/lib/report/base.rb b/lib/report/base.rb index 750854581..251b1741f 100644 --- a/lib/report/base.rb +++ b/lib/report/base.rb @@ -263,7 +263,6 @@ class Report::Base query, bind_params, tables = Ticket.selector2sql(data[:condition]) ticket_list = Ticket.where('tickets.created_at >= ? AND tickets.created_at <= ?', data[:start], data[:end]) .where(query, *bind_params).joins(tables) - tickets = 0 time_min = 0 ticket_ids = [] ticket_list.each do |ticket| @@ -301,7 +300,6 @@ class Report::Base query, bind_params, tables = Ticket.selector2sql(data[:condition]) ticket_list = Ticket.where('tickets.created_at >= ? AND tickets.created_at <= ?', data[:start], data[:end]) .where(query, *bind_params).joins(tables) - tickets = 0 time_max = 0 ticket_ids = [] ticket_list.each do |ticket| @@ -334,7 +332,6 @@ class Report::Base def self.ticket_condition(ticket_id, condition) ticket = Ticket.lookup( id: ticket_id ) - match = true condition.each do |key, value| if ticket[key.to_sym] != value return false diff --git a/lib/report/ticket_first_solution.rb b/lib/report/ticket_first_solution.rb index 4557605ff..77d4f56d6 100644 --- a/lib/report/ticket_first_solution.rb +++ b/lib/report/ticket_first_solution.rb @@ -17,10 +17,6 @@ returns def self.aggs(params_origin) params = params_origin.dup - interval = params[:interval] - if params[:interval] == 'week' - interval = 'day' - end result = [] if params[:interval] == 'month' diff --git a/lib/report/ticket_moved.rb b/lib/report/ticket_moved.rb index e13e76ab6..6f113e626 100644 --- a/lib/report/ticket_moved.rb +++ b/lib/report/ticket_moved.rb @@ -26,11 +26,6 @@ returns return [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] end - interval = params[:interval] - if params[:interval] == 'week' - interval = 'day' - end - result = [] if params[:interval] == 'month' stop_interval = 12 @@ -113,7 +108,6 @@ returns } end local_params = group_attributes(selector, params) - local_selector = params[:selector].clone without_merged_tickets = { 'ticket_state.name' => { 'operator' => 'is not', diff --git a/lib/report/ticket_reopened.rb b/lib/report/ticket_reopened.rb index 71ceb0c9c..5f6594f97 100644 --- a/lib/report/ticket_reopened.rb +++ b/lib/report/ticket_reopened.rb @@ -20,11 +20,6 @@ returns params = params_origin.dup ticket_state_ids = ticket_ids - interval = params[:interval] - if params[:interval] == 'week' - interval = 'day' - end - result = [] if params[:interval] == 'month' stop_interval = 12 diff --git a/lib/search_knowledge_base_backend.rb b/lib/search_knowledge_base_backend.rb index bddad6dd5..8f63f884b 100644 --- a/lib/search_knowledge_base_backend.rb +++ b/lib/search_knowledge_base_backend.rb @@ -171,7 +171,7 @@ class SearchKnowledgeBaseBackend } end - if (scope = @params.fetch(:scope, nil)) + if @params.fetch(:scope, nil) scope = { terms: { scope_id: @cached_scope_ids } } output[:query_extension][:bool][:must].push scope diff --git a/lib/sequencer/unit/import/common/model/skip/missing_mandatory/base.rb b/lib/sequencer/unit/import/common/model/skip/missing_mandatory/base.rb index 08ade7afd..5c23a49f4 100644 --- a/lib/sequencer/unit/import/common/model/skip/missing_mandatory/base.rb +++ b/lib/sequencer/unit/import/common/model/skip/missing_mandatory/base.rb @@ -37,7 +37,7 @@ class Sequencer def mandatory_missing? values = attribute_value.fetch_values(*mandatory) values.none?(&:present?) - rescue KeyError => e + rescue KeyError false end end diff --git a/lib/sequencer/unit/import/zendesk/tickets.rb b/lib/sequencer/unit/import/zendesk/tickets.rb index 70fd46c4f..47254c45a 100644 --- a/lib/sequencer/unit/import/zendesk/tickets.rb +++ b/lib/sequencer/unit/import/zendesk/tickets.rb @@ -35,7 +35,7 @@ class Sequencer # per request def update_ticket_count update_import_job - previous_page = next_page + next_page end attr_accessor :previous_page diff --git a/lib/service/geo_location/gmaps.rb b/lib/service/geo_location/gmaps.rb index 3363c4c8f..11e54f9db 100644 --- a/lib/service/geo_location/gmaps.rb +++ b/lib/service/geo_location/gmaps.rb @@ -23,7 +23,7 @@ class Service::GeoLocation::Gmaps lat = result['results'].first['geometry']['location']['lat'] lng = result['results'].first['geometry']['location']['lng'] - latlng = [lat, lng] + [lat, lng] end def self.reverse_geocode(lat, lng) diff --git a/lib/sessions.rb b/lib/sessions.rb index a9194b015..9c8835dac 100644 --- a/lib/sessions.rb +++ b/lib/sessions.rb @@ -440,7 +440,6 @@ returns files.push entry end files.sort.each do |entry| - filename = "#{path}/#{entry}" next if entry !~ /^send/ message = Sessions.queue_file_read(path, entry) diff --git a/lib/sessions/backend/ticket_overview_list.rb b/lib/sessions/backend/ticket_overview_list.rb index a8493d4d4..31c78166f 100644 --- a/lib/sessions/backend/ticket_overview_list.rb +++ b/lib/sessions/backend/ticket_overview_list.rb @@ -72,7 +72,6 @@ class Sessions::Backend::TicketOverviewList < Sessions::Backend::Base # push overview index indexes = [] index_and_lists.each do |index| - assets = {} overview = Overview.lookup(id: index[:overview][:id]) next if !overview diff --git a/lib/stats/ticket_escalation.rb b/lib/stats/ticket_escalation.rb index 8f8ad9a43..8b849a265 100644 --- a/lib/stats/ticket_escalation.rb +++ b/lib/stats/ticket_escalation.rb @@ -20,7 +20,6 @@ class Stats::TicketEscalation ).count average = '-' - state = 'supergood' state = if own_escalated.zero? 'supergood' elsif own_escalated <= 1 diff --git a/lib/stats/ticket_response_time.rb b/lib/stats/ticket_response_time.rb index 154385c2b..ebd48f4cb 100644 --- a/lib/stats/ticket_response_time.rb +++ b/lib/stats/ticket_response_time.rb @@ -23,7 +23,6 @@ class Stats::TicketResponseTime def self.generate(user) items = StatsStore.where('created_at > ? AND created_at < ?', Time.zone.now - 7.days, Time.zone.now).where(key: 'ticket:response_time') - count_total = items.count total = 0 count_own = 0 own = 0 diff --git a/lib/stats/ticket_waiting_time.rb b/lib/stats/ticket_waiting_time.rb index d8ff0a5ea..f53a95cf6 100644 --- a/lib/stats/ticket_waiting_time.rb +++ b/lib/stats/ticket_waiting_time.rb @@ -25,7 +25,6 @@ class Stats::TicketWaitingTime average_per_agent = (average_per_agent / 60).round end - state = 'supergood' percent = 0 state = if handling_time <= 60 percent = handling_time.to_f / 60 diff --git a/lib/tasks/zammad/ci/service/puma/start.rake b/lib/tasks/zammad/ci/service/puma/start.rake index 313792d79..3839ad1ef 100644 --- a/lib/tasks/zammad/ci/service/puma/start.rake +++ b/lib/tasks/zammad/ci/service/puma/start.rake @@ -24,7 +24,7 @@ namespace :zammad do env ] - stdout, stderr, status = Open3.capture3(*command) + _stdout, stderr, status = Open3.capture3(*command) next if status.success? diff --git a/lib/tasks/zammad/ci/service/scheduler/start.rake b/lib/tasks/zammad/ci/service/scheduler/start.rake index 398f90c70..ff21c1391 100644 --- a/lib/tasks/zammad/ci/service/scheduler/start.rake +++ b/lib/tasks/zammad/ci/service/scheduler/start.rake @@ -16,7 +16,7 @@ namespace :zammad do 'start', ] - stdout, stderr, status = Open3.capture3(*command) + _stdout, stderr, status = Open3.capture3(*command) next if status.success? diff --git a/lib/tasks/zammad/ci/service/scheduler/stop.rake b/lib/tasks/zammad/ci/service/scheduler/stop.rake index 7091b3d17..8e9a5d6db 100644 --- a/lib/tasks/zammad/ci/service/scheduler/stop.rake +++ b/lib/tasks/zammad/ci/service/scheduler/stop.rake @@ -16,7 +16,7 @@ namespace :zammad do 'stop', ] - stdout, stderr, status = Open3.capture3(*command) + _stdout, stderr, status = Open3.capture3(*command) next if status.success? diff --git a/lib/tasks/zammad/ci/service/websocket/start.rake b/lib/tasks/zammad/ci/service/websocket/start.rake index 6b4bd34f8..5ca08e8ca 100644 --- a/lib/tasks/zammad/ci/service/websocket/start.rake +++ b/lib/tasks/zammad/ci/service/websocket/start.rake @@ -20,7 +20,7 @@ namespace :zammad do port ] - stdout, stderr, status = Open3.capture3(*command) + _stdout, stderr, status = Open3.capture3(*command) next if status.success? diff --git a/lib/tasks/zammad/ci/service/websocket/stop.rake b/lib/tasks/zammad/ci/service/websocket/stop.rake index 1499ea77a..96a4e10e4 100644 --- a/lib/tasks/zammad/ci/service/websocket/stop.rake +++ b/lib/tasks/zammad/ci/service/websocket/stop.rake @@ -16,7 +16,7 @@ namespace :zammad do 'stop', ] - stdout, stderr, status = Open3.capture3(*command) + _stdout, stderr, status = Open3.capture3(*command) next if status.success? diff --git a/lib/twitter_sync.rb b/lib/twitter_sync.rb index 3c1674381..9215e75a0 100644 --- a/lib/twitter_sync.rb +++ b/lib/twitter_sync.rb @@ -345,10 +345,6 @@ class TwitterSync # import tweet to = nil - from = nil - article_type = nil - in_reply_to = nil - twitter_preferences = {} raise "Unknown tweet type '#{tweet.class}'" if tweet.class != Twitter::Tweet article_type = 'twitter status' @@ -504,7 +500,6 @@ create a tweet ot direct message from an article def get_state(channel, tweet, ticket = nil) - user_id = nil user_id = if tweet.is_a?(Hash) if tweet['user'] && tweet['user']['id'] tweet['user']['id'] diff --git a/script/websocket-server.rb b/script/websocket-server.rb index 633df6f18..a59885bbf 100755 --- a/script/websocket-server.rb +++ b/script/websocket-server.rb @@ -64,7 +64,6 @@ before_fork i: "#{dir}/tmp/pids/websocket.pid" } -tls_options = {} OptionParser.new do |opts| opts.banner = 'Usage: websocket-server.rb start|stop [options]' diff --git a/spec/db/migrate/issue_1977_remove_invalid_user_foreign_keys_spec.rb b/spec/db/migrate/issue_1977_remove_invalid_user_foreign_keys_spec.rb index 1c009da28..45441c0a1 100644 --- a/spec/db/migrate/issue_1977_remove_invalid_user_foreign_keys_spec.rb +++ b/spec/db/migrate/issue_1977_remove_invalid_user_foreign_keys_spec.rb @@ -12,7 +12,7 @@ RSpec.describe Issue1977RemoveInvalidUserForeignKeys, type: :db_migration do without_foreign_key(:online_notifications, column: :user_id) create(:online_notification, user_id: 1337) - valid = create(:online_notification, user_id: existing_user_id) + create(:online_notification, user_id: existing_user_id) expect do migrate @@ -24,7 +24,7 @@ RSpec.describe Issue1977RemoveInvalidUserForeignKeys, type: :db_migration do without_foreign_key(:recent_views, column: :created_by_id) create(:recent_view, created_by_id: 1337) - valid = create(:recent_view, created_by_id: existing_user_id) + create(:recent_view, created_by_id: existing_user_id) expect do migrate @@ -35,8 +35,8 @@ RSpec.describe Issue1977RemoveInvalidUserForeignKeys, type: :db_migration do without_foreign_key(:online_notifications, column: :user_id) create(:avatar, object_lookup_id: ObjectLookup.by_name('User'), o_id: 1337) - valid_ticket = create(:avatar, object_lookup_id: ObjectLookup.by_name('Ticket'), o_id: 1337) - valid_user = create(:avatar, object_lookup_id: ObjectLookup.by_name('User'), o_id: existing_user_id) + create(:avatar, object_lookup_id: ObjectLookup.by_name('Ticket'), o_id: 1337) + create(:avatar, object_lookup_id: ObjectLookup.by_name('User'), o_id: existing_user_id) expect do migrate diff --git a/spec/jobs/ticket_user_ticket_counter_job_spec.rb b/spec/jobs/ticket_user_ticket_counter_job_spec.rb index 67b137d12..36d7db75a 100644 --- a/spec/jobs/ticket_user_ticket_counter_job_spec.rb +++ b/spec/jobs/ticket_user_ticket_counter_job_spec.rb @@ -4,13 +4,15 @@ RSpec.describe TicketUserTicketCounterJob, type: :job do let!(:customer) { create(:user) } - let!(:tickets) do - ticket_states = { + let!(:ticket_states) do + { open: Ticket::State.by_category(:open).first, closed: Ticket::State.by_category(:closed).first, } + end - tickets = { + let!(:tickets) do + { open: [ create(:ticket, state_id: ticket_states[:open].id, customer_id: customer.id), create(:ticket, state_id: ticket_states[:open].id, customer_id: customer.id), diff --git a/spec/lib/import/zendesk/object_attribute/dropdown_spec.rb b/spec/lib/import/zendesk/object_attribute/dropdown_spec.rb index f03781bba..ef48d5c71 100644 --- a/spec/lib/import/zendesk/object_attribute/dropdown_spec.rb +++ b/spec/lib/import/zendesk/object_attribute/dropdown_spec.rb @@ -67,6 +67,6 @@ RSpec.describe Import::Zendesk::ObjectAttribute::Dropdown do expect(ObjectManager::Attribute).to receive(:add).with(expected_structure) expect(ObjectManager::Attribute).to receive(:migration_execute) - created_instance = described_class.new('Ticket', 'example_field', attribute) + described_class.new('Ticket', 'example_field', attribute) end end diff --git a/spec/lib/import/zendesk/object_attribute/tagger_spec.rb b/spec/lib/import/zendesk/object_attribute/tagger_spec.rb index fa06188ee..e71b2ca4b 100644 --- a/spec/lib/import/zendesk/object_attribute/tagger_spec.rb +++ b/spec/lib/import/zendesk/object_attribute/tagger_spec.rb @@ -67,6 +67,6 @@ RSpec.describe Import::Zendesk::ObjectAttribute::Tagger do expect(ObjectManager::Attribute).to receive(:add).with(expected_structure) expect(ObjectManager::Attribute).to receive(:migration_execute) - created_instance = described_class.new('Ticket', 'example_field', attribute) + described_class.new('Ticket', 'example_field', attribute) end end diff --git a/spec/lib/ldap/user_spec.rb b/spec/lib/ldap/user_spec.rb index 087e70d53..e4d02f8fb 100644 --- a/spec/lib/ldap/user_spec.rb +++ b/spec/lib/ldap/user_spec.rb @@ -96,7 +96,7 @@ RSpec.describe Ldap::User do connection = double() expect(mocked_ldap).to receive(:connection).and_return(connection) - ldap_entry = build(:ldap_entry) + build(:ldap_entry) expect(mocked_ldap).to receive(:base_dn) expect(connection).to receive(:bind_as).and_return(true) @@ -108,7 +108,7 @@ RSpec.describe Ldap::User do connection = double() expect(mocked_ldap).to receive(:connection).and_return(connection) - ldap_entry = build(:ldap_entry) + build(:ldap_entry) expect(mocked_ldap).to receive(:base_dn) expect(connection).to receive(:bind_as).and_return(false) diff --git a/spec/lib/notification_factory/renderer_spec.rb b/spec/lib/notification_factory/renderer_spec.rb index d84217bec..f27421194 100644 --- a/spec/lib/notification_factory/renderer_spec.rb +++ b/spec/lib/notification_factory/renderer_spec.rb @@ -32,7 +32,7 @@ RSpec.describe NotificationFactory::Renderer do end it 'correctly renders simple select attributes' do - attribute = create :object_manager_attribute_select, name: 'select' + create :object_manager_attribute_select, name: 'select' ObjectManager::Attribute.migration_execute ticket = create :ticket, customer: @user, select: 'key_1' @@ -52,9 +52,9 @@ RSpec.describe NotificationFactory::Renderer do end it 'correctly renders select attributes on chained user object' do - attribute = create :object_manager_attribute_select, - object_lookup_id: ObjectLookup.by_name('User'), - name: 'select' + create :object_manager_attribute_select, + object_lookup_id: ObjectLookup.by_name('User'), + name: 'select' ObjectManager::Attribute.migration_execute user = User.where(firstname: 'Nicole').first @@ -77,9 +77,9 @@ RSpec.describe NotificationFactory::Renderer do end it 'correctly renders select attributes on chained group object' do - attribute = create :object_manager_attribute_select, - object_lookup_id: ObjectLookup.by_name('Group'), - name: 'select' + create :object_manager_attribute_select, + object_lookup_id: ObjectLookup.by_name('Group'), + name: 'select' ObjectManager::Attribute.migration_execute ticket = create :ticket, customer: @user @@ -102,9 +102,9 @@ RSpec.describe NotificationFactory::Renderer do end it 'correctly renders select attributes on chained organization object' do - attribute = create :object_manager_attribute_select, - object_lookup_id: ObjectLookup.by_name('Organization'), - name: 'select' + create :object_manager_attribute_select, + object_lookup_id: ObjectLookup.by_name('Organization'), + name: 'select' ObjectManager::Attribute.migration_execute @user.organization.select = 'key_2' @@ -126,7 +126,7 @@ RSpec.describe NotificationFactory::Renderer do end it 'correctly renders tree select attributes' do - attribute = create :object_manager_attribute_tree_select, name: 'tree_select' + create :object_manager_attribute_tree_select, name: 'tree_select' ObjectManager::Attribute.migration_execute ticket = create :ticket, customer: @user, tree_select: 'Incident::Hardware::Laptop' diff --git a/spec/lib/sequencer/unit/import/common/model/reset_primary_key_sequence_spec.rb b/spec/lib/sequencer/unit/import/common/model/reset_primary_key_sequence_spec.rb index 9305c1490..c7e38fd23 100644 --- a/spec/lib/sequencer/unit/import/common/model/reset_primary_key_sequence_spec.rb +++ b/spec/lib/sequencer/unit/import/common/model/reset_primary_key_sequence_spec.rb @@ -8,8 +8,6 @@ RSpec.describe Sequencer::Unit::Import::Common::Model::ResetPrimaryKeySequence, expect(DbHelper).to receive(:import_post).with(model_class.table_name) - provided = process( - model_class: model_class, - ) + process(model_class: model_class) end end diff --git a/spec/models/trigger/sms_spec.rb b/spec/models/trigger/sms_spec.rb index 1cc7101f3..8c1854056 100644 --- a/spec/models/trigger/sms_spec.rb +++ b/spec/models/trigger/sms_spec.rb @@ -9,15 +9,15 @@ RSpec.describe Trigger do another_agent = create(:admin_user, mobile: '+37061010000') Group.lookup(id: 1).users << another_agent - channel = create(:channel, area: 'Sms::Notification') - trigger = create(:trigger, - disable_notification: false, - perform: { - 'notification.sms': { - recipient: 'ticket_agents', - body: 'space between #{ticket.title}', # rubocop:disable Lint/InterpolationCheck - } - }) + create(:channel, area: 'Sms::Notification') + create(:trigger, + disable_notification: false, + perform: { + 'notification.sms': { + recipient: 'ticket_agents', + body: 'space between #{ticket.title}', # rubocop:disable Lint/InterpolationCheck + } + }) ticket = create(:ticket, group: Group.lookup(id: 1), created_by_id: agent.id) Observer::Transaction.commit diff --git a/spec/requests/integration/monitoring_spec.rb b/spec/requests/integration/monitoring_spec.rb index 110037ca8..dcaae378d 100644 --- a/spec/requests/integration/monitoring_spec.rb +++ b/spec/requests/integration/monitoring_spec.rb @@ -257,7 +257,6 @@ RSpec.describe 'Monitoring', type: :request do expect(json_response).to be_a_kind_of(Hash) expect(json_response['token']).to be_truthy - token = json_response['token'] expect(json_response['error']).to be_falsey end diff --git a/spec/requests/integration/object_manager_attributes_spec.rb b/spec/requests/integration/object_manager_attributes_spec.rb index 5fcb5b561..cd94a41f7 100644 --- a/spec/requests/integration/object_manager_attributes_spec.rb +++ b/spec/requests/integration/object_manager_attributes_spec.rb @@ -11,7 +11,6 @@ RSpec.describe 'ObjectManager Attributes', type: :request do it 'does add new ticket text object' do authenticated_as(admin_user) post '/api/v1/object_manager_attributes', params: {}, as: :json - token = response.headers['CSRF-TOKEN'] # token based on headers params = { @@ -59,7 +58,6 @@ RSpec.describe 'ObjectManager Attributes', type: :request do it 'does add new ticket text object - no default' do authenticated_as(admin_user) post '/api/v1/object_manager_attributes', params: {}, as: :json - token = response.headers['CSRF-TOKEN'] # token based on headers params = { @@ -113,7 +111,6 @@ RSpec.describe 'ObjectManager Attributes', type: :request do authenticated_as(admin_user) post "/api/v1/object_manager_attributes/#{object.id}", params: {}, as: :json - token = response.headers['CSRF-TOKEN'] # parameters for updating params = { @@ -162,7 +159,6 @@ RSpec.describe 'ObjectManager Attributes', type: :request do it 'does add new ticket boolean object' do authenticated_as(admin_user) post '/api/v1/object_manager_attributes', params: {}, as: :json - token = response.headers['CSRF-TOKEN'] # token based on headers params = { @@ -211,7 +207,6 @@ RSpec.describe 'ObjectManager Attributes', type: :request do it 'does add new user select object' do authenticated_as(admin_user) post '/api/v1/object_manager_attributes', params: {}, as: :json - token = response.headers['CSRF-TOKEN'] # token based on headers params = { @@ -277,7 +272,6 @@ RSpec.describe 'ObjectManager Attributes', type: :request do expect(migration).to eq(true) post "/api/v1/object_manager_attributes/#{object.id}", params: {}, as: :json - token = response.headers['CSRF-TOKEN'] # parameters for updating params = { @@ -441,7 +435,7 @@ RSpec.describe 'ObjectManager Attributes', type: :request do it 'does ticket attributes cannot be removed when it is referenced by an overview (03)', db_strategy: :reset do # 1. create a new ticket attribute and execute migration - migration = ObjectManager::Attribute.migration_execute + ObjectManager::Attribute.migration_execute params = { 'name': 'test_attribute_referenced_by_an_overview', @@ -536,7 +530,7 @@ RSpec.describe 'ObjectManager Attributes', type: :request do it 'does ticket attributes cannot be removed when it is referenced by a trigger (04)', db_strategy: :reset do # 1. create a new ticket attribute and execute migration - migration = ObjectManager::Attribute.migration_execute + ObjectManager::Attribute.migration_execute params = { 'name': 'test_attribute_referenced_by_a_trigger', @@ -622,7 +616,7 @@ RSpec.describe 'ObjectManager Attributes', type: :request do it 'does ticket attributes cannot be removed when it is referenced by a scheduler (05)', db_strategy: :reset do # 1. create a new ticket attribute and execute migration - migration = ObjectManager::Attribute.migration_execute + ObjectManager::Attribute.migration_execute params = { 'name': 'test_attribute_referenced_by_a_scheduler', @@ -755,7 +749,7 @@ RSpec.describe 'ObjectManager Attributes', type: :request do it 'does ticket attributes can be removed when it is referenced by an overview but by user object (06)', db_strategy: :reset do # 1. create a new ticket attribute and execute migration - migration = ObjectManager::Attribute.migration_execute + ObjectManager::Attribute.migration_execute params = { 'name': 'test_attribute_referenced_by_an_overview', diff --git a/spec/requests/integration/twilio_sms_spec.rb b/spec/requests/integration/twilio_sms_spec.rb index af1c6f5b4..908115893 100644 --- a/spec/requests/integration/twilio_sms_spec.rb +++ b/spec/requests/integration/twilio_sms_spec.rb @@ -11,7 +11,6 @@ RSpec.describe 'Twilio SMS', type: :request do it 'does basic call' do # configure twilio channel - bot_id = 123_456_789 group_id = Group.find_by(name: 'Users').id UserInfo.current_user_id = 1 @@ -179,11 +178,8 @@ RSpec.describe 'Twilio SMS', type: :request do Observer::Transaction.commit Scheduler.worker(true) - # configure twilio channel - bot_id = 123_456_789 - UserInfo.current_user_id = 1 - channel = create( + create( :channel, area: 'Sms::Account', options: { diff --git a/spec/requests/ticket/article_attachments_spec.rb b/spec/requests/ticket/article_attachments_spec.rb index f390fa2a5..a02be13d7 100644 --- a/spec/requests/ticket/article_attachments_spec.rb +++ b/spec/requests/ticket/article_attachments_spec.rb @@ -68,7 +68,7 @@ RSpec.describe 'Ticket Article Attachments', type: :request do it 'does test attachments for split' do email_file_path = Rails.root.join('test', 'data', 'mail', 'mail024.box') email_raw_string = File.read(email_file_path) - ticket_p, article_p, user_p = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, article_p, _user_p = Channel::EmailParser.new.process({}, email_raw_string) authenticated_as(agent_user) get '/api/v1/ticket_split', params: { form_id: '1234-2', ticket_id: ticket_p.id, article_id: article_p.id }, as: :json @@ -83,7 +83,7 @@ RSpec.describe 'Ticket Article Attachments', type: :request do it 'does test attachments for forward' do email_file_path = Rails.root.join('test', 'data', 'mail', 'mail008.box') email_raw_string = File.read(email_file_path) - ticket_p, article_p, user_p = Channel::EmailParser.new.process({}, email_raw_string) + _ticket_p, article_p, _user_p = Channel::EmailParser.new.process({}, email_raw_string) authenticated_as(agent_user) post "/api/v1/ticket_attachment_upload_clone_by_article/#{article_p.id}", params: {}, as: :json @@ -98,7 +98,7 @@ RSpec.describe 'Ticket Article Attachments', type: :request do email_file_path = Rails.root.join('test', 'data', 'mail', 'mail024.box') email_raw_string = File.read(email_file_path) - ticket_p, article_p, user_p = Channel::EmailParser.new.process({}, email_raw_string) + _ticket_p, article_p, _user_p = Channel::EmailParser.new.process({}, email_raw_string) post "/api/v1/ticket_attachment_upload_clone_by_article/#{article_p.id}", params: { form_id: '1234-2' }, as: :json expect(response).to have_http_status(:ok) diff --git a/spec/requests/ticket/escalation_spec.rb b/spec/requests/ticket/escalation_spec.rb index d33a26bb1..683745cbb 100644 --- a/spec/requests/ticket/escalation_spec.rb +++ b/spec/requests/ticket/escalation_spec.rb @@ -110,7 +110,7 @@ Subject: some value 123 Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email) + ticket_p, _article_p, user_p, _mail = Channel::EmailParser.new.process({}, email) ticket_p.reload expect(ticket_p.escalation_at).to be_truthy expect(ticket_p.first_response_escalation_at.to_i).to be_within(90.seconds).of((ticket_p.created_at + 1.hour).to_i) diff --git a/spec/requests/ticket_spec.rb b/spec/requests/ticket_spec.rb index 148481027..b9e83b073 100644 --- a/spec/requests/ticket_spec.rb +++ b/spec/requests/ticket_spec.rb @@ -1951,7 +1951,6 @@ RSpec.describe 'Ticket', type: :request do it 'does ticket search sorted (08.01)' do title = "ticket pagination #{rand(999_999_999)}" - tickets = [] ticket1 = create( :ticket, diff --git a/spec/requests/time_accounting_spec.rb b/spec/requests/time_accounting_spec.rb index 84654f258..74cde3809 100644 --- a/spec/requests/time_accounting_spec.rb +++ b/spec/requests/time_accounting_spec.rb @@ -24,7 +24,7 @@ RSpec.describe 'Time Accounting API endpoints', type: :request do context 'when requesting a log report download' do it 'responds with an Excel spreadsheet' do - group = create(:group) + create(:group) ticket = create(:ticket, state: Ticket::State.lookup(name: 'open'), customer: customer ) article = create(:ticket_article, ticket: ticket, type: Ticket::Article::Type.lookup(name: 'note') ) @@ -46,7 +46,7 @@ RSpec.describe 'Time Accounting API endpoints', type: :request do it 'responds with an Excel spreadsheet' do ObjectManager::Attribute.add attributes_for :object_manager_attribute_select - group = create(:group) + create(:group) ticket = create(:ticket, state: Ticket::State.lookup(name: 'open'), customer: customer ) article = create(:ticket_article, ticket: ticket, type: Ticket::Article::Type.lookup(name: 'note') ) diff --git a/test/browser/abb_one_group_test.rb b/test/browser/abb_one_group_test.rb index 92d7c702f..5547e5912 100644 --- a/test/browser/abb_one_group_test.rb +++ b/test/browser/abb_one_group_test.rb @@ -14,7 +14,7 @@ class AgentTicketActionLevel0Test < TestCase tasks_close_all() # create new ticket - ticket1 = ticket_create( + ticket_create( data: { customer: 'nico', group: '-NONE-', @@ -230,7 +230,7 @@ class AgentTicketActionLevel0Test < TestCase sleep 12 # create new ticket - ticket1 = ticket_create( + ticket_create( data: { customer: 'nico', group: 'Users', diff --git a/test/browser/admin_object_manager_test.rb b/test/browser/admin_object_manager_test.rb index 8e349de91..72da05532 100644 --- a/test/browser/admin_object_manager_test.rb +++ b/test/browser/admin_object_manager_test.rb @@ -80,7 +80,7 @@ class AdminObjectManagerTest < TestCase ) # create new ticket - ticket = ticket_create( + ticket_create( data: { customer: 'nico', group: 'Users', @@ -283,7 +283,7 @@ class AdminObjectManagerTest < TestCase ) # create new ticket - ticket = ticket_create( + ticket_create( data: { customer: 'nico', group: 'Users', @@ -696,7 +696,7 @@ class AdminObjectManagerTest < TestCase ) object_manager_attribute_migrate - ticket = ticket_create( + ticket_create( data: { customer: 'nico', group: 'Users', diff --git a/test/browser/admin_overview_test.rb b/test/browser/admin_overview_test.rb index 67681b1a1..787d8345b 100644 --- a/test/browser/admin_overview_test.rb +++ b/test/browser/admin_overview_test.rb @@ -41,7 +41,7 @@ class AdminOverviewTest < TestCase name = "overview_#{rand(99_999_999)}" ticket_titles = (1..3).map { |i| "Priority #{i} ticket" } - @browser = instance = browser_instance + @browser = browser_instance login( username: 'master@example.com', password: 'test', diff --git a/test/browser/admin_role_test.rb b/test/browser/admin_role_test.rb index 232712fbf..b0b3c1c30 100644 --- a/test/browser/admin_role_test.rb +++ b/test/browser/admin_role_test.rb @@ -2,8 +2,6 @@ require 'browser_test_helper' class AdminRoleTest < TestCase def test_role_device - name = "some role #{rand(99_999_999)}" - @browser = browser_instance login( username: 'master@example.com', diff --git a/test/browser/agent_navigation_and_title_test.rb b/test/browser/agent_navigation_and_title_test.rb index 999abf482..7e09b9eb1 100644 --- a/test/browser/agent_navigation_and_title_test.rb +++ b/test/browser/agent_navigation_and_title_test.rb @@ -67,7 +67,7 @@ class AgentNavigationAndTitleTest < TestCase exists_not(css: '#navigation .js-menu .is-active') # ticket zoom screen - ticket1 = ticket_create( + ticket_create( data: { customer: 'nico', group: 'Users', diff --git a/test/browser/agent_ticket_attachment_test.rb b/test/browser/agent_ticket_attachment_test.rb index 9558e7a86..19065a1ae 100644 --- a/test/browser/agent_ticket_attachment_test.rb +++ b/test/browser/agent_ticket_attachment_test.rb @@ -315,7 +315,7 @@ class AgentTicketAttachmentTest < TestCase ) tasks_close_all() - ticket1 = ticket_create( + ticket_create( data: { customer: 'Nico', group: 'Users', diff --git a/test/browser/agent_ticket_email_reply_keep_body_test.rb b/test/browser/agent_ticket_email_reply_keep_body_test.rb index 14f61c90d..81db7ec3b 100644 --- a/test/browser/agent_ticket_email_reply_keep_body_test.rb +++ b/test/browser/agent_ticket_email_reply_keep_body_test.rb @@ -13,7 +13,7 @@ class AgentTicketEmailReplyKeepBodyTest < TestCase tasks_close_all() # create new ticket - ticket1 = ticket_create( + ticket_create( data: { customer: 'nico', group: 'Users', @@ -98,7 +98,7 @@ class AgentTicketEmailReplyKeepBodyTest < TestCase end def test_full_quote - @browser = instance = browser_instance + @browser = browser_instance login( username: 'master@example.com', password: 'test', @@ -174,7 +174,7 @@ class AgentTicketEmailReplyKeepBodyTest < TestCase # Regression test for issue #2344 - Missing translation for Full-Quote-Text "on xy wrote" def test_full_quote_german_locale - @browser = instance = browser_instance + @browser = browser_instance login( username: 'master@example.com', password: 'test', diff --git a/test/browser/agent_ticket_macro_test.rb b/test/browser/agent_ticket_macro_test.rb index d646dd123..758b42a17 100644 --- a/test/browser/agent_ticket_macro_test.rb +++ b/test/browser/agent_ticket_macro_test.rb @@ -101,7 +101,7 @@ class AgentTicketMacroTest < TestCase ux_flow_next_up: ux_flow_next_up, ) - ticket = ticket_create( + ticket_create( data: { customer: 'nico', group: 'Users', diff --git a/test/browser/agent_ticket_online_notification_test.rb b/test/browser/agent_ticket_online_notification_test.rb index 54f9f1a12..1bcfbfacc 100644 --- a/test/browser/agent_ticket_online_notification_test.rb +++ b/test/browser/agent_ticket_online_notification_test.rb @@ -13,7 +13,7 @@ class AgentTicketOnlineNotificationTest < TestCase tasks_close_all() # create new ticket - ticket1 = ticket_create( + ticket_create( data: { customer: 'nico', group: 'Users', @@ -66,7 +66,7 @@ class AgentTicketOnlineNotificationTest < TestCase no_quote: true, ) - ticket2 = ticket_create( + ticket_create( data: { customer: 'nico', group: 'Users', @@ -92,7 +92,7 @@ class AgentTicketOnlineNotificationTest < TestCase css: '.js-mark.hide', ) - ticket3 = ticket_create( + ticket_create( data: { customer: 'nico', group: 'Users', @@ -138,7 +138,7 @@ class AgentTicketOnlineNotificationTest < TestCase items = browser2.find_elements(css: '.js-notificationsContainer .js-item.is-inactive') assert_equal(1, items.count) - ticket4 = ticket_create( + ticket_create( data: { customer: 'nico', group: 'Users', @@ -179,7 +179,7 @@ class AgentTicketOnlineNotificationTest < TestCase no_quote: true, ) - ticket5 = ticket_create( + ticket_create( data: { customer: 'nico', group: 'Users', @@ -260,7 +260,7 @@ class AgentTicketOnlineNotificationTest < TestCase ) online_notitifcation_close_all(browser: browser2) - ticket1 = ticket_create( + ticket_create( data: { customer: 'nico', group: 'Users', @@ -268,7 +268,7 @@ class AgentTicketOnlineNotificationTest < TestCase body: 'online notification render #1', }, ) - ticket2 = ticket_create( + ticket_create( data: { customer: 'nico', group: 'Users', @@ -301,7 +301,7 @@ class AgentTicketOnlineNotificationTest < TestCase css: '.js-notificationsContainer .js-items .js-item:nth-child(2) .activity-text', value: 'render test 1', ) - ticket3 = ticket_create( + ticket_create( data: { customer: 'nico', group: 'Users', diff --git a/test/browser/agent_ticket_overview_group_by_organization_test.rb b/test/browser/agent_ticket_overview_group_by_organization_test.rb index ce7ac64e0..fc4ecfbda 100644 --- a/test/browser/agent_ticket_overview_group_by_organization_test.rb +++ b/test/browser/agent_ticket_overview_group_by_organization_test.rb @@ -21,14 +21,14 @@ class AgentTicketOverviewGroupByOrganizationTest < TestCase tasks_close_all() # 1. Create a new test organization with special characters in its name - organization = organization_create( + organization_create( data: { name: 'äöüß & Test Organization', } ) # 2. Create a new user that belongs to the test organization - user = user_create( + user_create( data: { login: 'test user', firstname: 'Max', @@ -40,7 +40,7 @@ class AgentTicketOverviewGroupByOrganizationTest < TestCase ) # 3. Create a new ticket for the test user - ticket = ticket_create( + ticket_create( data: { customer: user_email, title: 'test ticket', @@ -50,7 +50,7 @@ class AgentTicketOverviewGroupByOrganizationTest < TestCase ) # 4. Create an overview grouping by organization - overview = overview_create( + overview_create( data: { name: overview_name, roles: %w[Agent Admin Customer], diff --git a/test/browser/agent_ticket_overview_tab_test.rb b/test/browser/agent_ticket_overview_tab_test.rb index 233891ec2..f12275d5c 100644 --- a/test/browser/agent_ticket_overview_tab_test.rb +++ b/test/browser/agent_ticket_overview_tab_test.rb @@ -21,7 +21,7 @@ class AgentTicketOverviewTabTest < TestCase body: "overview tab test #1 - #{title}", } ) - ticket2 = ticket_create( + ticket_create( data: { customer: 'nico', group: 'Users', @@ -29,7 +29,7 @@ class AgentTicketOverviewTabTest < TestCase body: "overview tab test #2 - #{title}", } ) - ticket3 = ticket_create( + ticket_create( data: { customer: 'nico', group: 'Users', diff --git a/test/browser/agent_ticket_tag_test.rb b/test/browser/agent_ticket_tag_test.rb index d1686cdc2..4ddbcff5d 100644 --- a/test/browser/agent_ticket_tag_test.rb +++ b/test/browser/agent_ticket_tag_test.rb @@ -11,7 +11,7 @@ class AgentTicketTagTest < TestCase tasks_close_all() # set tag (by tab) - ticket1 = ticket_create( + ticket_create( data: { customer: 'nico', group: 'Users', @@ -51,7 +51,7 @@ class AgentTicketTagTest < TestCase ) # set tag (by blur) - ticket2 = ticket_create( + ticket_create( data: { customer: 'nico', group: 'Users', @@ -398,7 +398,7 @@ class AgentTicketTagTest < TestCase click(css: '.content.active .js-create .js-submit') # set tag (by tab) - ticket1 = ticket_create( + ticket_create( data: { customer: 'nico', group: 'Users', @@ -456,7 +456,7 @@ class AgentTicketTagTest < TestCase ) # new ticket with tags in zoom - ticket1 = ticket_create( + ticket_create( data: { customer: 'nico', group: 'Users', diff --git a/test/browser/agent_ticket_task_changed_test.rb b/test/browser/agent_ticket_task_changed_test.rb index c3dc25cea..7a4b05fbb 100644 --- a/test/browser/agent_ticket_task_changed_test.rb +++ b/test/browser/agent_ticket_task_changed_test.rb @@ -12,7 +12,7 @@ class AgentTicketTaskChangedTest < TestCase ) tasks_close_all() - ticket = ticket_create( + ticket_create( data: { customer: 'nico', group: 'Users', diff --git a/test/browser/agent_ticket_time_accounting_test.rb b/test/browser/agent_ticket_time_accounting_test.rb index a3ec7d7e8..d343fe7b4 100644 --- a/test/browser/agent_ticket_time_accounting_test.rb +++ b/test/browser/agent_ticket_time_accounting_test.rb @@ -22,7 +22,7 @@ class AgentTicketTimeAccountingTest < TestCase type: 'on', ) - ticket1 = ticket_create( + ticket_create( data: { customer: 'nico', group: 'Users', @@ -55,7 +55,7 @@ class AgentTicketTimeAccountingTest < TestCase value: '4', ) - ticket2 = ticket_create( + ticket_create( data: { customer: 'nico', group: 'Users', @@ -161,7 +161,7 @@ class AgentTicketTimeAccountingTest < TestCase type: 'on', ) - ticket1 = ticket_create( + ticket_create( data: { customer: 'nico', group: 'Users', diff --git a/test/browser/agent_ticket_update1_test.rb b/test/browser/agent_ticket_update1_test.rb index e81b1092b..bcca836a8 100644 --- a/test/browser/agent_ticket_update1_test.rb +++ b/test/browser/agent_ticket_update1_test.rb @@ -29,7 +29,7 @@ class AgentTicketUpdate1Test < TestCase sleep 1 # confirm on zoom - ticket1 = ticket_create( + ticket_create( data: { customer: 'nico', group: 'Users', diff --git a/test/browser/agent_ticket_update5_test.rb b/test/browser/agent_ticket_update5_test.rb index 5898f0f01..2758af52e 100644 --- a/test/browser/agent_ticket_update5_test.rb +++ b/test/browser/agent_ticket_update5_test.rb @@ -12,7 +12,7 @@ class AgentTicketUpdate5Test < TestCase # create ticket - ticket1 = ticket_create( + ticket_create( data: { customer: 'Nico', group: 'Users', diff --git a/test/browser/agent_ticket_zoom_hide_test.rb b/test/browser/agent_ticket_zoom_hide_test.rb index 06b17b355..d7e06c6d5 100644 --- a/test/browser/agent_ticket_zoom_hide_test.rb +++ b/test/browser/agent_ticket_zoom_hide_test.rb @@ -21,7 +21,7 @@ class AgentTicketZoomHideTest < TestCase ) # create two tickets - ticket1 = ticket_create( + ticket_create( data: { customer: 'Nico', group: 'Users', @@ -30,7 +30,7 @@ class AgentTicketZoomHideTest < TestCase } ) - ticket2 = ticket_create( + ticket_create( data: { customer: 'Nico', group: 'Users', diff --git a/test/browser/customer_ticket_create_test.rb b/test/browser/customer_ticket_create_test.rb index 9e2bd82da..c9483c290 100644 --- a/test/browser/customer_ticket_create_test.rb +++ b/test/browser/customer_ticket_create_test.rb @@ -213,7 +213,7 @@ class CustomerTicketCreateTest < TestCase ) tasks_close_all() - ticket1 = ticket_create( + ticket_create( data: { customer: 'nico', group: 'Users', diff --git a/test/browser/user_switch_cache_test.rb b/test/browser/user_switch_cache_test.rb index 759f3e1fe..4aece2739 100644 --- a/test/browser/user_switch_cache_test.rb +++ b/test/browser/user_switch_cache_test.rb @@ -11,7 +11,7 @@ class UserSwitchCache < TestCase url: browser_url, ) tasks_close_all() - ticket1 = ticket_create( + ticket_create( data: { customer: 'nico', group: 'Users', diff --git a/test/browser_test_helper.rb b/test/browser_test_helper.rb index b1a9b423e..5d7c594d6 100644 --- a/test/browser_test_helper.rb +++ b/test/browser_test_helper.rb @@ -768,7 +768,7 @@ class TestCase < ActiveSupport::TestCase instance.action.send_keys(key).perform end end - rescue => e + rescue sleep 0.5 # just try again @@ -4265,7 +4265,7 @@ wait untill text in selector disabppears ) sleep 4 - r = instance.execute_script("$(\".content.active #c-#{data[:object]} td:contains('#{data[:name]}')\").first().closest('tr').find('.js-delete').click()") + instance.execute_script("$(\".content.active #c-#{data[:object]} td:contains('#{data[:name]}')\").first().closest('tr').find('.js-delete').click()") end =begin diff --git a/test/integration/elasticsearch_active_test.rb b/test/integration/elasticsearch_active_test.rb index 118c0f210..555c734f6 100644 --- a/test/integration/elasticsearch_active_test.rb +++ b/test/integration/elasticsearch_active_test.rb @@ -10,7 +10,6 @@ class ElasticsearchActiveTest < ActiveSupport::TestCase rebuild_searchindex roles = Role.where(name: 'Agent') - groups = Group.where(name: 'Users') @agent = User.create!( login: 'es-agent@example.com', diff --git a/test/integration/elasticsearch_test.rb b/test/integration/elasticsearch_test.rb index f5b6bff05..acfac7d0e 100644 --- a/test/integration/elasticsearch_test.rb +++ b/test/integration/elasticsearch_test.rb @@ -23,7 +23,7 @@ class ElasticsearchTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - group_without_access = Group.create_if_not_exists( + Group.create_if_not_exists( name: 'WithoutAccess', note: 'Test for not access check.', updated_by_id: 1, @@ -253,7 +253,7 @@ class ElasticsearchTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - article2 = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket2.id, from: 'some_sender@example.org', to: 'some_recipient@example.org', @@ -279,7 +279,7 @@ class ElasticsearchTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - article3 = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket3.id, from: 'some_sender@example.org', to: 'some_recipient@example.org', diff --git a/test/integration/email_helper_test.rb b/test/integration/email_helper_test.rb index afe857e26..4750b671f 100644 --- a/test/integration/email_helper_test.rb +++ b/test/integration/email_helper_test.rb @@ -254,7 +254,7 @@ class EmailHelperTest < ActiveSupport::TestCase mailbox_user = ENV['EMAILHELPER_MAILBOX_1'].split(':')[0] mailbox_password = ENV['EMAILHELPER_MAILBOX_1'].split(':')[1] - user, domain = EmailHelper.parse_email(mailbox_user) + user, _domain = EmailHelper.parse_email(mailbox_user) result = EmailHelper::Probe.inbound( adapter: 'imap', options: { @@ -408,7 +408,7 @@ class EmailHelperTest < ActiveSupport::TestCase mailbox_user = ENV['EMAILHELPER_MAILBOX_1'].split(':')[0] mailbox_password = ENV['EMAILHELPER_MAILBOX_1'].split(':')[1] - user, domain = EmailHelper.parse_email(mailbox_user) + user, _domain = EmailHelper.parse_email(mailbox_user) result = EmailHelper::Probe.outbound( { adapter: 'smtp', @@ -478,7 +478,7 @@ class EmailHelperTest < ActiveSupport::TestCase mailbox_user = ENV['EMAILHELPER_MAILBOX_1'].split(':')[0] mailbox_password = ENV['EMAILHELPER_MAILBOX_1'].split(':')[1] - user, domain = EmailHelper.parse_email(mailbox_user) + user, _domain = EmailHelper.parse_email(mailbox_user) result = EmailHelper::Verify.email( inbound: { adapter: 'imap', @@ -511,7 +511,9 @@ class EmailHelperTest < ActiveSupport::TestCase mailbox_user = ENV['EMAILHELPER_MAILBOX_2'].split(':')[0] mailbox_password = ENV['EMAILHELPER_MAILBOX_2'].split(':')[1] - user, domain = EmailHelper.parse_email(mailbox_user) + + EmailHelper.parse_email(mailbox_user) + result = EmailHelper::Verify.email( inbound: { adapter: 'pop3', diff --git a/test/integration/facebook_browser_test.rb b/test/integration/facebook_browser_test.rb index 7ab9e30f4..cc4671176 100644 --- a/test/integration/facebook_browser_test.rb +++ b/test/integration/facebook_browser_test.rb @@ -34,8 +34,6 @@ class FacebookBrowserTest < TestCase raise "ERROR: Need FACEBOOK_BT_CUSTOMER - hint FACEBOOK_BT_CUSTOMER='name:1234:access_token'" end - customer_name = ENV['FACEBOOK_BT_CUSTOMER'].split(':')[0] - customer_id = ENV['FACEBOOK_BT_CUSTOMER'].split(':')[1] customer_access_token = ENV['FACEBOOK_BT_CUSTOMER'].split(':')[2] @browser = browser_instance @@ -201,7 +199,7 @@ class FacebookBrowserTest < TestCase hash = "##{rand(999_999)}" customer_client = Koala::Facebook::API.new(customer_access_token) message = "I need some help for your product #{hash}" - post = customer_client.put_wall_post(message, {}, page_id) + customer_client.put_wall_post(message, {}, page_id) watch_for( css: '.content.active', diff --git a/test/integration/facebook_test.rb b/test/integration/facebook_test.rb index 916fece9d..18e0e6af8 100644 --- a/test/integration/facebook_test.rb +++ b/test/integration/facebook_test.rb @@ -37,7 +37,6 @@ class FacebookTest < ActiveSupport::TestCase end customer_name = ENV['FACEBOOK_CUSTOMER'].split(':')[0] - customer_id = ENV['FACEBOOK_CUSTOMER'].split(':')[1] customer_access_token = ENV['FACEBOOK_CUSTOMER'].split(':')[2] provider_options = { diff --git a/test/integration/idoit_browser_test.rb b/test/integration/idoit_browser_test.rb index f2ca456e1..865ea1e77 100644 --- a/test/integration/idoit_browser_test.rb +++ b/test/integration/idoit_browser_test.rb @@ -20,7 +20,6 @@ class IntegrationIdoitTest < TestCase api_category = ENV['IDOIT_API_CATEGORY'] - id = rand(99_999_999) @browser = browser_instance login( username: 'master@example.com', @@ -55,7 +54,7 @@ class IntegrationIdoitTest < TestCase ) # new create a new ticket with an i-doit object - ticket = ticket_create( + ticket_create( data: { customer: 'nico', group: 'Users', @@ -115,7 +114,7 @@ class IntegrationIdoitTest < TestCase tasks_close_all() # new create a new ticket with an i-doit object - ticket = ticket_create( + ticket_create( data: { customer: 'nico', group: 'Users', diff --git a/test/integration/object_manager_test.rb b/test/integration/object_manager_test.rb index 2ac611cab..ed2166e01 100644 --- a/test/integration/object_manager_test.rb +++ b/test/integration/object_manager_test.rb @@ -74,7 +74,7 @@ class ObjectManagerTest < ActiveSupport::TestCase # create invalid attributes assert_raises(RuntimeError) do - attribute2 = ObjectManager::Attribute.add( + ObjectManager::Attribute.add( object: 'Ticket', name: 'test2_id', display: 'Test 2 with id', @@ -92,7 +92,7 @@ class ObjectManagerTest < ActiveSupport::TestCase ) end assert_raises(RuntimeError) do - attribute3 = ObjectManager::Attribute.add( + ObjectManager::Attribute.add( object: 'Ticket', name: 'test3_ids', display: 'Test 3 with id', @@ -110,7 +110,7 @@ class ObjectManagerTest < ActiveSupport::TestCase ) end assert_raises(ActiveRecord::RecordInvalid) do - attribute4 = ObjectManager::Attribute.add( + ObjectManager::Attribute.add( object: 'Ticket', name: 'test4', display: 'Test 4 with missing data_option[:type]', @@ -154,7 +154,7 @@ class ObjectManagerTest < ActiveSupport::TestCase ) assert_raises(ActiveRecord::RecordInvalid) do - attribute6 = ObjectManager::Attribute.add( + ObjectManager::Attribute.add( object: 'Ticket', name: 'test6', display: 'Test 6', @@ -201,7 +201,7 @@ class ObjectManagerTest < ActiveSupport::TestCase ) assert_raises(ActiveRecord::RecordInvalid) do - attribute8 = ObjectManager::Attribute.add( + ObjectManager::Attribute.add( object: 'Ticket', name: 'test8', display: 'Test 8', @@ -243,7 +243,7 @@ class ObjectManagerTest < ActiveSupport::TestCase ) assert_raises(ActiveRecord::RecordInvalid) do - attribute10 = ObjectManager::Attribute.add( + ObjectManager::Attribute.add( object: 'Ticket', name: 'test10', display: 'Test 10', @@ -287,7 +287,7 @@ class ObjectManagerTest < ActiveSupport::TestCase assert_equal(false, ObjectManager::Attribute.pending_migration?) assert_raises(RuntimeError) do - attribute13 = ObjectManager::Attribute.add( + ObjectManager::Attribute.add( object: 'Ticket', name: 'test13|', display: 'Test 13', @@ -308,7 +308,7 @@ class ObjectManagerTest < ActiveSupport::TestCase assert_equal(false, ObjectManager::Attribute.pending_migration?) assert_raises(RuntimeError) do - attribute14 = ObjectManager::Attribute.add( + ObjectManager::Attribute.add( object: 'Ticket', name: 'test14!', display: 'Test 14', @@ -329,7 +329,7 @@ class ObjectManagerTest < ActiveSupport::TestCase assert_equal(false, ObjectManager::Attribute.pending_migration?) assert_raises(RuntimeError) do - attribute15 = ObjectManager::Attribute.add( + ObjectManager::Attribute.add( object: 'Ticket', name: 'test15ä', display: 'Test 15', @@ -352,7 +352,7 @@ class ObjectManagerTest < ActiveSupport::TestCase # Test case #16 invalidated after callback added to set default #data_option[:null] value assert_raises(ActiveRecord::RecordInvalid) do - attribute17 = ObjectManager::Attribute.add( + ObjectManager::Attribute.add( object: 'Ticket', name: 'test17', display: 'Test 17', @@ -371,7 +371,7 @@ class ObjectManagerTest < ActiveSupport::TestCase assert_equal(false, ObjectManager::Attribute.pending_migration?) assert_raises(RuntimeError) do - attribute18 = ObjectManager::Attribute.add( + ObjectManager::Attribute.add( object: 'Ticket', name: 'delete', display: 'Test 18', @@ -392,7 +392,7 @@ class ObjectManagerTest < ActiveSupport::TestCase attribute_count = ObjectManager::Attribute.count assert_raises(RuntimeError) do - attribute19 = ObjectManager::Attribute.add( + ObjectManager::Attribute.add( object: 'Ticket', name: 'updated_at', display: 'Update Time', @@ -414,7 +414,7 @@ class ObjectManagerTest < ActiveSupport::TestCase assert_equal(attribute_count, ObjectManager::Attribute.count) assert_raises(RuntimeError) do - attribute20 = ObjectManager::Attribute.add( + ObjectManager::Attribute.add( object: 'Ticket', name: 'updated_AT', display: 'Update Time', @@ -492,7 +492,7 @@ class ObjectManagerTest < ActiveSupport::TestCase assert_equal('some attribute text', ticket1.attribute1) # add additional attributes - attribute2 = ObjectManager::Attribute.add( + ObjectManager::Attribute.add( object: 'Ticket', name: 'attribute2', display: 'Attribute 2', @@ -511,7 +511,7 @@ class ObjectManagerTest < ActiveSupport::TestCase created_by_id: 1, updated_by_id: 1, ) - attribute3 = ObjectManager::Attribute.add( + ObjectManager::Attribute.add( object: 'Ticket', name: 'attribute3', display: 'Attribute 3', @@ -528,7 +528,7 @@ class ObjectManagerTest < ActiveSupport::TestCase created_by_id: 1, updated_by_id: 1, ) - attribute4 = ObjectManager::Attribute.add( + ObjectManager::Attribute.add( object: 'Ticket', name: 'attribute4', display: 'Attribute 4', @@ -757,7 +757,7 @@ class ObjectManagerTest < ActiveSupport::TestCase created_by_id: 1, ) - overview1 = Overview.create!( + Overview.create!( name: 'Overview1', link: 'my_overview', roles: Role.all, @@ -900,7 +900,7 @@ class ObjectManagerTest < ActiveSupport::TestCase created_by_id: 1, ) - attribute1 = ObjectManager::Attribute.add( + ObjectManager::Attribute.add( object: 'Ticket', name: 'watcher', display: 'watcher', diff --git a/test/integration/package_test.rb b/test/integration/package_test.rb index 2adaa7549..51edd823f 100644 --- a/test/integration/package_test.rb +++ b/test/integration/package_test.rb @@ -358,9 +358,9 @@ class PackageTest < ActiveSupport::TestCase file.close end begin - success = Package.auto_install() + Package.auto_install() rescue - success = false + false end if test[:zpm] File.delete(location ) diff --git a/test/integration/report_test.rb b/test/integration/report_test.rb index 0938b894a..0e1638fc2 100644 --- a/test/integration/report_test.rb +++ b/test/integration/report_test.rb @@ -6,7 +6,7 @@ class ReportTest < ActiveSupport::TestCase setup do # create attribute - attribute1 = ObjectManager::Attribute.add( + ObjectManager::Attribute.add( object: 'Ticket', name: 'test_category', display: 'Test 1', @@ -1064,7 +1064,7 @@ class ReportTest < ActiveSupport::TestCase assert_equal(@ticket6.id, result[:ticket_ids][1].to_i) assert_nil(result[:ticket_ids][2]) - result = Report::TicketGenericTime.items( + Report::TicketGenericTime.items( range_start: Time.zone.parse('2015-01-01T00:00:00Z'), range_end: Time.zone.parse('2015-12-31T23:59:59Z'), selector: { diff --git a/test/integration/slack_test.rb b/test/integration/slack_test.rb index 3e0d00a45..24ca5eba0 100644 --- a/test/integration/slack_test.rb +++ b/test/integration/slack_test.rb @@ -57,7 +57,7 @@ class SlackTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - article1 = Ticket::Article.create( + Ticket::Article.create( ticket_id: ticket1.id, body: text, type: Ticket::Article::Type.find_by(name: 'note'), @@ -95,7 +95,7 @@ class SlackTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - article2 = Ticket::Article.create( + Ticket::Article.create( ticket_id: ticket2.id, body: text, type: Ticket::Article::Type.find_by(name: 'note'), @@ -176,7 +176,7 @@ class SlackTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - article3 = Ticket::Article.create( + Ticket::Article.create( ticket_id: ticket3.id, body: text, type: Ticket::Article::Type.find_by(name: 'note'), @@ -214,7 +214,7 @@ class SlackTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - article4 = Ticket::Article.create( + Ticket::Article.create( ticket_id: ticket4.id, body: text, type: Ticket::Article::Type.find_by(name: 'note'), diff --git a/test/integration/zendesk_import_test.rb b/test/integration/zendesk_import_test.rb index 8f2052018..8aa6b2561 100644 --- a/test/integration/zendesk_import_test.rb +++ b/test/integration/zendesk_import_test.rb @@ -92,7 +92,6 @@ class ZendeskImportTest < ActiveSupport::TestCase role_agent = Role.find_by(name: 'Agent') role_customer = Role.find_by(name: 'Customer') - group_users = Group.find_by(name: 'Users') group_support = Group.find_by(name: 'Support') group_additional_group = Group.find_by(name: 'Additional Group') diff --git a/test/support/coverage.rb b/test/support/coverage.rb index 03dbe4a54..48a604fc5 100644 --- a/test/support/coverage.rb +++ b/test/support/coverage.rb @@ -16,7 +16,6 @@ class ActiveSupport::TestCase SimpleCov::Formatter::RcovFormatter, Coveralls::SimpleCov::Formatter ]) - merge_timeout = 3600 SimpleCov.start fixtures :all end diff --git a/test/unit/calendar_subscription_test.rb b/test/unit/calendar_subscription_test.rb index 868994d25..b5c50fbe9 100644 --- a/test/unit/calendar_subscription_test.rb +++ b/test/unit/calendar_subscription_test.rb @@ -59,7 +59,7 @@ class CalendarSubscriptionTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - customer2 = User.create!( + User.create!( login: 'ticket-calendar-subscription-customer2@example.com', firstname: 'Notification', lastname: 'Customer2', diff --git a/test/unit/chat_test.rb b/test/unit/chat_test.rb index 48af672a9..4467d008d 100644 --- a/test/unit/chat_test.rb +++ b/test/unit/chat_test.rb @@ -156,7 +156,7 @@ class ChatTest < ActiveSupport::TestCase assert_equal(false, agent_state[:active]) # set agent 1 to active - chat_agent1 = Chat::Agent.create_or_update( + Chat::Agent.create_or_update( active: true, concurrent: 4, updated_by_id: @agent1.id, @@ -224,7 +224,7 @@ class ChatTest < ActiveSupport::TestCase assert_equal(true, agent_state[:active]) # start next chat - chat_session2 = Chat::Session.create( + Chat::Session.create( chat_id: chat.id, ) @@ -250,7 +250,7 @@ class ChatTest < ActiveSupport::TestCase assert_equal(true, agent_state[:active]) # start new chats - chat_session3 = Chat::Session.create( + Chat::Session.create( chat_id: chat.id, ) chat_session4 = Chat::Session.create( diff --git a/test/unit/email_process_auto_response_test.rb b/test/unit/email_process_auto_response_test.rb index 0541a7981..9b11ad11b 100644 --- a/test/unit/email_process_auto_response_test.rb +++ b/test/unit/email_process_auto_response_test.rb @@ -56,7 +56,7 @@ Subject: some new subject Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + _ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(true, mail['x-zammad-send-auto-response'.to_sym]) Scheduler.worker(true) assert_equal(2, article_p.ticket.articles.count) @@ -68,7 +68,7 @@ X-Loop: yes Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + _ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(false, mail['x-zammad-send-auto-response'.to_sym]) Scheduler.worker(true) assert_equal(1, article_p.ticket.articles.count) @@ -80,7 +80,7 @@ Precedence: Bulk Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + _ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(false, mail['x-zammad-send-auto-response'.to_sym]) email_raw_string = "From: me@example.com @@ -92,7 +92,7 @@ Some Text" Scheduler.worker(true) assert_equal(1, article_p.ticket.articles.count) - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + _ticket_p, _article_p, _user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(false, mail['x-zammad-send-auto-response'.to_sym]) email_raw_string = "From: me@example.com @@ -103,18 +103,11 @@ X-Auto-Response-Suppress: All Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + _ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(false, mail['x-zammad-send-auto-response'.to_sym]) Scheduler.worker(true) assert_equal(1, article_p.ticket.articles.count) - email_raw_string = "From: me@example.com -To: customer@example.com -Subject: some new subject -List-Unsubscribe: - -Some Text" - fqdn = Setting.get('fqdn') email_raw_string = "From: me@example.com To: customer@example.com @@ -123,7 +116,7 @@ Message-ID: <1234@#{fqdn}> Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + _ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(false, mail['x-zammad-send-auto-response'.to_sym]) Scheduler.worker(true) assert_equal(1, article_p.ticket.articles.count) @@ -136,7 +129,7 @@ Message-ID: <1234@not_matching.#{fqdn}> Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + _ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(true, mail['x-zammad-send-auto-response'.to_sym]) Scheduler.worker(true) assert_equal(2, article_p.ticket.articles.count) @@ -186,7 +179,7 @@ Content-Disposition: inline test" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + _ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(false, mail['x-zammad-send-auto-response'.to_sym]) Scheduler.worker(true) assert_equal(1, article_p.ticket.articles.count) @@ -227,7 +220,7 @@ X-Loop: yes Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(false, mail['x-zammad-send-auto-response'.to_sym]) Scheduler.worker(true) @@ -253,7 +246,7 @@ Some Text" Setting.set('ticket_trigger_recursive', true) - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(false, mail['x-zammad-send-auto-response'.to_sym]) Scheduler.worker(true) @@ -285,7 +278,7 @@ Subject: some new subject Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(true, mail['x-zammad-send-auto-response'.to_sym]) Scheduler.worker(true) @@ -316,7 +309,7 @@ Some Text" Setting.set('ticket_trigger_recursive', true) - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(true, mail['x-zammad-send-auto-response'.to_sym]) Scheduler.worker(true) tags = ticket_p.tag_list @@ -400,7 +393,7 @@ Subject: some new subject Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + _ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(true, mail['x-zammad-send-auto-response'.to_sym]) Scheduler.worker(true) assert_equal(2, article_p.ticket.articles.count) @@ -412,7 +405,7 @@ X-Loop: yes Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + _ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(false, mail['x-zammad-send-auto-response'.to_sym]) Scheduler.worker(true) assert_equal(1, article_p.ticket.articles.count) @@ -424,7 +417,7 @@ Precedence: Bulk Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + _ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(false, mail['x-zammad-send-auto-response'.to_sym]) email_raw_string = "From: me@example.com @@ -436,7 +429,7 @@ Some Text" Scheduler.worker(true) assert_equal(1, article_p.ticket.articles.count) - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + _ticket_p, _article_p, _user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(false, mail['x-zammad-send-auto-response'.to_sym]) email_raw_string = "From: me@example.com @@ -447,18 +440,11 @@ X-Auto-Response-Suppress: All Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + _ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(false, mail['x-zammad-send-auto-response'.to_sym]) Scheduler.worker(true) assert_equal(1, article_p.ticket.articles.count) - email_raw_string = "From: me@example.com -To: customer@example.com -Subject: some new subject -List-Unsubscribe: - -Some Text" - fqdn = Setting.get('fqdn') email_raw_string = "From: me@example.com To: customer@example.com @@ -467,7 +453,7 @@ Message-ID: <1234@#{fqdn}> Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + _ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(false, mail['x-zammad-send-auto-response'.to_sym]) Scheduler.worker(true) assert_equal(1, article_p.ticket.articles.count) @@ -480,7 +466,7 @@ Message-ID: <1234@not_matching.#{fqdn}> Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + _ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(true, mail['x-zammad-send-auto-response'.to_sym]) Scheduler.worker(true) assert_equal(2, article_p.ticket.articles.count) @@ -530,7 +516,7 @@ Content-Disposition: inline test" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + _ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(false, mail['x-zammad-send-auto-response'.to_sym]) Scheduler.worker(true) assert_equal(1, article_p.ticket.articles.count) @@ -571,7 +557,7 @@ X-Loop: yes Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(false, mail['x-zammad-send-auto-response'.to_sym]) Scheduler.worker(true) @@ -597,7 +583,7 @@ Some Text" Setting.set('ticket_trigger_recursive', true) - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(false, mail['x-zammad-send-auto-response'.to_sym]) Scheduler.worker(true) @@ -629,7 +615,7 @@ Subject: some new subject Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(true, mail['x-zammad-send-auto-response'.to_sym]) Scheduler.worker(true) @@ -660,7 +646,7 @@ Some Text" Setting.set('ticket_trigger_recursive', true) - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(true, mail['x-zammad-send-auto-response'.to_sym]) Scheduler.worker(true) tags = ticket_p.tag_list @@ -777,7 +763,7 @@ X-Loop: yes Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(false, mail['x-zammad-send-auto-response'.to_sym]) Scheduler.worker(true) @@ -803,7 +789,7 @@ Some Text" Setting.set('ticket_trigger_recursive', true) - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(false, mail['x-zammad-send-auto-response'.to_sym]) Scheduler.worker(true) @@ -835,7 +821,7 @@ Subject: some new subject Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(true, mail['x-zammad-send-auto-response'.to_sym]) Scheduler.worker(true) @@ -860,7 +846,7 @@ Some Text" Setting.set('ticket_trigger_recursive', true) - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(true, mail['x-zammad-send-auto-response'.to_sym]) Scheduler.worker(true) tags = ticket_p.tag_list diff --git a/test/unit/email_process_reply_to_test.rb b/test/unit/email_process_reply_to_test.rb index 56dcb1cc7..7213a922a 100644 --- a/test/unit/email_process_reply_to_test.rb +++ b/test/unit/email_process_reply_to_test.rb @@ -12,7 +12,7 @@ Reply-To: replay_to_customer_process1@example.com Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email) + ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email) assert_equal('Customer', article_p.sender.name) assert_equal('email', article_p.type.name) assert_equal('Bob Smith ', article_p.from) @@ -38,7 +38,7 @@ Reply-To: replay_to_customer_process2@example.com Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email) + ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email) assert_equal('replay_to_customer_process2@example.com', article_p.from) assert_equal('replay_to_customer_process2@example.com', article_p.reply_to) assert_equal('replay_to_customer_process2@example.com', ticket_p.customer.email) @@ -52,7 +52,7 @@ Reply-To: Some Name Some Text" - ticket_p, article_p, user_p = Channel::EmailParser.new.process({}, email) + ticket_p, article_p, _user_p = Channel::EmailParser.new.process({}, email) assert_equal('Customer', article_p.sender.name) assert_equal('email', article_p.type.name) assert_equal('Some Name ', article_p.from) @@ -78,7 +78,7 @@ Reply-To: replay_to_customer_process3@example.com Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email) + ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email) assert_equal('replay_to_customer_process3@example.com', article_p.from) assert_equal('replay_to_customer_process3@example.com', article_p.reply_to) assert_equal('replay_to_customer_process3@example.com', ticket_p.customer.email) @@ -98,7 +98,7 @@ Reply-To: Some Name Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email) + ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email) assert_equal('Customer', article_p.sender.name) assert_equal('email', article_p.type.name) assert_equal('Some Name ', article_p.from) @@ -133,7 +133,7 @@ Reply-To: replay_to_customer_process2@example.com Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email) + ticket_p, article_p, _user_p, mail = Channel::EmailParser.new.process({}, email) assert_equal('Customer', article_p.sender.name) assert_equal('email', article_p.type.name) assert_equal('replay_to_customer_process2@example.com', article_p.from) diff --git a/test/unit/email_process_sender_is_system_address_or_agent_test.rb b/test/unit/email_process_sender_is_system_address_or_agent_test.rb index 2a5fcb2e0..352e38726 100644 --- a/test/unit/email_process_sender_is_system_address_or_agent_test.rb +++ b/test/unit/email_process_sender_is_system_address_or_agent_test.rb @@ -21,7 +21,7 @@ Subject: #{subject} Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) ticket = Ticket.find(ticket_p.id) article = Ticket::Article.find(article_p.id) assert_equal(subject, ticket.title) @@ -40,7 +40,7 @@ Message-ID: <123456789-1@linuxhotel.de> Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) ticket = Ticket.find(ticket_p.id) article = Ticket::Article.find(article_p.id) @@ -63,9 +63,8 @@ References: <123456789-1@linuxhotel.de> Some Text" - ticket_p2, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p2, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) ticket2 = Ticket.find(ticket_p2.id) - article = Ticket::Article.find(article_p.id) assert_equal(subject, ticket2.title) assert_equal(ticket.id, ticket2.id) @@ -79,9 +78,8 @@ References: <123456789-1@linuxhotel.de> Some Text" - ticket_p2, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p2, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) ticket2 = Ticket.find(ticket_p2.id) - article = Ticket::Article.find(article_p.id) assert_not_equal(ticket.id, ticket2.id) assert_equal(subject, ticket2.title) assert_equal('new', ticket2.state.name) @@ -129,7 +127,7 @@ Subject: some subject #1 Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) ticket = Ticket.find(ticket_p.id) article = Ticket::Article.find(article_p.id) assert_equal('some subject #1', ticket.title) @@ -147,7 +145,7 @@ Subject: some subject #2 Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) ticket = Ticket.find(ticket_p.id) article = Ticket::Article.find(article_p.id) assert_equal('some subject #2', ticket.title) @@ -164,7 +162,7 @@ Subject: some subject #3 Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) ticket = Ticket.find(ticket_p.id) article = Ticket::Article.find(article_p.id) assert_equal('some subject #3', ticket.title) @@ -181,7 +179,7 @@ Subject: some subject #4 Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) ticket = Ticket.find(ticket_p.id) article = Ticket::Article.find(article_p.id) assert_equal('some subject #4', ticket.title) @@ -198,7 +196,7 @@ Subject: some subject #5 Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) ticket = Ticket.find(ticket_p.id) article = Ticket::Article.find(article_p.id) assert_equal('some subject #5', ticket.title) @@ -215,7 +213,7 @@ Subject: some subject #6 Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) ticket = Ticket.find(ticket_p.id) article = Ticket::Article.find(article_p.id) assert_equal('some subject #6', ticket.title) diff --git a/test/unit/integration_icinga_test.rb b/test/unit/integration_icinga_test.rb index a18ec2772..a1cb59baf 100644 --- a/test/unit/integration_icinga_test.rb +++ b/test/unit/integration_icinga_test.rb @@ -36,7 +36,7 @@ Service: RBL check (Display Name: \"RBL check\") Host: apn4711.dc.example.com (Display Name: \"apn4711.dc.example.com\") IPv4: 127.0.0.1=" - ticket_0, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_0, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('new', ticket_0.state.name) assert(ticket_0.preferences) assert(ticket_0.preferences['icinga']) @@ -67,7 +67,7 @@ Service: RBL check (Display Name: \"RBL check\") Host: apn4711.dc.example.com (Display Name: \"apn4711.dc.example.com\") IPv4: 127.0.0.1=" - ticket_0_1, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_0_1, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('new', ticket_0_1.state.name) assert(ticket_0_1.preferences) assert(ticket_0_1.preferences['icinga']) @@ -98,7 +98,7 @@ Service: RBL check (Display Name: \"RBL check\") Host: apn4711.dc.example.com (Display Name: \"apn4711.dc.example.com\") IPv4: 127.0.0.1=" - ticket_0_2, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_0_2, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('closed', ticket_0_2.state.name) assert(ticket_0_2.preferences) assert(ticket_0_2.preferences['icinga']) @@ -134,7 +134,7 @@ Additional Info: WARNING - load average: 3.44, 0.99, 0.35 Comment: [] = " - ticket_1, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_1, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('new', ticket_1.state.name) assert(ticket_1.preferences) assert(ticket_1.preferences['icinga']) @@ -168,7 +168,7 @@ Additional Info: WARNING - load average: 3.44, 0.99, 0.35 Comment: [] = " - ticket_2, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_2, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('new', ticket_2.state.name) assert(ticket_2.preferences) assert(ticket_2.preferences['icinga']) @@ -203,7 +203,7 @@ Additional Info: WARNING - load average: 3.44, 0.99, 0.35 Comment: [] = " - ticket_1_1, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_1_1, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('new', ticket_1_1.state.name) assert(ticket_1_1.preferences) assert(ticket_1_1.preferences['icinga']) @@ -238,7 +238,7 @@ Additional Info: OK - load average: 1.62, 1.17, 0.49 Comment: [] = " - ticket_1_2, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_1_2, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(ticket_1.id, ticket_1_2.id) assert_equal('closed', ticket_1_2.state.name) assert(ticket_1_2.preferences) @@ -271,7 +271,7 @@ Additional Info: CRITICAL - Host Unreachable (127.0.0.1) Comment: [] = " - ticket_3, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_3, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('new', ticket_3.state.name) assert(ticket_3.preferences) assert(ticket_3.preferences['icinga']) @@ -304,7 +304,7 @@ Additional Info: PING OK - Packet loss = 0%, RTA = 21.37 ms Comment: [] = " - ticket_3_1, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_3_1, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(ticket_3.id, ticket_3_1.id) assert_equal('closed', ticket_3_1.state.name) assert(ticket_3_1.preferences) @@ -329,7 +329,7 @@ Service: Ping IPv4 Host: apn4711.dc.example.com IPv4: 127.0.0.1=" - ticket_4, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_4, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('new', ticket_4.state.name) assert(ticket_4.preferences) assert(ticket_4.preferences['icinga']) @@ -354,7 +354,7 @@ Service: Ping IPv4 Host: apn4711.dc.example.com IPv4: 127.0.0.1=" - ticket_4_1, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_4_1, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(ticket_4.id, ticket_4_1.id) assert_equal('closed', ticket_4_1.state.name) assert(ticket_4_1.preferences) @@ -383,7 +383,7 @@ When: 2017-09-29 14:19:40 +0200 Host: apn4709.dc.example.com IPv4:=09 127.0.0.1=" - ticket_5, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_5, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('new', ticket_5.state.name) assert(ticket_5.preferences) assert(ticket_5.preferences['icinga']) @@ -411,7 +411,7 @@ When: 2017-09-29 14:23:36 +0200 Host: apn4709.dc.example.com IPv4:=09 127.0.0.1= " - ticket_5_1, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_5_1, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(ticket_5.id, ticket_5_1.id) assert_equal('closed', ticket_5_1.state.name) assert(ticket_5_1.preferences) @@ -450,7 +450,7 @@ Additional Info: WARNING - load average: 3.44, 0.99, 0.35 Comment: [] = " - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('new', ticket_p.state.name) assert(ticket_p.preferences) assert_not(ticket_p.preferences['icinga']) @@ -483,7 +483,7 @@ Additional Info: WARNING - load average: 3.44, 0.99, 0.35 Comment: [] = " - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('new', ticket_p.state.name) assert(ticket_p.preferences) assert_not(ticket_p.preferences['icinga']) @@ -514,7 +514,7 @@ Additional Info: WARNING - load average: 3.44, 0.99, 0.35 Comment: [] = " - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('new', ticket_p.state.name) assert(ticket_p.preferences) assert_not(ticket_p.preferences['icinga']) @@ -548,7 +548,7 @@ Additional Info: WARNING - load average: 3.44, 0.99, 0.35 Comment: [] = " - ticket_1_1, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_1_1, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('new', ticket_1_1.state.name) assert(ticket_1_1.preferences) assert(ticket_1_1.preferences['icinga']) @@ -584,7 +584,7 @@ Additional Info: WARNING - load average: 3.44, 0.99, 0.35 Comment: [] = " - ticket_1_1, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_1_1, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('new', ticket_1_1.state.name) assert(ticket_1_1.preferences) assert(ticket_1_1.preferences['icinga']) @@ -620,7 +620,7 @@ Additional Info: WARNING - load average: 3.44, 0.99, 0.35 Comment: [] = " - ticket_1_1, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_1_1, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('new', ticket_1_1.state.name) assert(ticket_1_1.preferences) assert(ticket_1_1.preferences['icinga']) @@ -656,7 +656,7 @@ Additional Info: PING OK - Packet loss = 0%, RTA = 21.37 ms Comment: [] = " - ticket_1, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_1, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) ticket_count = Ticket.count assert_not(ticket_1) assert_equal(ticket_count, Ticket.count) @@ -698,7 +698,7 @@ Host: Awesell IPv4: 192.168.1.8 ------MIME delimiter for sendEmail-587258.191387267--' - ticket_0, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_0, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('new', ticket_0.state.name) assert(ticket_0.preferences) assert(ticket_0.preferences['icinga']) @@ -739,7 +739,7 @@ IPv4: 192.168.1.8 ------MIME delimiter for sendEmail-322998.239033954-- ' - ticket_1, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_1, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('closed', ticket_1.state.name) assert(ticket_1.preferences) assert(ticket_1.preferences['icinga']) @@ -782,7 +782,7 @@ When: 2018-08-21 03:05:01 +0200 Service: OS Updates (yum) Host: host.example.com' - ticket_1, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_1, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('new', ticket_1.state.name) assert(ticket_1.preferences) assert(ticket_1.preferences['icinga']) diff --git a/test/unit/integration_monit_test.rb b/test/unit/integration_monit_test.rb index ffcae433c..96bfb0f39 100644 --- a/test/unit/integration_monit_test.rb +++ b/test/unit/integration_monit_test.rb @@ -34,7 +34,7 @@ Your faithful employee, Monit " - ticket_0, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_0, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('new', ticket_0.state.name) assert(ticket_0.preferences) assert(ticket_0.preferences['monit']) @@ -64,7 +64,7 @@ Action done Service php-fpm Your faithful employee, Monit" - ticket_0_1, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_0_1, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('closed', ticket_0_1.state.name) assert(ticket_0_1.preferences) assert(ticket_0_1.preferences['monit']) @@ -97,7 +97,7 @@ P] -- HTTP: Error receiving data -- Resource temporarily unavailable Your faithful employee, Monit" - ticket_1, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_1, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('new', ticket_1.state.name) assert(ticket_1.preferences) assert(ticket_1.preferences['monit']) @@ -127,7 +127,7 @@ Connection succeeded Service host.example=20 Your faithful employee, Monit" - ticket_1_1, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_1_1, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('closed', ticket_1_1.state.name) assert(ticket_1_1.preferences) assert(ticket_1_1.preferences['monit']) @@ -160,7 +160,7 @@ Resource limit matched Service web5.example.net=20 Your faithful employee, Monit" - ticket_2, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_2, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('new', ticket_2.state.name) assert(ticket_2.preferences) assert(ticket_2.preferences['monit']) @@ -190,7 +190,7 @@ Resource limit succeeded Service web5.example.net=20 Your faithful employee, Monit" - ticket_2_1, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_2_1, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('closed', ticket_2_1.state.name) assert(ticket_2_1.preferences) assert(ticket_2_1.preferences['monit']) diff --git a/test/unit/integration_nagios_test.rb b/test/unit/integration_nagios_test.rb index f086e7029..32696d5e2 100644 --- a/test/unit/integration_nagios_test.rb +++ b/test/unit/integration_nagios_test.rb @@ -36,7 +36,7 @@ Additional Info: WARNING - load average: 3.44, 0.99, 0.35 " - ticket_1, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_1, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('new', ticket_1.state.name) assert(ticket_1.preferences) assert(ticket_1.preferences['nagios']) @@ -68,7 +68,7 @@ Additional Info: WARNING - load average: 3.44, 0.99, 0.35 " - ticket_2, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_2, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('new', ticket_2.state.name) assert(ticket_2.preferences) assert(ticket_2.preferences['nagios']) @@ -101,7 +101,7 @@ Additional Info: WARNING - load average: 3.44, 0.99, 0.35 " - ticket_1_1, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_1_1, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('new', ticket_1_1.state.name) assert(ticket_1_1.preferences) assert(ticket_1_1.preferences['nagios']) @@ -132,7 +132,7 @@ Date/Time: 2016-01-31 10:48:02 +0100 Additional Info: " - ticket_1_2, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_1_2, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(ticket_1.id, ticket_1_2.id) assert_equal('closed', ticket_1_2.state.name) assert(ticket_1_2.preferences) @@ -165,7 +165,7 @@ Additional Info: CRITICAL - Host Unreachable (127.0.0.1) Comment: [] = " - ticket_3, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_3, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('new', ticket_3.state.name) assert(ticket_3.preferences) assert(ticket_3.preferences['nagios']) @@ -198,7 +198,7 @@ Additional Info: PING OK - Packet loss = 0%, RTA = 21.37 ms Comment: [] = " - ticket_3_1, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_3_1, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal(ticket_3.id, ticket_3_1.id) assert_equal('closed', ticket_3_1.state.name) assert(ticket_3_1.preferences) @@ -237,7 +237,7 @@ Additional Info: WARNING - load average: 3.44, 0.99, 0.35 " - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('new', ticket_p.state.name) assert(ticket_p.preferences) assert_not(ticket_p.preferences['nagios']) @@ -268,7 +268,7 @@ Additional Info: WARNING - load average: 3.44, 0.99, 0.35 " - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('new', ticket_p.state.name) assert(ticket_p.preferences) assert_not(ticket_p.preferences['nagios']) @@ -297,7 +297,7 @@ Additional Info: WARNING - load average: 3.44, 0.99, 0.35 " - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('new', ticket_p.state.name) assert(ticket_p.preferences) assert_not(ticket_p.preferences['nagios']) @@ -329,7 +329,7 @@ Additional Info: WARNING - load average: 3.44, 0.99, 0.35 " - ticket_1, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_1, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('new', ticket_1.state.name) assert(ticket_1.preferences) assert(ticket_1.preferences['nagios']) @@ -363,7 +363,7 @@ Additional Info: WARNING - load average: 3.44, 0.99, 0.35 " - ticket_1, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_1, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('new', ticket_1.state.name) assert(ticket_1.preferences) assert(ticket_1.preferences['nagios']) @@ -397,7 +397,7 @@ Additional Info: WARNING - load average: 3.44, 0.99, 0.35 " - ticket_1, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_1, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('new', ticket_1.state.name) assert(ticket_1.preferences) assert(ticket_1.preferences['nagios']) @@ -433,7 +433,7 @@ Additional Info: PING OK - Packet loss = 0%, RTA = 21.37 ms Comment: [] = " - ticket_1, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_1, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) ticket_count = Ticket.count assert_not(ticket_1) assert_equal(ticket_count, Ticket.count) diff --git a/test/unit/model_test.rb b/test/unit/model_test.rb index ab549cdec..b5489e940 100644 --- a/test/unit/model_test.rb +++ b/test/unit/model_test.rb @@ -103,8 +103,8 @@ class ModelTest < ActiveSupport::TestCase updated_by_id: agent1.id, created_by_id: 1, ) - roles = Role.where(name: 'Customer') - customer1 = User.create_or_update( + roles = Role.where(name: 'Customer') + User.create_or_update( login: 'model-customer1@example.com', firstname: 'Model', lastname: 'Customer1', @@ -117,7 +117,7 @@ class ModelTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - customer2 = User.create_or_update( + User.create_or_update( login: 'model-customer2@example.com', firstname: 'Model', lastname: 'Customer2', @@ -130,7 +130,7 @@ class ModelTest < ActiveSupport::TestCase updated_by_id: agent1.id, created_by_id: 1, ) - customer3 = User.create_or_update( + User.create_or_update( login: 'model-customer3@example.com', firstname: 'Model', lastname: 'Customer3', diff --git a/test/unit/notification_factory_renderer_test.rb b/test/unit/notification_factory_renderer_test.rb index be5f7e249..92fe654e6 100644 --- a/test/unit/notification_factory_renderer_test.rb +++ b/test/unit/notification_factory_renderer_test.rb @@ -10,7 +10,6 @@ class NotificationFactoryRendererTest < ActiveSupport::TestCase group = Group.new(name: 'Users') owner = User.new(firstname: 'Ownerxxx', lastname: 'Agent1yyy') current_user = User.new(firstname: 'CurrentUserxxx', lastname: 'Agent2yyy') - recipient = User.new(firstname: 'Recipientxxx', lastname: 'Customer1yyy') state = Ticket::State.new(name: 'new') ticket = Ticket.new( id: 1, diff --git a/test/unit/object_create_update_with_ref_name_test.rb b/test/unit/object_create_update_with_ref_name_test.rb index efa49878b..c2f6afcf2 100644 --- a/test/unit/object_create_update_with_ref_name_test.rb +++ b/test/unit/object_create_update_with_ref_name_test.rb @@ -74,7 +74,7 @@ class ObjectCreateUpdateWithRefNameTest < ActiveSupport::TestCase end test 'user' do - org1 = Organization.create_if_not_exists_with_ref( + Organization.create_if_not_exists_with_ref( name: 'some org update_with_ref user', updated_by_id: 1, created_by_id: 1, diff --git a/test/unit/online_notifiaction_test.rb b/test/unit/online_notifiaction_test.rb index cbbb3911c..948047617 100644 --- a/test/unit/online_notifiaction_test.rb +++ b/test/unit/online_notifiaction_test.rb @@ -74,7 +74,7 @@ class OnlineNotificationTest < ActiveSupport::TestCase created_by_id: 1, ) - sla1 = Sla.create_or_update( + Sla.create_or_update( name: 'test sla 1', condition: {}, first_response_time: 20, @@ -102,7 +102,7 @@ class OnlineNotificationTest < ActiveSupport::TestCase updated_by_id: @agent_user1.id, created_by_id: @agent_user1.id, ) - article1 = Ticket::Article.create( + Ticket::Article.create( ticket_id: ticket1.id, updated_by_id: @agent_user1.id, created_by_id: @agent_user1.id, @@ -157,7 +157,7 @@ class OnlineNotificationTest < ActiveSupport::TestCase updated_by_id: @customer_user.id, created_by_id: @customer_user.id, ) - article2 = Ticket::Article.create( + Ticket::Article.create( ticket_id: ticket2.id, updated_by_id: @customer_user.id, created_by_id: @customer_user.id, @@ -212,7 +212,7 @@ class OnlineNotificationTest < ActiveSupport::TestCase updated_by_id: @agent_user1.id, created_by_id: @agent_user1.id, ) - article3 = Ticket::Article.create( + Ticket::Article.create( ticket_id: ticket3.id, updated_by_id: @agent_user1.id, created_by_id: @agent_user1.id, @@ -257,7 +257,7 @@ class OnlineNotificationTest < ActiveSupport::TestCase assert_not(OnlineNotification.exists?(@agent_user2, 'Ticket', ticket3.id, 'update', @customer_user, false)) assert(OnlineNotification.exists?(@agent_user2, 'Ticket', ticket3.id, 'update', @customer_user, true)) - article3 = Ticket::Article.create( + Ticket::Article.create( ticket_id: ticket3.id, updated_by_id: @customer_user.id, created_by_id: @customer_user.id, @@ -292,7 +292,7 @@ class OnlineNotificationTest < ActiveSupport::TestCase updated_by_id: @customer_user.id, created_by_id: @customer_user.id, ) - article4 = Ticket::Article.create( + Ticket::Article.create( ticket_id: ticket4.id, updated_by_id: @customer_user.id, created_by_id: @customer_user.id, @@ -346,7 +346,7 @@ class OnlineNotificationTest < ActiveSupport::TestCase updated_by_id: @agent_user1.id, created_by_id: @agent_user1.id, ) - article5 = Ticket::Article.create( + Ticket::Article.create( ticket_id: ticket5.id, updated_by_id: @agent_user1.id, created_by_id: @agent_user1.id, @@ -429,7 +429,7 @@ class OnlineNotificationTest < ActiveSupport::TestCase created_by_id: 1, ) assert(ticket1, 'ticket created') - article_inbound = Ticket::Article.create( + Ticket::Article.create( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', diff --git a/test/unit/role_validate_agent_limit_test.rb b/test/unit/role_validate_agent_limit_test.rb index edb343477..f46d23a2b 100644 --- a/test/unit/role_validate_agent_limit_test.rb +++ b/test/unit/role_validate_agent_limit_test.rb @@ -178,7 +178,7 @@ class RoleValidateAgentLimit < ActiveSupport::TestCase user1.role_ids = [Role.find_by(name: 'Agent').id, role_agent_limit1.id, role_agent_limit2.id] assert_raises(Exceptions::UnprocessableEntity) do - user2 = User.create!( + User.create!( firstname: 'Firstname2', lastname: 'Lastname2', email: 'some-agentlimit-role-2@example.com', @@ -193,7 +193,7 @@ class RoleValidateAgentLimit < ActiveSupport::TestCase current_agent_max = User.with_permissions('ticket.agent').count + 1 Setting.set('system_agent_limit', current_agent_max) - user3 = User.create!( + User.create!( firstname: 'Firstname', lastname: 'Lastname', email: 'some-agentlimit-role-3@example.com', diff --git a/test/unit/session_basic_test.rb b/test/unit/session_basic_test.rb index 83c6ea5ae..7d8d8f789 100644 --- a/test/unit/session_basic_test.rb +++ b/test/unit/session_basic_test.rb @@ -243,7 +243,7 @@ class SessionBasicTest < ActiveSupport::TestCase assert_not(result1, 'check as agent1 - recall 2') agent1.update!(email: 'activity-stream-agent11@example.com') - ticket = Ticket.create!( + Ticket.create!( title: '12323', group_id: 1, priority_id: 1, diff --git a/test/unit/session_enhanced_test.rb b/test/unit/session_enhanced_test.rb index 1583ecadd..d4a22461c 100644 --- a/test/unit/session_enhanced_test.rb +++ b/test/unit/session_enhanced_test.rb @@ -150,7 +150,7 @@ class SessionEnhancedTest < ActiveSupport::TestCase # check if session still exists after idle cleanup travel 10.seconds - client_ids = Sessions.destroy_idle_sessions(2) + Sessions.destroy_idle_sessions(2) travel 2.seconds # check client sessions @@ -303,7 +303,7 @@ class SessionEnhancedTest < ActiveSupport::TestCase # check if session still exists after idle cleanup travel 10.seconds - client_ids = Sessions.destroy_idle_sessions(2) + Sessions.destroy_idle_sessions(2) travel 2.seconds # check client sessions diff --git a/test/unit/store_test.rb b/test/unit/store_test.rb index e91120354..53049d946 100644 --- a/test/unit/store_test.rb +++ b/test/unit/store_test.rb @@ -15,7 +15,7 @@ class StoreTest < ActiveSupport::TestCase assert(result) exists = File.exist?(location) assert(exists) - result = Store::Provider::File.delete(sha) + Store::Provider::File.delete(sha) exists = File.exist?(location) assert_not(exists) exists = File.exist?(Rails.root.join('storage', 'fs', 'ed70', '02b4')) diff --git a/test/unit/tag_test.rb b/test/unit/tag_test.rb index bf700aeac..4949fd2e8 100644 --- a/test/unit/tag_test.rb +++ b/test/unit/tag_test.rb @@ -150,7 +150,6 @@ class TagTest < ActiveSupport::TestCase # delete tags tests.each do |test| - tags = nil tags = test[:tag_add] || test[:tag_remove] success = Tag.tag_remove(tags) assert(success, 'Tag.tag_remove successful') diff --git a/test/unit/ticket_article_communicate_test.rb b/test/unit/ticket_article_communicate_test.rb index 164852146..cd4a78e3e 100644 --- a/test/unit/ticket_article_communicate_test.rb +++ b/test/unit/ticket_article_communicate_test.rb @@ -133,8 +133,7 @@ X-Loop: yes Some Text" - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({ trusted: true }, email_raw_string) - ticket = Ticket.find(ticket_p.id) + _ticket_p, article_p, _user_p, _mail = Channel::EmailParser.new.process({ trusted: true }, email_raw_string) article_email = Ticket::Article.find(article_p.id) assert_equal(0, email_count('my_zammad@example.com')) diff --git a/test/unit/ticket_last_owner_update_test.rb b/test/unit/ticket_last_owner_update_test.rb index 31f516c88..84292430c 100644 --- a/test/unit/ticket_last_owner_update_test.rb +++ b/test/unit/ticket_last_owner_update_test.rb @@ -3,7 +3,7 @@ require 'test_helper' class TicketLastOwnerUpdateTest < ActiveSupport::TestCase setup do - group = Group.create_or_update( + Group.create_or_update( name: 'LastOwnerUpdate', email_address: EmailAddress.first, assignment_timeout: 60, @@ -75,7 +75,7 @@ class TicketLastOwnerUpdateTest < ActiveSupport::TestCase travel 1.hour - article1 = Ticket::Article.create( + Ticket::Article.create( ticket_id: ticket.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -96,7 +96,7 @@ class TicketLastOwnerUpdateTest < ActiveSupport::TestCase travel 1.hour - article2 = Ticket::Article.create( + Ticket::Article.create( ticket_id: ticket.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', diff --git a/test/unit/ticket_overview_out_of_office_test.rb b/test/unit/ticket_overview_out_of_office_test.rb index 765b46f01..70feb74c2 100644 --- a/test/unit/ticket_overview_out_of_office_test.rb +++ b/test/unit/ticket_overview_out_of_office_test.rb @@ -267,7 +267,7 @@ class TicketOverviewOutOfOfficeTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - article1 = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', diff --git a/test/unit/ticket_overview_test.rb b/test/unit/ticket_overview_test.rb index 87dd7a2cc..416ded78b 100644 --- a/test/unit/ticket_overview_test.rb +++ b/test/unit/ticket_overview_test.rb @@ -424,7 +424,7 @@ class TicketOverviewTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - article1 = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -482,7 +482,7 @@ class TicketOverviewTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - article2 = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket2.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -579,7 +579,7 @@ class TicketOverviewTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - article3 = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket3.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', diff --git a/test/unit/ticket_screen_options_test.rb b/test/unit/ticket_screen_options_test.rb index 87aa32769..e14572d1a 100644 --- a/test/unit/ticket_screen_options_test.rb +++ b/test/unit/ticket_screen_options_test.rb @@ -105,7 +105,7 @@ class TicketScreenOptionsTest < ActiveSupport::TestCase group3.name => 'full', } - agent6 = User.create!( + User.create!( login: 'agent6@example.com', firstname: 'Role', lastname: 'Agent6', @@ -247,7 +247,7 @@ class TicketScreenOptionsTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - article1 = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -270,7 +270,7 @@ class TicketScreenOptionsTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - article2 = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket2.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', diff --git a/test/unit/ticket_selector_test.rb b/test/unit/ticket_selector_test.rb index 0aa2af459..2b9000684 100644 --- a/test/unit/ticket_selector_test.rb +++ b/test/unit/ticket_selector_test.rb @@ -1011,7 +1011,7 @@ class TicketSelectorTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - ticket_tags_3 = Ticket.create!( + Ticket.create!( title: 'some title1', group: @group, customer_id: @customer1.id, @@ -1055,7 +1055,7 @@ class TicketSelectorTest < ActiveSupport::TestCase value: 'contains_all_1, contains_all_2, contains_all_3', }, } - ticket_count, tickets = Ticket.selectors(condition, limit: 10, current_user: @agent1) + ticket_count, _tickets = Ticket.selectors(condition, limit: 10, current_user: @agent1) assert_equal(1, ticket_count) condition = { @@ -1064,7 +1064,7 @@ class TicketSelectorTest < ActiveSupport::TestCase value: 'contains_all_1, contains_all_2, contains_all_3, xxx', }, } - ticket_count, tickets = Ticket.selectors(condition, limit: 10, current_user: @agent1) + ticket_count, _tickets = Ticket.selectors(condition, limit: 10, current_user: @agent1) assert_equal(0, ticket_count) # search all with contains one @@ -1074,7 +1074,7 @@ class TicketSelectorTest < ActiveSupport::TestCase value: 'contains_all_1, contains_all_2, contains_all_3', }, } - ticket_count, tickets = Ticket.selectors(condition, limit: 10, current_user: @agent1) + ticket_count, _tickets = Ticket.selectors(condition, limit: 10, current_user: @agent1) assert_equal(2, ticket_count) condition = { @@ -1083,7 +1083,7 @@ class TicketSelectorTest < ActiveSupport::TestCase value: 'contains_all_1, contains_all_2' }, } - ticket_count, tickets = Ticket.selectors(condition, limit: 10, current_user: @agent1) + ticket_count, _tickets = Ticket.selectors(condition, limit: 10, current_user: @agent1) assert_equal(1, ticket_count) # search all with contains one not @@ -1093,7 +1093,7 @@ class TicketSelectorTest < ActiveSupport::TestCase value: 'contains_all_1, contains_all_3' }, } - ticket_count, tickets = Ticket.selectors(condition, limit: 10, current_user: @agent1) + ticket_count, _tickets = Ticket.selectors(condition, limit: 10, current_user: @agent1) assert_equal(2, ticket_count) condition = { @@ -1102,7 +1102,7 @@ class TicketSelectorTest < ActiveSupport::TestCase value: 'contains_all_1, contains_all_2, contains_all_3' }, } - ticket_count, tickets = Ticket.selectors(condition, limit: 10, current_user: @agent1) + ticket_count, _tickets = Ticket.selectors(condition, limit: 10, current_user: @agent1) assert_equal(2, ticket_count) end diff --git a/test/unit/ticket_sla_test.rb b/test/unit/ticket_sla_test.rb index ff3fa76f6..b372c91b0 100644 --- a/test/unit/ticket_sla_test.rb +++ b/test/unit/ticket_sla_test.rb @@ -56,7 +56,7 @@ class TicketSlaTest < ActiveSupport::TestCase created_by_id: 1, ) - sla = Sla.create_or_update( + Sla.create_or_update( name: 'test sla 1', condition: {}, first_response_time: 60, @@ -130,7 +130,7 @@ class TicketSlaTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - sla = Sla.create_or_update( + Sla.create_or_update( name: 'test sla 2', condition: { 'ticket.priority_id' => { @@ -447,7 +447,7 @@ class TicketSlaTest < ActiveSupport::TestCase assert_nil(ticket.close_at, 'ticket.close_at verify - inbound') # create note article - article_note = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket.id, from: 'some_sender@example.com', subject: 'some subject', @@ -535,7 +535,7 @@ class TicketSlaTest < ActiveSupport::TestCase created_by_id: 1, ) - sla = Sla.create_or_update( + Sla.create_or_update( name: 'test sla 1', condition: { 'ticket.priority_id' => { @@ -653,7 +653,7 @@ class TicketSlaTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - sla = Sla.create_or_update( + Sla.create_or_update( name: 'aaa should not match', condition: { 'ticket.priority_id' => { @@ -1554,7 +1554,7 @@ class TicketSlaTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - article_inbound = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -1609,7 +1609,7 @@ class TicketSlaTest < ActiveSupport::TestCase created_by_id: 1, ) - sla = Sla.create_or_update( + Sla.create_or_update( name: 'test sla - ticket.title & article.subject', condition: { 'ticket.priority_id' => { @@ -1639,7 +1639,7 @@ class TicketSlaTest < ActiveSupport::TestCase assert_nil(ticket.close_in_min, 'ticket.close_in_min verify 3') assert_nil(ticket.close_diff_in_min, 'ticket.close_diff_in_min# verify 3') - sla = Sla.create_or_update( + Sla.create_or_update( name: 'test sla - ticket.title & article.subject', condition: { 'ticket.priority_id' => { @@ -1723,7 +1723,7 @@ class TicketSlaTest < ActiveSupport::TestCase assert(ticket, 'ticket created') assert_nil(ticket.escalation_at, 'ticket.escalation_at verify') - article_customer = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -1806,7 +1806,7 @@ class TicketSlaTest < ActiveSupport::TestCase ticket.updated_at = '2016-11-01 15:25:40 UTC' ticket.save! - article_agent = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -1833,7 +1833,7 @@ class TicketSlaTest < ActiveSupport::TestCase ticket.updated_at = '2016-11-01 15:59:14 UTC' ticket.save! - article_customer = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -1872,7 +1872,7 @@ class TicketSlaTest < ActiveSupport::TestCase ticket.updated_at = '2016-11-07 13:26:36 UTC' ticket.save! - article_customer = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -1895,7 +1895,7 @@ class TicketSlaTest < ActiveSupport::TestCase assert_equal(ticket.update_escalation_at.gmtime.to_s, '2016-11-09 09:26:36 UTC', 'ticket.update_escalation_at verify 1') assert_nil(ticket.close_escalation_at, 'ticket.close_escalation_at verify 1') - article_agent = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -1942,7 +1942,7 @@ class TicketSlaTest < ActiveSupport::TestCase assert(ticket, 'ticket created') assert_nil(ticket.escalation_at, 'ticket.escalation_at verify') - article_customer = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -2020,7 +2020,7 @@ class TicketSlaTest < ActiveSupport::TestCase assert_equal(ticket.update_escalation_at.gmtime.to_s, '2016-11-02 09:00:00 UTC', 'ticket.update_escalation_at verify 1') assert_nil(ticket.close_escalation_at, 'ticket.close_escalation_at verify 1') - article_agent = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', diff --git a/test/unit/ticket_trigger_extended_recursive_disabled_test.rb b/test/unit/ticket_trigger_extended_recursive_disabled_test.rb index e8d8aa031..a70ae2f00 100644 --- a/test/unit/ticket_trigger_extended_recursive_disabled_test.rb +++ b/test/unit/ticket_trigger_extended_recursive_disabled_test.rb @@ -7,7 +7,7 @@ class TicketTriggerExtendedRecursiveDisabledTest < ActiveSupport::TestCase end test 'recursive trigger' do - trigger1 = Trigger.create!( + Trigger.create!( name: '1) set prio to 3 high', condition: { 'ticket.action' => { @@ -30,7 +30,7 @@ class TicketTriggerExtendedRecursiveDisabledTest < ActiveSupport::TestCase updated_by_id: 1, ) - trigger2 = Trigger.create!( + Trigger.create!( name: '2) set state to closed', condition: { 'ticket.action' => { @@ -59,7 +59,7 @@ Subject: some new subject Some Text' - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('some new subject', ticket_p.title) assert_equal('Users', ticket_p.group.name) assert_equal('3 high', ticket_p.priority.name) @@ -69,7 +69,7 @@ Some Text' end test 'recursive trigger - loop test' do - trigger1 = Trigger.create!( + Trigger.create!( name: '1) set prio to 3 high', condition: { 'ticket.priority_id' => { @@ -91,7 +91,7 @@ Some Text' updated_by_id: 1, ) - trigger2 = Trigger.create!( + Trigger.create!( name: '2) set prio to 1 low', condition: { 'ticket.priority_id' => { @@ -113,7 +113,7 @@ Some Text' updated_by_id: 1, ) - trigger3 = Trigger.create!( + Trigger.create!( name: '3) set prio to 3 high', condition: { 'ticket.priority_id' => { @@ -138,7 +138,7 @@ Subject: some new subject Some Text' - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('some new subject', ticket_p.title) assert_equal('Users', ticket_p.group.name) assert_equal('2 normal', ticket_p.priority.name) @@ -148,7 +148,7 @@ Some Text' end test 'recursive trigger - 2 trigger will not trigger next trigger' do - trigger1 = Trigger.create!( + Trigger.create!( name: '1) set prio to 3 high', condition: { 'ticket.action' => { @@ -171,7 +171,7 @@ Some Text' updated_by_id: 1, ) - trigger2 = Trigger.create!( + Trigger.create!( name: '2) set state to open', condition: { 'ticket.action' => { @@ -194,7 +194,7 @@ Some Text' updated_by_id: 1, ) - trigger3 = Trigger.create!( + Trigger.create!( name: '3) set state to closed', condition: { 'ticket.action' => { @@ -227,7 +227,7 @@ Subject: some new subject Some Text' - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('some new subject', ticket_p.title) assert_equal('Users', ticket_p.group.name) assert_equal('3 high', ticket_p.priority.name) @@ -238,7 +238,7 @@ Some Text' end test 'recursive trigger - 2 trigger will trigger next trigger - case 1' do - trigger1 = Trigger.create!( + Trigger.create!( name: '1) set state to closed', condition: { 'ticket.action' => { @@ -265,7 +265,7 @@ Some Text' updated_by_id: 1, ) - trigger2 = Trigger.create!( + Trigger.create!( name: '2) set prio to 3 high', condition: { 'ticket.action' => { @@ -288,7 +288,7 @@ Some Text' updated_by_id: 1, ) - trigger3 = Trigger.create!( + Trigger.create!( name: '3) set state to open', condition: { 'ticket.action' => { @@ -313,7 +313,7 @@ Subject: some new subject Some Text' - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('some new subject', ticket_p.title) assert_equal('Users', ticket_p.group.name) @@ -324,7 +324,7 @@ Some Text' end test 'recursive trigger - 2 trigger will trigger next trigger - case 2' do - trigger1 = Trigger.create!( + Trigger.create!( name: '1) set prio to 3 high', condition: { 'ticket.action' => { @@ -351,7 +351,7 @@ Some Text' updated_by_id: 1, ) - trigger2 = Trigger.create!( + Trigger.create!( name: '2) set state to closed', condition: { 'ticket.action' => { @@ -378,7 +378,7 @@ Some Text' updated_by_id: 1, ) - trigger3 = Trigger.create!( + Trigger.create!( name: '3) set state to open', condition: { 'ticket.action' => { @@ -403,7 +403,7 @@ Subject: some new subject Some Text' - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('some new subject', ticket_p.title) assert_equal('Users', ticket_p.group.name) @@ -464,7 +464,7 @@ Some Text' ) # trigger, move ticket created in group1 into group3 and then into group2 - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: '1 dispatch', condition: { 'ticket.action' => { @@ -490,7 +490,7 @@ Some Text' created_by_id: 1, updated_by_id: 1, ) - trigger2 = Trigger.create_or_update( + Trigger.create_or_update( name: '2 dispatch', condition: { 'ticket.action' => { @@ -528,7 +528,7 @@ Some Text' assert_equal(ticket1.group.name, group1.name) assert_equal(ticket1.state.name, 'new') - article_inbound1 = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -567,7 +567,7 @@ Some Text' end test 'recursive trigger loop check' do - trigger0 = Trigger.create!( + Trigger.create!( name: '000', condition: { 'ticket.action' => { @@ -589,7 +589,7 @@ Some Text' created_by_id: 1, updated_by_id: 1, ) - trigger1 = Trigger.create!( + Trigger.create!( name: '001', condition: { 'ticket.action' => { @@ -611,7 +611,7 @@ Some Text' created_by_id: 1, updated_by_id: 1, ) - trigger2 = Trigger.create!( + Trigger.create!( name: '002', condition: { 'ticket.action' => { @@ -649,7 +649,7 @@ Some Text' assert_equal(ticket1.group.name, group1.name) assert_equal(ticket1.state.name, 'new') - article_inbound1 = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', diff --git a/test/unit/ticket_trigger_extended_test.rb b/test/unit/ticket_trigger_extended_test.rb index 3c6c57ada..46e16378e 100644 --- a/test/unit/ticket_trigger_extended_test.rb +++ b/test/unit/ticket_trigger_extended_test.rb @@ -7,7 +7,7 @@ class TicketTriggerExtendedTest < ActiveSupport::TestCase end test 'recursive trigger' do - trigger1 = Trigger.create!( + Trigger.create!( name: '1) set prio to 3 high', condition: { 'ticket.action' => { @@ -30,7 +30,7 @@ class TicketTriggerExtendedTest < ActiveSupport::TestCase updated_by_id: 1, ) - trigger2 = Trigger.create!( + Trigger.create!( name: '2) set state to closed', condition: { 'ticket.action' => { @@ -59,7 +59,7 @@ Subject: some new subject Some Text' - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('some new subject', ticket_p.title) assert_equal('Users', ticket_p.group.name) assert_equal('3 high', ticket_p.priority.name) @@ -69,7 +69,7 @@ Some Text' end test 'recursive trigger - loop test' do - trigger1 = Trigger.create!( + Trigger.create!( name: '1) set prio to 3 high', condition: { 'ticket.priority_id' => { @@ -91,7 +91,7 @@ Some Text' updated_by_id: 1, ) - trigger2 = Trigger.create!( + Trigger.create!( name: '2) set prio to 1 low', condition: { 'ticket.priority_id' => { @@ -113,7 +113,7 @@ Some Text' updated_by_id: 1, ) - trigger3 = Trigger.create!( + Trigger.create!( name: '3) set prio to 3 high', condition: { 'ticket.priority_id' => { @@ -138,7 +138,7 @@ Subject: some new subject Some Text' - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('some new subject', ticket_p.title) assert_equal('Users', ticket_p.group.name) assert_equal('2 normal', ticket_p.priority.name) @@ -148,7 +148,7 @@ Some Text' end test 'recursive trigger - 2 trigger will not trigger next trigger' do - trigger1 = Trigger.create!( + Trigger.create!( name: '1) set prio to 3 high', condition: { 'ticket.action' => { @@ -171,7 +171,7 @@ Some Text' updated_by_id: 1, ) - trigger2 = Trigger.create!( + Trigger.create!( name: '2) set state to open', condition: { 'ticket.action' => { @@ -194,7 +194,7 @@ Some Text' updated_by_id: 1, ) - trigger3 = Trigger.create!( + Trigger.create!( name: '3) set state to closed', condition: { 'ticket.action' => { @@ -227,7 +227,7 @@ Subject: some new subject Some Text' - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('some new subject', ticket_p.title) assert_equal('Users', ticket_p.group.name) assert_equal('3 high', ticket_p.priority.name) @@ -238,7 +238,7 @@ Some Text' end test 'recursive trigger - 2 trigger will trigger next trigger - case 1' do - trigger1 = Trigger.create!( + Trigger.create!( name: '1) set state to closed', condition: { 'ticket.action' => { @@ -265,7 +265,7 @@ Some Text' updated_by_id: 1, ) - trigger2 = Trigger.create!( + Trigger.create!( name: '2) set prio to 3 high', condition: { 'ticket.action' => { @@ -288,7 +288,7 @@ Some Text' updated_by_id: 1, ) - trigger3 = Trigger.create!( + Trigger.create!( name: '3) set state to open', condition: { 'ticket.action' => { @@ -313,7 +313,7 @@ Subject: some new subject Some Text' - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('some new subject', ticket_p.title) assert_equal('Users', ticket_p.group.name) @@ -324,7 +324,7 @@ Some Text' end test 'recursive trigger - 2 trigger will trigger next trigger - case 2' do - trigger1 = Trigger.create!( + Trigger.create!( name: '1) set prio to 3 high', condition: { 'ticket.action' => { @@ -351,7 +351,7 @@ Some Text' updated_by_id: 1, ) - trigger2 = Trigger.create!( + Trigger.create!( name: '2) set state to closed', condition: { 'ticket.action' => { @@ -378,7 +378,7 @@ Some Text' updated_by_id: 1, ) - trigger3 = Trigger.create!( + Trigger.create!( name: '3) set state to open', condition: { 'ticket.action' => { @@ -403,7 +403,7 @@ Subject: some new subject Some Text' - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string) + ticket_p, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, email_raw_string) assert_equal('some new subject', ticket_p.title) assert_equal('Users', ticket_p.group.name) @@ -464,7 +464,7 @@ Some Text' ) # trigger, move ticket created in group1 into group3 and then into group2 - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: '1 dispatch', condition: { 'ticket.action' => { @@ -490,7 +490,7 @@ Some Text' created_by_id: 1, updated_by_id: 1, ) - trigger2 = Trigger.create_or_update( + Trigger.create_or_update( name: '2 dispatch', condition: { 'ticket.action' => { @@ -528,7 +528,7 @@ Some Text' assert_equal(ticket1.group.name, group1.name) assert_equal(ticket1.state.name, 'new') - article_inbound1 = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -568,7 +568,7 @@ Some Text' test 'recursive trigger loop check' do Setting.set('ticket_trigger_recursive_max_loop', 2) - trigger0 = Trigger.create!( + Trigger.create!( name: '000', condition: { 'ticket.action' => { @@ -590,7 +590,7 @@ Some Text' created_by_id: 1, updated_by_id: 1, ) - trigger1 = Trigger.create!( + Trigger.create!( name: '001', condition: { 'ticket.action' => { @@ -612,7 +612,7 @@ Some Text' created_by_id: 1, updated_by_id: 1, ) - trigger2 = Trigger.create!( + Trigger.create!( name: '002', condition: { 'ticket.action' => { @@ -650,7 +650,7 @@ Some Text' assert_equal(ticket1.group.name, group1.name) assert_equal(ticket1.state.name, 'new') - article_inbound1 = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -690,7 +690,7 @@ Some Text' assert_equal(ticket1.group.name, group1.name) assert_equal(ticket1.state.name, 'new') - article_inbound1 = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -731,7 +731,7 @@ Some Text' updated_by_id: 1, ) - trigger1 = Trigger.create!( + Trigger.create!( name: "002 - move ticket to #{group2.name}", condition: { 'ticket.action' => { @@ -759,7 +759,7 @@ Some Text' updated_by_id: 1, ) - trigger2 = Trigger.create_or_update( + Trigger.create_or_update( name: "001 auto reply for tickets in group #{group1.name}", condition: { 'ticket.action' => { @@ -841,7 +841,7 @@ X-Zammad-Ticket-Group: #{group1.name} test 1" - ticket2, article2, user2 = Channel::EmailParser.new.process({ trusted: true }, email_raw) + ticket2, _article2, _user2 = Channel::EmailParser.new.process({ trusted: true }, email_raw) assert_equal('test 1', ticket2.title, 'ticket2.title verify') assert_equal('Group with auto responder', ticket2.group.name, 'ticket2.group verify') diff --git a/test/unit/ticket_trigger_recursive_disabled_test.rb b/test/unit/ticket_trigger_recursive_disabled_test.rb index c821af298..9d01c8dd2 100644 --- a/test/unit/ticket_trigger_recursive_disabled_test.rb +++ b/test/unit/ticket_trigger_recursive_disabled_test.rb @@ -7,7 +7,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase end test '1 basic' do - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: 'aaa loop check', condition: { 'article.subject' => { @@ -32,7 +32,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase updated_by_id: 1, ) - trigger2 = Trigger.create_or_update( + Trigger.create_or_update( name: 'auto reply', condition: { 'ticket.action' => { @@ -64,7 +64,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase updated_by_id: 1, ) - trigger3 = Trigger.create_or_update( + Trigger.create_or_update( name: 'auto tag 1', condition: { 'ticket.action' => { @@ -91,7 +91,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase updated_by_id: 1, ) - trigger4 = Trigger.create_or_update( + Trigger.create_or_update( name: 'auto tag 2', condition: { 'ticket.state_id' => { @@ -111,7 +111,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase updated_by_id: 1, ) - trigger5 = Trigger.create_or_update( + Trigger.create_or_update( name: 'not matching', condition: { 'ticket.state_id' => { @@ -130,7 +130,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase updated_by_id: 1, ) - trigger6 = Trigger.create_or_update( + Trigger.create_or_update( name: 'zzz last', condition: { 'article.subject' => { @@ -397,7 +397,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase end test '2 actions - create' do - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: 'auto reply', condition: { 'ticket.action' => { @@ -490,7 +490,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase end test '2 actions - update' do - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: 'auto reply', condition: { 'ticket.action' => { @@ -578,7 +578,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase test '3 auto replys' do roles = Role.where(name: 'Customer') - customer1 = User.create_or_update( + User.create_or_update( login: 'postmaster@example.com', firstname: 'Trigger', lastname: 'Customer1', @@ -590,7 +590,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - customer2 = User.create_or_update( + User.create_or_update( login: 'ticket-auto-reply-customer2@example.com', firstname: 'Trigger', lastname: 'Customer2', @@ -604,7 +604,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase created_by_id: 1, ) - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: 'auto reply - new ticket', condition: { 'ticket.action' => { @@ -643,7 +643,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase updated_by_id: 1, ) - trigger2 = Trigger.create_or_update( + Trigger.create_or_update( name: 'auto reply (on follow up of tickets)', condition: { 'ticket.action' => { @@ -681,7 +681,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase updated_by_id: 1, ) - trigger3 = Trigger.create_or_update( + Trigger.create_or_update( name: 'not matching', condition: { 'ticket.action' => { @@ -708,7 +708,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase # process mail without Precedence header content = File.read(Rails.root.join('test', 'data', 'ticket_trigger', 'mail1.box')) - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, content) + ticket_p, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, content) assert_equal('aaäöüßad asd', ticket_p.title) assert_equal('Users', ticket_p.group.name) @@ -732,7 +732,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase assert_equal('2 normal', ticket_p.priority.name, 'ticket_p.priority verify') assert_equal(2, ticket_p.articles.count, 'ticket_p.articles verify') - article_p = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket_p.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -752,7 +752,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase assert_equal('2 normal', ticket_p.priority.name, 'ticket_p.priority verify') assert_equal(3, ticket_p.articles.count, 'ticket_p.articles verify') - article_p = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket_p.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -772,7 +772,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase assert_equal('2 normal', ticket_p.priority.name, 'ticket_p.priority verify') assert_equal(4, ticket_p.articles.count, 'ticket_p.articles verify') - article_p = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket_p.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -803,7 +803,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase ticket_p.state = Ticket::State.lookup(name: 'open') ticket_p.save! - article_p = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket_p.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -834,21 +834,21 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase # process mail without Precedence header content = File.read(Rails.root.join('test', 'data', 'ticket_trigger', 'mail1.box')) - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, content) + ticket_p, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, content) assert_equal('new', ticket_p.state.name) assert_equal(2, ticket_p.articles.count) # process mail with Precedence header (no auto response) content = File.read(Rails.root.join('test', 'data', 'ticket_trigger', 'mail2.box')) - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, content) + ticket_p, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, content) assert_equal('new', ticket_p.state.name) assert_equal(1, ticket_p.articles.count) # process mail with abuse@ (no auto response) content = File.read(Rails.root.join('test', 'data', 'ticket_trigger', 'mail3.box')) - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, content) + ticket_p, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, content) assert_equal('new', ticket_p.state.name) assert_equal(1, ticket_p.articles.count) @@ -856,7 +856,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase test '4 has changed' do roles = Role.where(name: 'Customer') - customer1 = User.create_or_update( + User.create_or_update( login: 'postmaster@example.com', firstname: 'Trigger', lastname: 'Customer1', @@ -868,7 +868,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - customer2 = User.create_or_update( + User.create_or_update( login: 'ticket-has-changed-customer2@example.com', firstname: 'Trigger', lastname: 'Customer2', @@ -896,7 +896,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: 'owner update - to customer', condition: { 'ticket.owner_id' => { @@ -927,13 +927,12 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase # process mail without Precedence header content = File.read(Rails.root.join('test', 'data', 'ticket_trigger', 'mail1.box')) - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, content) + ticket_p, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, content) assert_equal('aaäöüßad asd', ticket_p.title) assert_equal('Users', ticket_p.group.name) assert_equal('new', ticket_p.state.name) assert_equal(1, ticket_p.articles.count) - article_p = ticket_p.articles.last Observer::Transaction.commit @@ -957,7 +956,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase assert_match(ticket_p.number, article_p.body) assert_equal('text/html', article_p.content_type) - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: 'owner update - to customer', condition: { 'ticket.owner_id' => { @@ -992,13 +991,12 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase # process mail without Precedence header content = File.read(Rails.root.join('test', 'data', 'ticket_trigger', 'mail1.box')) - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, content) + ticket_p, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, content) assert_equal('aaäöüßad asd', ticket_p.title) assert_equal('Users', ticket_p.group.name) assert_equal('new', ticket_p.state.name) assert_equal(1, ticket_p.articles.count) - article_p = ticket_p.articles.last Observer::Transaction.commit assert_equal(1, ticket_p.articles.count) @@ -1038,7 +1036,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase assert_equal('text/html', article_p.content_type) # should trigger - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: 'owner update - to customer', condition: { 'ticket.owner_id' => { @@ -1077,13 +1075,12 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase # process mail without Precedence header content = File.read(Rails.root.join('test', 'data', 'ticket_trigger', 'mail1.box')) - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, content) + ticket_p, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, content) assert_equal('aaäöüßad asd', ticket_p.title) assert_equal('Users', ticket_p.group.name) assert_equal('new', ticket_p.state.name) assert_equal(1, ticket_p.articles.count) - article_p = ticket_p.articles.last Observer::Transaction.commit assert_equal(1, ticket_p.articles.count) @@ -1122,7 +1119,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase assert_equal('text/html', article_p.content_type) # should not trigger - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: 'owner update - to customer', condition: { 'ticket.owner_id' => { @@ -1157,7 +1154,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase # process mail without Precedence header content = File.read(Rails.root.join('test', 'data', 'ticket_trigger', 'mail1.box')) - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, content) + ticket_p, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, content) assert_equal(1, ticket_p.articles.count) @@ -1172,7 +1169,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase end test '5 notify owner' do - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: 'aaa notify mail', condition: { 'ticket.state_id' => { @@ -1262,7 +1259,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase assert_equal(3, ticket1.articles.count) - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: 'aaa notify mail 2', condition: { 'ticket.state_id' => { @@ -1307,7 +1304,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase end test '6 owner auto assignment' do - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: 'aaa auto assignment', condition: { 'ticket.owner_id' => { @@ -1421,7 +1418,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase end test '6.1 owner auto assignment based on organization' do - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: 'aaa auto assignment', condition: { 'ticket.organization_id' => { @@ -1534,7 +1531,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase end test '6.2 owner auto assignment based on organization' do - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: 'aaa auto assignment', condition: { 'ticket.organization_id' => { @@ -1647,7 +1644,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase end test '7 owner auto assignment' do - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: 'aaa auto assignment', condition: { 'ticket.owner_id' => { @@ -1840,7 +1837,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase end test '8 owner auto assignment' do - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: 'aaa auto assignment', condition: { 'ticket.owner_id' => { @@ -1990,7 +1987,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase end test '9 vip priority set' do - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: 'aaa vip priority', condition: { 'customer.vip' => { @@ -2128,7 +2125,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase end test '10 owner auto assignment notify to customer' do - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: 'aaa auto assignment', condition: { 'ticket.owner_id' => { @@ -2255,7 +2252,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase end test '11 notify to customer on public note' do - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: 'aaa notify to customer on public note', condition: { 'article.internal' => { @@ -2465,7 +2462,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase end test '12 notify on owner change' do - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: 'aaa notify to customer on public note', condition: { 'ticket.owner_id' => { @@ -2694,7 +2691,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase test '1 empty condition should not create errors' do assert_raises(Exception) do - trigger_empty = Trigger.create_or_update( + Trigger.create_or_update( name: 'aaa loop check', condition: { 'ticket.number' => { @@ -2718,7 +2715,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase end test 'article_last_sender trigger -> reply_to' do - trigger = Trigger.create_or_update( + Trigger.create_or_update( name: 'auto reply', condition: { 'ticket.action' => { @@ -2775,7 +2772,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase end test 'article_last_sender trigger -> from' do - trigger = Trigger.create_or_update( + Trigger.create_or_update( name: 'auto reply', condition: { 'ticket.action' => { @@ -2831,7 +2828,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase end test 'article_last_sender trigger -> origin_by_id' do - trigger = Trigger.create_or_update( + Trigger.create_or_update( name: 'auto reply', condition: { 'ticket.action' => { @@ -2900,7 +2897,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase end test 'article_last_sender trigger -> created_by_id' do - trigger = Trigger.create_or_update( + Trigger.create_or_update( name: 'auto reply', condition: { 'ticket.action' => { @@ -2968,7 +2965,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase end test 'multiple recipients owner_id, article_last_sender(reply_to) trigger' do - trigger = Trigger.create_or_update( + Trigger.create_or_update( name: 'auto reply', condition: { 'ticket.action' => { @@ -3039,7 +3036,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase end test 'article_last_sender trigger -> invalid reply_to' do - trigger = Trigger.create_or_update( + Trigger.create_or_update( name: 'auto reply', condition: { 'ticket.action' => { @@ -3093,7 +3090,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase end test '2 loop check' do - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: 'aaa loop check', condition: { 'ticket.state_id' => { @@ -3423,7 +3420,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase }) assert_equal('invalid invalid 4', trigger1.condition['ticket.first_response_at']['value']) - trigger2 = Trigger.create_or_update( + Trigger.create_or_update( name: 'auto reply', condition: { 'ticket.action' => { @@ -3504,7 +3501,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase end test '4 tag based auto response' do - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: '100 add tag if sender 1', condition: { 'ticket.action' => { @@ -3528,7 +3525,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase updated_by_id: 1, ) - trigger2 = Trigger.create_or_update( + Trigger.create_or_update( name: '200 add tag if sender 2', condition: { 'ticket.action' => { @@ -3552,7 +3549,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase updated_by_id: 1, ) - trigger3 = Trigger.create_or_update( + Trigger.create_or_update( name: '300 auto reply', condition: { 'ticket.action' => { @@ -3695,12 +3692,12 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase assert_equal('2 normal', ticket3.priority.name, 'ticket3.priority verify') assert_equal(2, ticket3.articles.count, 'ticket3.articles verify') assert_equal([], ticket3.tag_list) - article1 = ticket3.articles.last + ticket3.articles.last end test 'article.body' do - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: 'auto reply', condition: { 'ticket.action' => { @@ -3816,7 +3813,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase assert_equal(1, ticket2.articles.count, 'ticket2.articles verify') assert_equal(%w[], ticket2.tag_list) - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: 'auto reply', condition: { 'ticket.action' => { @@ -3966,7 +3963,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase ) # multi tag trigger with changed owner - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: 'change owner', condition: { 'ticket.owner_id' => { @@ -3995,7 +3992,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase ) # single tag trigger with changed owner - trigger2 = Trigger.create_or_update( + Trigger.create_or_update( name: 'change owner', condition: { 'ticket.owner_id' => { @@ -4057,7 +4054,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase # control test - should pass # create common object tag - tag_object = Tag::Object.create_or_update(name: 'Ticket') + Tag::Object.create_or_update(name: 'Ticket') # add tag ticket1.tag_add('thisisthebestjob', agent1.id) @@ -4135,7 +4132,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase end test 'trigger auto reply with umlaut in form' do - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: 'auto reply', condition: { 'ticket.action' => { @@ -4209,7 +4206,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase end test 'trigger auto reply with 2 sender addresses in form' do - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: 'auto reply', condition: { 'ticket.action' => { @@ -4234,7 +4231,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase updated_by_id: 1, ) - ticket1, article1, user, mail = Channel::EmailParser.new.process({}, File.read(Rails.root.join('test', 'data', 'mail', 'mail065.box'))) + ticket1, _article1, _user, _mail = Channel::EmailParser.new.process({}, File.read(Rails.root.join('test', 'data', 'mail', 'mail065.box'))) assert_equal('aaäöüßad asd', ticket1.title, 'ticket1.title verify') assert_equal('Users', ticket1.group.name, 'ticket1.group verify') @@ -4250,7 +4247,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase end test 'make sure attachments should be attached with content id' do - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: 'auto reply', condition: { 'ticket.action' => { @@ -4275,7 +4272,7 @@ class TicketTriggerRecursiveDisabledTest < ActiveSupport::TestCase updated_by_id: 1, ) - ticket1, article1, user, mail = Channel::EmailParser.new.process({}, File.read(Rails.root.join('test', 'data', 'mail', 'mail065.box'))) + ticket1, _article1, _user, _mail = Channel::EmailParser.new.process({}, File.read(Rails.root.join('test', 'data', 'mail', 'mail065.box'))) assert_equal('aaäöüßad asd', ticket1.title, 'ticket1.title verify') assert_equal('Users', ticket1.group.name, 'ticket1.group verify') diff --git a/test/unit/ticket_trigger_test.rb b/test/unit/ticket_trigger_test.rb index 975953622..ca2f1d4d4 100644 --- a/test/unit/ticket_trigger_test.rb +++ b/test/unit/ticket_trigger_test.rb @@ -7,7 +7,7 @@ class TicketTriggerTest < ActiveSupport::TestCase end test '1 basic' do - trigger1 = Trigger.create!( + Trigger.create!( name: 'aaa loop check', condition: { 'article.subject' => { @@ -32,7 +32,7 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, ) - trigger2 = Trigger.create!( + Trigger.create!( name: 'auto reply', condition: { 'ticket.action' => { @@ -64,7 +64,7 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, ) - trigger3 = Trigger.create!( + Trigger.create!( name: 'auto tag 1', condition: { 'ticket.action' => { @@ -91,7 +91,7 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, ) - trigger4 = Trigger.create!( + Trigger.create!( name: 'auto tag 2', condition: { 'ticket.state_id' => { @@ -111,7 +111,7 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, ) - trigger5 = Trigger.create!( + Trigger.create!( name: 'not matching', condition: { 'ticket.state_id' => { @@ -130,7 +130,7 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, ) - trigger6 = Trigger.create!( + Trigger.create!( name: 'zzz last', condition: { 'article.subject' => { @@ -411,7 +411,7 @@ class TicketTriggerTest < ActiveSupport::TestCase end test '2 actions - create' do - trigger1 = Trigger.create!( + Trigger.create!( name: 'auto reply', condition: { 'ticket.action' => { @@ -504,7 +504,7 @@ class TicketTriggerTest < ActiveSupport::TestCase end test '2 actions - update' do - trigger1 = Trigger.create!( + Trigger.create!( name: 'auto reply', condition: { 'ticket.action' => { @@ -592,7 +592,7 @@ class TicketTriggerTest < ActiveSupport::TestCase test '3 auto replys' do roles = Role.where(name: 'Customer') - customer1 = User.create!( + User.create!( login: 'postmaster@example.com', firstname: 'Trigger', lastname: 'Customer1', @@ -604,7 +604,7 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - customer2 = User.create!( + User.create!( login: 'ticket-auto-reply-customer2@example.com', firstname: 'Trigger', lastname: 'Customer2', @@ -618,7 +618,7 @@ class TicketTriggerTest < ActiveSupport::TestCase created_by_id: 1, ) - trigger1 = Trigger.create!( + Trigger.create!( name: 'auto reply - new ticket', condition: { 'ticket.action' => { @@ -657,7 +657,7 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, ) - trigger2 = Trigger.create!( + Trigger.create!( name: 'auto reply (on follow up of tickets)', condition: { 'ticket.action' => { @@ -695,7 +695,7 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, ) - trigger3 = Trigger.create!( + Trigger.create!( name: 'not matching', condition: { 'ticket.action' => { @@ -722,7 +722,7 @@ class TicketTriggerTest < ActiveSupport::TestCase # process mail without Precedence header content = File.read(Rails.root.join('test', 'data', 'ticket_trigger', 'mail1.box')) - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, content) + ticket_p, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, content) assert_equal('aaäöüßad asd', ticket_p.title) assert_equal('Users', ticket_p.group.name) @@ -746,7 +746,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal('2 normal', ticket_p.priority.name, 'ticket_p.priority verify') assert_equal(2, ticket_p.articles.count, 'ticket_p.articles verify') - article_p = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket_p.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -766,7 +766,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal('2 normal', ticket_p.priority.name, 'ticket_p.priority verify') assert_equal(3, ticket_p.articles.count, 'ticket_p.articles verify') - article_p = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket_p.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -786,7 +786,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal('2 normal', ticket_p.priority.name, 'ticket_p.priority verify') assert_equal(4, ticket_p.articles.count, 'ticket_p.articles verify') - article_p = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket_p.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -817,7 +817,7 @@ class TicketTriggerTest < ActiveSupport::TestCase ticket_p.state = Ticket::State.lookup(name: 'open') ticket_p.save! - article_p = Ticket::Article.create!( + Ticket::Article.create!( ticket_id: ticket_p.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -848,7 +848,7 @@ class TicketTriggerTest < ActiveSupport::TestCase # process mail without Precedence header content = File.read(Rails.root.join('test', 'data', 'ticket_trigger', 'mail1.box')) - ticket_p1, article_p1, user_p1, mail = Channel::EmailParser.new.process({}, content) + ticket_p1, _article_p1, _user_p1, _mail = Channel::EmailParser.new.process({}, content) assert_not_equal(ticket_p.id, ticket_p1.id) assert_equal('new', ticket_p1.state.name) @@ -856,7 +856,7 @@ class TicketTriggerTest < ActiveSupport::TestCase # process mail with Precedence header (no auto response) content = File.read(Rails.root.join('test', 'data', 'ticket_trigger', 'mail2.box')) - ticket_p2, article_p2, user_p2, mail = Channel::EmailParser.new.process({}, content) + ticket_p2, _article_p2, _user_p2, _mail = Channel::EmailParser.new.process({}, content) assert_not_equal(ticket_p.id, ticket_p1.id) assert_not_equal(ticket_p.id, ticket_p2.id) @@ -866,7 +866,7 @@ class TicketTriggerTest < ActiveSupport::TestCase # process mail with abuse@ (no auto response) content = File.read(Rails.root.join('test', 'data', 'ticket_trigger', 'mail3.box')) - ticket_p3, article_p3, user_p3, mail = Channel::EmailParser.new.process({}, content) + ticket_p3, _article_p3, _user_p3, _mail = Channel::EmailParser.new.process({}, content) assert_not_equal(ticket_p.id, ticket_p1.id) assert_not_equal(ticket_p.id, ticket_p2.id) @@ -881,7 +881,7 @@ class TicketTriggerTest < ActiveSupport::TestCase test '4 has changed' do roles = Role.where(name: 'Customer') - customer1 = User.create!( + User.create!( login: 'postmaster@example.com', firstname: 'Trigger', lastname: 'Customer1', @@ -893,7 +893,7 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - customer2 = User.create!( + User.create!( login: 'ticket-has-changed-customer2@example.com', firstname: 'Trigger', lastname: 'Customer2', @@ -921,7 +921,7 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - trigger1 = Trigger.create!( + Trigger.create!( name: 'owner update - to customer', condition: { 'ticket.owner_id' => { @@ -952,13 +952,13 @@ class TicketTriggerTest < ActiveSupport::TestCase # process mail without Precedence header content = File.read(Rails.root.join('test', 'data', 'ticket_trigger', 'mail1.box')) - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, content) + ticket_p, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, content) assert_equal('aaäöüßad asd', ticket_p.title) assert_equal('Users', ticket_p.group.name) assert_equal('new', ticket_p.state.name) assert_equal(1, ticket_p.articles.count) - article_p = ticket_p.articles.last + ticket_p.articles.last Observer::Transaction.commit @@ -982,7 +982,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_match(ticket_p.number, article_p.body) assert_equal('text/html', article_p.content_type) - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: 'owner update - to customer', condition: { 'ticket.owner_id' => { @@ -1017,13 +1017,12 @@ class TicketTriggerTest < ActiveSupport::TestCase # process mail without Precedence header content = File.read(Rails.root.join('test', 'data', 'ticket_trigger', 'mail1.box')) - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, content) + ticket_p, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, content) assert_equal('aaäöüßad asd', ticket_p.title) assert_equal('Users', ticket_p.group.name) assert_equal('new', ticket_p.state.name) assert_equal(1, ticket_p.articles.count) - article_p = ticket_p.articles.last Observer::Transaction.commit assert_equal(1, ticket_p.articles.count) @@ -1063,7 +1062,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal('text/html', article_p.content_type) # should trigger - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: 'owner update - to customer', condition: { 'ticket.owner_id' => { @@ -1102,13 +1101,12 @@ class TicketTriggerTest < ActiveSupport::TestCase # process mail without Precedence header content = File.read(Rails.root.join('test', 'data', 'ticket_trigger', 'mail1.box')) - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, content) + ticket_p, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, content) assert_equal('aaäöüßad asd', ticket_p.title) assert_equal('Users', ticket_p.group.name) assert_equal('new', ticket_p.state.name) assert_equal(1, ticket_p.articles.count) - article_p = ticket_p.articles.last Observer::Transaction.commit assert_equal(1, ticket_p.articles.count) @@ -1147,7 +1145,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal('text/html', article_p.content_type) # should not trigger - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: 'owner update - to customer', condition: { 'ticket.owner_id' => { @@ -1182,7 +1180,7 @@ class TicketTriggerTest < ActiveSupport::TestCase # process mail without Precedence header content = File.read(Rails.root.join('test', 'data', 'ticket_trigger', 'mail1.box')) - ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, content) + ticket_p, _article_p, _user_p, _mail = Channel::EmailParser.new.process({}, content) assert_equal(1, ticket_p.articles.count) @@ -1197,7 +1195,7 @@ class TicketTriggerTest < ActiveSupport::TestCase end test '5 notify owner' do - trigger1 = Trigger.create!( + Trigger.create!( name: 'aaa notify mail', condition: { 'ticket.state_id' => { @@ -1287,7 +1285,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal(3, ticket1.articles.count) - trigger1 = Trigger.create!( + Trigger.create!( name: 'aaa notify mail 2', condition: { 'ticket.state_id' => { @@ -1332,7 +1330,7 @@ class TicketTriggerTest < ActiveSupport::TestCase end test '6 owner auto assignment' do - trigger1 = Trigger.create!( + Trigger.create!( name: 'aaa auto assignment', condition: { 'ticket.owner_id' => { @@ -1446,7 +1444,7 @@ class TicketTriggerTest < ActiveSupport::TestCase end test '6.1 owner auto assignment based on organization' do - trigger1 = Trigger.create!( + Trigger.create!( name: 'aaa auto assignment', condition: { 'ticket.organization_id' => { @@ -1559,7 +1557,7 @@ class TicketTriggerTest < ActiveSupport::TestCase end test '6.2 owner auto assignment based on organization' do - trigger1 = Trigger.create!( + Trigger.create!( name: 'aaa auto assignment', condition: { 'ticket.organization_id' => { @@ -1672,7 +1670,7 @@ class TicketTriggerTest < ActiveSupport::TestCase end test '7 owner auto assignment' do - trigger1 = Trigger.create!( + Trigger.create!( name: 'aaa auto assignment', condition: { 'ticket.owner_id' => { @@ -1865,7 +1863,7 @@ class TicketTriggerTest < ActiveSupport::TestCase end test '8 owner auto assignment' do - trigger1 = Trigger.create!( + Trigger.create!( name: 'aaa auto assignment', condition: { 'ticket.owner_id' => { @@ -2015,7 +2013,7 @@ class TicketTriggerTest < ActiveSupport::TestCase end test '9 vip priority set' do - trigger1 = Trigger.create!( + Trigger.create!( name: 'aaa vip priority', condition: { 'customer.vip' => { @@ -2153,7 +2151,7 @@ class TicketTriggerTest < ActiveSupport::TestCase end test '10 owner auto assignment notify to customer' do - trigger1 = Trigger.create!( + Trigger.create!( name: 'aaa auto assignment', condition: { 'ticket.owner_id' => { @@ -2280,7 +2278,7 @@ class TicketTriggerTest < ActiveSupport::TestCase end test '11 notify to customer on public note' do - trigger1 = Trigger.create!( + Trigger.create!( name: 'aaa notify to customer on public note', condition: { 'article.internal' => { @@ -2490,7 +2488,7 @@ class TicketTriggerTest < ActiveSupport::TestCase end test '12 notify on owner change' do - trigger1 = Trigger.create!( + Trigger.create!( name: 'aaa notify to customer on public note', condition: { 'ticket.owner_id' => { @@ -2719,7 +2717,7 @@ class TicketTriggerTest < ActiveSupport::TestCase test '1 empty condition should not create errors' do assert_raises(Exception) do - trigger_empty = Trigger.create!( + Trigger.create!( name: 'aaa loop check', condition: { 'ticket.number' => { @@ -2743,7 +2741,7 @@ class TicketTriggerTest < ActiveSupport::TestCase end test 'article_last_sender trigger -> reply_to' do - trigger = Trigger.create!( + Trigger.create!( name: 'auto reply', condition: { 'ticket.action' => { @@ -2800,7 +2798,7 @@ class TicketTriggerTest < ActiveSupport::TestCase end test 'article_last_sender trigger -> from' do - trigger = Trigger.create!( + Trigger.create!( name: 'auto reply', condition: { 'ticket.action' => { @@ -2856,7 +2854,7 @@ class TicketTriggerTest < ActiveSupport::TestCase end test 'article_last_sender trigger -> origin_by_id' do - trigger = Trigger.create!( + Trigger.create!( name: 'auto reply', condition: { 'ticket.action' => { @@ -2925,7 +2923,7 @@ class TicketTriggerTest < ActiveSupport::TestCase end test 'article_last_sender trigger -> created_by_id' do - trigger = Trigger.create!( + Trigger.create!( name: 'auto reply', condition: { 'ticket.action' => { @@ -2993,7 +2991,7 @@ class TicketTriggerTest < ActiveSupport::TestCase end test 'multiple recipients owner_id, article_last_sender(reply_to) trigger' do - trigger = Trigger.create!( + Trigger.create!( name: 'auto reply', condition: { 'ticket.action' => { @@ -3064,7 +3062,7 @@ class TicketTriggerTest < ActiveSupport::TestCase end test 'article_last_sender trigger -> invalid reply_to' do - trigger = Trigger.create!( + Trigger.create!( name: 'auto reply', condition: { 'ticket.action' => { @@ -3118,7 +3116,7 @@ class TicketTriggerTest < ActiveSupport::TestCase end test '2 loop check' do - trigger1 = Trigger.create!( + Trigger.create!( name: 'aaa loop check', condition: { 'ticket.state_id' => { @@ -3448,7 +3446,7 @@ class TicketTriggerTest < ActiveSupport::TestCase }) assert_equal('invalid invalid 4', trigger1.condition['ticket.first_response_at']['value']) - trigger2 = Trigger.create!( + Trigger.create!( name: 'auto reply', condition: { 'ticket.action' => { @@ -3529,7 +3527,7 @@ class TicketTriggerTest < ActiveSupport::TestCase end test '4 tag based auto response' do - trigger1 = Trigger.create!( + Trigger.create!( name: '100 add tag if sender 1', condition: { 'ticket.action' => { @@ -3553,7 +3551,7 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, ) - trigger2 = Trigger.create!( + Trigger.create!( name: '200 add tag if sender 2', condition: { 'ticket.action' => { @@ -3577,7 +3575,7 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, ) - trigger3 = Trigger.create!( + Trigger.create!( name: '300 auto reply', condition: { 'ticket.action' => { @@ -3720,12 +3718,12 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal('2 normal', ticket3.priority.name, 'ticket3.priority verify') assert_equal(2, ticket3.articles.count, 'ticket3.articles verify') assert_equal([], ticket3.tag_list) - article1 = ticket3.articles.last + ticket3.articles.last end test 'article.body' do - trigger1 = Trigger.create!( + Trigger.create!( name: 'auto reply', condition: { 'ticket.action' => { @@ -3841,7 +3839,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal(1, ticket2.articles.count, 'ticket2.articles verify') assert_equal(%w[], ticket2.tag_list) - trigger1 = Trigger.create_or_update( + Trigger.create_or_update( name: 'auto reply', condition: { 'ticket.action' => { @@ -3991,7 +3989,7 @@ class TicketTriggerTest < ActiveSupport::TestCase ) # multi tag trigger with changed owner - trigger1 = Trigger.create!( + Trigger.create!( name: 'change owner', condition: { 'ticket.owner_id' => { @@ -4020,7 +4018,7 @@ class TicketTriggerTest < ActiveSupport::TestCase ) # single tag trigger with changed owner - trigger2 = Trigger.create_or_update( + Trigger.create_or_update( name: 'change owner', condition: { 'ticket.owner_id' => { @@ -4082,7 +4080,7 @@ class TicketTriggerTest < ActiveSupport::TestCase # control test - should pass # create common object tag - tag_object = Tag::Object.create_or_update(name: 'Ticket') + Tag::Object.create_or_update(name: 'Ticket') # add tag ticket1.tag_add('thisisthebestjob', agent1.id) @@ -4160,7 +4158,7 @@ class TicketTriggerTest < ActiveSupport::TestCase end test 'trigger auto reply with umlaut in form' do - trigger1 = Trigger.create!( + Trigger.create!( name: 'auto reply', condition: { 'ticket.action' => { @@ -4234,7 +4232,7 @@ class TicketTriggerTest < ActiveSupport::TestCase end test 'trigger auto reply with 2 sender addresses in form' do - trigger1 = Trigger.create!( + Trigger.create!( name: 'auto reply', condition: { 'ticket.action' => { @@ -4259,7 +4257,7 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, ) - ticket1, article1, user, mail = Channel::EmailParser.new.process({}, File.read(Rails.root.join('test', 'data', 'mail', 'mail065.box'))) + ticket1, _article1, _user, _mail = Channel::EmailParser.new.process({}, File.read(Rails.root.join('test', 'data', 'mail', 'mail065.box'))) assert_equal('aaäöüßad asd', ticket1.title, 'ticket1.title verify') assert_equal('Users', ticket1.group.name, 'ticket1.group verify') @@ -4275,7 +4273,7 @@ class TicketTriggerTest < ActiveSupport::TestCase end test 'make sure attachments should be attached with content id' do - trigger1 = Trigger.create!( + Trigger.create!( name: 'auto reply', condition: { 'ticket.action' => { @@ -4300,7 +4298,7 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, ) - ticket1, article1, user, mail = Channel::EmailParser.new.process({}, File.read(Rails.root.join('test', 'data', 'mail', 'mail065.box'))) + ticket1, _article1, _user, _mail = Channel::EmailParser.new.process({}, File.read(Rails.root.join('test', 'data', 'mail', 'mail065.box'))) assert_equal('aaäöüßad asd', ticket1.title, 'ticket1.title verify') assert_equal('Users', ticket1.group.name, 'ticket1.group verify') @@ -4368,7 +4366,7 @@ class TicketTriggerTest < ActiveSupport::TestCase end test 'trigger tags and auto responder when there is an article body contains matched values' do - trigger1 = Trigger.create!( + Trigger.create!( name: 'detect message body', condition: { 'article.body' => { @@ -4438,7 +4436,7 @@ class TicketTriggerTest < ActiveSupport::TestCase end test 'trigger note and auto responder (correct order) when there is an article body contains matched values' do - trigger1 = Trigger.create!( + Trigger.create!( name: 'detect message body', condition: { 'article.body' => { @@ -4599,7 +4597,7 @@ class TicketTriggerTest < ActiveSupport::TestCase #2399 - Attached images are broken on trigger reply with #{article.body_as_html} test 'make sure auto reply using #{article.body_as_html} copies all articles image attachments as well' do # make sure that this auto reply trigger only reacts to this particular test in order not to interfer with other auto reply tests - trigger1 = Trigger.create!( + Trigger.create!( name: 'auto reply with HTML quote', condition: { 'ticket.action' => { @@ -4628,7 +4626,7 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, ) - ticket1, article1, user, mail = Channel::EmailParser.new.process({}, File.read(Rails.root.join('test', 'data', 'mail', 'mail048.box'))) + ticket1, _article1, _user, _mail = Channel::EmailParser.new.process({}, File.read(Rails.root.join('test', 'data', 'mail', 'mail048.box'))) assert_equal('AW: OTRS / Anfrage OTRS Einführung/Präsentation [Ticket#11545]', ticket1.title, 'ticket1.title verify') assert_equal(2, ticket1.articles.count, 'ticket1.articles verify') @@ -4644,7 +4642,7 @@ class TicketTriggerTest < ActiveSupport::TestCase #2399 - Attached images are broken on trigger reply with #{article.body_as_html} test 'make sure auto reply using #{article.body_as_html} does not copy any non-image attachments' do # make sure that this auto reply trigger only reacts to this particular test in order not to interfer with other auto reply tests - trigger1 = Trigger.create!( + Trigger.create!( name: 'auto reply with HTML quote', condition: { 'ticket.action' => { @@ -4673,7 +4671,7 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, ) - ticket1, article1, user, mail = Channel::EmailParser.new.process({}, File.read(Rails.root.join('test', 'data', 'mail', 'mail069.box'))) + ticket1, _article1, _user, _mail = Channel::EmailParser.new.process({}, File.read(Rails.root.join('test', 'data', 'mail', 'mail069.box'))) assert_equal('Online-apotheke. Günstigster Preis. Ohne Rezepte', ticket1.title, 'ticket1.title verify') assert_equal(2, ticket1.articles.count, 'ticket1.articles verify') diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb index 33e2bc88d..9cf76c857 100644 --- a/test/unit/user_test.rb +++ b/test/unit/user_test.rb @@ -1026,8 +1026,8 @@ class UserTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - roles = Role.where(name: 'Agent') - agent1 = User.create_or_update( + roles = Role.where(name: 'Agent') + User.create_or_update( login: "agent-default-vaild_agent_group_permission-1#{name}@example.com", firstname: 'vaild_agent_group_permission-1', lastname: "Agent#{name}",