diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index b7776694b..58570b4f9 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,6 +1,18 @@ ### Infos: -* Used Zammad version: -* Used Zammad installation source: (source, package, ...) -* Operating system: -* Browser + version: +* Used Zammad version: +* Installation method (source, package, ..): +* Operating system: +* Database + version: +* Elasticsearch version: +* Browser + version: ### Expected behavior: -* +* ### Actual behavior: -* +* ### Steps to reproduce the behavior: -* +* +Yes I'm sure this is a bug and no feature request or a general question. diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2e89ebccc..cd85b1971 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -310,7 +310,8 @@ test:integration:es_mysql: - ruby -I test/ test/controllers/search_controller_test.rb - ruby -I test/ test/integration/report_test.rb - ruby -I test/ test/controllers/form_controller_test.rb - - ruby -I test/ test/controllers/user_organization_controller_test.rb + - ruby -I test/ test/controllers/user_controller_test.rb + - ruby -I test/ test/controllers/organization_controller_test.rb - rake db:drop test:integration:es_postgresql: @@ -328,7 +329,8 @@ test:integration:es_postgresql: - ruby -I test/ test/controllers/search_controller_test.rb - ruby -I test/ test/integration/report_test.rb - ruby -I test/ test/controllers/form_controller_test.rb - - ruby -I test/ test/controllers/user_organization_controller_test.rb + - ruby -I test/ test/controllers/user_controller_test.rb + - ruby -I test/ test/controllers/organization_controller_test.rb - rake db:drop test:integration:zendesk_mysql: @@ -355,24 +357,36 @@ test:integration:zendesk_postgresql: - ruby -I test/ test/integration/zendesk_import_test.rb - rake db:drop -test:integration:otrs_5_mysql: +test:integration:otrs_6_mysql: stage: test tags: - core - mysql script: - export RAILS_ENV=test - - export IMPORT_OTRS_ENDPOINT="http://vz1109.demo.znuny.com/otrs/public.pl?Action=ZammadMigrator" + - export IMPORT_OTRS_ENDPOINT="http://vz1185.test.znuny.com/otrs/public.pl?Action=ZammadMigrator" - rake db:create - rake db:migrate - ruby -I test/ test/integration/otrs_import_test.rb - rake db:drop -test:integration:otrs_5_postgresql: +test:integration:otrs_6_postgresql: stage: test tags: - core - postgresql + script: + - export RAILS_ENV=test + - export IMPORT_OTRS_ENDPOINT="http://vz1185.test.znuny.com/otrs/public.pl?Action=ZammadMigrator" + - rake db:create + - rake db:migrate + - ruby -I test/ test/integration/otrs_import_test.rb + - rake db:drop + +test:integration:otrs_5: + stage: test + tags: + - core script: - export RAILS_ENV=test - export IMPORT_OTRS_ENDPOINT="http://vz1109.demo.znuny.com/otrs/public.pl?Action=ZammadMigrator" diff --git a/.rubocop.yml b/.rubocop.yml index f9156d529..6e91d3296 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -45,29 +45,29 @@ Style/TrailingCommaInArguments: StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas' Enabled: false -Style/SpaceInsideParens: +Layout/SpaceInsideParens: Description: 'No spaces after ( or before ).' StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-spaces-braces' Enabled: false -Style/SpaceAfterMethodName: +Layout/SpaceAfterMethodName: Description: >- Do not put a space between a method name and the opening parenthesis in a method definition. StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#parens-no-spaces' Enabled: false -Style/LeadingCommentSpace: +Layout/LeadingCommentSpace: Description: 'Comments should start with a space.' StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#hash-space' Enabled: false -Style/MethodCallParentheses: +Style/MethodCallWithoutArgsParentheses: Description: 'Do not use parentheses for method calls with no arguments.' StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-args-no-parens' Enabled: false -Style/SpaceInsideBrackets: +Layout/SpaceInsideBrackets: Description: 'No spaces after [ or before ].' StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-spaces-braces' Enabled: false @@ -83,19 +83,19 @@ Style/MethodDefParentheses: StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#method-parens' Enabled: false -Style/EmptyLinesAroundClassBody: +Layout/EmptyLinesAroundClassBody: Description: "Keeps track of empty lines around class bodies." Enabled: false -Style/EmptyLinesAroundMethodBody: +Layout/EmptyLinesAroundMethodBody: Description: "Keeps track of empty lines around method bodies." Enabled: false -Style/EmptyLinesAroundBlockBody: +Layout/EmptyLinesAroundBlockBody: Description: "Keeps track of empty lines around block bodies." Enabled: false -Style/EmptyLinesAroundModuleBody: +Layout/EmptyLinesAroundModuleBody: Description: "Keeps track of empty lines around module bodies." Enabled: false @@ -143,17 +143,29 @@ Rails/HasAndBelongsToMany: # StyleGuide: 'https://github.com/bbatsov/rails-style-guide#has-many-through' Enabled: false +Rails/SkipsModelValidations: + Description: >- + Use methods that skips model validations with caution. + See reference for more information. + Reference: 'http://guides.rubyonrails.org/active_record_validations.html#skipping-validations' + Enabled: true + Exclude: + - test/**/* + Style/ClassAndModuleChildren: Description: 'Checks style of children classes and modules.' Enabled: false -Style/FileName: +Naming/FileName: Description: 'Use snake_case for source file names.' StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#snake-case-files' Enabled: true Exclude: - 'script/websocket-server.rb' +Naming/VariableNumber: + Description: 'Use the configured style when numbering variables.' + Enabled: false # 2.0 @@ -184,8 +196,23 @@ Metrics/ModuleLength: Description: 'Avoid modules longer than 100 lines of code.' Enabled: false +Metrics/BlockLength: + Enabled: false + +Lint/RescueWithoutErrorClass: + Enabled: false + +Rails/ApplicationRecord: + Enabled: false + # TODO +Rails/HasManyOrHasOneDependent: + Enabled: false + +Style/DateTime: + Enabled: false + Style/Documentation: Description: 'Document classes and non-namespace modules.' Enabled: false @@ -193,7 +220,7 @@ Style/Documentation: Lint/UselessAssignment: Enabled: false -Style/ExtraSpacing: +Layout/ExtraSpacing: Description: 'Do not use unnecessary spacing.' Enabled: false @@ -215,4 +242,14 @@ Style/NumericPredicate: AutoCorrect: false Enabled: true Exclude: - - "**/*_spec.rb" \ No newline at end of file + - "**/*_spec.rb" + +Lint/AmbiguousBlockAssociation: + Description: >- + Checks for ambiguous block association with method when param passed without + parentheses. + StyleGuide: '#syntax' + Enabled: true + Exclude: + - "**/*_spec.rb" + - "**/*_examples.rb" diff --git a/.ruby-version b/.ruby-version index 005119baa..8e8299dcc 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.4.1 +2.4.2 diff --git a/.travis.yml b/.travis.yml index e2ba0b4fc..7602977d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ services: - mysql language: ruby rvm: - - 2.4.1 + - 2.4.2 before_install: - git fetch --unshallow - sudo apt-get -qq update @@ -62,3 +62,4 @@ script: after_success: - if [ "${DB}" = "mysql" ]; then contrib/travis-ci.org/trigger-docker-build.sh; fi - if [ "${DB}" = "mysql" ]; then contrib/travis-ci.org/trigger-docker-compose-build.sh; fi + - if [ "${DB}" = "mysql" ]; then contrib/travis-ci.org/trigger-docker-univention-build.sh; fi diff --git a/CHANGELOG.md b/CHANGELOG.md index e4ceaf451..283608e9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Change Log -## [2.2.0](https://github.com/zammad/zammad/tree/2.2.0) (2017-xx-xx) -[Full Changelog](https://github.com/zammad/zammad/compare/2.1.0...2.2.0) +## [2.4.0](https://github.com/zammad/zammad/tree/2.4.0) (2018-xx-xx) +[Full Changelog](https://github.com/zammad/zammad/compare/2.3.0...2.4.0) **Implemented enhancements:** diff --git a/Gemfile b/Gemfile index 812e6cdf9..c980c2377 100644 --- a/Gemfile +++ b/Gemfile @@ -1,111 +1,131 @@ source 'https://rubygems.org' -ruby '2.4.1' - +# core - base +ruby '2.4.2' gem 'rails', '5.1.4' -gem 'rails-observers' + +# core - rails additions gem 'activerecord-session_store' - -# Bundle edge Rails instead: -#gem 'rails', :git => 'git://github.com/rails/rails.git' - +gem 'composite_primary_keys' gem 'json' +gem 'rails-observers' -# Supported DBs +# core - application servers +gem 'puma', group: :puma +gem 'unicorn', group: :unicorn + +# core - supported ORMs gem 'activerecord-nulldb-adapter', group: :nulldb gem 'mysql2', group: :mysql gem 'pg', group: :postgres +# core - asynchrous task execution +gem 'daemons' +gem 'delayed_job_active_record' + +# core - websocket +gem 'em-websocket' +gem 'eventmachine' + +# core - password security +gem 'argon2' + +# performance - Memcached +gem 'dalli' + +# asset handling group :assets do - gem 'sass-rails' #, github: 'rails/sass-rails' + # asset handling - coffee-script gem 'coffee-rails' gem 'coffee-script-source' - gem 'sprockets' - - gem 'uglifier' + # asset handling - frontend templating gem 'eco' + + # asset handling - SASS + gem 'sass-rails' + + # asset handling - pipeline + gem 'sprockets' + gem 'uglifier' end gem 'autoprefixer-rails' +# asset handling - javascript execution for e.g. linux +gem 'execjs' +gem 'libv8' +gem 'therubyracer' + +# authentication - provider gem 'doorkeeper' gem 'oauth2' +# authentication - third party gem 'omniauth' -gem 'omniauth-oauth2' gem 'omniauth-facebook' gem 'omniauth-github' gem 'omniauth-gitlab' gem 'omniauth-google-oauth2' gem 'omniauth-linkedin-oauth2' -gem 'omniauth-twitter' gem 'omniauth-microsoft-office365' +gem 'omniauth-oauth2' +gem 'omniauth-twitter' gem 'omniauth-weibo-oauth2' -gem 'twitter' -gem 'telegramAPI' +# channels gem 'koala' -gem 'mail' -gem 'valid_email2' +gem 'telegramAPI' +gem 'twitter' + +# channels - email additions gem 'htmlentities' - +gem 'mail', '2.6.6' gem 'mime-types' +gem 'valid_email2' +# feature - business hours gem 'biz' -gem 'composite_primary_keys' -gem 'delayed_job_active_record' -gem 'daemons' - -gem 'simple-rss' - -# e. g. on linux we need a javascript execution -gem 'libv8' -gem 'execjs' -gem 'therubyracer' - -require 'erb' -require 'yaml' - -gem 'net-ldap' - -# password security -gem 'argon2' +# feature - signature diffing +gem 'diffy' +# feature - excel output gem 'writeexcel' -gem 'icalendar' -gem 'icalendar-recurrence' + +# feature - device logging gem 'browser' +# feature - iCal export +gem 'icalendar' +gem 'icalendar-recurrence' + # integrations -gem 'slack-notifier' gem 'clearbit' +gem 'net-ldap' +gem 'slack-notifier' gem 'zendesk_api' -gem 'viewpoint' -gem 'rubyntlm', git: 'https://github.com/wimm/rubyntlm.git' + +# integrations - exchange gem 'autodiscover', git: 'https://github.com/thorsteneckel/autodiscover.git' - -# event machine -gem 'eventmachine' -gem 'em-websocket' - -gem 'diffy' +gem 'rubyntlm', git: 'https://github.com/wimm/rubyntlm.git' +gem 'viewpoint' # Gems used only for develop/test and not required # in production environments by default. group :development, :test do + # test frameworks gem 'rspec-rails' gem 'test-unit' - gem 'spring' - gem 'spring-commands-rspec' + + # test DB gem 'sqlite3' # code coverage + gem 'coveralls', require: false gem 'simplecov' gem 'simplecov-rcov' - gem 'coveralls', require: false # UI tests w/ Selenium gem 'selenium-webdriver', '2.53.4' @@ -120,9 +140,9 @@ group :development, :test do gem 'guard-symlink', require: false # code QA + gem 'coffeelint' gem 'pre-commit' gem 'rubocop' - gem 'coffeelint' # changelog generation gem 'github_changelog_generator' @@ -130,17 +150,14 @@ group :development, :test do # Setting ENV for testing purposes gem 'figaro' - # Use Factory Girl for generating random test data - gem 'factory_girl_rails' + # Use Factory Bot for generating random test data + gem 'factory_bot_rails' # mock http calls gem 'webmock' end -gem 'puma', group: :puma -gem 'unicorn', group: :unicorn - -# load onw gem's +# load onw gems for development and testing purposes local_gemfile = File.join(File.dirname(__FILE__), 'Gemfile.local') if File.exist?(local_gemfile) eval_gemfile local_gemfile diff --git a/Gemfile.lock b/Gemfile.lock index 3e2981f49..6821c1c42 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -65,22 +65,22 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) arel (8.0.0) - argon2 (1.1.3) + argon2 (1.1.4) ffi (~> 1.9) ffi-compiler (~> 0.1) ast (2.3.0) - autoprefixer-rails (7.1.3) + autoprefixer-rails (7.1.6) execjs biz (1.7.0) clavius (~> 1.0) tzinfo - browser (2.5.1) + browser (2.5.2) buftok (0.2.0) builder (3.2.3) - childprocess (0.7.1) + childprocess (0.8.0) ffi (~> 1.0, >= 1.0.11) clavius (1.0.3) - clearbit (0.2.7) + clearbit (0.2.8) nestful (~> 1.1.0) coderay (1.1.2) coffee-rails (4.2.2) @@ -90,22 +90,24 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - coffeelint (1.16.0) + coffeelint (1.16.1) coffee-script execjs json - composite_primary_keys (10.0.0) + composite_primary_keys (10.0.1) activerecord (~> 5.1.0) concurrent-ruby (1.0.5) - coveralls (0.8.21) - json (>= 1.8, < 3) - simplecov (~> 0.14.1) - term-ansicolor (~> 1.3) - thor (~> 0.19.4) - tins (~> 1.6) + coveralls (0.7.1) + multi_json (~> 1.3) + rest-client + simplecov (>= 0.7) + term-ansicolor + thor crack (0.4.3) safe_yaml (~> 1.0.0) - daemons (1.2.4) + crass (1.0.3) + daemons (1.2.5) + dalli (2.7.6) delayed_job (4.1.3) activesupport (>= 3.0, < 5.2) delayed_job_active_record (4.1.2) @@ -127,15 +129,15 @@ GEM eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) equalizer (0.0.11) - erubi (1.6.1) + erubi (1.7.0) eventmachine (1.2.5) execjs (2.7.0) - factory_girl (4.8.0) + factory_bot (4.8.2) activesupport (>= 3.0.0) - factory_girl_rails (4.8.0) - factory_girl (~> 4.8.0) + factory_bot_rails (4.8.2) + factory_bot (~> 4.8.2) railties (>= 3.0.0) - faraday (0.11.0) + faraday (0.12.2) multipart-post (>= 1.2, < 3) faraday-http-cache (2.0.0) faraday (~> 0.8) @@ -154,7 +156,7 @@ GEM rainbow (>= 2.1) rake (>= 10.0) retriable (~> 2.1) - globalid (0.4.0) + globalid (0.4.1) activesupport (>= 4.2.0) guard (2.14.1) formatador (>= 0.2.4) @@ -174,20 +176,21 @@ GEM guard-symlink (0.1.1) guard guard-compat (~> 1.1) - hashdiff (0.3.6) + hashdiff (0.3.7) hashie (3.5.6) htmlentities (4.3.4) - http (2.2.2) + http (3.0.0) addressable (~> 2.3) http-cookie (~> 1.0) - http-form_data (~> 1.0.1) + http-form_data (>= 2.0.0.pre.pre2, < 3) http_parser.rb (~> 0.6.0) http-cookie (1.0.3) domain_name (~> 0.5) - http-form_data (1.0.3) + http-form_data (2.0.0) http_parser.rb (0.6.0) httpclient (2.8.3) - i18n (0.8.6) + i18n (0.9.1) + concurrent-ruby (~> 1.0) icalendar (2.4.1) icalendar-recurrence (1.1.2) icalendar (~> 2.0) @@ -210,25 +213,26 @@ GEM logging (2.2.2) little-plugger (~> 1.1) multi_json (~> 1.10) - loofah (2.0.3) + loofah (2.1.1) + crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.0.12) mail (2.6.6) mime-types (>= 1.16, < 4) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) - method_source (0.8.2) + method_source (0.9.0) mime-types (2.99.3) mini_portile2 (2.3.0) minitest (5.10.3) multi_json (1.12.2) multi_xml (0.6.0) multipart-post (2.0.0) - mysql2 (0.4.9) + mysql2 (0.4.10) naught (1.1.0) nenv (0.3.0) - nestful (1.1.1) - net-ldap (0.16.0) + nestful (1.1.3) + net-ldap (0.16.1) netrc (0.11.0) nio4r (2.1.0) nokogiri (1.8.1) @@ -246,7 +250,7 @@ GEM rack (>= 1.2, < 3) octokit (4.7.0) sawyer (~> 0.8.0, >= 0.5.3) - omniauth (1.6.1) + omniauth (1.7.1) hashie (>= 3.4.6, < 3.6.0) rack (>= 1.6.2, < 3) omniauth-facebook (4.0.0) @@ -280,24 +284,24 @@ GEM omniauth-weibo-oauth2 (0.4.5) omniauth (~> 1.5) omniauth-oauth2 (>= 1.4.0) - parser (2.4.0.0) - ast (~> 2.2) + parallel (1.12.0) + parser (2.4.0.2) + ast (~> 2.3) pg (0.21.0) pluginator (1.5.0) - power_assert (1.1.0) + power_assert (1.1.1) powerpack (0.1.1) - pre-commit (0.35.0) + pre-commit (0.37.0) pluginator (~> 1.5) - pry (0.10.4) + pry (0.11.3) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - public_suffix (3.0.0) - puma (3.10.0) + method_source (~> 0.9.0) + public_suffix (3.0.1) + puma (3.11.0) rack (2.0.3) rack-livereload (0.3.16) rack - rack-test (0.7.0) + rack-test (0.8.2) rack (>= 1.0, < 3) rails (5.1.4) actioncable (= 5.1.4) @@ -327,7 +331,7 @@ GEM rainbow (2.2.2) rake raindrops (0.19.0) - rake (12.1.0) + rake (12.3.0) rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) @@ -337,39 +341,40 @@ GEM mime-types (>= 1.16, < 3.0) netrc (~> 0.7) retriable (2.1.0) - rspec-core (3.6.0) - rspec-support (~> 3.6.0) - rspec-expectations (3.6.0) + rspec-core (3.7.0) + rspec-support (~> 3.7.0) + rspec-expectations (3.7.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) - rspec-mocks (3.6.0) + rspec-support (~> 3.7.0) + rspec-mocks (3.7.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) - rspec-rails (3.6.1) + rspec-support (~> 3.7.0) + rspec-rails (3.7.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.6.0) - rspec-expectations (~> 3.6.0) - rspec-mocks (~> 3.6.0) - rspec-support (~> 3.6.0) - rspec-support (3.6.0) - rubocop (0.42.0) - parser (>= 2.3.1.1, < 3.0) + rspec-core (~> 3.7.0) + rspec-expectations (~> 3.7.0) + rspec-mocks (~> 3.7.0) + rspec-support (~> 3.7.0) + rspec-support (3.7.0) + rubocop (0.51.0) + parallel (~> 1.10) + parser (>= 2.3.3.1, < 3.0) powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) + rainbow (>= 2.2.2, < 3.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.8.1) + ruby-progressbar (1.9.0) ruby_dep (1.5.0) rubyzip (1.2.1) safe_yaml (1.0.4) - sass (3.5.1) + sass (3.5.3) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (5.0.6) + sass-rails (5.0.7) railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) @@ -383,9 +388,8 @@ GEM rubyzip (~> 1.0) websocket (~> 1.0) shellany (0.0.1) - simple-rss (1.3.1) simple_oauth (0.3.1) - simplecov (0.14.1) + simplecov (0.15.1) docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) @@ -393,11 +397,6 @@ GEM simplecov-rcov (0.2.3) simplecov (>= 0.4.1) slack-notifier (2.3.1) - slop (3.6.0) - spring (2.0.2) - activesupport (>= 4.2) - spring-commands-rspec (1.0.4) - spring (>= 0.9.1) sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -410,26 +409,27 @@ GEM rest-client (~> 1.7, >= 1.7.3) term-ansicolor (1.6.0) tins (~> 1.0) - test-unit (3.2.5) + test-unit (3.2.6) power_assert therubyracer (0.12.3) libv8 (~> 3.16.14.15) ref - thor (0.19.4) + thor (0.20.0) thread_safe (0.3.6) tilt (2.0.8) - tins (1.15.0) - twitter (6.1.0) - addressable (~> 2.5) + tins (1.15.1) + twitter (6.2.0) + addressable (~> 2.3) buftok (~> 0.2.0) - equalizer (= 0.0.11) - faraday (~> 0.11.0) - http (~> 2.1) + equalizer (~> 0.0.11) + http (~> 3.0) + http-form_data (~> 2.0) http_parser.rb (~> 0.6.0) - memoizable (~> 0.4.2) - naught (~> 1.1) - simple_oauth (~> 0.3.1) - tzinfo (1.2.3) + memoizable (~> 0.4.0) + multipart-post (~> 2.0) + naught (~> 1.0) + simple_oauth (~> 0.3.0) + tzinfo (1.2.4) thread_safe (~> 0.1) uglifier (3.2.0) execjs (>= 0.3.0, < 3) @@ -437,10 +437,10 @@ GEM unf_ext unf_ext (0.0.7.4) unicode-display_width (1.3.0) - unicorn (5.3.0) + unicorn (5.3.1) kgio (~> 2.6) raindrops (~> 0.7) - valid_email2 (2.0.1) + valid_email2 (2.1.0) activemodel (>= 3.2) mail (~> 2.5) viewpoint (1.1.0) @@ -448,16 +448,16 @@ GEM logging nokogiri rubyntlm - webmock (3.0.1) + webmock (3.1.1) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - websocket (1.2.4) + websocket (1.2.5) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) + websocket-extensions (0.1.3) writeexcel (1.0.5) - zendesk_api (1.14.4) + zendesk_api (1.16.0) faraday (~> 0.9) hashie (>= 3.5.2, < 4.0.0) inflection @@ -482,6 +482,7 @@ DEPENDENCIES composite_primary_keys coveralls daemons + dalli delayed_job_active_record diffy doorkeeper @@ -489,7 +490,7 @@ DEPENDENCIES em-websocket eventmachine execjs - factory_girl_rails + factory_bot_rails figaro github_changelog_generator guard @@ -501,7 +502,7 @@ DEPENDENCIES json koala libv8 - mail + mail (= 2.6.6) mime-types mysql2 net-ldap @@ -528,12 +529,9 @@ DEPENDENCIES rubyntlm! sass-rails selenium-webdriver (= 2.53.4) - simple-rss simplecov simplecov-rcov slack-notifier - spring - spring-commands-rspec sprockets sqlite3 telegramAPI @@ -549,7 +547,7 @@ DEPENDENCIES zendesk_api RUBY VERSION - ruby 2.4.1p111 + ruby 2.4.2p198 BUNDLED WITH - 1.15.4 + 1.16.0 diff --git a/README.md b/README.md index e2f8578ce..030acd785 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,9 @@ Zammad is a web based open source helpdesk/customer support system with many features to manage customer communication via several channels like telephone, facebook, twitter, chat and e-mails. It is distributed under the GNU AFFERO -General Public License (AGPL) and tested on Linux, Solaris, AIX, FreeBSD, -OpenBSD and Mac OS 10.x. Do you receive many e-mails and want to answer them -with a team of agents? +General Public License (AGPL). + +Do you receive many e-mails and want to answer them with a team of agents? You're going to love Zammad! diff --git a/Rakefile b/Rakefile old mode 100644 new mode 100755 diff --git a/VERSION b/VERSION index 1f4ca9020..a13300a9a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2.x +2.4.x diff --git a/app/assets/javascripts/app/controllers/_application_controller.coffee b/app/assets/javascripts/app/controllers/_application_controller.coffee index c6fc9fa3f..ff9a2f972 100644 --- a/app/assets/javascripts/app/controllers/_application_controller.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller.coffee @@ -700,6 +700,8 @@ class App.ControllerModal extends App.Controller headPrefix: '' shown: true closeOnAnyClick: false + initalFormParams: {} + initalFormParamsIgnore: false events: 'submit form': 'submit' @@ -746,10 +748,10 @@ class App.ControllerModal extends App.Controller centerButtons: @centerButtons leftButtons: @leftButtons ) - modal.find('.modal-body').html content + modal.find('.modal-body').html(content) if !@initRenderingDone @initRenderingDone = true - @html modal + @html(modal) else @$('.modal-dialog').replaceWith(modal) @post() @@ -761,6 +763,8 @@ class App.ControllerModal extends App.Controller @el render: => + @initalFormParamsIgnore = false + if @buttonSubmit is true @buttonSubmit = 'Submit' if @buttonCancel is true @@ -775,19 +779,18 @@ class App.ControllerModal extends App.Controller if @small @el.addClass('modal--small') - @el.modal + @el.modal( keyboard: @keyboard show: true backdrop: @backdrop container: @container - .on - 'show.bs.modal': @onShow - 'shown.bs.modal': @onShown - 'hide.bs.modal': @onClose - 'hidden.bs.modal': => - @onClosed() - $('.modal').remove() - 'dismiss.bs.modal': @onCancel + ).on( + 'show.bs.modal': @localOnShow + 'shown.bs.modal': @localOnShown + 'hide.bs.modal': @localOnClose + 'hidden.bs.modal': @localOnClosed + 'dismiss.bs.modal': @localOnCancel + ) if @closeOnAnyClick @el.on('click', => @@ -797,6 +800,7 @@ class App.ControllerModal extends App.Controller close: (e) => if e e.preventDefault() + @initalFormParamsIgnore = true @el.modal('hide') formParams: => @@ -804,28 +808,50 @@ class App.ControllerModal extends App.Controller return @formParam(@container.find('.modal form')) return @formParam(@$('.modal form')) - onShow: -> + localOnShow: (e) => + @onShow(e) + + onShow: (e) -> # do nothing - onShown: => + localOnShown: (e) => + @onShown(e) + + onShown: (e) => @$('input:not([disabled]):not([type="hidden"]):not(".btn"), textarea').first().focus() + @initalFormParams = @formParams() + + localOnClose: (e) => + diff = difference(@initalFormParams, @formParams()) + if @initalFormParamsIgnore is false && !_.isEmpty(diff) + if !confirm(App.i18n.translateContent('The form content has been changed. Do you want to close it and lose your changes?')) + e.preventDefault() + return + @onClose(e) onClose: -> # do nothing - onClosed: -> + localOnClosed: (e) => + @onClosed(e) + $('.modal').remove() + + onClosed: (e) -> # do nothing - onSubmit: -> - # do nothing + localOnCancel: (e) => + @onCancel(e) - onCancel: -> + onCancel: (e) -> # do nothing cancel: (e) => @close(e) @onCancel(e) + onSubmit: (e) -> + # do nothing + submit: (e) => e.stopPropagation() e.preventDefault() diff --git a/app/assets/javascripts/app/controllers/_application_controller_form.coffee b/app/assets/javascripts/app/controllers/_application_controller_form.coffee index bc82db034..91fdcbdb1 100644 --- a/app/assets/javascripts/app/controllers/_application_controller_form.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller_form.coffee @@ -86,6 +86,9 @@ class App.ControllerForm extends App.Controller for attribute in @attributes attribute_count = attribute_count + 1 + if @isDisabled == true + attribute.disabled = true + # add item item = @formGenItem(attribute, className, fieldset, attribute_count) item.appendTo(fieldset) diff --git a/app/assets/javascripts/app/controllers/_application_controller_generic.coffee b/app/assets/javascripts/app/controllers/_application_controller_generic.coffee index 71789f94c..9b2c87cc8 100644 --- a/app/assets/javascripts/app/controllers/_application_controller_generic.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller_generic.coffee @@ -148,24 +148,26 @@ class App.ControllerGenericIndex extends App.Controller return item ) - # show description button, only if content exists - showDescription = false - if App[ @genericObject ].description && !_.isEmpty(objects) - showDescription = true + if !@table - @html App.view('generic/admin/index')( - head: @pageData.objects - notes: @pageData.notes - buttons: @pageData.buttons - menus: @pageData.menus - showDescription: showDescription - ) + # show description button, only if content exists + showDescription = false + if App[ @genericObject ].description && !_.isEmpty(objects) + showDescription = true - # show description in content if no no content exists - if _.isEmpty(objects) && App[ @genericObject ].description - description = marked(App[ @genericObject ].description) - @$('.table-overview').html(description) - return + @html App.view('generic/admin/index')( + head: @pageData.objects + notes: @pageData.notes + buttons: @pageData.buttons + menus: @pageData.menus + showDescription: showDescription + ) + + # show description in content if no no content exists + if _.isEmpty(objects) && App[ @genericObject ].description + description = marked(App[ @genericObject ].description) + @$('.table-overview').html(description) + return # append content table params = _.extend( @@ -184,7 +186,10 @@ class App.ControllerGenericIndex extends App.Controller }, @pageData.tableExtend ) - new App.ControllerTable(params) + if !@table + @table = new App.ControllerTable(params) + else + @table.update(objects: objects) edit: (id, e) => e.preventDefault() @@ -651,7 +656,7 @@ class App.Sidebar extends App.Controller '.sidebar': 'sidebars' events: - 'click .tabsSidebar-tab': 'toggleTab' + 'click .tabsSidebar-tab': 'toggleTab' 'click .tabsSidebar-close': 'toggleSidebar' 'click .sidebar-header .js-headline': 'toggleDropdown' @@ -675,26 +680,48 @@ class App.Sidebar extends App.Controller @toggleTabAction(name) render: => + itemsLocal = [] + for item in @items + itemLocal = item.sidebarItem() + if itemLocal + itemsLocal.push itemLocal + + # container localEl = $(App.view('generic/sidebar_tabs')( - items: @items + items: itemsLocal scrollbarWidth: App.Utils.getScrollBarWidth() dir: App.i18n.dir() )) - # init content callback - for item in @items - area = localEl.filter('.sidebar[data-tab="' + item.name + '"]') - if item.callback - item.callback( area.find('.sidebar-content') ) - if item.actions - new App.ActionRow( - el: area.find('.js-actions') - items: item.actions - type: 'small' - ) + # init sidebar badget + for item in itemsLocal + el = localEl.find('.tabsSidebar-tab[data-tab="' + item.name + '"]') + if item.badgeCallback + item.badgeCallback(el) + else + @badgeRender(el, item) + + # init sidebar content + for item in itemsLocal + if item.sidebarCallback + el = localEl.filter('.sidebar[data-tab="' + item.name + '"]') + item.sidebarCallback(el.find('.sidebar-content')) + if !_.isEmpty(item.sidebarActions) + new App.ActionRow( + el: el.find('.js-actions') + items: item.sidebarActions + type: 'small' + ) @html localEl + badgeRender: (el, item) => + @badgeEl = el + @badgeRenderLocal(item) + + badgeRenderLocal: (item) => + @badgeEl.html(App.view('generic/sidebar_tabs_item')(icon: item.badgeIcon)) + toggleDropdown: (e) -> e.stopPropagation() $(e.currentTarget).next('.js-actions').find('.dropdown-toggle').dropdown('toggle') @@ -1170,7 +1197,6 @@ class App.ObserverController extends App.Controller if @globalRerender @bind('ui:rerender', => @lastAttributres = undefined - console.log('aaaa', @model, @template) @maybeRender(App[@model].fullLocal(@object_id)) ) diff --git a/app/assets/javascripts/app/controllers/_application_controller_table.coffee b/app/assets/javascripts/app/controllers/_application_controller_table.coffee index 21fcab3e9..64433f28e 100644 --- a/app/assets/javascripts/app/controllers/_application_controller_table.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller_table.coffee @@ -97,6 +97,7 @@ class App.ControllerTable extends App.Controller checkBoxColWidth: 40 radioColWidth: 22 sortableColWidth: 36 + destroyColWidth: 70 elements: '.js-tableHead': 'tableHead' @@ -133,6 +134,8 @@ class App.ControllerTable extends App.Controller customOrderDirection: undefined customOrderBy: undefined + frontendTimeUpdateExecute: true + bindCol: {} bindRow: {} @@ -269,6 +272,7 @@ class App.ControllerTable extends App.Controller @currentRows = newCurrentRows @log 'debug', 'table.fullRender.contentRemoved', removePositions, addPositions @renderPager(@el, true) + @frontendTimeUpdateElement(@el) if @frontendTimeUpdateExecute is true return ['fullRender.contentRemoved', removePositions, addPositions] if newRows.length isnt @currentRows.length @@ -304,6 +308,7 @@ class App.ControllerTable extends App.Controller else @currentRows = clone(rows) container.find('.js-tableBody').html(rows) + @frontendTimeUpdateElement(container) if @frontendTimeUpdateExecute is true @renderPager(container) @@ -506,6 +511,7 @@ class App.ControllerTable extends App.Controller # get header data @headers = [] + availableWidth = @availableWidth for item in @overviewAttributes headerFound = false for attributeName, attribute of @attributesList @@ -520,7 +526,7 @@ class App.ControllerTable extends App.Controller # e.g. column: owner headerFound = true if @headerWidth[attribute.name] - attribute.displayWidth = @headerWidth[attribute.name] * @availableWidth + attribute.displayWidth = @headerWidth[attribute.name] * availableWidth else if !attribute.width attribute.displayWidth = @baseColWidth else @@ -529,7 +535,7 @@ class App.ControllerTable extends App.Controller unit = attribute.width.match(/[px|%]+/)[0] if unit is '%' - attribute.displayWidth = value / 100 * @el.width() + attribute.displayWidth = value / 100 * availableWidth else attribute.displayWidth = value @headers.push attribute @@ -538,7 +544,7 @@ class App.ControllerTable extends App.Controller if attributeName is "#{item}_id" || attributeName is "#{item}_ids" headerFound = true if @headerWidth[attribute.name] - attribute.displayWidth = @headerWidth[attribute.name] * @availableWidth + attribute.displayWidth = @headerWidth[attribute.name] * availableWidth else if !attribute.width attribute.displayWidth = @baseColWidth else @@ -547,7 +553,7 @@ class App.ControllerTable extends App.Controller unit = attribute.width.match(/[px|%]+/)[0] if unit is '%' - attribute.displayWidth = value / 100 * @el.width() + attribute.displayWidth = value / 100 * availableWidth else attribute.displayWidth = value @headers.push attribute @@ -741,8 +747,10 @@ class App.ControllerTable extends App.Controller if @availableWidth is 0 @availableWidth = @minTableWidth + availableWidth = @availableWidth + widths = @getHeaderWidths() - shrinkBy = Math.ceil (widths - @availableWidth) / @getShrinkableHeadersCount() + shrinkBy = Math.ceil (widths - availableWidth) / @getShrinkableHeadersCount() # make all cols evenly smaller @headers = _.map @headers, (col) => @@ -751,7 +759,8 @@ class App.ControllerTable extends App.Controller return col # give left-over space from rounding to last column to get to 100% - roundingLeftOver = @availableWidth - @getHeaderWidths() + roundingLeftOver = availableWidth - @getHeaderWidths() + # but only if there is something left over (will get negative when there are too many columns for each column to stay in their min width) if roundingLeftOver > 0 @headers[@headers.length - 1].displayWidth = @headers[@headers.length - 1].displayWidth + roundingLeftOver @@ -777,6 +786,9 @@ class App.ControllerTable extends App.Controller if @dndCallback widths += @sortableColWidth + if @destroy + widths += @destroyColWidth + widths setHeaderWidths: => diff --git a/app/assets/javascripts/app/controllers/_channel/email.coffee b/app/assets/javascripts/app/controllers/_channel/email.coffee index 5c92bc279..20a827462 100644 --- a/app/assets/javascripts/app/controllers/_channel/email.coffee +++ b/app/assets/javascripts/app/controllers/_channel/email.coffee @@ -478,7 +478,6 @@ class App.ChannelEmailEdit extends App.ControllerModal class App.ChannelEmailAccountWizard extends App.WizardModal elements: '.modal-body': 'body' - events: 'submit .js-intro': 'probeBasedOnIntro' 'submit .js-inbound': 'probeInbound' @@ -487,6 +486,9 @@ class App.ChannelEmailAccountWizard extends App.WizardModal 'click .js-goToSlide': 'goToSlide' 'click .js-expert': 'probeBasedOnIntro' 'click .js-close': 'hide' + inboundPassword: '' + outboundPassword: '' + passwordPlaceholder: '{{{{{{{{{{{{SECRTE_PASSWORD}}}}}}}}}}}}' constructor: -> super @@ -503,9 +505,17 @@ class App.ChannelEmailAccountWizard extends App.WizardModal if @channel @account = - inbound: @channel.options.inbound - outbound: @channel.options.outbound - meta: {} + inbound: clone(@channel.options.inbound) + outbound: clone(@channel.options.outbound) + meta: {} + + # remember passwords, do not show in ui + if @account.inbound.options && @account.inbound.options.password + @inboundPassword = @account.inbound.options.password + @account.inbound.options.password = @passwordPlaceholder + if @account.outbound.options && @account.outbound.options.password + @outboundPassword = @account.outbound.options.password + @account.outbound.options.password = @passwordPlaceholder if @container @el.addClass('modal--local') @@ -515,17 +525,17 @@ class App.ChannelEmailAccountWizard extends App.WizardModal if @channel @$('.js-goToSlide[data-slide=js-intro]').addClass('hidden') - @el.modal + @el.modal( keyboard: true show: true backdrop: true container: @container - .on + ).on( 'hidden.bs.modal': => if @callback @callback() @el.remove() - + ) if @slide @showSlide(@slide) @@ -712,6 +722,9 @@ class App.ChannelEmailAccountWizard extends App.WizardModal # get params params = @formParam(e.target) + if params.options.password is @passwordPlaceholder + params.options.password = @inboundPassword + # let backend know about the channel if @channel params.channel_id = @channel.id @@ -771,6 +784,9 @@ class App.ChannelEmailAccountWizard extends App.WizardModal params = @formParam(e.target) params['email'] = @account['meta']['email'] + if params.options.password is @passwordPlaceholder + params.options.password = @outboundPassword + if !params['email'] && @channel email_addresses = App.EmailAddress.search(filter: { channel_id: @channel.id }) if email_addresses && email_addresses[0] @@ -867,11 +883,13 @@ class App.ChannelEmailAccountWizard extends App.WizardModal class App.ChannelEmailNotificationWizard extends App.WizardModal elements: '.modal-body': 'body' - events: 'change .js-outbound [name=adapter]': 'toggleOutboundAdapter' 'submit .js-outbound': 'probleOutbound' 'click .js-close': 'hide' + inboundPassword: '' + outboundPassword: '' + passwordPlaceholder: '{{{{{{{{{{{{SECRTE_PASSWORD}}}}}}}}}}}}' constructor: -> super @@ -888,27 +906,35 @@ class App.ChannelEmailNotificationWizard extends App.WizardModal if @channel @account = - inbound: @channel.options.inbound - outbound: @channel.options.outbound + inbound: clone(@channel.options.inbound) + outbound: clone(@channel.options.outbound) + + # remember passwords, do not show in ui + if @account.inbound && @account.inbound.options && @account.inbound.options.password + @inboundPassword = @account.inbound.options.password + @account.inbound.options.password = @passwordPlaceholder + if @account.outbound && @account.outbound.options && @account.outbound.options.password + @outboundPassword = @account.outbound.options.password + @account.outbound.options.password = @passwordPlaceholder if @container @el.addClass('modal--local') @render() - @el.modal + @el.modal( keyboard: true show: true backdrop: true container: @container - .on + ).on( 'show.bs.modal': @onShow 'shown.bs.modal': @onShown 'hidden.bs.modal': => if @callback @callback() @el.remove() - + ) if @slide @showSlide(@slide) @@ -956,6 +982,9 @@ class App.ChannelEmailNotificationWizard extends App.WizardModal # get params params = @formParam(e.target) + if params.options && params.options.password is @passwordPlaceholder + params.options.password = @outboundPassword + # let backend know about the channel params.channel_id = @channel.id diff --git a/app/assets/javascripts/app/controllers/_channel/form.coffee b/app/assets/javascripts/app/controllers/_channel/form.coffee index 96cca32d3..2edaa3cdc 100644 --- a/app/assets/javascripts/app/controllers/_channel/form.coffee +++ b/app/assets/javascripts/app/controllers/_channel/form.coffee @@ -67,11 +67,15 @@ class App.ChannelForm extends App.ControllerSubContent # rebuild preview params.test = true if params.modal + @$('.js-modal').removeClass('hide') + @$('.js-inlineForm').addClass('hide') @$('.js-formInline').addClass('hide') @$('.js-formBtn').removeClass('hide') @$('.js-formBtn').ZammadForm(params) @$('.js-formBtn').text('Feedback') else + @$('.js-modal').addClass('hide') + @$('.js-inlineForm').removeClass('hide') @$('.js-formBtn').addClass('hide') @$('.js-formInline').removeClass('hide') @$('.js-formInline').ZammadForm(params) diff --git a/app/assets/javascripts/app/controllers/_integration/exchange.coffee b/app/assets/javascripts/app/controllers/_integration/exchange.coffee index c02c541ba..13ea97709 100644 --- a/app/assets/javascripts/app/controllers/_integration/exchange.coffee +++ b/app/assets/javascripts/app/controllers/_integration/exchange.coffee @@ -131,13 +131,12 @@ class Form extends App.Controller if _.isEmpty(job) @lastImport.html('') return - countDone = job.result.created + job.result.updated + job.result.unchanged + job.result.skipped + job.result.failed if !job.result.roles job.result.roles = {} for role_id, statistic of job.result.role_ids role = App.Role.find(role_id) job.result.roles[role.displayName()] = statistic - el = $(App.view('integration/exchange_last_import')(job: job, countDone: countDone)) + el = $(App.view('integration/exchange_last_import')(job: job)) @lastImport.html(el) activeDryRun: => @@ -540,34 +539,26 @@ class ConnectionWizard extends App.WizardModal @showAlert('js-error', (job.result.error || job.result.info)) return - total = 0 if job.result && _.keys(job.result).length > 0 @$('.js-preprogress').addClass('hide') @$('.js-analyzing').removeClass('hide') - analized = 0 - total = job.result.sum - for action, sum of job.result - continue if action == 'folders' - continue if action == 'sum' - analized += sum - - @$('.js-progress progress').attr('value', analized) - @$('.js-progress progress').attr('max', total) + @$('.js-progress progress').attr('value', job.result.sum) + @$('.js-progress progress').attr('max', job.result.total) if job.finished_at # reset initial state in case the back button is used @$('.js-preprogress').removeClass('hide') @$('.js-analyzing').addClass('hide') - @tryResult(job, total) + @tryResult(job) else @delay(@tryLoop, 4000) ) - tryResult: (job, total) => + tryResult: (job) => @showSlide('js-try') - el = $(App.view('integration/exchange_summary')(job: job, countDone: total)) + el = $(App.view('integration/exchange_summary')(job: job)) @el.find('.js-summary').html(el) App.Config.set( diff --git a/app/assets/javascripts/app/controllers/_integration/ldap.coffee b/app/assets/javascripts/app/controllers/_integration/ldap.coffee index cd6312a68..433b80b57 100644 --- a/app/assets/javascripts/app/controllers/_integration/ldap.coffee +++ b/app/assets/javascripts/app/controllers/_integration/ldap.coffee @@ -132,13 +132,12 @@ class Form extends App.Controller if _.isEmpty(job) @lastImport.html('') return - countDone = job.result.created + job.result.updated + job.result.unchanged + job.result.skipped + job.result.failed if !job.result.roles job.result.roles = {} for role_id, statistic of job.result.role_ids role = App.Role.find(role_id) job.result.roles[role.displayName()] = statistic - el = $(App.view('integration/ldap_last_import')(job: job, countDone: countDone)) + el = $(App.view('integration/ldap_last_import')(job: job)) @lastImport.html(el) activeDryRun: => @@ -419,7 +418,7 @@ class ConnectionWizard extends App.WizardModal if !_.isArray(user_attributes[key]) user_attributes[key] = [user_attributes[key]] user_attributes_local = - "#{@wizardConfig['user_uid']}": 'login' + 'samaccountname': 'login' length = user_attributes.source.length-1 for count in [0..length] if user_attributes.source[count] && user_attributes.dest[count] @@ -450,7 +449,7 @@ class ConnectionWizard extends App.WizardModal buildRowsUserMap: (user_attribute_map) => # show static login row - userUidDisplayValue = @wizardConfig.wizardData.backend_user_attributes[ @wizardConfig['user_uid'] ] + userUidDisplayValue = @wizardConfig.wizardData.backend_user_attributes['samaccountname'] el = [ $(App.view('integration/ldap_user_attribute_row_read_only')( @@ -459,7 +458,7 @@ class ConnectionWizard extends App.WizardModal )) ] for source, dest of user_attribute_map - continue if source == @wizardConfig['user_uid'] + continue if source == 'samaccountname' continue if !(source of @wizardConfig.wizardData.backend_user_attributes) el.push @buildRowUserAttribute(source, dest) el @@ -539,22 +538,12 @@ class ConnectionWizard extends App.WizardModal @showAlert('js-error', (job.result.error || job.result.info)) return - if job.result && job.result.sum + if job.result && job.result.total @$('.js-preprogress').addClass('hide') @$('.js-analyzing').removeClass('hide') - total = 0 - if job.result.created - total += job.result.created - if job.result.failed - total += job.result.failed - if job.result.skipped - total += job.result.skipped - if job.result.unchanged - total += job.result.unchanged - if job.result.updated - total += job.result.updated - @$('.js-progress progress').attr('value', total) - @$('.js-progress progress').attr('max', job.result.sum) + + @$('.js-progress progress').attr('value', job.result.sum) + @$('.js-progress progress').attr('max', job.result.total) if job.finished_at # reset initial state in case the back button is used @$('.js-preprogress').removeClass('hide') @@ -574,9 +563,8 @@ class ConnectionWizard extends App.WizardModal for role_id, statistic of job.result.role_ids role = App.Role.find(role_id) job.result.roles[role.displayName()] = statistic - countDone = job.result.created + job.result.updated + job.result.unchanged + job.result.skipped @showSlide('js-try') - el = $(App.view('integration/ldap_summary')(job: job, countDone: countDone)) + el = $(App.view('integration/ldap_summary')(job: job)) @el.find('.js-summary').html(el) App.Config.set( diff --git a/app/assets/javascripts/app/controllers/_settings/area_item.coffee b/app/assets/javascripts/app/controllers/_settings/area_item.coffee index c7db71eb3..877caeee0 100644 --- a/app/assets/javascripts/app/controllers/_settings/area_item.coffee +++ b/app/assets/javascripts/app/controllers/_settings/area_item.coffee @@ -32,7 +32,7 @@ class App.SettingsAreaItem extends App.Controller ) new App.ControllerForm( - el: @el.find('.form-item'), + el: @el.find('.form-item') model: { configure_attributes: @configure_attributes, className: '' } autofocus: false ) diff --git a/app/assets/javascripts/app/controllers/_settings/area_item_default_locale.coffee b/app/assets/javascripts/app/controllers/_settings/area_item_default_locale.coffee new file mode 100644 index 000000000..5d22c5a59 --- /dev/null +++ b/app/assets/javascripts/app/controllers/_settings/area_item_default_locale.coffee @@ -0,0 +1,21 @@ +class App.SettingsAreaItemDefaultLocale extends App.SettingsAreaItem + + render: => + + options = {} + locales = App.Locale.all() + for locale in locales + options[locale.locale] = locale.name + configure_attributes = [ + { name: 'locale_default', display: '', tag: 'searchable_select', null: false, class: 'input', options: options, default: @setting.state_current.value }, + ] + + @html App.view(@template)( + setting: @setting + ) + + new App.ControllerForm( + el: @el.find('.form-item') + model: { configure_attributes: configure_attributes, className: '' } + autofocus: false + ) diff --git a/app/assets/javascripts/app/controllers/_settings/area_ticket_number.coffee b/app/assets/javascripts/app/controllers/_settings/area_ticket_number.coffee index 70ccfb563..dcbd9f6f6 100644 --- a/app/assets/javascripts/app/controllers/_settings/area_ticket_number.coffee +++ b/app/assets/javascripts/app/controllers/_settings/area_ticket_number.coffee @@ -42,7 +42,7 @@ class App.SettingsAreaTicketNumber extends App.Controller number = "#{App.Config.get('ticket_hook')}#{App.Config.get('system_id')}" counter = '1' if paramsItem.min_size - minSize = parseInt(paramsItem.min_size) + minSize = parseInt(paramsItem.min_size) - "#{App.Config.get('system_id')}".length if paramsItem.checksum minSize -= 1 if minSize > 1 diff --git a/app/assets/javascripts/app/controllers/_ui_element/column_select.coffee b/app/assets/javascripts/app/controllers/_ui_element/column_select.coffee index e7ab5301e..6741b3946 100644 --- a/app/assets/javascripts/app/controllers/_ui_element/column_select.coffee +++ b/app/assets/javascripts/app/controllers/_ui_element/column_select.coffee @@ -6,24 +6,24 @@ class App.UiElement.column_select extends App.UiElement.ApplicationUiElement attribute.multiple = 'multiple' # build options list based on config - @getConfigOptionList( attribute, params ) + @getConfigOptionList(attribute, params) # build options list based on relation - @getRelationOptionList( attribute, params ) + @getRelationOptionList(attribute, params) # add null selection if needed - @addNullOption( attribute, params ) + @addNullOption(attribute, params) # sort attribute.options - @sortOptions( attribute, params ) + @sortOptions(attribute, params) # find selected/checked item of list - @selectedOptions( attribute, params ) + @selectedOptions(attribute, params) # disable item of list - @disabledOptions( attribute, params ) + @disabledOptions(attribute, params) # filter attributes - @filterOption( attribute, params ) + @filterOption(attribute, params) - new App.ColumnSelect( attribute: attribute ).element() + new App.ColumnSelect(attribute: attribute).element() diff --git a/app/assets/javascripts/app/controllers/_ui_element/richtext.coffee b/app/assets/javascripts/app/controllers/_ui_element/richtext.coffee index f3cba6f7b..387a35a8f 100644 --- a/app/assets/javascripts/app/controllers/_ui_element/richtext.coffee +++ b/app/assets/javascripts/app/controllers/_ui_element/richtext.coffee @@ -1,8 +1,7 @@ # coffeelint: disable=camel_case_classes class App.UiElement.richtext - @render: (attribute) -> - - item = $( App.view('generic/richtext')( attribute: attribute ) ) + @render: (attribute, params) -> + item = $( App.view('generic/richtext')(attribute: attribute) ) item.find('[contenteditable]').ce( mode: attribute.type maxlength: attribute.maxlength @@ -15,42 +14,42 @@ class App.UiElement.richtext new App[plugin.controller](params) if attribute.upload - item.append( $( App.view('generic/attachment')( attribute: attribute ) ) ) + @attachments = [] + item.append( $( App.view('generic/attachment')(attribute: attribute) ) ) - renderAttachment = (file) => - item.find('.attachments').append( App.view('generic/attachment_item')( - fileName: file.filename - fileSize: App.Utils.humanFileSize(file.size) - store_id: file.store_id - )) - item.on( - 'click' - "[data-id=#{file.store_id}]", (e) => - @attachments = _.filter( - @attachments, - (item) -> - return if item.id isnt file.store_id - item - ) - store_id = $(e.currentTarget).data('id') + renderFile = (file) => + item.find('.attachments').append(App.view('generic/attachment_item')(file)) + @attachments.push file - # delete attachment from storage - App.Ajax.request( - type: 'DELETE' - url: "#{App.Config.get('api_path')}/ticket_attachment_upload" - data: JSON.stringify(store_id: store_id), - processData: false - ) + if params && params.attachments + for file in params.attachments + renderFile(file) - # remove attachment from dom - element = $(e.currentTarget).closest('.attachments') - $(e.currentTarget).closest('.attachment').remove() - # empty .attachment (remove spaces) to keep css working, thanks @mrflix :-o - if element.find('.attachment').length == 0 - element.empty() + # remove items + item.find('.attachments').on('click', '.js-delete', (e) => + id = $(e.currentTarget).data('id') + @attachments = _.filter( + @attachments, + (item) -> + return if item.id.toString() is id.toString() + item ) - @attachments = [] + # delete attachment from storage + App.Ajax.request( + type: 'DELETE' + url: "#{App.Config.get('api_path')}/ticket_attachment_upload" + data: JSON.stringify(id: id), + processData: false + ) + + # remove attachment from dom + element = $(e.currentTarget).closest('.attachments') + $(e.currentTarget).closest('.attachment').remove() + if element.find('.attachment').length == 0 + element.empty() + ) + @progressBar = item.find('.attachmentUpload-progressBar') @progressText = item.find('.js-percentage') @attachmentPlaceholder = item.find('.attachmentPlaceholder') @@ -84,7 +83,6 @@ class App.UiElement.richtext # Called after received response from the server onCompleted: (response) => response = JSON.parse(response) - @attachments.push response.data @attachmentPlaceholder.removeClass('hide') @attachmentUpload.addClass('hide') @@ -93,7 +91,7 @@ class App.UiElement.richtext @progressBar.width(parseInt(0) + '%') @progressText.text('') - renderAttachment(response.data) + renderFile(response.data) item.find('input').val('') App.Log.debug 'UiElement.richtext', 'upload complete', response.data @@ -111,4 +109,5 @@ class App.UiElement.richtext ) ) App.Delay.set(u, 100, undefined, 'form_upload') + item diff --git a/app/assets/javascripts/app/controllers/_ui_element/richtext_search.coffee b/app/assets/javascripts/app/controllers/_ui_element/richtext_search.coffee new file mode 100644 index 000000000..9a5f05581 --- /dev/null +++ b/app/assets/javascripts/app/controllers/_ui_element/richtext_search.coffee @@ -0,0 +1,4 @@ +# coffeelint: disable=camel_case_classes +class App.UiElement.richtext_search + @render: (attribute) -> + $( App.view('generic/input')( attribute: attribute ) ) diff --git a/app/assets/javascripts/app/controllers/_ui_element/select_search.coffee b/app/assets/javascripts/app/controllers/_ui_element/select_search.coffee new file mode 100644 index 000000000..2b53dd6d1 --- /dev/null +++ b/app/assets/javascripts/app/controllers/_ui_element/select_search.coffee @@ -0,0 +1,35 @@ +# coffeelint: disable=camel_case_classes +class App.UiElement.select_search extends App.UiElement.ApplicationUiElement + @render: (attribute, params) -> + + # set multiple option + if attribute.multiple + attribute.multiple = 'multiple' + else + attribute.multiple = '' + + delete attribute.filter + + # build options list based on config + @getConfigOptionList(attribute, params) + + # build options list based on relation + @getRelationOptionList(attribute, params) + + # add null selection if needed + @addNullOption(attribute, params) + + # sort attribute.options + @sortOptions(attribute, params) + + # finde selected/checked item of list + @selectedOptions(attribute, params) + + # disable item of list + @disabledOptions(attribute, params) + + # filter attributes + @filterOption(attribute, params) + + # return item + $( App.view('generic/select')(attribute: attribute) ) diff --git a/app/assets/javascripts/app/controllers/_ui_element/ticket_selector.coffee b/app/assets/javascripts/app/controllers/_ui_element/ticket_selector.coffee index a88901169..f46eac253 100644 --- a/app/assets/javascripts/app/controllers/_ui_element/ticket_selector.coffee +++ b/app/assets/javascripts/app/controllers/_ui_element/ticket_selector.coffee @@ -22,9 +22,12 @@ class App.UiElement.ticket_selector '^timestamp$': ['before (absolute)', 'after (absolute)', 'before (relative)', 'after (relative)', 'within next (relative)', 'within last (relative)'] '^date$': ['before (absolute)', 'after (absolute)', 'before (relative)', 'after (relative)', 'within next (relative)', 'within last (relative)'] 'boolean$': ['is', 'is not'] + 'integer$': ['is', 'is not'] '^radio$': ['is', 'is not'] '^select$': ['is', 'is not'] + '^tree_select$': ['is', 'is not'] '^input$': ['contains', 'contains not'] + '^richtext$': ['contains', 'contains not'] '^textarea$': ['contains', 'contains not'] '^tag$': ['contains all', 'contains one', 'contains all not', 'contains one not'] @@ -34,9 +37,12 @@ class App.UiElement.ticket_selector '^timestamp$': ['before (absolute)', 'after (absolute)', 'before (relative)', 'after (relative)', 'within next (relative)', 'within last (relative)', 'has changed'] '^date$': ['before (absolute)', 'after (absolute)', 'before (relative)', 'after (relative)', 'within next (relative)', 'within last (relative)', 'has changed'] 'boolean$': ['is', 'is not', 'has changed'] + 'integer$': ['is', 'is not', 'has changed'] '^radio$': ['is', 'is not', 'has changed'] '^select$': ['is', 'is not', 'has changed'] + '^tree_select$': ['is', 'is not', 'has changed'] '^input$': ['contains', 'contains not', 'has changed'] + '^richtext$': ['contains', 'contains not', 'has changed'] '^textarea$': ['contains', 'contains not', 'has changed'] '^tag$': ['contains all', 'contains one', 'contains all not', 'contains one not'] diff --git a/app/assets/javascripts/app/controllers/agent_ticket_create.coffee b/app/assets/javascripts/app/controllers/agent_ticket_create.coffee index 617c83f0c..de43df318 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_create.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_create.coffee @@ -14,6 +14,8 @@ class App.TicketCreate extends App.Controller # define default type @default_type = 'phone-in' + @formId = App.ControllerForm.formId() + # remember split info if exists @split = '' if @ticket_id && @article_id @@ -92,6 +94,10 @@ class App.TicketCreate extends App.Controller else @$('[name="cc"]').closest('.form-group').addClass('hide') + # show notice + @$('.js-note').addClass('hide') + @$(".js-note[data-type='#{type}']").removeClass('hide') + App.TaskManager.touch(@task_key) meta: => @@ -158,7 +164,7 @@ class App.TicketCreate extends App.Controller # get data / in case also ticket data for split buildScreen: (params) => - if !params.ticket_id && !params.article_id + if _.isEmpty(params.ticket_id) && _.isEmpty(params.article_id) if !_.isEmpty(params.customer_id) @render(options: { customer_id: params.customer_id }) return @@ -173,6 +179,7 @@ class App.TicketCreate extends App.Controller data: ticket_id: params.ticket_id article_id: params.article_id + form_id: @formId processData: true success: (data, status, xhr) => @@ -194,6 +201,9 @@ class App.TicketCreate extends App.Controller else t.body = App.Utils.text2html(a.body) + # add attachments + t.attachments = data.attachments + # render page @render(options: t) ) @@ -201,23 +211,20 @@ class App.TicketCreate extends App.Controller render: (template = {}) -> # get params - params = {} + params = @prefilledParams || {} if template && !_.isEmpty(template.options) params = template.options else if App.TaskManager.get(@task_key) && !_.isEmpty(App.TaskManager.get(@task_key).state) params = App.TaskManager.get(@task_key).state + if !_.isEmpty(params['form_id']) + @formId = params['form_id'] - if params['form_id'] - @form_id = params['form_id'] - else - @form_id = App.ControllerForm.formId() - - @html App.view('agent_ticket_create')( + @html(App.view('agent_ticket_create')( head: 'New Ticket' agent: @permissionCheck('ticket.agent') admin: @permissionCheck('admin') - form_id: @form_id - ) + form_id: @formId + )) signatureChanges = (params, attribute, attributes, classname, form, ui) => if attribute && attribute.name is 'group_id' @@ -272,7 +279,7 @@ class App.TicketCreate extends App.Controller } new App.ControllerForm( el: @$('.ticket-form-top') - form_id: @form_id + form_id: @formId model: App.Ticket screen: 'create_top' events: @@ -288,14 +295,14 @@ class App.TicketCreate extends App.Controller new App.ControllerForm( el: @$('.article-form-top') - form_id: @form_id + form_id: @formId model: App.TicketArticle screen: 'create_top' params: params ) new App.ControllerForm( el: @$('.ticket-form-middle') - form_id: @form_id + form_id: @formId model: App.Ticket screen: 'create_middle' events: @@ -310,7 +317,7 @@ class App.TicketCreate extends App.Controller ) new App.ControllerForm( el: @$('.ticket-form-bottom') - form_id: @form_id + form_id: @formId model: App.Ticket screen: 'create_bottom' events: @@ -420,7 +427,7 @@ class App.TicketCreate extends App.Controller body: params.body type_id: type.id sender_id: sender.id - form_id: @form_id + form_id: @formId content_type: 'text/html' } else @@ -432,7 +439,7 @@ class App.TicketCreate extends App.Controller body: params.body type_id: type.id sender_id: sender.id - form_id: @form_id + form_id: @formId content_type: 'text/html' } diff --git a/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar.coffee b/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar.coffee index 88b151449..1d34f85d6 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar.coffee @@ -32,9 +32,7 @@ class App.TicketCreateSidebar extends App.Controller params: @params query: @query ) - item = @sidebarBackends[key].sidebarItem() - if item - @sidebarItems.push item + @sidebarItems.push @sidebarBackends[key] new App.Sidebar( el: @el diff --git a/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar_customer.coffee b/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar_customer.coffee index cbfd4e7e9..8de9ea04a 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar_customer.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar_customer.coffee @@ -1,26 +1,62 @@ class SidebarCustomer extends App.Controller sidebarItem: => return if !@permissionCheck('ticket.agent') - return if !@params.customer_id - { - head: 'Customer' - name: 'customer' - icon: 'person' - actions: [ + return if _.isEmpty(@params.customer_id) + @item = { + name: 'customer' + badgeCallback: @badgeRender + sidebarHead: 'Customer' + sidebarCallback: @showCustomer + sidebarActions: [ { title: 'Edit Customer' name: 'customer-edit' callback: @editCustomer }, ] - callback: @showCustomer } + metaBadge: (user) => + counter = '' + cssClass = '' + counter = @sidebarItemCounter(user) + + if @Config.get('ui_sidebar_open_ticket_indicator_colored') is true + if counter == 1 + cssClass = 'tabsSidebar-tab-count--warning' + if counter > 1 + cssClass = 'tabsSidebar-tab-count--danger' + + { + name: 'customer' + icon: 'person' + counterPossible: true + counter: counter + cssClass: cssClass + } + + badgeRender: (el) => + @badgeEl = el + if App.User.exists(@params.customer_id) + user = App.User.find(@params.customer_id) + @badgeRenderLocal(user) + + badgeRenderLocal: (user) => + @badgeEl.html(App.view('generic/sidebar_tabs_item')(@metaBadge(user))) + + sidebarItemCounter: (user) -> + counter = '' + if user && user.preferences && user.preferences.tickets_open + counter = user.preferences.tickets_open + counter + showCustomer: (el) => - @el = el + @elSidebar = el + return if _.isEmpty(@params.customer_id) new App.WidgetUser( - el: @el + el: @elSidebar user_id: @params.customer_id + callback: @badgeRenderLocal ) editCustomer: => @@ -32,7 +68,7 @@ class SidebarCustomer extends App.Controller title: 'Users' object: 'User' objects: 'Users' - container: @el.closest('.content') + container: @elSidebar.closest('.content') ) App.Config.set('200-Customer', SidebarCustomer, 'TicketCreateSidebar') diff --git a/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar_organization.coffee b/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar_organization.coffee index db2a9239d..de2bc6b26 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar_organization.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar_organization.coffee @@ -6,24 +6,25 @@ class SidebarOrganization extends App.Controller customer = App.User.find(@params.customer_id) @organization_id = customer.organization_id return if !@organization_id - { - head: 'Organization' + @item = { name: 'organization' - icon: 'group' - actions: [ + badgeIcon: 'group' + sidebarHead: 'Organization' + sidebarCallback: @showOrganization + sidebarActions: [ { title: 'Edit Organization' name: 'organization-edit' callback: @editOrganization }, ] - callback: @showOrganization } + @item showOrganization: (el) => - @el = el + @elSidebar = el new App.WidgetOrganization( - el: @el + el: @elSidebar organization_id: @organization_id ) @@ -35,7 +36,7 @@ class SidebarOrganization extends App.Controller title: 'Organizations' object: 'Organization' objects: 'Organizations' - container: @el.closest('.content') + container: @elSidebar.closest('.content') ) App.Config.set('300-Organization', SidebarOrganization, 'TicketCreateSidebar') diff --git a/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar_template.coffee b/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar_template.coffee index bb724bc83..318813dec 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar_template.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar_template.coffee @@ -1,13 +1,15 @@ class SidebarTemplate extends App.Controller sidebarItem: => return if !@permissionCheck('ticket.agent') - { - head: 'Templates' - name: 'template' - icon: 'templates' - actions: [] - callback: @showTemplates + @item = { + name: 'template' + badgeIcon: 'templates' + badgeCallback: @badgeRender + sidebarHead: 'Templates' + sidebarActions: [] + sidebarCallback: @showTemplates } + @item showTemplates: (el) => @el = el diff --git a/app/assets/javascripts/app/controllers/chat.coffee b/app/assets/javascripts/app/controllers/chat.coffee index 2966e3b4c..7414c4c12 100644 --- a/app/assets/javascripts/app/controllers/chat.coffee +++ b/app/assets/javascripts/app/controllers/chat.coffee @@ -35,7 +35,7 @@ class App.CustomerChat extends App.Controller active_agent_ids: [] @render() - @on 'layout-has-changed', @propagateLayoutChange + @on('layout-has-changed', @propagateLayoutChange) # update navbar on new status @bind('chat_status_agent', (data) => @@ -163,6 +163,12 @@ class App.CustomerChat extends App.Controller @title 'Customer Chat', true @navupdate '#customer_chat' + if params.session_id + callback = (session) => + @addChat(session) + App.ChatSession.full(params.session_id, callback) + @navigate '#customer_chat' + active: (state) => return @shown if state is undefined @shown = state @@ -264,10 +270,11 @@ class App.CustomerChat extends App.Controller addChat: (session) -> return if @chatWindows[session.session_id] - chat = new ChatWindow + chat = new ChatWindow( session: session removeCallback: @removeChat messageCallback: @updateNavMenu + ) @workspace.append chat.el chat.render() @@ -289,7 +296,7 @@ class App.CustomerChat extends App.Controller propagateLayoutChange: (event) => # adjust scroll position on layoutChange for session_id, chat of @chatWindows - chat.trigger 'layout-changed' + chat.trigger('layout-changed') acceptChat: => return if @windowCount() >= @maxChatWindows @@ -324,19 +331,6 @@ class App.CustomerChat extends App.Controller currentPosition: => @$('.main').scrollTop() -class CustomerChatRouter extends App.ControllerPermanent - requiredPermission: 'chat.agent' - constructor: (params) -> - super - - App.TaskManager.execute( - key: 'CustomerChat' - controller: 'CustomerChat' - params: {} - show: true - persistent: true - ) - class ChatWindow extends App.Controller className: 'chat-window' @@ -348,6 +342,9 @@ class ChatWindow extends App.Controller 'click .js-close': 'close' 'click .js-disconnect': 'disconnect' 'click .js-scrollHint': 'onScrollHintClick' + 'click .js-info': 'toggleMeta' + 'click .js-createTicket': 'ticketCreate' + 'submit .js-metaForm': 'sendMetaForm' elements: '.js-customerChatInput': 'input' @@ -355,8 +352,11 @@ class ChatWindow extends App.Controller '.js-close': 'closeButton' '.js-disconnect': 'disconnectButton' '.js-body': 'body' + '.js-meta': 'meta' + '.js-name': 'metaName' '.js-scrollHolder': 'scrollHolder' '.js-scrollHint': 'scrollHint' + '.js-metaForm': 'metaForm' sounds: message: new Audio('assets/sounds/chat_message.mp3') @@ -374,9 +374,11 @@ class ChatWindow extends App.Controller @scrollSnapTolerance = 10 # pixels @chat = App.Chat.find(@session.chat_id) - @name = "#{@chat.displayName()} ##{@session.id}" + @name = @chat.displayName() + if @session && !_.isEmpty(@session.name) + @name = @session.name - @on 'layout-change', @onLayoutChange + @on('layout-change', @onLayoutChange) @bind('chat_session_typing', (data) => return if data.session_id isnt @session.session_id @@ -413,12 +415,45 @@ class ChatWindow extends App.Controller onLayoutChange: => @scrollToBottom() - render: -> - @html App.view('customer_chat/chat_window') - name: @name + toggleMeta: => + if @meta.hasClass('hidden') + @showMeta() + else + @hideMeta() - @el.one 'transitionend', @onTransitionend - @scrollHolder.scroll @detectScrolledtoBottom + hideMeta: => + @body.removeClass('hidden') + @meta.addClass('hidden') + @sendMetaForm() + + showMeta: => + @body.addClass('hidden') + @meta.removeClass('hidden') + + sendMetaForm: (e) => + if e + e.preventDefault() + params = @formParam(@metaForm) + + App.WebSocket.send( + event:'chat_session_update' + data: + session_id: @session.session_id + name: params.name + tags: params.tags + ) + + if !_.isEmpty(params.name) + @metaName.text(params.name) + + render: -> + @html App.view('customer_chat/chat_window')( + name: @name + session: @session + ) + + @el.one('transitionend', @onTransitionend) + @scrollHolder.scroll(@detectScrolledtoBottom) # force repaint @el.prop('offsetHeight') @@ -426,18 +461,24 @@ class ChatWindow extends App.Controller # @addMessage 'Hello. My name is Roger, how can I help you?', 'agent' if @session + + # set chat to offline if state is already closed + activeChat = true + if @session.state is 'closed' + activeChat = false + if @session && @session.preferences && @session.preferences.url - @addNoticeMessage(@session.preferences.url) + @addNoticeMessage(@session.preferences.url, undefined, activeChat) if @session.messages for message in @session.messages if message.created_by_id - @addMessage message.content, 'agent' + @addMessage(message.content, 'agent', false, activeChat) else - @addMessage message.content, 'customer' + @addMessage(message.content, 'customer', false, activeChat) # send init reply - if !@session.messages || _.isEmpty(@session.messages) + if activeChat && _.isEmpty(@session.messages) preferences = @Session.get('preferences') if preferences.chat && preferences.chat.phrase phrases = preferences.chat.phrase[@session.chat_id] @@ -447,20 +488,9 @@ class ChatWindow extends App.Controller @input.html(phrase) @sendMessage(1600) - @$('.js-info').popover( - trigger: 'hover' - html: true - animation: false - delay: 0 - placement: 'bottom' - container: 'body' # place in body do prevent it from animating - title: -> - App.i18n.translateContent('Details') - content: => - App.view('customer_chat/chat_window_info')( - session: @session - ) - ) + # set chat to offline if state is already closed + if !activeChat + @goOffline() # show text module UI new App.WidgetTextModule( @@ -470,6 +500,18 @@ class ChatWindow extends App.Controller config: App.Config.all() ) + configureAttributesOutbound = [ + { name: 'name', display: 'Name', tag: 'input', null: true, }, + { name: 'tags', display: 'Tags', tag: 'tag', null: true, }, + ] + new App.ControllerForm( + el: @$('.js-metaForm') + model: + configure_attributes: configureAttributesOutbound + className: '' + params: @session + ) + focus: => @input.focus() @@ -498,7 +540,8 @@ class ChatWindow extends App.Controller @goOffline() close: => - @el.one 'transitionend', { callback: @release }, @onTransitionend + @sendMetaForm() + @el.one('transitionend', { callback: @release }, @onTransitionend) @el.removeClass('is-open') if @removeCallback @removeCallback(@session.session_id) @@ -577,7 +620,8 @@ class ChatWindow extends App.Controller ) @delay(send, delay) - @addMessage content, 'agent' + @hideMeta() + @addMessage(content, 'agent') @input.html('') updateModified: (state) => @@ -614,18 +658,19 @@ class ChatWindow extends App.Controller @messageCallback(@session.session_id) @unreadMessagesCounter = 0 - addMessage: (message, sender, isNew) => - @maybeAddTimestamp() + addMessage: (message, sender, isNew, useMaybeAddTimestamp = true) => + @maybeAddTimestamp() if useMaybeAddTimestamp @lastAddedType = sender - @body.append App.view('customer_chat/chat_message') + @body.append App.view('customer_chat/chat_message')( message: message sender: sender isNew: isNew timestamp: Date.now() + ) - @scrollToBottom showHint: true + @scrollToBottom(showHint: true) showWritingLoader: => if !@isTyping @@ -667,33 +712,37 @@ class ChatWindow extends App.Controller @lastAddedType = 'timestamp' addTimestamp: (label, time) => - @body.append App.view('customer_chat/chat_timestamp') + @body.append App.view('customer_chat/chat_timestamp')( label: label time: time + ) updateLastTimestamp: (label, time) -> @body .find('.js-timestamp') .last() - .replaceWith App.view('customer_chat/chat_timestamp') + .replaceWith App.view('customer_chat/chat_timestamp')( label: label time: time + ) - addStatusMessage: (message, args) -> - @maybeAddTimestamp() + addStatusMessage: (message, args, useMaybeAddTimestamp = true) -> + @maybeAddTimestamp() if useMaybeAddTimestamp - @body.append App.view('customer_chat/chat_status_message') + @body.append App.view('customer_chat/chat_status_message')( message: message args: args + ) @scrollToBottom() - addNoticeMessage: (message, args) -> - @maybeAddTimestamp() + addNoticeMessage: (message, args, useMaybeAddTimestamp = true) -> + @maybeAddTimestamp() if useMaybeAddTimestamp - @body.append App.view('customer_chat/chat_notice_message') + @body.append App.view('customer_chat/chat_notice_message')( message: message args: args + ) @scrollToBottom() @@ -717,6 +766,37 @@ class ChatWindow extends App.Controller else if showHint @showScrollHint() + ticketCreate: (e) => + e.preventDefault() + + id = Math.floor( Math.random() * 99999 ) + @navigate "#ticket/create/id/#{id}" + + # cleanup params + fqdn = App.Config.get('fqdn') + http_type = App.Config.get('http_type') + url = '' + session = @session + + # in case we do not have a model, create one + if session && !session.uiUrl + session = new App.ChatSession(session) + if session && session.uiUrl + url = session.uiUrl() + + clean_params = + id: id + prefilledParams: + body: "#{http_type}://#{fqdn}/#{url}" + title: 'Chat' + + App.TaskManager.execute( + key: "TicketCreateScreen-#{id}" + controller: 'TicketCreate' + params: clean_params + show: true + ) + class Setting extends App.ControllerModal buttonClose: true buttonCancel: true @@ -784,6 +864,24 @@ class Setting extends App.ControllerModal msg: App.i18n.translateContent(data.message) ) +class CustomerChatRouter extends App.ControllerPermanent + requiredPermission: 'chat.agent' + constructor: (params) -> + super + + # cleanup params + clean_params = + session_id: params.session_id + + App.TaskManager.execute( + key: 'CustomerChat' + controller: 'CustomerChat' + params: clean_params + show: true + persistent: true + ) + App.Config.set('customer_chat', CustomerChatRouter, 'Routes') +App.Config.set('customer_chat/session/:session_id', CustomerChatRouter, 'Routes') App.Config.set('CustomerChat', { controller: 'CustomerChat', permission: ['chat.agent'] }, 'permanentTask') App.Config.set('CustomerChat', { prio: 1200, parent: '', name: 'Customer Chat', target: '#customer_chat', key: 'CustomerChat', shown: false, permission: ['chat.agent'], class: 'chat' }, 'NavBar') diff --git a/app/assets/javascripts/app/controllers/getting_started.coffee b/app/assets/javascripts/app/controllers/getting_started.coffee index 8c2fbb71d..de73f124e 100644 --- a/app/assets/javascripts/app/controllers/getting_started.coffee +++ b/app/assets/javascripts/app/controllers/getting_started.coffee @@ -337,11 +337,9 @@ class Base extends App.WizardFullScreen @hideAlerts() @disable(e) - # get params @params = @formParam(e.target) - - # add logo @params.logo = @logoPreview.attr('src') + @params.locale_default = App.i18n.detectBrowserLocale() store = (logoResizeDataUrl) => @params.logo_resize = logoResizeDataUrl @@ -354,7 +352,7 @@ class Base extends App.WizardFullScreen success: (data, status, xhr) => if data.result is 'ok' for key, value of data.settings - App.Config.set( key, value ) + App.Config.set(key, value) if App.Config.get('system_online_service') @navigate 'getting_started/channel/email_pre_configured' else diff --git a/app/assets/javascripts/app/controllers/idoit_object_selector.coffee b/app/assets/javascripts/app/controllers/idoit_object_selector.coffee index d2b7f2065..2a7053e50 100644 --- a/app/assets/javascripts/app/controllers/idoit_object_selector.coffee +++ b/app/assets/javascripts/app/controllers/idoit_object_selector.coffee @@ -3,6 +3,7 @@ class App.IdoitObjectSelector extends App.ControllerModal buttonCancel: true buttonSubmit: true head: 'i-doit' + lastSearchTermEmpty: false content: -> @ajax( @@ -44,16 +45,24 @@ class App.IdoitObjectSelector extends App.ControllerModal '' search: (filter) => + if _.isEmpty(filter.type) && _.isEmpty(filter.title) + @lastSearchTermEmpty = true + @renderResult() + return + if _.isEmpty(filter.type) + delete filter.type if _.isEmpty(filter.title) delete filter.title else filter.title = "%#{filter.title}%" + @lastSearchTermEmpty = false @ajax( id: 'idoit-object-selector' type: 'POST' url: "#{@apiPath}/integration/idoit" data: JSON.stringify(method: 'cmdb.objects', filter: filter) success: (data, status, xhr) => + return if @lastSearchTermEmpty @renderResult(data.response.result) error: (xhr, status, error) => diff --git a/app/assets/javascripts/app/controllers/import_zendesk.coffee b/app/assets/javascripts/app/controllers/import_zendesk.coffee index 1858adde1..c49004230 100644 --- a/app/assets/javascripts/app/controllers/import_zendesk.coffee +++ b/app/assets/javascripts/app/controllers/import_zendesk.coffee @@ -154,35 +154,35 @@ class Index extends App.ControllerContent processData: true success: (data, status, xhr) => - if data.result is 'import_done' - window.location.reload() - return - - if data.result is 'error' - @$('.js-error').removeClass('hide') - @$('.js-error').html(App.i18n.translateContent(data.message)) - else - @$('.js-error').addClass('hide') - - if data.message is 'not running' && @updateMigrationDisplayLoop > 16 + if _.isEmpty(data.result) && @updateMigrationDisplayLoop > 16 @$('.js-error').removeClass('hide') @$('.js-error').html(App.i18n.translateContent('Background process did not start or has not finished! Please contact your support.')) return - if data.result is 'in_progress' - for key, item of data.data - if item.done > item.total - item.done = item.total + if !_.isEmpty(data.result['error']) + @$('.js-error').removeClass('hide') + @$('.js-error').html(App.i18n.translateContent(data.result['error'])) + else + @$('.js-error').addClass('hide') - if key == 'Ticket' && item.total >= 1000 + if !_.isEmpty(data.finished_at) && _.isEmpty(data.result['error']) + window.location.reload() + return + + if !_.isEmpty(data.result) + for model, stats of data.result + if stats.sum > stats.total + stats.sum = stats.total + + if model == 'Ticket' && stats.total >= 1000 @ticketCountInfo.removeClass('hide') - element = @$('.js-' + key.toLowerCase() ) - element.find('.js-done').text(item.done) - element.find('.js-total').text(item.total) - element.find('progress').attr('max', item.total ) - element.find('progress').attr('value', item.done ) - if item.total <= item.done + element = @$('.js-' + model.toLowerCase() ) + element.find('.js-done').text(stats.sum) + element.find('.js-total').text(stats.total) + element.find('progress').attr('max', stats.total ) + element.find('progress').attr('value', stats.sum ) + if stats.total <= stats.sum element.addClass('is-done') else element.removeClass('is-done') diff --git a/app/assets/javascripts/app/controllers/layout_ref.coffee b/app/assets/javascripts/app/controllers/layout_ref.coffee index f4dc268e7..07ee4bafa 100644 --- a/app/assets/javascripts/app/controllers/layout_ref.coffee +++ b/app/assets/javascripts/app/controllers/layout_ref.coffee @@ -349,7 +349,7 @@ class LayoutRefCommunicationReply extends App.ControllerContent file = @uploadQueue.shift() # console.log "working of", file, "from", @uploadQueue - @fakeUpload file.name, file.size, @workOfUploadQueue + @fakeUpload(file.name, file.size, @workOfUploadQueue) humanFileSize: (size) -> i = Math.floor( Math.log(size) / Math.log(1024) ) @@ -363,27 +363,27 @@ class LayoutRefCommunicationReply extends App.ControllerContent @attachmentPlaceholder.removeClass('hide') @attachmentUpload.addClass('hide') - fakeUpload: (fileName, fileSize, callback) -> + fakeUpload: (filename, size, callback) -> @attachmentPlaceholder.addClass('hide') @attachmentUpload.removeClass('hide') progress = 0 - duration = fileSize / 1024 + duration = size / 1024 for i in [0..100] setTimeout @updateUploadProgress, i*duration/100 , i setTimeout (=> callback() - @renderAttachment(fileName, fileSize) + @renderAttachment(filename, size) ), duration - renderAttachment: (fileName, fileSize) => - @attachments.push([fileName, fileSize]) - @attachmentsHolder.append App.view('generic/attachment_item') - fileName: fileName - fileSize: @humanFileSize(fileSize) - + renderAttachment: (filename, size) => + @attachments.push([filename, size]) + @attachmentsHolder.append(App.view('generic/attachment_item') + filename: filename + size: @humanFileSize(size) + ) App.Config.set( 'layout_ref/communication_reply/:content', LayoutRefCommunicationReply, 'Routes' ) @@ -2121,7 +2121,7 @@ class TwitterConversationRef extends App.ControllerContent open: 88 closed: 20 - maxTextLength: 140 + maxTextLength: 280 warningTextLength: 10 constructor: -> diff --git a/app/assets/javascripts/app/controllers/overview.coffee b/app/assets/javascripts/app/controllers/overview.coffee index 3a8fae430..377328750 100644 --- a/app/assets/javascripts/app/controllers/overview.coffee +++ b/app/assets/javascripts/app/controllers/overview.coffee @@ -23,17 +23,22 @@ class Index extends App.ControllerSubContent ] container: @el.closest('.content') large: true - dndCallback: => + dndCallback: (e, item) => items = @el.find('table > tbody > tr') - order = [] + prios = [] prio = 0 for item in items prio += 1 id = $(item).data('id') - overview = App.Overview.find(id) - if overview.prio isnt prio - overview.prio = prio - overview.save() + prios.push [id, prio] + + @ajax( + id: 'overview_prio' + type: 'POST' + url: "#{@apiPath}/overviews_prio" + processData: true + data: JSON.stringify(prios: prios) + ) ) App.Config.set('Overview', { prio: 2300, name: 'Overviews', parent: '#manage', target: '#manage/overviews', controller: Index, permission: ['admin.overview'] }, 'NavBarAdmin') diff --git a/app/assets/javascripts/app/controllers/report.coffee b/app/assets/javascripts/app/controllers/report.coffee index 90c3c9d1f..c8cc04620 100644 --- a/app/assets/javascripts/app/controllers/report.coffee +++ b/app/assets/javascripts/app/controllers/report.coffee @@ -108,33 +108,40 @@ class Graph extends App.ControllerContent @render() - render: => + update: (data) => - update = (data) => + # show only selected lines + dataNew = {} + for key, value of data.data + if @params.backendSelected[key] is true + dataNew[key] = value + @ui.storeParams() - # show only selected lines - dataNew = {} - for key, value of data.data - if @params.backendSelected[key] is true - dataNew[key] = value - @ui.storeParams() + if !@lastNewData + @lastNewData = {} - if !@lastNewData - @lastNewData = {} + return if @lastNewData && JSON.stringify(dataNew) is JSON.stringify(@lastNewData) + @lastNewData = dataNew - return if @lastNewData && JSON.stringify(dataNew) is JSON.stringify(@lastNewData) - @lastNewData = dataNew - - @draw(dataNew) - t = new Date - @el.find('#download-chart').html(t.toString()) - new Download( + @draw(dataNew) + t = new Date + @el.find('#download-chart').html(t.toString()) + if @downloadWidget + @downloadWidget.update( + config: @config + params: @params + ui: @ui + ) + else + @downloadWidget = new Download( el: @el.find('.js-dataDownload') config: @config params: @params ui: @ui ) + render: => + url = "#{@apiPath}/reports/generate" interval = 5 * 60000 if @params.timeRange is 'year' @@ -142,9 +149,9 @@ class Graph extends App.ControllerContent if @params.timeRange is 'month' interval = 60000 if @params.timeRange is 'week' - interval = 40000 + interval = 50000 if @params.timeRange is 'day' - interval = 20000 + interval = 30000 if @params.timeRange is 'realtime' interval = 10000 @@ -164,7 +171,7 @@ class Graph extends App.ControllerContent ) processData: true success: (data) => - update(data) + @update(data) @delay(@render, interval, 'report-update', 'page') ) @@ -215,7 +222,7 @@ class Graph extends App.ControllerContent class Download extends App.Controller events: - 'click .js-dataDownloadBackendSelector': 'tableUpdate' + 'click .js-dataDownloadBackendSelector': 'selectBackend' constructor: (data) -> @@ -225,7 +232,24 @@ class Download extends App.Controller super @render() - render: -> + selectBackend: (e) => + e.preventDefault() + @el.find('.js-dataDownloadBackendSelector').parent().removeClass('active') + $(e.target).parent().addClass('active') + @profileSelectedId = $(e.target).data('profile-id') + @params.downloadBackendSelected = $(e.target).data('backend') + @ui.storeParams() + @table = false + @render() + + update: => + @render() + + render: => + + if !@contentRendered + @contentRendered = true + @html(App.view('report/download_content')()) reports = [] @@ -244,44 +268,84 @@ class Download extends App.Controller @profileSelectedId = key profiles.push App.ReportProfile.find(key) - @html App.view('report/download_header')( + downloadHeaderHtml = App.view('report/download_header')( reports: reports profiles: profiles downloadBackendSelected: @params.downloadBackendSelected metric: @config.metric[@params.metric] ) + if downloadHeaderHtml isnt @downloadHeaderHtml + @el.find('.js-dataDownloadHeader').html(downloadHeaderHtml) + @downloadHeaderHtml = downloadHeaderHtml @tableUpdate() - tableUpdate: (e) => - if e - e.preventDefault() - @el.find('.js-dataDownloadBackendSelector').parent().removeClass('active') - $(e.target).parent().addClass('active') - @profileSelectedId = $(e.target).data('profile-id') - @params.downloadBackendSelected = $(e.target).data('backend') - @ui.storeParams() + tableRender: (tickets, count) => + if _.isEmpty(tickets) + @$('.js-dataDownloadButton').html('') + @$('.js-dataDownloadTable').html('') + return - table = (tickets, count) => - url = '#ticket/zoom/' - if App.Config.get('import_mode') - url = App.Config.get('import_otrs_endpoint') + '/index.pl?Action=AgentTicketZoom;TicketID=' - if _.isEmpty(tickets) - @el.find('.js-dataDownloadTable').html('') - else - profile_id = 0 - for key, value of @params.profileSelected - if value - profile_id = key - downloadUrl = "#{@apiPath}/reports/sets?sheet=true;metric=#{@params.metric};year=#{@params.year};month=#{@params.month};week=#{@params.week};day=#{@params.day};timeRange=#{@params.timeRange};profile_id=#{profile_id};downloadBackendSelected=#{@params.downloadBackendSelected}" - html = App.view('report/download_list')( - tickets: tickets - count: count - url: url - download: downloadUrl - ) - @el.find('.js-dataDownloadTable').html(html) + profile_id = 0 + for key, value of @params.profileSelected + if value + profile_id = key + downloadUrl = "#{@apiPath}/reports/sets?sheet=true;metric=#{@params.metric};year=#{@params.year};month=#{@params.month};week=#{@params.week};day=#{@params.day};timeRange=#{@params.timeRange};profile_id=#{profile_id};downloadBackendSelected=#{@params.downloadBackendSelected}" + @$('.js-dataDownloadButton').html(App.view('report/download_button')( + count: count + downloadUrl: downloadUrl + )) + openTicket = (id,e) => + ticket = App.Ticket.findNative(id) + @navigate ticket.uiUrl() + callbackTicketTitleAdd = (value, object, attribute, attributes) -> + attribute.title = object.title + value + callbackLinkToTicket = (value, object, attribute, attributes) -> + attribute.link = object.uiUrl() + value + callbackIconHeader = (headers) -> + attribute = + name: 'icon' + display: '' + translation: false + width: '28px' + displayWidth:28 + unresizable: true + headers.unshift(0) + headers[0] = attribute + headers + callbackIcon = (value, object, attribute, header) -> + value = ' ' + attribute.class = object.iconClass() + attribute.link = '' + attribute.title = object.iconTitle() + value + + params = + el: @el.find('.js-dataDownloadTable') + model: App.Ticket + objects: tickets + overviewAttributes: ['number', 'title', 'state', 'group', 'created_at'] + bindRow: + events: + 'click': openTicket + callbackHeader: [ callbackIconHeader ] + callbackAttributes: + icon: + [ callbackIcon ] + title: + [ callbackLinkToTicket, callbackTicketTitleAdd ] + number: + [ callbackLinkToTicket, callbackTicketTitleAdd ] + + if !@table + @table = new App.ControllerTable(params) + else + @table.update(objects: tickets) + + tableUpdate: => @ajax( id: 'report_download' type: 'POST' @@ -298,15 +362,14 @@ class Download extends App.Controller downloadBackendSelected: @params.downloadBackendSelected ) processData: true - success: (data) -> + success: (data) => App.Collection.loadAssets(data.assets) ticket_collection = [] if data.ticket_ids for record_id in data.ticket_ids - ticket = App.Ticket.fullLocal( record_id ) + ticket = App.Ticket.fullLocal(record_id) ticket_collection.push ticket - - table(ticket_collection, data.count) + @tableRender(ticket_collection, data.count) ) class TimeRangePicker extends App.Controller diff --git a/app/assets/javascripts/app/controllers/search.coffee b/app/assets/javascripts/app/controllers/search.coffee index 9a6f45052..67e9c009a 100644 --- a/app/assets/javascripts/app/controllers/search.coffee +++ b/app/assets/javascripts/app/controllers/search.coffee @@ -79,6 +79,7 @@ class App.Search extends App.Controller @tabs = [] for model in App.Config.get('models_searchable') + model = model.replace(/::/, '') tab = name: model model: model diff --git a/app/assets/javascripts/app/controllers/ticket_customer.coffee b/app/assets/javascripts/app/controllers/ticket_customer.coffee index edb5df0c0..713761a10 100644 --- a/app/assets/javascripts/app/controllers/ticket_customer.coffee +++ b/app/assets/javascripts/app/controllers/ticket_customer.coffee @@ -6,7 +6,7 @@ class App.TicketCustomer extends App.ControllerModal content: -> configure_attributes = [ - { name: 'customer_id', display: 'Customer', tag: 'user_autocompletion', null: false, placeholder: 'Enter Person or Organization/Company', minLengt: 2, disableCreateObject: true }, + { name: 'customer_id', display: 'Customer', tag: 'user_autocompletion', null: false, placeholder: 'Enter Person or Organization/Company', minLengt: 2, disableCreateObject: false }, ] controller = new App.ControllerForm( model: @@ -18,8 +18,19 @@ class App.TicketCustomer extends App.ControllerModal onSubmit: (e) => params = @formParam(e.target) - @customer_id = params['customer_id'] + ticket = App.Ticket.find(@ticket_id) + ticket.customer_id = params['customer_id'] + errors = ticket.validate() + if !_.isEmpty(errors) + @log 'error', errors + @formValidate( + form: e.target + errors: errors + ) + return + + @customer_id = params['customer_id'] callback = => # close modal diff --git a/app/assets/javascripts/app/controllers/ticket_overview.coffee b/app/assets/javascripts/app/controllers/ticket_overview.coffee index de9d4df17..40f9b7a7e 100644 --- a/app/assets/javascripts/app/controllers/ticket_overview.coffee +++ b/app/assets/javascripts/app/controllers/ticket_overview.coffee @@ -956,7 +956,6 @@ class Table extends App.Controller ticketListShow = [] for ticket in tickets ticketListShow.push App.Ticket.find(ticket.id) - console.log('overview', overview) @overview = App.Overview.find(overview.id) @table.update( overviewAttributes: @overview.view.s diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.coffee index 094a15f30..d05db0448 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom.coffee @@ -461,6 +461,7 @@ class App.TicketZoom extends App.Controller ui: @ highligher: @highligher ticket_article_ids: @ticket_article_ids + form_id: @form_id ) new App.TicketCustomerAvatar( diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_action/delete.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_action/delete.coffee new file mode 100644 index 000000000..7436c15f6 --- /dev/null +++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_action/delete.coffee @@ -0,0 +1,34 @@ +class Delete + @action: (actions, ticket, article, ui) -> + return actions if ui.permissionCheck('ticket.customer') + + if article.type.name is 'note' + user = undefined + if App.Session.get('id') == article.created_by_id + user = App.User.find(App.Session.get('id')) + if user.permission('ticket.agent') + actions.push { + name: 'delete' + type: 'delete' + icon: 'trash' + href: '#' + } + + actions + + @perform: (articleContainer, type, ticket, article, ui) -> + return true if type isnt 'delete' + + callback = -> + article = App.TicketArticle.find(article.id) + article.destroy() + + new App.ControllerConfirm( + message: 'Sure?' + callback: callback + container: ui.el.closest('.content') + ) + + true + +App.Config.set('900-Delete', Delete, 'TicketZoomArticleAction') diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_action/email_reply.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_action/email_reply.coffee new file mode 100644 index 000000000..f233d2bb2 --- /dev/null +++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_action/email_reply.coffee @@ -0,0 +1,203 @@ +class EmailReply extends App.Controller + @action: (actions, ticket, article, ui) -> + return actions if ui.permissionCheck('ticket.customer') + + group = ticket.group + if group.email_address_id && (article.type.name is 'email' || article.type.name is 'web') + actions.push { + name: 'reply' + type: 'emailReply' + icon: 'reply' + href: '#' + } + recipients = [] + if article.sender.name is 'Customer' + if article.from + localRecipients = emailAddresses.parseAddressList(article.from) + if localRecipients + recipients = recipients.concat localRecipients + if article.to + localRecipients = emailAddresses.parseAddressList(article.to) + if localRecipients + recipients = recipients.concat localRecipients + if article.cc + localRecipients = emailAddresses.parseAddressList(article.cc) + if localRecipients + recipients = recipients.concat localRecipients + + # remove system addresses + localAddresses = App.EmailAddress.all() + forgeinRecipients = [] + recipientUsed = {} + for recipient in recipients + if !_.isEmpty(recipient.address) + localRecipientAddress = recipient.address.toString().toLowerCase() + if !recipientUsed[localRecipientAddress] + recipientUsed[localRecipientAddress] = true + localAddress = false + for address in localAddresses + if localRecipientAddress is address.email.toString().toLowerCase() + recipientUsed[localRecipientAddress] = true + localAddress = true + if !localAddress + forgeinRecipients.push recipient + + # check if reply all is neede + if forgeinRecipients.length > 1 + actions.push { + name: 'reply all' + type: 'emailReplyAll' + icon: 'reply-all' + href: '#' + } + + actions.push { + name: 'forward' + type: 'emailForward' + icon: 'forward' + href: '#' + } + + if article.sender.name is 'Customer' && article.type.name is 'phone' + actions.push { + name: 'reply' + type: 'emailReply' + icon: 'reply' + href: '#' + } + actions.push { + name: 'forward' + type: 'emailForward' + icon: 'forward' + href: '#' + } + if article.sender.name is 'Agent' && article.type.name is 'phone' + actions.push { + name: 'reply' + type: 'emailReply' + icon: 'reply' + href: '#' + } + actions.push { + name: 'forward' + type: 'emailForward' + icon: 'forward' + href: '#' + } + + actions + + @perform: (articleContainer, type, ticket, article, ui) -> + return true if type isnt 'emailReply' && type isnt 'emailReplyAll' && type isnt 'emailForward' + + if type is 'emailReply' + @emailReply(false, ticket, article, ui) + + else if type is 'emailReplyAll' + @emailReply(true, ticket, article, ui) + + else if type is 'emailForward' + @emailForward(ticket, article, ui) + + true + + @emailReply: (all = false, ticket, article, ui) -> + + # get reference article + type = App.TicketArticleType.find(article.type_id) + article_created_by = App.User.find(article.created_by_id) + email_addresses = App.EmailAddress.all() + + ui.scrollToCompose() + + # empty form + articleNew = App.Utils.getRecipientArticle(ticket, article, article_created_by, type, email_addresses, all) + + # get current body + body = ui.el.closest('.ticketZoom').find('.article-add [data-name="body"]').html() || '' + + # check if quote need to be added + signaturePosition = 'bottom' + selected = App.ClipBoard.getSelected('html') + if selected + selected = App.Utils.htmlCleanup(selected).html() + if !selected + selected = App.ClipBoard.getSelected('text') + if selected + selected = App.Utils.textCleanup(selected) + selected = App.Utils.text2html(selected) + + # full quote, if needed + if !selected && article && App.Config.get('ui_ticket_zoom_article_email_full_quote') + signaturePosition = 'top' + if article.content_type.match('html') + selected = App.Utils.textCleanup(article.body) + if article.content_type.match('plain') + selected = App.Utils.textCleanup(article.body) + selected = App.Utils.text2html(selected) + + if selected + selected = "


#{selected}

" + + # add selected text to body + body = selected + body + + articleNew.body = body + + type = App.TicketArticleType.findByAttribute(name:'email') + + App.Event.trigger('ui::ticket::setArticleType', { + ticket: ticket + type: type + article: articleNew + signaturePosition: signaturePosition + }) + + true + + @emailForward: (ticket, article, ui) -> + + ui.scrollToCompose() + + signaturePosition = 'top' + body = '' + if article.content_type.match('html') + body = App.Utils.textCleanup(article.body) + if article.content_type.match('plain') + body = App.Utils.textCleanup(article.body) + body = App.Utils.text2html(body) + + body = "
---Begin forwarded message:---

#{body}

" + + articleNew = {} + articleNew.body = body + + type = App.TicketArticleType.findByAttribute(name:'email') + + App.Event.trigger('ui::ticket::setArticleType', { + ticket: ticket + type: type + article: articleNew + signaturePosition: signaturePosition + }) + + # add attachments to form + App.Ajax.request( + id: "ticket_attachment_clone#{ui.form_id}" + type: 'POST' + url: "#{App.Config.get('api_path')}/ticket_attachment_upload_clone_by_article/#{article.id}" + data: JSON.stringify(form_id: ui.form_id) + processData: true + success: (data, status, xhr) -> + return if _.isEmpty(data.attachments) + App.Event.trigger('ui::ticket::addArticleAttachent', { + ticket: ticket + article: article + attachments: data.attachments + form_id: ui.form_id + }) + ) + + true + +App.Config.set('200-EmailReply', EmailReply, 'TicketZoomArticleAction') diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_action/facebook_reply.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_action/facebook_reply.coffee new file mode 100644 index 000000000..41c9ad4e8 --- /dev/null +++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_action/facebook_reply.coffee @@ -0,0 +1,37 @@ +class FacebookReply + @action: (actions, ticket, article, ui) -> + return actions if ui.permissionCheck('ticket.customer') + + if article.type.name is 'facebook feed post' || article.type.name is 'facebook feed comment' + actions.push { + name: 'reply' + type: 'facebookFeedReply' + icon: 'reply' + href: '#' + } + + actions + + @perform: (articleContainer, type, ticket, article, ui) -> + return true if type isnt 'facebookFeedReply' + + ui.scrollToCompose() + + type = App.TicketArticleType.findByAttribute('name', 'facebook feed comment') + + articleNew = { + to: '' + cc: '' + body: '' + in_reply_to: '' + } + + App.Event.trigger('ui::ticket::setArticleType', { + ticket: ticket + type: type + article: articleNew + }) + + true + +App.Config.set('300-FacebookReply', FacebookReply, 'TicketZoomArticleAction') diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_action/internal.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_action/internal.coffee new file mode 100644 index 000000000..8fc1e88bd --- /dev/null +++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_action/internal.coffee @@ -0,0 +1,40 @@ +class Internal + @action: (actions, ticket, article, ui) -> + return actions if ui.permissionCheck('ticket.customer') + + if article.internal is true + actions.push { + name: 'set to public' + type: 'public' + icon: 'lock-open' + } + else + actions.push { + name: 'set to internal' + type: 'internal' + icon: 'lock' + } + + actions + + @perform: (articleContainer, type, ticket, article, ui) -> + return true if type isnt 'internal' && type isnt 'public' + + # storage update + internal = true + if article.internal == true + internal = false + ui.lastAttributres.internal = internal + article.updateAttributes(internal: internal) + + # runtime update + if internal + articleContainer.addClass('is-internal') + else + articleContainer.removeClass('is-internal') + + ui.render() + + true + +App.Config.set('100-Internal', Internal, 'TicketZoomArticleAction') diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_action/split.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_action/split.coffee new file mode 100644 index 000000000..716267dd2 --- /dev/null +++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_action/split.coffee @@ -0,0 +1,18 @@ +class Split + @action: (actions, ticket, article, ui) -> + return actions if ui.permissionCheck('ticket.customer') + + actions.push { + name: 'split' + type: 'split' + icon: 'split' + href: "#ticket/create/#{article.ticket_id}/#{article.id}" + } + actions + + @perform: (articleContainer, type, ticket, article, ui) -> + return true if type isnt 'split' + ui.navigate "#ticket/create/#{article.ticket_id}/#{article.id}" + true + +App.Config.set('700-Split', Split, 'TicketZoomArticleAction') diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_action/telegram.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_action/telegram.coffee new file mode 100644 index 000000000..6f18a172d --- /dev/null +++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_action/telegram.coffee @@ -0,0 +1,45 @@ +class TelegramReply + @action: (actions, ticket, article, ui) -> + return actions if ui.permissionCheck('ticket.customer') + + if article.sender.name is 'Customer' && article.type.name is 'telegram personal-message' + actions.push { + name: 'reply' + type: 'telegramPersonalMessageReply' + icon: 'reply' + href: '#' + } + + actions + + @perform: (articleContainer, type, ticket, article, ui) -> + return true if type isnt 'telegramPersonalMessageReply' + + ui.scrollToCompose() + + # get reference article + type = App.TicketArticleType.find(article.type_id) + + articleNew = { + to: '' + cc: '' + body: '' + in_reply_to: '' + } + + if article.message_id + articleNew.in_reply_to = article.message_id + + # get current body + articleNew.body = ui.el.closest('.ticketZoom').find('.article-add [data-name="body"]').html().trim() || '' + + App.Event.trigger('ui::ticket::setArticleType', { + ticket: ticket + type: type + article: articleNew + position: 'end' + }) + + true + +App.Config.set('300-TelegramReply', TelegramReply, 'TicketZoomArticleAction') diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_action/twitter_reply.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_action/twitter_reply.coffee new file mode 100644 index 000000000..6ce871868 --- /dev/null +++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_action/twitter_reply.coffee @@ -0,0 +1,128 @@ +class TwitterReply + @action: (actions, ticket, article, ui) -> + return actions if ui.permissionCheck('ticket.customer') + + if article.type.name is 'twitter status' + actions.push { + name: 'reply' + type: 'twitterStatusReply' + icon: 'reply' + href: '#' + } + if article.type.name is 'twitter direct-message' + actions.push { + name: 'reply' + type: 'twitterDirectMessageReply' + icon: 'reply' + href: '#' + } + + actions + + @perform: (articleContainer, type, ticket, article, ui) -> + return true if type isnt 'twitterStatusReply' && type isnt 'twitterDirectMessageReply' + + if type is 'twitterStatusReply' + @twitterStatusReply(ticket, article, ui) + + else if type is 'twitterDirectMessageReply' + @twitterDirectMessageReply(ticket, article, ui) + + true + + @twitterStatusReply: (ticket, article, ui) -> + + ui.scrollToCompose() + + # get reference article + type = App.TicketArticleType.find(article.type_id) + + # empty form + articleNew = { + to: '' + cc: '' + body: '' + in_reply_to: '' + } + + if article.message_id + articleNew.in_reply_to = article.message_id + + # get current body + body = ui.el.closest('.ticketZoom').find('.article-add [data-name="body"]').html().trim() || '' + articleNew.body = body + + recipients = article.from + if article.to + if recipients + recipients += ', ' + recipients += article.to + + if recipients + recipientString = '' + recipientScreenNames = recipients.split(',') + for recipientScreenName in recipientScreenNames + if recipientScreenName + recipientScreenName = recipientScreenName.trim().toLowerCase() + + # exclude already listed screen name + exclude = false + if body && body.toLowerCase().match(recipientScreenName) + exclude = true + + # exclude own screen_name + if recipientScreenName is "@#{ticket.preferences.channel_screen_name}".toLowerCase() + exclude = true + + if exclude is false + if recipientString isnt '' + recipientString += ' ' + recipientString += recipientScreenName + + if body + articleNew.body = "#{recipientString} #{body} " + else + articleNew.body = "#{recipientString} " + + App.Event.trigger('ui::ticket::setArticleType', { + ticket: ticket + type: type + article: articleNew + position: 'end' + }) + + @twitterDirectMessageReply: (ticket, article, ui) -> + + # get reference article + type = App.TicketArticleType.find(article.type_id) + sender = App.TicketArticleSender.find(article.sender_id) + customer = App.User.find(article.created_by_id) + + ui.scrollToCompose() + + # empty form + articleNew = { + to: '' + cc: '' + body: '' + in_reply_to: '' + } + + if article.message_id + articleNew.in_reply_to = article.message_id + + if sender.name is 'Agent' + articleNew.to = article.to + else + articleNew.to = article.from + + if !articleNew.to + articleNew.to = customer.accounts['twitter'].username || customer.accounts['twitter'].uid + + App.Event.trigger('ui::ticket::setArticleType', { + ticket: ticket + type: type + article: articleNew + }) + +App.Config.set('300-TwitterReply', TwitterReply, 'TicketZoomArticleAction') diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_actions.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_actions.coffee index 3f42ce106..fbece5315 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/article_actions.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_actions.coffee @@ -1,21 +1,13 @@ class App.TicketZoomArticleActions extends App.Controller events: - 'click [data-type=public]': 'publicInternal' - 'click [data-type=internal]': 'publicInternal' - 'click [data-type=emailReply]': 'emailReply' - 'click [data-type=emailReplyAll]': 'emailReplyAll' - 'click [data-type=twitterStatusReply]': 'twitterStatusReply' - 'click [data-type=twitterDirectMessageReply]': 'twitterDirectMessageReply' - 'click [data-type=facebookFeedReply]': 'facebookFeedReply' - 'click [data-type=telegramPersonalMessageReply]': 'telegramPersonalMessageReply' - 'click [data-type=delete]': 'delete' + 'click .js-ArticleAction': 'actionPerform' constructor: -> super @render() render: -> - actions = @actionRow(@article) + actions = @actionRow(@ticket, @article) if actions @html App.view('ticket_zoom/article_view_actions')( @@ -25,371 +17,31 @@ class App.TicketZoomArticleActions extends App.Controller else @html '' - publicInternal: (e) => - e.preventDefault() - articleContainer = $(e.target).closest('.ticket-article-item') - article_id = $(e.target).parents('[data-id]').data('id') - - # storage update - article = App.TicketArticle.find(article_id) - internal = true - if article.internal == true - internal = false - @lastAttributres.internal = internal - article.updateAttributes(internal: internal) - - # runntime update - if internal - articleContainer.addClass('is-internal') - else - articleContainer.removeClass('is-internal') - - @render() - - actionRow: (article) -> - if @permissionCheck('ticket.customer') - return [] - + actionRow: (ticket, article) -> + actionConfig = App.Config.get('TicketZoomArticleAction') + keys = _.keys(actionConfig).sort() actions = [] - if article.internal is true - actions = [ - { - name: 'set to public' - type: 'public' - icon: 'lock-open' - } - ] - else - actions = [ - { - name: 'set to internal' - type: 'internal' - icon: 'lock' - } - ] - #if @article.type.name is 'note' - # actions.push [] - group = @ticket.group - if group.email_address_id && (article.type.name is 'email' || article.type.name is 'web') - actions.push { - name: 'reply' - type: 'emailReply' - icon: 'reply' - href: '#' - } - recipients = [] - if article.sender.name is 'Customer' - if article.from - localRecipients = emailAddresses.parseAddressList(article.from) - if localRecipients - recipients = recipients.concat localRecipients - if article.to - localRecipients = emailAddresses.parseAddressList(article.to) - if localRecipients - recipients = recipients.concat localRecipients - if article.cc - localRecipients = emailAddresses.parseAddressList(article.cc) - if localRecipients - recipients = recipients.concat localRecipients - - # remove system addresses - localAddresses = App.EmailAddress.all() - forgeinRecipients = [] - recipientUsed = {} - for recipient in recipients - if !_.isEmpty(recipient.address) - localRecipientAddress = recipient.address.toString().toLowerCase() - if !recipientUsed[localRecipientAddress] - recipientUsed[localRecipientAddress] = true - localAddress = false - for address in localAddresses - if localRecipientAddress is address.email.toString().toLowerCase() - recipientUsed[localRecipientAddress] = true - localAddress = true - if !localAddress - forgeinRecipients.push recipient - - # check if reply all is neede - if forgeinRecipients.length > 1 - actions.push { - name: 'reply all' - type: 'emailReplyAll' - icon: 'reply-all' - href: '#' - } - if article.sender.name is 'Customer' && article.type.name is 'phone' - actions.push { - name: 'reply' - type: 'emailReply' - icon: 'reply' - href: '#' - } - if article.sender.name is 'Agent' && article.type.name is 'phone' - actions.push { - name: 'reply' - type: 'emailReply' - icon: 'reply' - href: '#' - } - if article.type.name is 'twitter status' - actions.push { - name: 'reply' - type: 'twitterStatusReply' - icon: 'reply' - href: '#' - } - if article.type.name is 'twitter direct-message' - actions.push { - name: 'reply' - type: 'twitterDirectMessageReply' - icon: 'reply' - href: '#' - } - if article.type.name is 'facebook feed post' || article.type.name is 'facebook feed comment' - actions.push { - name: 'reply' - type: 'facebookFeedReply' - icon: 'reply' - href: '#' - } - if article.sender.name is 'Customer' && article.type.name is 'telegram personal-message' - actions.push { - name: 'reply' - type: 'telegramPersonalMessageReply' - icon: 'reply' - href: '#' - } - - actions.push { - name: 'split' - type: 'split' - icon: 'split' - href: '#ticket/create/' + article.ticket_id + '/' + article.id - } - - if article.type.name is 'note' - user = undefined - if App.Session.get('id') == article.created_by_id - user = App.User.find(App.Session.get('id')) - if user.permission('ticket.agent') - actions.push { - name: 'delete' - type: 'delete' - icon: 'trash' - href: '#' - } + for key in keys + config = actionConfig[key] + if config + actions = config.action(actions, ticket, article, @) actions - facebookFeedReply: (e) => + actionPerform: (e) => e.preventDefault() - type = App.TicketArticleType.findByAttribute('name', 'facebook feed comment') - @scrollToCompose() + articleContainer = $(e.target).closest('.ticket-article-item') + type = $(e.currentTarget).attr('data-type') + ticket = App.Ticket.fullLocal(@ticket.id) + article = App.TicketArticle.fullLocal(@article.id) - # empty form - articleNew = { - to: '' - cc: '' - body: '' - in_reply_to: '' - } - - App.Event.trigger('ui::ticket::setArticleType', { ticket: @ticket, type: type, article: articleNew } ) - - twitterStatusReply: (e) => - e.preventDefault() - - # get reference article - article_id = $(e.target).parents('[data-id]').data('id') - article = App.TicketArticle.fullLocal(article_id) - sender = App.TicketArticleSender.find(article.sender_id) - type = App.TicketArticleType.find(article.type_id) - customer = App.User.find(article.created_by_id) - - @scrollToCompose() - - # empty form - articleNew = { - to: '' - cc: '' - body: '' - in_reply_to: '' - } - - if article.message_id - articleNew.in_reply_to = article.message_id - - # get current body - body = @el.closest('.ticketZoom').find('.article-add [data-name="body"]').html().trim() || '' - articleNew.body = body - - recipients = article.from - if article.to - if recipients - recipients += ', ' - recipients += article.to - - if recipients - recipientString = '' - recipientScreenNames = recipients.split(',') - for recipientScreenName in recipientScreenNames - if recipientScreenName - recipientScreenName = recipientScreenName.trim().toLowerCase() - - # exclude already listed screen name - exclude = false - if body && body.toLowerCase().match(recipientScreenName) - exclude = true - - # exclude own screen_name - if recipientScreenName is "@#{@ticket.preferences.channel_screen_name}".toLowerCase() - exclude = true - - if exclude is false - if recipientString isnt '' - recipientString += ' ' - recipientString += recipientScreenName - - if body - articleNew.body = "#{recipientString} #{body} " - else - articleNew.body = "#{recipientString} " - - App.Event.trigger('ui::ticket::setArticleType', { ticket: @ticket, type: type, article: articleNew, position: 'end' } ) - - twitterDirectMessageReply: (e) => - e.preventDefault() - - # get reference article - article_id = $(e.target).parents('[data-id]').data('id') - article = App.TicketArticle.fullLocal(article_id) - type = App.TicketArticleType.find(article.type_id) - sender = App.TicketArticleSender.find(article.sender_id) - customer = App.User.find(article.created_by_id) - - @scrollToCompose() - - # empty form - articleNew = { - to: '' - cc: '' - body: '' - in_reply_to: '' - } - - if article.message_id - articleNew.in_reply_to = article.message_id - - if sender.name is 'Agent' - articleNew.to = article.to - else - articleNew.to = article.from - - if !articleNew.to - articleNew.to = customer.accounts['twitter'].username || customer.accounts['twitter'].uid - - App.Event.trigger('ui::ticket::setArticleType', { ticket: @ticket, type: type, article: articleNew } ) - - emailReplyAll: (e) => - @emailReply(e, true) - - emailReply: (e, all = false) => - e.preventDefault() - - # get reference article - article_id = $(e.target).parents('[data-id]').data('id') - article = App.TicketArticle.fullLocal(article_id) - ticket = App.Ticket.fullLocal(article.ticket_id) - type = App.TicketArticleType.find(article.type_id) - article_created_by = App.User.find(article.created_by_id) - email_addresses = App.EmailAddress.all() - - @scrollToCompose() - - # empty form - articleNew = App.Utils.getRecipientArticle(ticket, article, article_created_by, type, email_addresses, all) - - # get current body - body = @el.closest('.ticketZoom').find('.article-add [data-name="body"]').html() || '' - - # check if quote need to be added - signaturePosition = 'bottom' - selected = App.ClipBoard.getSelected('html') - if selected - selected = App.Utils.htmlCleanup(selected).html() - if !selected - selected = App.ClipBoard.getSelected('text') - if selected - selected = App.Utils.textCleanup(selected) - selected = App.Utils.text2html(selected) - - # full quote, if needed - if !selected && article && App.Config.get('ui_ticket_zoom_article_email_full_quote') - signaturePosition = 'top' - if article.content_type.match('html') - selected = App.Utils.textCleanup(article.body) - if article.content_type.match('plain') - selected = App.Utils.textCleanup(article.body) - selected = App.Utils.text2html(selected) - - if selected - selected = "


#{selected}

" - - # add selected text to body - body = selected + body - - articleNew.body = body - - type = App.TicketArticleType.findByAttribute(name:'email') - - App.Event.trigger('ui::ticket::setArticleType', { - ticket: @ticket - type: type - article: articleNew - signaturePosition: signaturePosition - }) - - telegramPersonalMessageReply: (e) => - e.preventDefault() - - # get reference article - article_id = $(e.target).parents('[data-id]').data('id') - article = App.TicketArticle.fullLocal(article_id) - sender = App.TicketArticleSender.find(article.sender_id) - type = App.TicketArticleType.find(article.type_id) - customer = App.User.find(article.created_by_id) - - @scrollToCompose() - - # empty form - articleNew = { - to: '' - cc: '' - body: '' - in_reply_to: '' - } - - if article.message_id - articleNew.in_reply_to = article.message_id - - # get current body - articleNew.body = @el.closest('.ticketZoom').find('.article-add [data-name="body"]').html().trim() || '' - - App.Event.trigger('ui::ticket::setArticleType', { ticket: @ticket, type: type, article: articleNew, position: 'end' } ) - - delete: (e) => - e.preventDefault() - - callback = -> - article_id = $(e.target).parents('[data-id]').data('id') - article = App.TicketArticle.find(article_id) - article.destroy() - - new App.ControllerConfirm( - message: 'Sure?' - callback: callback - container: @el.closest('.content') - ) + actionConfig = App.Config.get('TicketZoomArticleAction') + keys = _.keys(actionConfig).sort() + actions = [] + for key in keys + config = actionConfig[key] + if config + return if !config.perform(articleContainer, type, ticket, article, @) scrollToCompose: => @el.closest('.content').find('.article-add').ScrollTo() diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee index edb39480d..d8bc066ba 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee @@ -70,6 +70,14 @@ class App.TicketZoomArticleNew extends App.Controller @textarea.focus() ) + # add article attachment + @bind('ui::ticket::addArticleAttachent', (data) => + return if data.ticket.id.toString() isnt @ticket_id.toString() + return if _.isEmpty(data.attachments) + for file in data.attachments + @renderAttachment(file) + ) + # reset new article screen @bind('ui::ticket::taskReset', (data) => return if data.ticket_id.toString() isnt @ticket_id.toString() @@ -143,8 +151,8 @@ class App.TicketZoomArticleNew extends App.Controller icon: 'twitter' attributes: [] internal: false, - features: ['body:limit', 'body:initials'] - maxTextLength: 140 + features: attributes + maxTextLength: 280 warningTextLength: 30 } if possibleArticleType['twitter direct-message'] @@ -156,7 +164,7 @@ class App.TicketZoomArticleNew extends App.Controller icon: 'twitter' attributes: ['to'] internal: false, - features: ['body:limit', 'body:initials'] + features: attributes maxTextLength: 10000 warningTextLength: 500 } @@ -245,7 +253,7 @@ class App.TicketZoomArticleNew extends App.Controller controller = new App.ControllerForm( el: @$('.recipients') model: - configure_attributes: configure_attributes, + configure_attributes: configure_attributes ) @$('[data-name="body"]').ce({ @@ -255,12 +263,13 @@ class App.TicketZoomArticleNew extends App.Controller }) html5Upload.initialize( - uploadUrl: App.Config.get('api_path') + '/ticket_attachment_upload', - dropContainer: @$('.article-add').get(0), - cancelContainer: @cancelContainer, - inputField: @$('.article-attachment input').get(0), - key: 'File', - data: { form_id: @form_id }, + uploadUrl: App.Config.get('api_path') + '/ticket_attachment_upload' + dropContainer: @$('.article-add').get(0) + cancelContainer: @cancelContainer + inputField: @$('.article-attachment input').get(0) + key: 'File' + data: + form_id: @form_id maxSimultaneousUploads: 1, onFileAdded: (file) => @@ -303,6 +312,8 @@ class App.TicketZoomArticleNew extends App.Controller ) ) + @bindAttachmentDelete() + # show text module UI if !@permissionCheck('ticket.customer') textModule = new App.WidgetTextModule( @@ -737,33 +748,29 @@ class App.TicketZoomArticleNew extends App.Controller @articleNewEdit.parent().removeClass('is-dropTarget') if @dragEventCounter is 0 renderAttachment: (file) => - @attachmentsHolder.append App.view('generic/attachment_item') - fileName: file.filename - fileSize: @humanFileSize( file.size ) - store_id: file.store_id - @attachmentsHolder.on( - 'click' - "[data-id=#{file.store_id}]", (e) => - @attachments = _.filter( - @attachments, - (item) -> - return if item.id isnt file.store_id - item - ) - store_id = $(e.currentTarget).data('id') + @attachmentsHolder.append(App.view('generic/attachment_item')(file)) - # delete attachment from storage - App.Ajax.request( - type: 'DELETE' - url: App.Config.get('api_path') + '/ticket_attachment_upload' - data: JSON.stringify(store_id: store_id) - processData: false - ) + bindAttachmentDelete: => + @attachmentsHolder.on('click', '.js-delete', (e) => + id = $(e.currentTarget).data('id') + @attachments = _.filter( + @attachments, + (item) -> + return if item.id.toString() is id.toString() + item + ) - # remove attachment from dom - element = $(e.currentTarget).closest('.attachments') - $(e.currentTarget).closest('.attachment').remove() - # empty .attachment (remove spaces) to keep css working, thanks @mrflix :-o - if element.find('.attachment').length == 0 - element.empty() + # delete attachment from storage + App.Ajax.request( + type: 'DELETE' + url: App.Config.get('api_path') + '/ticket_attachment_upload' + data: JSON.stringify(id: id) + processData: false + ) + + # remove attachment from dom + element = $(e.currentTarget).closest('.attachments') + $(e.currentTarget).closest('.attachment').remove() + if element.find('.attachment').length == 0 + element.empty() ) diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_view.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_view.coffee index d66ed3c15..d70282853 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/article_view.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_view.coffee @@ -20,6 +20,7 @@ class App.TicketZoomArticleView extends App.Controller el: el ui: @ui highligher: @highligher + form_id: @form_id ) if !@ticketArticleInsertByIndex(index, el) all.push el @@ -193,6 +194,7 @@ class ArticleViewItem extends App.ObserverController ticket: @ticket article: article lastAttributres: @lastAttributres + form_id: @form_id ) # set see more diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/sidebar.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/sidebar.coffee index 3059d1d0c..416d16742 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/sidebar.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/sidebar.coffee @@ -32,16 +32,14 @@ class App.TicketZoomSidebar extends App.ObserverController ) else @sidebarBackends[key].reload( - params: @params - query: @query + params: @params + query: @query formMeta: @formMeta markForm: @markForm tags: @tags links: @links ) - item = @sidebarBackends[key].sidebarItem() - if item - @sidebarItems.push item + @sidebarItems.push @sidebarBackends[key] new App.Sidebar( el: @el.find('.tabsSidebar') diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_customer.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_customer.coffee index 92bfd8c65..521e0d4ac 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_customer.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_customer.coffee @@ -1,32 +1,67 @@ class SidebarCustomer extends App.Controller sidebarItem: => return if !@permissionCheck('ticket.agent') - items = { - head: 'Customer' - name: 'customer' - icon: 'person' - actions: [ + @item = { + name: 'customer' + badgeCallback: @badgeRender + sidebarHead: 'Customer' + sidebarCallback: @showCustomer + sidebarActions: [ { title: 'Change Customer' name: 'customer-change' callback: @changeCustomer }, ] - callback: @showCustomer } - return items if @ticket && @ticket.customer_id == 1 - items.actions.push { + return @item if @ticket && @ticket.customer_id == 1 + @item.sidebarActions.push { title: 'Edit Customer' name: 'customer-edit' callback: @editCustomer } - items + @item + + metaBadge: (user) => + counter = '' + cssClass = '' + counter = @sidebarItemCounter(user) + + if @Config.get('ui_sidebar_open_ticket_indicator_colored') is true + if counter == 1 + cssClass = 'tabsSidebar-tab-count--warning' + if counter > 1 + cssClass = 'tabsSidebar-tab-count--danger' + + { + name: 'customer' + icon: 'person' + counterPossible: true + counter: counter + cssClass: cssClass + } + + badgeRender: (el) => + @badgeEl = el + if App.User.exists(@ticket.customer_id) + user = App.User.find(@ticket.customer_id) + @badgeRenderLocal(user) + + badgeRenderLocal: (user) => + @badgeEl.html(App.view('generic/sidebar_tabs_item')(@metaBadge(user))) + + sidebarItemCounter: (user) -> + counter = '' + if user && user.preferences && user.preferences.tickets_open + counter = user.preferences.tickets_open + counter showCustomer: (el) => - @el = el + @elSidebar = el new App.WidgetUser( - el: @el + el: @elSidebar user_id: @ticket.customer_id + callback: @badgeRenderLocal ) editCustomer: => @@ -38,13 +73,13 @@ class SidebarCustomer extends App.Controller title: 'Users' object: 'User' objects: 'Users' - container: @el.closest('.content') + container: @elSidebar.closest('.content') ) changeCustomer: => new App.TicketCustomer( ticket_id: @ticket.id - container: @el.closest('.content') + container: @elSidebar.closest('.content') ) App.Config.set('200-Customer', SidebarCustomer, 'TicketZoomSidebar') diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_idoit.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_idoit.coffee index 5ebce7924..a3a8aad7d 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_idoit.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_idoit.coffee @@ -1,19 +1,20 @@ class SidebarIdoit extends App.Controller sidebarItem: => return if !@Config.get('idoit_integration') - { - head: 'i-doit' - name: 'idoit' - icon: 'printer' - actions: [ + @item = { + name: 'idoit' + badgeIcon: 'printer' + sidebarHead: 'i-doit' + sidebarCallback: @showObjects + sidebarActions: [ { title: 'Change Objects' name: 'objects-change' callback: @changeObjects }, ] - callback: @showObjects } + @item changeObjects: => new App.IdoitObjectSelector( diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_organization.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_organization.coffee index 6fc2ef5cb..357813ef4 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_organization.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_organization.coffee @@ -2,24 +2,25 @@ class SidebarOrganization extends App.Controller sidebarItem: => return if !@permissionCheck('ticket.agent') return if !@ticket.organization_id - { - head: 'Organization' + @item = { name: 'organization' - icon: 'group' - actions: [ + badgeIcon: 'group' + sidebarHead: 'Organization' + sidebarCallback: @showOrganization + sidebarActions: [ { title: 'Edit Organization' name: 'organization-edit' callback: @editOrganization }, ] - callback: @showOrganization } + @item showOrganization: (el) => - @el = el + @elSidebar = el new App.WidgetOrganization( - el: @el + el: @elSidebar organization_id: @ticket.organization_id ) @@ -31,7 +32,7 @@ class SidebarOrganization extends App.Controller title: 'Organizations' object: 'Organization' objects: 'Organizations' - container: @el.closest('.content') + container: @elSidebar.closest('.content') ) App.Config.set('300-Organization', SidebarOrganization, 'TicketZoomSidebar') diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_ticket.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_ticket.coffee index cb656f976..53253d729 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_ticket.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_ticket.coffee @@ -20,8 +20,9 @@ class Edit extends App.ObserverController handlers: [ @ticketFormChanges ] - filter: @formMeta.filter - params: defaults + filter: @formMeta.filter + params: defaults + isDisabled: !ticket.editable() #bookmarkable: true ) @@ -36,14 +37,14 @@ class Edit extends App.ObserverController class SidebarTicket extends App.Controller sidebarItem: => - sidebarItem = { - head: 'Ticket' - name: 'ticket' - icon: 'message' - callback: @editTicket + @item = { + name: 'ticket' + badgeIcon: 'message' + sidebarHead: 'Ticket' + sidebarCallback: @editTicket } if @permissionCheck('ticket.agent') - sidebarItem['actions'] = [ + @item.sidebarActions = [ { title: 'History' name: 'ticket-history' @@ -60,7 +61,7 @@ class SidebarTicket extends App.Controller callback: @changeCustomer }, ] - sidebarItem + @item reload: (args) => @@ -79,7 +80,7 @@ class SidebarTicket extends App.Controller editTicket: (el) => @el = el - localEl = $( App.view('ticket_zoom/sidebar_ticket')() ) + localEl = $(App.view('ticket_zoom/sidebar_ticket')()) @edit = new Edit( object_id: @ticket.id diff --git a/app/assets/javascripts/app/controllers/users.coffee b/app/assets/javascripts/app/controllers/users.coffee index 07b893a58..27b464580 100644 --- a/app/assets/javascripts/app/controllers/users.coffee +++ b/app/assets/javascripts/app/controllers/users.coffee @@ -145,7 +145,7 @@ class Index extends App.ControllerSubContent query: @query limit: 140 role_ids: role_ids - full: 1 + full: true processData: true, success: (data, status, xhr) => App.Collection.loadAssets(data.assets) @@ -167,7 +167,7 @@ class Index extends App.ControllerSubContent data: limit: 50 role_ids: role_ids - full: 1 + full: true processData: true success: (data, status, xhr) => App.Collection.loadAssets(data.assets) diff --git a/app/assets/javascripts/app/controllers/widget/default_locale.coffee b/app/assets/javascripts/app/controllers/widget/default_locale.coffee new file mode 100644 index 000000000..db4437c30 --- /dev/null +++ b/app/assets/javascripts/app/controllers/widget/default_locale.coffee @@ -0,0 +1,23 @@ +class DefaultLocale extends App.Controller + constructor: -> + super + + check = => + + preferences = App.Session.get('preferences') + return if !preferences + return if !_.isEmpty(preferences.locale) + locale = App.i18n.get() + @ajax( + id: "i18n-set-user-#{locale}" + type: 'PUT' + url: "#{App.Config.get('api_path')}/users/preferences" + data: JSON.stringify(locale: locale) + processData: true + ) + + App.Event.bind('auth:login', (session) => + @delay(check, 3500, 'default_locale') + ) + +App.Config.set('default_locale', DefaultLocale, 'Widgets') diff --git a/app/assets/javascripts/app/controllers/widget/switch_back_to_user.coffee b/app/assets/javascripts/app/controllers/widget/switch_back_to_user.coffee index 9f5e3c526..612d9cbe4 100644 --- a/app/assets/javascripts/app/controllers/widget/switch_back_to_user.coffee +++ b/app/assets/javascripts/app/controllers/widget/switch_back_to_user.coffee @@ -47,4 +47,4 @@ class Widget extends App.ControllerWidgetOnDemand 800 ) -App.Config.set( 'switch_back_to_user', Widget, 'Widgets' ) +App.Config.set('switch_back_to_user', Widget, 'Widgets') diff --git a/app/assets/javascripts/app/controllers/widget/ticket_stats.coffee b/app/assets/javascripts/app/controllers/widget/ticket_stats.coffee index 7445e8294..67d8b4b5b 100644 --- a/app/assets/javascripts/app/controllers/widget/ticket_stats.coffee +++ b/app/assets/javascripts/app/controllers/widget/ticket_stats.coffee @@ -70,6 +70,7 @@ class App.TicketStats extends App.Controller render: (data) => if !data data = @data + return if !data user_total = 0 if data.user.open_ids && data.user.closed_ids diff --git a/app/assets/javascripts/app/index.coffee b/app/assets/javascripts/app/index.coffee index 3e6211d9b..d9fbb2028 100644 --- a/app/assets/javascripts/app/index.coffee +++ b/app/assets/javascripts/app/index.coffee @@ -12,8 +12,8 @@ class App extends Spine.Controller helper = # define print name helper - P: (object, attributeName, attributes) -> - App.viewPrint(object, attributeName, attributes) + P: (object, attributeName, attributes, table = false) -> + App.viewPrint(object, attributeName, attributes, table) # define date format helper date: (time) -> @@ -136,7 +136,7 @@ class App extends Spine.Controller return marked(string) App.i18n.translateContent(string) - @viewPrint: (object, attributeName, attributes) -> + @viewPrint: (object, attributeName, attributes, table) -> if !attributes attributes = {} if object.constructor.attributesGet @@ -172,10 +172,10 @@ class App extends Spine.Controller if object[attributeNameWithoutRef] valueRef = object[attributeNameWithoutRef] - @viewPrintItem(value, attributeConfig, valueRef) + @viewPrintItem(value, attributeConfig, valueRef, table) # define print name helper - @viewPrintItem: (item, attributeConfig = {}, valueRef) -> + @viewPrintItem: (item, attributeConfig = {}, valueRef, table) -> return '-' if item is undefined return '-' if item is '' return item if item is null @@ -238,7 +238,7 @@ class App extends Spine.Controller # transform date if attributeConfig.tag is 'date' isHtmlEscape = true - resultLocal = App.i18n.translateDate(resultLocal) + resultLocal = App.i18n.translateDate(resultLocal) # transform input tel|url to make it clickable if attributeConfig.tag is 'input' @@ -258,8 +258,10 @@ class App extends Spine.Controller cssClass = attributeConfig.class || '' if cssClass.match 'escalation' escalation = true - humanTime = App.PrettyDate.humanTime(resultLocal, escalation) - resultLocal = "" + humanTime = '' + if !table + humanTime = App.PrettyDate.humanTime(resultLocal, escalation) + resultLocal = "" if !isHtmlEscape && typeof resultLocal is 'string' resultLocal = App.Utils.htmlEscape(resultLocal) diff --git a/app/assets/javascripts/app/lib/app_post/_collection_base.coffee b/app/assets/javascripts/app/lib/app_post/_collection_base.coffee index ddd758914..2e1a487b0 100644 --- a/app/assets/javascripts/app/lib/app_post/_collection_base.coffee +++ b/app/assets/javascripts/app/lib/app_post/_collection_base.coffee @@ -77,7 +77,7 @@ class App._CollectionSingletonBase callback: (data) => for counter, attr of @callbacks - callback = -> + callback = => attr.callback(data) if attr.one delete @callbacks[counter] diff --git a/app/assets/javascripts/app/lib/app_post/_object_organization_autocompletion.coffee b/app/assets/javascripts/app/lib/app_post/_object_organization_autocompletion.coffee index 011dc2202..da0d8b2ee 100644 --- a/app/assets/javascripts/app/lib/app_post/_object_organization_autocompletion.coffee +++ b/app/assets/javascripts/app/lib/app_post/_object_organization_autocompletion.coffee @@ -71,7 +71,7 @@ class App.ObjectOrganizationAutocompletion extends App.Controller @open() focusInput: => - @objectSelect.focus() if not @formControl.hasClass 'focus' + @objectSelect.focus() if not @formControl.hasClass('focus') onBlur: => selectObject = @objectSelect.val() @@ -85,6 +85,9 @@ class App.ObjectOrganizationAutocompletion extends App.Controller @objectId.val("guess:#{selectObject}") @formControl.removeClass 'focus' + resetObjectSelection: => + @objectId.val('').trigger('change') + onObjectClick: (e) => objectId = $(e.currentTarget).data('object-id') @selectObject(objectId) @@ -103,23 +106,23 @@ class App.ObjectOrganizationAutocompletion extends App.Controller # Only work with the last one since its the newest one objectId = @objectId.val().split(',').pop() - return if !objectId - return if !App[@objectSingle].exists(objectId) - object = App[@objectSingle].find(objectId) - name = object.displayName() + if objectId && App[@objectSingle].exists(objectId) + object = App[@objectSingle].find(objectId) + name = object.displayName() - if @attribute.multiple - # create token - @createToken name, objectId - else - if object.email + if @attribute.multiple - # quote name for special character - if name.match(/\@|,|;|\^|\+|#|§|\$|%|&|\/|\(|\)|=|\?|!|\*|\[|\]/) - name = "\"#{name}\"" - name += " <#{object.email}>" + # create token + @createToken(name, objectId) + else + if object.email - @objectSelect.val(name) + # quote name for special character + if name.match(/\@|,|;|\^|\+|#|§|\$|%|&|\/|\(|\)|=|\?|!|\*|\[|\]/) + name = "\"#{name}\"" + name += " <#{object.email}>" + + @objectSelect.val(name) if @callback @callback(objectId) @@ -321,12 +324,16 @@ class App.ObjectOrganizationAutocompletion extends App.Controller @hideOrganizationMembers() # hide dropdown - if !query + if _.isEmpty(query) @emptyResultList() if !@attribute.disableCreateObject @recipientList.append(@buildObjectNew()) + # reset object selection + @resetObjectSelection() + return + # show dropdown if query && ( !@attribute.minLengt || @attribute.minLengt <= query.length ) @lazySearch(query) diff --git a/app/assets/javascripts/app/lib/app_post/auth.coffee b/app/assets/javascripts/app/lib/app_post/auth.coffee index f46c8c6e3..7f95f2375 100644 --- a/app/assets/javascripts/app/lib/app_post/auth.coffee +++ b/app/assets/javascripts/app/lib/app_post/auth.coffee @@ -79,8 +79,7 @@ class App.Auth @_updateModelAttributes(data.models) # set locale - locale = window.navigator.userLanguage || window.navigator.language || 'en-us' - App.i18n.set(locale) + App.i18n.set(App.i18n.detectBrowserLocale()) # rebuild navbar with new navbar items App.Event.trigger('auth') @@ -120,7 +119,7 @@ class App.Auth if preferences && preferences.locale locale = preferences.locale if !locale - locale = window.navigator.userLanguage || window.navigator.language || 'en-us' + locale = App.i18n.detectBrowserLocale() App.i18n.set(locale) App.Event.trigger('auth:login', data.session) diff --git a/app/assets/javascripts/app/lib/app_post/column_select.coffee b/app/assets/javascripts/app/lib/app_post/column_select.coffee index 728c2d499..a38cca006 100644 --- a/app/assets/javascripts/app/lib/app_post/column_select.coffee +++ b/app/assets/javascripts/app/lib/app_post/column_select.coffee @@ -39,14 +39,27 @@ class App.ColumnSelect extends Spine.Controller ) render: -> + if !_.isEmpty(@attribute.seperator) + values = [] + if @attribute.value + values = @attribute.value.split(';') + else if @attribute.default + values = @attribute.default.split(';') + + for value in values + for option in @options.attribute.options + if option.value is value + option.selected = true + @values = [] _.each @options.attribute.options, (option) => if option.selected @values.push option.value.toString() - @html App.view('generic/column_select') + @html App.view('generic/column_select')( attribute: @options.attribute values: @values + ) # keep inital height # disabled for now since controls in modals get rendered hidden @@ -60,13 +73,17 @@ class App.ColumnSelect extends Spine.Controller @throttledSelect() select: (value) -> - @selected.find("[data-value='#{value}']").removeClass 'is-hidden' - @pool.find("[data-value='#{value}']").addClass 'is-hidden' + @selected.find("[data-value='#{value}']").removeClass('is-hidden') + @pool.find("[data-value='#{value}']").addClass('is-hidden') @values.push(value) - @shadow.val(@values) - @shadow.trigger('change') - @placeholder.addClass 'is-hidden' + if !_.isEmpty(@attribute.seperator) + @shadow.val(@values.join(';')) + else + @shadow.val(@values) + @shadow.trigger('change') + + @placeholder.addClass('is-hidden') if @search.val() and @poolOptions.not('.is-filtered').not('.is-hidden').size() is 0 @clear() @@ -76,14 +93,17 @@ class App.ColumnSelect extends Spine.Controller @throttledRemove() remove: (value) -> - @pool.find("[data-value='#{value}']").removeClass 'is-hidden' - @selected.find("[data-value='#{value}']").addClass 'is-hidden' + @pool.find("[data-value='#{value}']").removeClass('is-hidden') + @selected.find("[data-value='#{value}']").addClass('is-hidden') @values.splice(@values.indexOf(value), 1) - @shadow.val(@values) - @shadow.trigger('change') + if !_.isEmpty(@attribute.seperator) + @shadow.val(@values.join(';')) + else + @shadow.val(@values) + @shadow.trigger('change') if !@values.length - @placeholder.removeClass 'is-hidden' + @placeholder.removeClass('is-hidden') filter: (event) -> filter = $(event.currentTarget).val() @@ -92,16 +112,16 @@ class App.ColumnSelect extends Spine.Controller return if $(el).hasClass('is-hidden') if $(el).text().toLowerCase().indexOf(filter.toLowerCase()) > -1 - $(el).removeClass 'is-filtered' + $(el).removeClass('is-filtered') else - $(el).addClass 'is-filtered' + $(el).addClass('is-filtered') @clearButton.toggleClass 'is-hidden', filter.length is 0 clear: -> @search.val('') - @poolOptions.removeClass 'is-filtered' - @clearButton.addClass 'is-hidden' + @poolOptions.removeClass('is-filtered') + @clearButton.addClass('is-hidden') onFilterKeydown: (event) -> return if event.keyCode != 13 @@ -111,4 +131,4 @@ class App.ColumnSelect extends Spine.Controller firstVisibleOption = @poolOptions.not('.is-filtered').not('.is-hidden').first() if firstVisibleOption - @select firstVisibleOption.attr('data-value') \ No newline at end of file + @select firstVisibleOption.attr('data-value') diff --git a/app/assets/javascripts/app/lib/app_post/i18n.coffee b/app/assets/javascripts/app/lib/app_post/i18n.coffee index 560562269..6eff7b768 100644 --- a/app/assets/javascripts/app/lib/app_post/i18n.coffee +++ b/app/assets/javascripts/app/lib/app_post/i18n.coffee @@ -80,6 +80,24 @@ class App.i18n _instance ?= new _i18nSingleton() _instance.mapTime + @detectBrowserLocale: -> + return 'en-us' if !window.navigator.userLanguage && !window.navigator.language + + if window.navigator.languages + allLocales = App.Locale.all() + for browserLocale in window.navigator.languages + for localAllLocale in allLocales + if browserLocale is localAllLocale.locale + return localAllLocale.locale + + for browserLocale in window.navigator.languages + browserLocale = browserLocale.substr(0, 2) + for localAllLocale in allLocales + if browserLocale is localAllLocale.alias + return localAllLocale.locale + + window.navigator.userLanguage || window.navigator.language || 'en-us' + class _i18nSingleton extends Spine.Module @include App.LogInclude @@ -319,18 +337,20 @@ class _i18nSingleton extends Spine.Module if offset timeObject = new Date(timeObject.getTime() + (timeObject.getTimezoneOffset() * 60000)) - d = timeObject.getDate() - m = timeObject.getMonth() + 1 - y = timeObject.getFullYear() - S = timeObject.getSeconds() - M = timeObject.getMinutes() - H = timeObject.getHours() + d = timeObject.getDate() + m = timeObject.getMonth() + 1 + yfull = timeObject.getFullYear() + yshort = timeObject.getYear()-100 + S = timeObject.getSeconds() + M = timeObject.getMinutes() + H = timeObject.getHours() format = format .replace(/dd/, s(d, 2)) .replace(/d/, d) .replace(/mm/, s(m, 2)) .replace(/m/, m) - .replace(/yyyy/, y) + .replace(/yyyy/, yfull) + .replace(/yy/, yshort) .replace(/SS/, s(S, 2)) .replace(/MM/, s(M, 2)) .replace(/HH/, s(H, 2)) diff --git a/app/assets/javascripts/app/lib/app_post/image_service.coffee b/app/assets/javascripts/app/lib/app_post/image_service.coffee index eb8eba5c6..5b0656e74 100644 --- a/app/assets/javascripts/app/lib/app_post/image_service.coffee +++ b/app/assets/javascripts/app/lib/app_post/image_service.coffee @@ -20,37 +20,53 @@ class App.ImageService imageWidth = imageObject.width imageHeight = imageObject.height console.log('ImageService', 'current size', imageWidth, imageHeight) + console.log('ImageService', 'sizeFactor', sizeFactor) if y is 'auto' && x is 'auto' x = imageWidth y = imageHeight + # set max x/y + if x isnt 'auto' && x > imageWidth + x = imageWidth + + if y isnt 'auto' && y > imageHeight + y = imageHeight + # get auto dimensions - if y is 'auto' + if y is 'auto'# && (y * factor) >= imageHeight factor = imageWidth / x y = imageHeight / factor - if x is 'auto' + if x is 'auto'# && (y * factor) >= imageWidth factor = imageWidth / y x = imageHeight / factor + canvas = document.createElement('canvas') + # check if resize is needed resize = false - if x < imageWidth || y < imageHeight + if (x < imageWidth && (x * sizeFactor < imageWidth)) || (y < imageHeight && (y * sizeFactor < imageHeight)) resize = true x = x * sizeFactor y = y * sizeFactor + + # set dimensions + canvas.width = x + canvas.height = y + + # draw image on canvas and set image dimensions + context = canvas.getContext('2d') + context.drawImage(imageObject, 0, 0, x, y) + else - x = imageWidth - y = imageHeight - # create canvas and set dimensions - canvas = document.createElement('canvas') - canvas.width = x - canvas.height = y + # set dimensions + canvas.width = imageWidth + canvas.height = imageHeight - # draw image on canvas and set image dimensions - context = canvas.getContext('2d') - context.drawImage(imageObject, 0, 0, x, y) + # draw image on canvas and set image dimensions + context = canvas.getContext('2d') + context.drawImage(imageObject, 0, 0, imageWidth, imageHeight) # set quallity based on image size if quallity == 'auto' diff --git a/app/assets/javascripts/app/lib/app_post/utils.coffee b/app/assets/javascripts/app/lib/app_post/utils.coffee index 6b7c21eef..134deb96e 100644 --- a/app/assets/javascripts/app/lib/app_post/utils.coffee +++ b/app/assets/javascripts/app/lib/app_post/utils.coffee @@ -5,6 +5,8 @@ class App.Utils 'TD': ['abbr', 'align', 'axis', 'colspan', 'headers', 'rowspan', 'valign', 'width', 'style'] 'TH': ['abbr', 'align', 'axis', 'colspan', 'headers', 'rowspan', 'scope', 'sorted', 'valign', 'width', 'style'] 'TR': ['width', 'style'] + 'A': ['href', 'hreflang', 'name', 'rel'] + 'IMG': ['align', 'alt', 'border', 'height', 'src', 'srcset', 'width', 'style'] @mapCss: 'TABLE': [ @@ -14,15 +16,9 @@ class App.Utils 'text-align', 'border', 'border-top', 'border-right', 'border-bottom', 'border-left', 'border-collapse', 'border-style', 'border-spacing', - 'border-top-width', - 'border-right-width', - 'border-bottom-width', - 'border-left-width', - - 'border-top-color', - 'border-right-color', - 'border-bottom-color', - 'border-left-color', + 'border-top-width', 'border-right-width', 'border-bottom-width', 'border-left-width', + 'border-top-color', 'border-right-color', 'border-bottom-color', 'border-left-color', + 'border-top-style', 'border-right-style', 'border-bottom-style', 'border-left-style', ] 'TH': [ 'background', 'background-color', 'color', 'font-size', 'vertical-align', @@ -31,15 +27,10 @@ class App.Utils 'text-align', 'border', 'border-top', 'border-right', 'border-bottom', 'border-left', 'border-collapse', 'border-style', 'border-spacing', - 'border-top-width', - 'border-right-width', - 'border-bottom-width', - 'border-left-width', + 'border-top-width', 'border-right-width', 'border-bottom-width', 'border-left-width', + 'border-top-color', 'border-right-color', 'border-bottom-color', 'border-left-color', + 'border-top-style', 'border-right-style', 'border-bottom-style', 'border-left-style', - 'border-top-color', - 'border-right-color', - 'border-bottom-color', - 'border-left-color', ] 'TR': [ 'background', 'background-color', 'color', 'font-size', 'vertical-align', @@ -48,15 +39,10 @@ class App.Utils 'text-align', 'border', 'border-top', 'border-right', 'border-bottom', 'border-left', 'border-collapse', 'border-style', 'border-spacing', - 'border-top-width', - 'border-right-width', - 'border-bottom-width', - 'border-left-width', + 'border-top-width', 'border-right-width', 'border-bottom-width', 'border-left-width', + 'border-top-color', 'border-right-color', 'border-bottom-color', 'border-left-color', + 'border-top-style', 'border-right-style', 'border-bottom-style', 'border-left-style', - 'border-top-color', - 'border-right-color', - 'border-bottom-color', - 'border-left-color', ] 'TD': [ 'background', 'background-color', 'color', 'font-size', 'vertical-align', @@ -65,15 +51,13 @@ class App.Utils 'text-align', 'border', 'border-top', 'border-right', 'border-bottom', 'border-left', 'border-collapse', 'border-style', 'border-spacing', - 'border-top-width', - 'border-right-width', - 'border-bottom-width', - 'border-left-width', + 'border-top-width', 'border-right-width', 'border-bottom-width', 'border-left-width', + 'border-top-color', 'border-right-color', 'border-bottom-color', 'border-left-color', + 'border-top-style', 'border-right-style', 'border-bottom-style', 'border-left-style', - 'border-top-color', - 'border-right-color', - 'border-bottom-color', - 'border-left-color', + ] + 'IMG': [ + 'width', 'height', ] # textCleand = App.Utils.textCleanup(rawText) @@ -230,7 +214,7 @@ class App.Utils # remove comments @_removeComments(html) - # remove work markup + # remove word markup @_removeWordMarkup(html) # remove tags, keep content @@ -251,7 +235,7 @@ class App.Utils # remove comments @_removeComments(html) - # remove work markup + # remove word markup @_removeWordMarkup(html) # remove tags, keep content @@ -275,11 +259,11 @@ class App.Utils # remove comments @_removeComments(html) - # remove work markup + # remove word markup @_removeWordMarkup(html) # remove tags, keep content - html.find('a, font, small, time, form, label').replaceWith( -> + html.find('font, small, time, form, label').replaceWith( -> $(@).contents() ) @@ -303,7 +287,7 @@ class App.Utils ) # remove tags & content - html.find('font, img, svg, input, select, button, style, applet, embed, noframes, canvas, script, frame, iframe, meta, link, title, head, fieldset').remove() + html.find('font, svg, input, select, button, style, applet, embed, noframes, canvas, script, frame, iframe, meta, link, title, head, fieldset').remove() # remove style and class @_cleanAttributes(html) @@ -906,6 +890,29 @@ class App.Utils text = text.replace(/http(s|):\/\/[-A-Za-z0-9+&@#\/%?=~_\|!:,.;]+[-A-Za-z0-9+&@#\/%=~_|]/img, placeholder) text.length + @parseAddressListLocal: (line) -> + recipients = emailAddresses.parseAddressList(line) + result = [] + if !_.isEmpty(recipients) + for recipient in recipients + if recipient && recipient.address + result.push recipient.address + return result + + # workaround for email-addresses.js issue with this kind of + # mail headers "From: invalid sender, realname " + # email-addresses.js is returning null because it can't parse the + # whole header + if _.isEmpty(recipients) && line.match('@') + recipients = line.split(',') + re = /(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))/ + for recipient in recipients + if recipient && recipient.match('@') + localResult = recipient.match(re) + if localResult && localResult[0] + result.push localResult[0] + result + @getRecipientArticle: (ticket, article, article_created_by, type, email_addresses = [], all) -> # empty form @@ -954,16 +961,18 @@ class App.Utils # check if article sender is local senderIsLocal = false if !_.isEmpty(article.from) - senders = emailAddresses.parseAddressList(article.from) - if senders && senders[0] && senders[0].address - senderIsLocal = isLocalAddress(senders[0].address) + senders = App.Utils.parseAddressListLocal(article.from) + if senders + for sender in senders + if sender && sender.match('@') + senderIsLocal = isLocalAddress(sender) # check if article recipient is local recipientIsLocal = false if !_.isEmpty(article.to) - recipients = emailAddresses.parseAddressList(article.to) - if recipients && recipients[0] && recipients[0].address - recipientIsLocal = isLocalAddress(recipients[0].address) + recipients = App.Utils.parseAddressListLocal(article.to) + if recipients && recipients[0] + recipientIsLocal = isLocalAddress(recipients[0]) # sender is local if senderIsLocal @@ -987,14 +996,14 @@ class App.Utils # filter for uniq recipients recipientAddresses = {} - addAddresses = (addressLine, line) -> lineNew = '' - recipients = emailAddresses.parseAddressList(addressLine) + recipients = App.Utils.parseAddressListLocal(addressLine) + if !_.isEmpty(recipients) for recipient in recipients - if !_.isEmpty(recipient.address) - localRecipientAddress = recipient.address.toString().toLowerCase() + if !_.isEmpty(recipient) + localRecipientAddress = recipient.toString().toLowerCase() # check if address is not local if !isLocalAddress(localRecipientAddress) diff --git a/app/assets/javascripts/app/lib/base/ba-linkify.js b/app/assets/javascripts/app/lib/base/ba-linkify.js index 293dd67af..911456236 100644 --- a/app/assets/javascripts/app/lib/base/ba-linkify.js +++ b/app/assets/javascripts/app/lib/base/ba-linkify.js @@ -161,7 +161,14 @@ window.linkify = (function(){ } // Push massaged link onto the array - parts.push([ link, href ]); + // 2018-10-30: me only link urls, not mailto link + //parts.push([ link, href ]); + if ( href && href.substr && href.substr(0,7) != 'mailto:') { + parts.push([ link, href ]); + } + else { + parts.push([ link, undefined ]); + } }; // Push remaining non-link text onto the array. diff --git a/app/assets/javascripts/app/lib/base/email-addresses.js b/app/assets/javascripts/app/lib/base/email-addresses.js index 4f36f700b..ce7b30d85 100644 --- a/app/assets/javascripts/app/lib/base/email-addresses.js +++ b/app/assets/javascripts/app/lib/base/email-addresses.js @@ -1,6 +1,6 @@ // email-addresses.js - RFC 5322 email address parser -// v 2.0.1 +// v 3.0.1 // // http://tools.ietf.org/html/rfc5322 // @@ -186,27 +186,7 @@ function parse5322(opts) { // "First Last" -> "First Last" // "First Last" -> "First Last" function collapseWhitespace(s) { - function isWhitespace(c) { - return c === ' ' || - c === '\t' || - c === '\r' || - c === '\n'; - } - var i, str; - str = ""; - for (i = 0; i < s.length; i += 1) { - if (!isWhitespace(s[i]) || !isWhitespace(s[i + 1])) { - str += s[i]; - } - } - - if (isWhitespace(str[0])) { - str = str.substring(1); - } - if (isWhitespace(str[str.length - 1])) { - str = str.substring(0, str.length - 1); - } - return str; + return s.replace(/([ \t]|\r\n)+/g, ' ').replace(/^\s*/, '').replace(/\s*$/, ''); } // UTF-8 pseudo-production (RFC 6532) @@ -597,10 +577,14 @@ function parse5322(opts) { return wrap('domain', function domainCheckTLD() { var result = or(obsDomain, dotAtom, domainLiteral)(); if (opts.rejectTLD) { - if (result.semantic.indexOf('.') < 0) { + if (result && result.semantic && result.semantic.indexOf('.') < 0) { return null; } } + // strip all whitespace from domains + if (result) { + result.semantic = result.semantic.replace(/\s+/g, ''); + } return result; }()); } @@ -612,6 +596,36 @@ function parse5322(opts) { )()); } + // 3.6.2 Originator Fields + // Below we only parse the field body, not the name of the field + // like "From:", "Sender:", or "Reply-To:". Other libraries that + // parse email headers can parse those and defer to these productions + // for the "RFC 5322" part. + + // RFC 6854 2.1. Replacement of RFC 5322, Section 3.6.2. Originator Fields + // from = "From:" (mailbox-list / address-list) CRLF + function fromSpec() { + return wrap('from', or( + mailboxList, + addressList + )()); + } + + // RFC 6854 2.1. Replacement of RFC 5322, Section 3.6.2. Originator Fields + // sender = "Sender:" (mailbox / address) CRLF + function senderSpec() { + return wrap('sender', or( + mailbox, + address + )()); + } + + // RFC 6854 2.1. Replacement of RFC 5322, Section 3.6.2. Originator Fields + // reply-to = "Reply-To:" address-list CRLF + function replyToSpec() { + return wrap('reply-to', addressList()); + } + // 4.1. Miscellaneous Obsolete Tokens // obs-NO-WS-CTL = %d1-8 / ; US-ASCII control @@ -766,92 +780,186 @@ function parse5322(opts) { // ast analysis function findNode(name, root) { - var i, queue, node; + var i, stack, node; if (root === null || root === undefined) { return null; } - queue = [root]; - while (queue.length > 0) { - node = queue.shift(); + stack = [root]; + while (stack.length > 0) { + node = stack.pop(); if (node.name === name) { return node; } - for (i = 0; i < node.children.length; i += 1) { - queue.push(node.children[i]); + for (i = node.children.length - 1; i >= 0; i -= 1) { + stack.push(node.children[i]); } } return null; } function findAllNodes(name, root) { - var i, queue, node, result; + var i, stack, node, result; if (root === null || root === undefined) { return null; } - queue = [root]; + stack = [root]; result = []; - while (queue.length > 0) { - node = queue.shift(); + while (stack.length > 0) { + node = stack.pop(); if (node.name === name) { result.push(node); } - for (i = 0; i < node.children.length; i += 1) { - queue.push(node.children[i]); + for (i = node.children.length - 1; i >= 0; i -= 1) { + stack.push(node.children[i]); + } + } + return result; + } + + function findAllNodesNoChildren(names, root) { + var i, stack, node, result, namesLookup; + if (root === null || root === undefined) { return null; } + stack = [root]; + result = []; + namesLookup = {}; + for (i = 0; i < names.length; i += 1) { + namesLookup[names[i]] = true; + } + + while (stack.length > 0) { + node = stack.pop(); + if (node.name in namesLookup) { + result.push(node); + // don't look at children (hence findAllNodesNoChildren) + } else { + for (i = node.children.length - 1; i >= 0; i -= 1) { + stack.push(node.children[i]); + } } } return result; } function giveResult(ast) { - function grabSemantic(n) { - return n !== null ? n.semantic : null; - } - var i, ret, addresses, addr, name, aspec, local, domain; + var addresses, groupsAndMailboxes, i, groupOrMailbox, result; if (ast === null) { return null; } - ret = { ast: ast }; - addresses = findAllNodes('address', ast); - ret.addresses = []; - for (i = 0; i < addresses.length; i += 1) { - addr = addresses[i]; - name = findNode('display-name', addr); - aspec = findNode('addr-spec', addr); - local = findNode('local-part', aspec); - domain = findNode('domain', aspec); - ret.addresses.push({ - node: addr, - parts: { - name: name, - address: aspec, - local: local, - domain: domain - }, - name: grabSemantic(name), - address: grabSemantic(aspec), - local: grabSemantic(local), - domain: grabSemantic(domain) - }); - } + addresses = []; - if (opts.simple) { - ret = ret.addresses; - for (i = 0; i < ret.length; i += 1) { - delete ret[i].node; + // An address is a 'group' (i.e. a list of mailboxes) or a 'mailbox'. + groupsAndMailboxes = findAllNodesNoChildren(['group', 'mailbox'], ast); + for (i = 0; i < groupsAndMailboxes.length; i += 1) { + groupOrMailbox = groupsAndMailboxes[i]; + if (groupOrMailbox.name === 'group') { + addresses.push(giveResultGroup(groupOrMailbox)); + } else if (groupOrMailbox.name === 'mailbox') { + addresses.push(giveResultMailbox(groupOrMailbox)); } } - return ret; + + result = { + ast: ast, + addresses: addresses, + }; + if (opts.simple) { + result = simplifyResult(result); + } + if (opts.oneResult) { + return oneResult(result); + } + if (opts.simple) { + return result && result.addresses; + } else { + return result; + } + } + + function giveResultGroup(group) { + var i; + var groupName = findNode('display-name', group); + var groupResultMailboxes = []; + var mailboxes = findAllNodesNoChildren(['mailbox'], group); + for (i = 0; i < mailboxes.length; i += 1) { + groupResultMailboxes.push(giveResultMailbox(mailboxes[i])); + } + return { + node: group, + parts: { + name: groupName, + }, + type: group.name, // 'group' + name: grabSemantic(groupName), + addresses: groupResultMailboxes, + }; + } + + function giveResultMailbox(mailbox) { + var name = findNode('display-name', mailbox); + var aspec = findNode('addr-spec', mailbox); + var comments = findAllNodes('cfws', mailbox); + + var local = findNode('local-part', aspec); + var domain = findNode('domain', aspec); + return { + node: mailbox, + parts: { + name: name, + address: aspec, + local: local, + domain: domain, + comments: comments + }, + type: mailbox.name, // 'mailbox' + name: grabSemantic(name), + address: grabSemantic(aspec), + local: grabSemantic(local), + domain: grabSemantic(domain), + groupName: grabSemantic(mailbox.groupName), + }; + } + + function grabSemantic(n) { + return n !== null && n !== undefined ? n.semantic : null; + } + + function simplifyResult(result) { + var i; + if (result && result.addresses) { + for (i = 0; i < result.addresses.length; i += 1) { + delete result.addresses[i].node; + } + } + return result; + } + + function oneResult(result) { + if (!result) { return null; } + if (!opts.partial && result.addresses.length > 1) { return null; } + return result.addresses && result.addresses[0]; } ///////////////////////////////////////////////////// - var parseString, pos, len, parsed; + var parseString, pos, len, parsed, startProduction; opts = handleOpts(opts, {}); if (opts === null) { return null; } parseString = opts.input; + startProduction = { + 'address': address, + 'address-list': addressList, + 'angle-addr': angleAddr, + 'from': fromSpec, + 'group': group, + 'mailbox': mailbox, + 'mailbox-list': mailboxList, + 'reply-to': replyToSpec, + 'sender': senderSpec, + }[opts.startAt] || addressList; + if (!opts.strict) { initialize(); opts.strict = true; - parsed = addressList(parseString); + parsed = startProduction(parseString); if (opts.partial || !inStr()) { return giveResult(parsed); } @@ -859,46 +967,51 @@ function parse5322(opts) { } initialize(); - parsed = addressList(parseString); + parsed = startProduction(parseString); if (!opts.partial && inStr()) { return null; } return giveResult(parsed); } function parseOneAddressSimple(opts) { - var result; - - opts = handleOpts(opts, { + return parse5322(handleOpts(opts, { + oneResult: true, rfc6532: true, - simple: true - }); - if (opts === null) { return null; } - - result = parse5322(opts); - - if ((!result) || - (!opts.partial && - (opts.simple && result.length > 1) || - (!opts.simple && result.addresses.length > 1))) { - return null; - } - - return opts.simple ? - result && result[0] : - result && result.addresses && result.addresses[0]; + simple: true, + startAt: 'address-list', + })); } function parseAddressListSimple(opts) { - var result; - - opts = handleOpts(opts, { + return parse5322(handleOpts(opts, { rfc6532: true, - simple: true - }); - if (opts === null) { return null; } + simple: true, + startAt: 'address-list', + })); +} - result = parse5322(opts); +function parseFromSimple(opts) { + return parse5322(handleOpts(opts, { + rfc6532: true, + simple: true, + startAt: 'from', + })); +} - return opts.simple ? result : result.addresses; +function parseSenderSimple(opts) { + return parse5322(handleOpts(opts, { + oneResult: true, + rfc6532: true, + simple: true, + startAt: 'sender', + })); +} + +function parseReplyToSimple(opts) { + return parse5322(handleOpts(opts, { + rfc6532: true, + simple: true, + startAt: 'reply-to', + })); } function handleOpts(opts, defs) { @@ -926,24 +1039,28 @@ function handleOpts(opts, defs) { if (!defs) { return null; } defaults = { - rfc6532: false, + oneResult: false, partial: false, + rejectTLD: false, + rfc6532: false, simple: false, + startAt: 'address-list', strict: false, - rejectTLD: false }; for (o in defaults) { if (isNullUndef(opts[o])) { opts[o] = !isNullUndef(defs[o]) ? defs[o] : defaults[o]; } - opts[o] = !!opts[o]; } return opts; } parse5322.parseOneAddress = parseOneAddressSimple; parse5322.parseAddressList = parseAddressListSimple; +parse5322.parseFrom = parseFromSimple; +parse5322.parseSender = parseSenderSimple; +parse5322.parseReplyTo = parseReplyToSimple; // in Zammad context, go back to non CommonJS // if (typeof module !== 'undefined' && typeof module.exports !== 'undefined') { diff --git a/app/assets/javascripts/app/lib/base/jquery.contenteditable.js b/app/assets/javascripts/app/lib/base/jquery.contenteditable.js index a82a036dc..85618ba36 100644 --- a/app/assets/javascripts/app/lib/base/jquery.contenteditable.js +++ b/app/assets/javascripts/app/lib/base/jquery.contenteditable.js @@ -289,15 +289,16 @@ var result = e.target.result var img = document.createElement('img') img.src = result + maxWidth = _this.$element.width() || 500 + scaleFactor = 2 + //scaleFactor = 1 + //if (window.isRetina && window.isRetina()) { + // scaleFactor = 2 + //} - insert = function(dataUrl, width, height, isRetina) { + insert = function(dataUrl, width, height, isResized) { //console.log('dataUrl', dataUrl) - - // adapt image if we are on retina devices - if (!isRetina && window.isRetina && window.isRetina()) { - width = width / 2 - height = height / 2 - } + //console.log('scaleFactor', scaleFactor, isResized, maxWidth, width, height) _this.log('image inserted') result = dataUrl if (_this.options.imageWidth == 'absolute') { @@ -310,7 +311,7 @@ } // resize if to big - App.ImageService.resize(img.src, 460, 'auto', 2, 'image/jpeg', 'auto', insert) + App.ImageService.resize(img.src, maxWidth, 'auto', scaleFactor, 'image/jpeg', 'auto', insert) } reader.readAsDataURL(imageFile) imageInserted = true @@ -416,17 +417,18 @@ var result = e.target.result var img = document.createElement('img') img.src = result + maxWidth = _this.$element.width() || 500 + scaleFactor = 2 + //scaleFactor = 1 + //if (window.isRetina && window.isRetina()) { + // scaleFactor = 2 + //} //Insert the image at the carat - insert = function(dataUrl, width, height, isRetina) { - - // adapt image if we are on retina devices - if (!isRetina && window.isRetina && window.isRetina()) { - width = width / 2 - height = height / 2 - } + insert = function(dataUrl, width, height, isResized) { //console.log('dataUrl', dataUrl) + //console.log('scaleFactor', scaleFactor, isResized, maxWidth, width, height) _this.log('image inserted') result = dataUrl if (_this.options.imageWidth == 'absolute') { @@ -454,7 +456,7 @@ } // resize if to big - App.ImageService.resize(img.src, 460, 'auto', 2, 'image/jpeg', 'auto', insert) + App.ImageService.resize(img.src, maxWidth, 'auto', scaleFactor, 'image/jpeg', 'auto', insert) }) reader.readAsDataURL(file) } diff --git a/app/assets/javascripts/app/lib/base/word_filter.js b/app/assets/javascripts/app/lib/base/word_filter.js index 9300d07f9..cd73b5b2e 100644 --- a/app/assets/javascripts/app/lib/base/word_filter.js +++ b/app/assets/javascripts/app/lib/base/word_filter.js @@ -74,8 +74,9 @@ window.word_filter = function(editor){ } }) - $('[style]', editor).removeAttr('style'); - $('[align]', editor).removeAttr('align'); + // style and align is handled by utils.coffee it self, don't clean it here + //$('[style]', editor).removeAttr('style'); + //$('[align]', editor).removeAttr('align'); $('span', editor).replaceWith(function() {return $(this).contents();}); $('span:empty', editor).remove(); $("[class^='Mso']", editor).removeAttr('class'); diff --git a/app/assets/javascripts/app/lib/bootstrap/bootstrap-datepicker.js b/app/assets/javascripts/app/lib/bootstrap/bootstrap-datepicker.js index cf25e7b64..c08105f0b 100755 --- a/app/assets/javascripts/app/lib/bootstrap/bootstrap-datepicker.js +++ b/app/assets/javascripts/app/lib/bootstrap/bootstrap-datepicker.js @@ -26,6 +26,7 @@ - allow custom template as options parameter - fix that place method doesn't think that the container is the window, but rather the real window is the window - added rerender method to show correct today if task is longer open the 24 hours + - scroll into view */ (function(factory){ @@ -515,7 +516,9 @@ ) ) this.setValue(); - this._trigger('hide'); + // 2018-01-22 trigger locale hide event - conflicts with modal hide + //this._trigger('hide'); + this._trigger('hide.bs.datepicker'); return this; }, @@ -757,6 +760,16 @@ zIndex: zIndex }); } + + // adjust scroll of scrollParent + var scrollParent = this.picker.scrollParent(); + var bottomEdge = offset.top + height + this.picker.outerHeight(); + var scrollBottomEdge = scrollParent.scrollTop() + scrollParent.height(); + + if(bottomEdge > scrollBottomEdge){ + scrollParent.scrollTop(scrollParent.scrollTop() + (bottomEdge - scrollBottomEdge) + 10); + } + return this; }, diff --git a/app/assets/javascripts/app/models/_application_model.coffee b/app/assets/javascripts/app/models/_application_model.coffee index cf41a2c23..660af96df 100644 --- a/app/assets/javascripts/app/models/_application_model.coffee +++ b/app/assets/javascripts/app/models/_application_model.coffee @@ -387,15 +387,17 @@ set new attributes of model (remove already available attributes) => return if _.isEmpty(@SUBSCRIPTION_COLLECTION) App.Log.debug('Model', "server notify collection change #{@className}") - @fetchFull( - -> - clear: true - ) + callback = => + @fetchFull( + -> + clear: true + ) + App.Delay.set(callback, 200, "full-#{@className}") "Collection::Subscribe::#{@className}" ) - key = @className + '-' + Math.floor( Math.random() * 99999 ) + key = "#{@className}-#{Math.floor(Math.random() * 99999)}" @SUBSCRIPTION_COLLECTION[key] = callback # fetch init collection diff --git a/app/assets/javascripts/app/models/chat.coffee b/app/assets/javascripts/app/models/chat.coffee index 4a93284bb..ddd0f7eaa 100644 --- a/app/assets/javascripts/app/models/chat.coffee +++ b/app/assets/javascripts/app/models/chat.coffee @@ -1,16 +1,260 @@ class App.Chat extends App.Model - @configure 'Chat', 'name', 'active', 'public', 'max_queue', 'note' + @configure 'Chat', 'name', 'active', 'public', 'max_queue', 'block_ip', 'block_country', 'note' @extend Spine.Model.Ajax @url: @apiPath + '/chats' + @countries: + AF: 'Afghanistan' + AL: 'Albania' + DZ: 'Algeria' + AS: 'American Samoa' + AD: 'Andorra' + AO: 'Angola' + AI: 'Anguilla' + AQ: 'Antarctica' + AG: 'Antigua And Barbuda' + AR: 'Argentina' + AM: 'Armenia' + AW: 'Aruba' + AU: 'Australia' + AT: 'Austria' + AZ: 'Azerbaijan' + BS: 'Bahamas' + BH: 'Bahrain' + BD: 'Bangladesh' + BB: 'Barbados' + BY: 'Belarus' + BE: 'Belgium' + BZ: 'Belize' + BJ: 'Benin' + BM: 'Bermuda' + BT: 'Bhutan' + BO: 'Bolivia' + BA: 'Bosnia And Herzegovina' + BW: 'Botswana' + BV: 'Bouvet Island' + BR: 'Brazil' + IO: 'British Indian Ocean Territory' + BN: 'Brunei Darussalam' + BG: 'Bulgaria' + BF: 'Burkina Faso' + BI: 'Burundi' + KH: 'Cambodia' + CM: 'Cameroon' + CA: 'Canada' + CV: 'Cape Verde' + KY: 'Cayman Islands' + CF: 'Central African Republic' + TD: 'Chad' + CL: 'Chile' + CN: 'China' + CX: 'Christmas Island' + CC: 'Cocos (keeling) Islands' + CO: 'Colombia' + KM: 'Comoros' + CG: 'Congo' + CD: 'Congo, The Democratic Republic Of The' + CK: 'Cook Islands' + CR: 'Costa Rica' + CI: 'Cote D\'ivoire' + HR: 'Croatia' + CU: 'Cuba' + CY: 'Cyprus' + CZ: 'Czech Republic' + DK: 'Denmark' + DJ: 'Djibouti' + DM: 'Dominica' + DO: 'Dominican Republic' + TP: 'East Timor' + EC: 'Ecuador' + EG: 'Egypt' + SV: 'El Salvador' + GQ: 'Equatorial Guinea' + ER: 'Eritrea' + EE: 'Estonia' + ET: 'Ethiopia' + FK: 'Falkland Islands (malvinas)' + FO: 'Faroe Islands' + FJ: 'Fiji' + FI: 'Finland' + FR: 'France' + GF: 'French Guiana' + PF: 'French Polynesia' + TF: 'French Southern Territories' + GA: 'Gabon' + GM: 'Gambia' + GE: 'Georgia' + DE: 'Germany' + GH: 'Ghana' + GI: 'Gibraltar' + GR: 'Greece' + GL: 'Greenland' + GD: 'Grenada' + GP: 'Guadeloupe' + GU: 'Guam' + GT: 'Guatemala' + GN: 'Guinea' + GW: 'Guinea-bissau' + GY: 'Guyana' + HT: 'Haiti' + HM: 'Heard Island And Mcdonald Islands' + VA: 'Holy See (vatican City State)' + HN: 'Honduras' + HK: 'Hong Kong' + HU: 'Hungary' + IS: 'Iceland' + IN: 'India' + ID: 'Indonesia' + IR: 'Iran, Islamic Republic Of' + IQ: 'Iraq' + IE: 'Ireland' + IL: 'Israel' + IT: 'Italy' + JM: 'Jamaica' + JP: 'Japan' + JO: 'Jordan' + KZ: 'Kazakstan' + KE: 'Kenya' + KI: 'Kiribati' + KP: 'Korea, Democratic People\'s Republic Of' + KR: 'Korea, Republic Of' + KV: 'Kosovo' + KW: 'Kuwait' + KG: 'Kyrgyzstan' + LA: 'Lao People\'s Democratic Republic' + LV: 'Latvia' + LB: 'Lebanon' + LS: 'Lesotho' + LR: 'Liberia' + LY: 'Libyan Arab Jamahiriya' + LI: 'Liechtenstein' + LT: 'Lithuania' + LU: 'Luxembourg' + MO: 'Macau' + MK: 'Macedonia, The Former Yugoslav Republic Of' + MG: 'Madagascar' + MW: 'Malawi' + MY: 'Malaysia' + MV: 'Maldives' + ML: 'Mali' + MT: 'Malta' + MH: 'Marshall Islands' + MQ: 'Martinique' + MR: 'Mauritania' + MU: 'Mauritius' + YT: 'Mayotte' + MX: 'Mexico' + FM: 'Micronesia, Federated States Of' + MD: 'Moldova, Republic Of' + MC: 'Monaco' + MN: 'Mongolia' + MS: 'Montserrat' + ME: 'Montenegro' + MA: 'Morocco' + MZ: 'Mozambique' + MM: 'Myanmar' + NA: 'Namibia' + NR: 'Nauru' + NP: 'Nepal' + NL: 'Netherlands' + AN: 'Netherlands Antilles' + NC: 'New Caledonia' + NZ: 'New Zealand' + NI: 'Nicaragua' + NE: 'Niger' + NG: 'Nigeria' + NU: 'Niue' + NF: 'Norfolk Island' + MP: 'Northern Mariana Islands' + NO: 'Norway' + OM: 'Oman' + PK: 'Pakistan' + PW: 'Palau' + PS: 'Palestinian Territory, Occupied' + PA: 'Panama' + PG: 'Papua New Guinea' + PY: 'Paraguay' + PE: 'Peru' + PH: 'Philippines' + PN: 'Pitcairn' + PL: 'Poland' + PT: 'Portugal' + PR: 'Puerto Rico' + QA: 'Qatar' + RE: 'Reunion' + RO: 'Romania' + RU: 'Russian Federation' + RW: 'Rwanda' + SH: 'Saint Helena' + KN: 'Saint Kitts And Nevis' + LC: 'Saint Lucia' + PM: 'Saint Pierre And Miquelon' + VC: 'Saint Vincent And The Grenadines' + WS: 'Samoa' + SM: 'San Marino' + ST: 'Sao Tome And Principe' + SA: 'Saudi Arabia' + SN: 'Senegal' + RS: 'Serbia' + SC: 'Seychelles' + SL: 'Sierra Leone' + SG: 'Singapore' + SK: 'Slovakia' + SI: 'Slovenia' + SB: 'Solomon Islands' + SO: 'Somalia' + ZA: 'South Africa' + GS: 'South Georgia And The South Sandwich Islands' + ES: 'Spain' + LK: 'Sri Lanka' + SD: 'Sudan' + SR: 'Suriname' + SJ: 'Svalbard And Jan Mayen' + SZ: 'Swaziland' + SE: 'Sweden' + CH: 'Switzerland' + SY: 'Syrian Arab Republic' + TW: 'Taiwan, Province Of China' + TJ: 'Tajikistan' + TZ: 'Tanzania, United Republic Of' + TH: 'Thailand' + TG: 'Togo' + TK: 'Tokelau' + TO: 'Tonga' + TT: 'Trinidad And Tobago' + TN: 'Tunisia' + TR: 'Turkey' + TM: 'Turkmenistan' + TC: 'Turks And Caicos Islands' + TV: 'Tuvalu' + UG: 'Uganda' + UA: 'Ukraine' + AE: 'United Arab Emirates' + GB: 'United Kingdom' + US: 'United States' + UM: 'United States Minor Outlying Islands' + UY: 'Uruguay' + UZ: 'Uzbekistan' + VU: 'Vanuatu' + VE: 'Venezuela' + VN: 'Viet Nam' + VG: 'Virgin Islands, British' + VI: 'Virgin Islands, U.s.' + WF: 'Wallis And Futuna' + EH: 'Western Sahara' + YE: 'Yemen' + ZM: 'Zambia' + ZW: 'Zimbabwe' @configure_attributes = [ { name: 'name', display: 'Name', tag: 'input', type: 'text', limit: 100, null: false }, { name: 'note', display: 'Note', tag: 'textarea', limit: 250, null: true }, - #{ name: 'public', display: 'Public', tag: 'boolean', default: true }, - { name: 'max_queue', display: 'Max. clients in waitlist', tag: 'input', default: 2 }, + { name: 'max_queue', display: 'Max. clients in waitlist', tag: 'input', default: 2 }, + { name: 'block_ip', display: 'Blocked IPs (separated by ;)', tag: 'input', default: '', null: true }, + { name: 'block_country', display: 'Blocked countries', tag: 'column_select', multiple: true, null: true, default: '', options: @countries, seperator: ';' }, { name: 'active', display: 'Active', tag: 'active', default: true }, { name: 'created_by_id', display: 'Created by', relation: 'User', readonly: 1 }, { name: 'created_at', display: 'Created', tag: 'datetime', readonly: 1 }, { name: 'updated_by_id', display: 'Updated by', relation: 'User', readonly: 1 }, { name: 'updated_at', display: 'Updated', tag: 'datetime', readonly: 1 }, ] + diff --git a/app/assets/javascripts/app/models/chat_sessions.coffee b/app/assets/javascripts/app/models/chat_sessions.coffee new file mode 100644 index 000000000..d32fccd18 --- /dev/null +++ b/app/assets/javascripts/app/models/chat_sessions.coffee @@ -0,0 +1,32 @@ +class App.ChatSession extends App.Model + @configure 'ChatSession', 'name', 'note' + @extend Spine.Model.Ajax + @url: @apiPath + '/chat_sessions' + + @configure_attributes = [ + { name: 'name', display: 'Name', tag: 'input', type: 'text', limit: 100, 'null': false } + { name: 'state', display: 'State', readonly: 1 } + { name: 'created_by_id', display: 'Created by', relation: 'User', readonly: 1 } + { name: 'created_at', display: 'Created', tag: 'datetime', readonly: 1 } + { name: 'updated_by_id', display: 'Updated by', relation: 'User', readonly: 1 } + { name: 'updated_at', display: 'Updated', tag: 'datetime', readonly: 1 } + ] + + @configure_overview = [ + 'name', + 'state', + 'created_at', + ] + + uiUrl: -> + "#customer_chat/session/#{@id}" + + searchResultAttributes: -> + displayName = '' + if !_.isEmpty(@name) + displayName = @displayName() + display: "##{@id} #{displayName}" + id: @id + class: 'chat_session chat_session-popover' + url: @uiUrl() + icon: 'chat' diff --git a/app/assets/javascripts/app/models/overview.coffee b/app/assets/javascripts/app/models/overview.coffee index 85581873c..d6ad48a3c 100644 --- a/app/assets/javascripts/app/models/overview.coffee +++ b/app/assets/javascripts/app/models/overview.coffee @@ -1,5 +1,5 @@ class App.Overview extends App.Model - @configure 'Overview', 'name', 'prio', 'condition', 'order', 'group_by', 'view', 'user_ids', 'organization_shared', 'role_ids', 'order', 'group_by', 'active', 'updated_at' + @configure 'Overview', 'name', 'prio', 'condition', 'order', 'group_by', 'view', 'user_ids', 'organization_shared', 'role_ids', 'active' @extend Spine.Model.Ajax @url: @apiPath + '/overviews' @configure_attributes = [ diff --git a/app/assets/javascripts/app/models/ticket.coffee b/app/assets/javascripts/app/models/ticket.coffee index ac9d93df1..87865f956 100644 --- a/app/assets/javascripts/app/models/ticket.coffee +++ b/app/assets/javascripts/app/models/ticket.coffee @@ -200,6 +200,26 @@ class App.Ticket extends App.Model result = true if objectValue.toString().match(contains_regex) else if condition.operator == 'contains not' result = true if !objectValue.toString().match(contains_regex) + else if condition.operator == 'contains all' + result = true + for loopConditionValue in conditionValue + if !_.contains(objectValue, loopConditionValue) + result = false + else if condition.operator == 'contains one' + result = false + for loopConditionValue in conditionValue + if _.contains(objectValue, loopConditionValue) + result = true + else if condition.operator == 'contains all not' + result = true + for loopObjectValue in objectValue + if _.contains(conditionValue, loopObjectValue) + result = false + else if condition.operator == 'contains one not' + result = false + for loopObjectValue in objectValue + if !_.contains(conditionValue, loopObjectValue) + result = true else if condition.operator == 'is' result = true if objectValue.toString().trim().toLowerCase() is loopConditionValue.toString().trim().toLowerCase() else if condition.operator == 'is not' @@ -224,3 +244,19 @@ class App.Ticket extends App.Model throw "Unknown operator: #{condition.operator}" result + + editable: (permission = 'change') -> + user_id = App.Session.get('id') + return true if user_id is @customer_id + group_ids = App.Session.get('group_ids') + if group_ids + return true if group_ids[@group_id] && (_.include(group_ids[@group_id], permission) || _.include(group_ids[@group_id], 'full')) + role_ids = App.Session.get('role_ids') + if role_ids + for role_id in role_ids + if App.Role.exists(role_id) + role = App.Role.find(role_id) + if role.group_ids + return true if role.group_ids[@group_id] && (_.include(role.group_ids[@group_id], permission) || _.include(role.group_ids[@group_id], 'full')) + false + diff --git a/app/assets/javascripts/app/views/agent_ticket_create.jst.eco b/app/assets/javascripts/app/views/agent_ticket_create.jst.eco index 1f4804fc9..669cca9fe 100644 --- a/app/assets/javascripts/app/views/agent_ticket_create.jst.eco +++ b/app/assets/javascripts/app/views/agent_ticket_create.jst.eco @@ -3,28 +3,31 @@
-

<%- @T( @head ) %>

+

<%- @T(@head) %>

    -
  • <%- @Icon('received-calls', 'tab-icon') %> <%- @T('Received Call') %>
    • -
  • <%- @Icon('outbound-calls', 'tab-icon') %> <%- @T('Outbound Call') %>
    • - -
  • +
  • <%- @Icon('email', 'tab-icon') %> <%- @T('Send Email') %>
+ <% if !_.isEmpty(@C('ui_ticket_create_notes')): %> + <% for type, note of @C('ui_ticket_create_notes'): %> + + <% end %> + <% end %> +
@@ -46,7 +49,6 @@
-
\ No newline at end of file +
<%- @T('Turn chat into ticket') %>
+ \ No newline at end of file diff --git a/app/assets/javascripts/app/views/customer_chat/chat_window.jst.eco b/app/assets/javascripts/app/views/customer_chat/chat_window.jst.eco index 1fef2ed9b..de2f271da 100644 --- a/app/assets/javascripts/app/views/customer_chat/chat_window.jst.eco +++ b/app/assets/javascripts/app/views/customer_chat/chat_window.jst.eco @@ -7,9 +7,7 @@
- <%= @name %>
-
<%- @Icon('info') %>
-
+ <%= @name %> #<%= @session.id %>
<%- @T('disconnect') %>
@@ -24,6 +22,25 @@
+
diff --git a/app/assets/javascripts/app/views/customer_chat/chat_window_info.jst.eco b/app/assets/javascripts/app/views/customer_chat/chat_window_info.jst.eco deleted file mode 100644 index a7c3b1ff3..000000000 --- a/app/assets/javascripts/app/views/customer_chat/chat_window_info.jst.eco +++ /dev/null @@ -1,17 +0,0 @@ -
-
    -<% if @session: %> -
  • <%- @T('Created at') %>: <%- @Ttimestamp(@session.created_at) %> -<% end %> -<% if @session && @session.preferences: %> - <% if @session.preferences.geo_ip: %> -
  • GeoIP: <%= @session.preferences.geo_ip.country_name %> <%= @session.preferences.geo_ip.city_name %> - <% end %> - <% if @session.preferences.remote_ip: %> -
  • IP: <%= @session.preferences.remote_ip %> - <% end %> - <% if @session.preferences.dns_name: %> -
  • DNS: <%= @session.preferences.dns_name %> - <% end %> -<% end %> -
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/generic/attachment_item.jst.eco b/app/assets/javascripts/app/views/generic/attachment_item.jst.eco index dfa927c95..d4de0ce4a 100644 --- a/app/assets/javascripts/app/views/generic/attachment_item.jst.eco +++ b/app/assets/javascripts/app/views/generic/attachment_item.jst.eco @@ -1,7 +1,7 @@
-
<%= @fileName %>
-
<%= @fileSize %>
-
+
<%= @filename %>
+
<%= @humanFileSize(@size) %>
+
<%- @Icon('diagonal-cross') %><%- @T('Delete File') %>
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/generic/column_select.jst.eco b/app/assets/javascripts/app/views/generic/column_select.jst.eco index 301dd0415..196bcb833 100644 --- a/app/assets/javascripts/app/views/generic/column_select.jst.eco +++ b/app/assets/javascripts/app/views/generic/column_select.jst.eco @@ -1,3 +1,6 @@ +<% if @attribute.seperator: %> + +<% else: %> +<% end %>
<%- @T('Nothing selected') %>
<% for option in @attribute.options: %> diff --git a/app/assets/javascripts/app/views/generic/sidebar_tabs.jst.eco b/app/assets/javascripts/app/views/generic/sidebar_tabs.jst.eco index d1bd32527..f41f1fb33 100644 --- a/app/assets/javascripts/app/views/generic/sidebar_tabs.jst.eco +++ b/app/assets/javascripts/app/views/generic/sidebar_tabs.jst.eco @@ -1,7 +1,7 @@ <% for item in @items: %>
-

<%- @T(item.head) %>

+

<%- @T(item.sidebarHead) %>

<%- @Icon('long-arrow-right') %> @@ -13,8 +13,6 @@ <% end %>
<% for item in @items: %> -
- <%- @Icon(item.icon) %> -
+
<% end %>
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/generic/sidebar_tabs_item.jst.eco b/app/assets/javascripts/app/views/generic/sidebar_tabs_item.jst.eco new file mode 100644 index 000000000..881b44273 --- /dev/null +++ b/app/assets/javascripts/app/views/generic/sidebar_tabs_item.jst.eco @@ -0,0 +1,4 @@ +<% if @counterPossible is true: %> +
<%= @counter %>
+<% end %> +<%- @Icon(@icon) %> \ No newline at end of file diff --git a/app/assets/javascripts/app/views/generic/table.jst.eco b/app/assets/javascripts/app/views/generic/table.jst.eco index 5e0bbc2c2..ea1ce0b1b 100644 --- a/app/assets/javascripts/app/views/generic/table.jst.eco +++ b/app/assets/javascripts/app/views/generic/table.jst.eco @@ -1,5 +1,5 @@
-"> +
<% if @sortable: %> @@ -19,14 +19,10 @@ <% end %> <% for header, i in @headers: %> - - + @@ -596,7 +598,7 @@ Managing Director: Martin Edenhofer }, { data: IO.binread('test/fixtures/mail21.box'), - body_md5: '380ca2bca1d7e013abd4109459a06fac', + body_md5: '7cb50fe6b37420fe9aea61eb5badc25a', params: { from: 'Viagra Super Force Online ', from_email: 'pharmacy_affordable1@ertelecom.ru', @@ -735,14 +737,14 @@ end }, { data: IO.binread('test/fixtures/mail29.box'), - body_md5: 'f18cceddc06b60f5cdf2d39a556ab1f2', + body_md5: '0637f48a0979e479efec07120a2bb700', params: { from: 'Example Sales ', from_email: 'sales@example.com', from_display_name: 'Example Sales', subject: 'Example licensing information: No channel available', to: 'info@znuny.inc', - body: 'Dear Mr. Edenhofer,

We want to keep you updated on TeamViewer licensing shortages on a regular basis.

We would like to inform you that since the last message on 25-Nov-2014 there have been temporary session channel exceedances which make it impossible to establish more sessions. Since the last e-mail this has occurred in a total of 1 cases.

Additional session channels can be added at any time. Please visit our TeamViewer Online Shop (https://www.teamviewer.com/en/licensing/update.aspx?channel=D842CS9BF85-P1009645N-348785E76E) for pricing information.

Thank you - and again all the best with TeamViewer!

Best regards,

Your TeamViewer Team

P.S.: You receive this e-mail because you are listed in our database as person who ordered a TeamViewer license. Please click here (http://www.teamviewer.com/en/company/unsubscribe.aspx?id=1009645&ident=E37682EAC65E8CA6FF36074907D8BC14) to unsubscribe from further e-mails.

-----------------------------
+ body: 'Dear Mr. Edenhofer,

We want to keep you updated on TeamViewer licensing shortages on a regular basis.

We would like to inform you that since the last message on 25-Nov-2014 there have been temporary session channel exceedances which make it impossible to establish more sessions. Since the last e-mail this has occurred in a total of 1 cases.

Additional session channels can be added at any time. Please visit our TeamViewer Online Shop for pricing information.

Thank you - and again all the best with TeamViewer!

Best regards,

Your TeamViewer Team

P.S.: You receive this e-mail because you are listed in our database as person who ordered a TeamViewer license. Please click here to unsubscribe from further e-mails.

-----------------------------
www.teamviewer.com

TeamViewer GmbH * Jahnstr. 30 * 73037 Göppingen * Germany
Tel. 07161 60692 50 * Fax 07161 60692 79

Registration AG Ulm HRB 534075 * General Manager Holger Felgner' }, @@ -938,7 +940,7 @@ end }, { data: IO.binread('test/fixtures/mail43.box'), - body_md5: 'a3f7ff5e1876fdbf051c38649b4c9668', + body_md5: '23cb094f443f41069b9f347a551e2e4d', params: { from: 'Paula ', from_email: 'databases.en@example.com', @@ -947,32 +949,32 @@ end to: 'info@example.ch', cc: nil, body: "
<%= " align-#{ header.align }" if header.align %>" style="<% if header.displayWidth: %>width:<%= header.displayWidth %>px<% end %>" data-column-key="<%= header.name %>"> +
<%- @T(header.display) %>
-
- <% if header.sortOrderIcon: %> - <%- @Icon(header.sortOrderIcon[0], header.sortOrderIcon[1]) %> - <% end %> -
+
<% if header.sortOrderIcon: %><%- @Icon(header.sortOrderIcon[0], header.sortOrderIcon[1]) %><% end %>
<% if @tableId && !header.unresizable && i < @headers.length - 1: %>
diff --git a/app/assets/javascripts/app/views/generic/table_row.jst.eco b/app/assets/javascripts/app/views/generic/table_row.jst.eco index 1aa07f841..c414bca04 100644 --- a/app/assets/javascripts/app/views/generic/table_row.jst.eco +++ b/app/assets/javascripts/app/views/generic/table_row.jst.eco @@ -21,7 +21,7 @@ <% end %> <% for header in @headers: %> - <% value = @P(@object, header.name, @attributes) %> + <% value = @P(@object, header.name, @attributes, true) %> <% if @callbacks: %> <% for attribute, callbacksAll of @callbacks: %> <% if attribute is header.name: %> @@ -31,7 +31,7 @@ <% end %> <% end %> <% end %> - <%- " title='#{ header.title }'" if header.title %><%- " style='text-align:#{ header.align }'" if header.align %>> + class="<%= header.parentClass %>"<% end %><% if header.title: %> title="<%= header.title %>"<% end %><% if header.align: %> style="text-align:<%= header.align %>"<% end %>> <% if header.name is 'icon': %> <%- @Icon('task-state', header.class) %> <% else if header.icon: %> diff --git a/app/assets/javascripts/app/views/import/otrs.jst.eco b/app/assets/javascripts/app/views/import/otrs.jst.eco index c14f05cf2..a1b158946 100644 --- a/app/assets/javascripts/app/views/import/otrs.jst.eco +++ b/app/assets/javascripts/app/views/import/otrs.jst.eco @@ -7,9 +7,10 @@

<%- @T('Download and install the %s Migration Plugin on your %s instance.', 'OTRS', 'OTRS') %>:

- <%- @Icon('download') %> <%- @T('Migration Plugin for %s', 'OTRS 5') %> - <%- @Icon('download') %> <%- @T('Migration Plugin for %s', 'OTRS 4') %> - <%- @Icon('download') %> <%- @T('Migration Plugin for %s', 'OTRS 3.3-3.1') %> + <%- @Icon('download') %> <%- @T('Migration Plugin for %s', 'OTRS 6') %> + <%- @Icon('download') %> <%- @T('Migration Plugin for %s', 'OTRS 5') %> + <%- @Icon('download') %> <%- @T('Migration Plugin for %s', 'OTRS 4') %> + <%- @Icon('download') %> <%- @T('Migration Plugin for %s', 'OTRS 3.3-3.1') %>
<%- @T('Go Back') %> diff --git a/app/assets/javascripts/app/views/import/zendesk.jst.eco b/app/assets/javascripts/app/views/import/zendesk.jst.eco index eeb7f95c9..e48d4d4a5 100644 --- a/app/assets/javascripts/app/views/import/zendesk.jst.eco +++ b/app/assets/javascripts/app/views/import/zendesk.jst.eco @@ -64,7 +64,7 @@
- + - + - + - + ' @@ -1011,7 +1011,7 @@ html.html2html_strict assert_equal(result, html.html2html_strict) html = '
  • Luxemburg
    • ' - result = '
  • Luxemburg (http://business-catalogs.example.com/ODtpbGs5MWIzbjUyYzExLTA4Yy06Mmg7N3AvL3R0bmFvY3B0LXlhbW9sc2Nhb3NnYy5lL3RpbXJlZi9lbS9ycnJuaWFpZXMsdGxnY25pLGUsdXJ0b3NVTGVpNWZ8fGZh)
    • ' + result = '
  • Luxemburg
    • ' assert_equal(result, html.html2html_strict) end diff --git a/test/unit/activity_stream_test.rb b/test/unit/activity_stream_test.rb index 01110299e..3b2f8cda4 100644 --- a/test/unit/activity_stream_test.rb +++ b/test/unit/activity_stream_test.rb @@ -1,10 +1,10 @@ -# encoding: utf-8 + require 'test_helper' class ActivityStreamTest < ActiveSupport::TestCase setup do - roles = Role.where(name: %w(Admin Agent)) + roles = Role.where(name: %w[Admin Agent]) groups = Group.where(name: 'Users') @admin_user = User.create_or_update( login: 'admin', @@ -83,7 +83,7 @@ class ActivityStreamTest < ActiveSupport::TestCase assert_not(stream[3]) stream = @current_user.activity_stream(4) - assert(stream.empty?) + assert(stream.blank?) # cleanup ticket.destroy! @@ -122,7 +122,7 @@ class ActivityStreamTest < ActiveSupport::TestCase assert_not(stream[2]) stream = @current_user.activity_stream(4) - assert(stream.empty?) + assert(stream.blank?) # cleanup organization.destroy! @@ -154,7 +154,7 @@ class ActivityStreamTest < ActiveSupport::TestCase assert_not(stream[1]) stream = @current_user.activity_stream(4) - assert(stream.empty?) + assert(stream.blank?) # cleanup user.destroy! @@ -201,7 +201,7 @@ class ActivityStreamTest < ActiveSupport::TestCase assert_not(stream[2]) stream = @current_user.activity_stream(4) - assert(stream.empty?) + assert(stream.blank?) # cleanup user.destroy! diff --git a/test/unit/assets_test.rb b/test/unit/assets_test.rb deleted file mode 100644 index 9e7914d7b..000000000 --- a/test/unit/assets_test.rb +++ /dev/null @@ -1,566 +0,0 @@ -# encoding: utf-8 -require 'test_helper' - -class AssetsTest < ActiveSupport::TestCase - test 'user' do - - roles = Role.where(name: %w(Agent Admin)) - groups = Group.all - org1 = Organization.create_or_update( - name: 'some user org', - updated_by_id: 1, - created_by_id: 1, - ) - - user1 = User.create_or_update( - login: 'assets1@example.org', - firstname: 'assets1', - lastname: 'assets1', - email: 'assets1@example.org', - password: 'some_pass', - active: true, - updated_by_id: 1, - created_by_id: 1, - organization_id: org1.id, - roles: roles, - groups: groups, - ) - - user2 = User.create_or_update( - login: 'assets2@example.org', - firstname: 'assets2', - lastname: 'assets2', - email: 'assets2@example.org', - password: 'some_pass', - active: true, - updated_by_id: 1, - created_by_id: 1, - roles: roles, - groups: groups, - ) - - user3 = User.create_or_update( - login: 'assets3@example.org', - firstname: 'assets3', - lastname: 'assets3', - email: 'assets3@example.org', - password: 'some_pass', - active: true, - updated_by_id: user1.id, - created_by_id: user2.id, - roles: roles, - groups: groups, - ) - user3 = User.find(user3.id) - assets = user3.assets({}) - - org1 = Organization.find(org1.id) - attributes = org1.attributes_with_association_ids - attributes.delete('user_ids') - assert( diff(attributes, assets[:Organization][org1.id]), 'check assets') - - user1 = User.find(user1.id) - attributes = user1.attributes_with_association_ids - attributes['accounts'] = {} - attributes.delete('password') - attributes.delete('token_ids') - attributes.delete('authorization_ids') - assert( diff(attributes, assets[:User][user1.id]), 'check assets' ) - - user2 = User.find(user2.id) - attributes = user2.attributes_with_association_ids - attributes['accounts'] = {} - attributes.delete('password') - attributes.delete('token_ids') - attributes.delete('authorization_ids') - assert( diff(attributes, assets[:User][user2.id]), 'check assets' ) - - user3 = User.find(user3.id) - attributes = user3.attributes_with_association_ids - attributes['accounts'] = {} - attributes.delete('password') - attributes.delete('token_ids') - attributes.delete('authorization_ids') - assert( diff(attributes, assets[:User][user3.id]), 'check assets' ) - - # touch org, check if user1 has changed - travel 2.seconds - org2 = Organization.find(org1.id) - org2.note = "some note...#{rand(9_999_999_999_999)}" - org2.save! - - attributes = org2.attributes_with_association_ids - attributes.delete('user_ids') - assert( !diff(attributes, assets[:Organization][org2.id]), 'check assets' ) - - user1_new = User.find(user1.id) - attributes = user1_new.attributes_with_association_ids - attributes['accounts'] = {} - attributes.delete('password') - attributes.delete('token_ids') - attributes.delete('authorization_ids') - assert( !diff(attributes, assets[:User][user1_new.id]), 'check assets' ) - - # check new assets lookup - assets = user3.assets({}) - attributes = org2.attributes_with_association_ids - attributes.delete('user_ids') - assert( diff(attributes, assets[:Organization][org1.id]), 'check assets') - - user1 = User.find(user1.id) - attributes = user1.attributes_with_association_ids - attributes['accounts'] = {} - attributes.delete('password') - attributes.delete('token_ids') - attributes.delete('authorization_ids') - assert( diff(attributes, assets[:User][user1.id]), 'check assets' ) - - user2 = User.find(user2.id) - attributes = user2.attributes_with_association_ids - attributes['accounts'] = {} - attributes.delete('password') - attributes.delete('token_ids') - attributes.delete('authorization_ids') - assert( diff(attributes, assets[:User][user2.id]), 'check assets' ) - - user3 = User.find(user3.id) - attributes = user3.attributes_with_association_ids - attributes['accounts'] = {} - attributes.delete('password') - attributes.delete('token_ids') - attributes.delete('authorization_ids') - assert( diff(attributes, assets[:User][user3.id]), 'check assets' ) - travel_back - - user3.destroy! - user2.destroy! - user1.destroy! - org1.destroy! - assert_not(Organization.find_by(id: org2.id)) - end - - test 'organization' do - - roles = Role.where( name: %w(Agent Admin) ) - admin1 = User.create_or_update( - login: 'admin1@example.org', - firstname: 'admin1', - lastname: 'admin1', - email: 'admin1@example.org', - password: 'some_pass', - active: true, - updated_by_id: 1, - created_by_id: 1, - roles: roles, - ) - - roles = Role.where( name: %w(Customer) ) - org = Organization.create_or_update( - name: 'some customer org', - updated_by_id: admin1.id, - created_by_id: 1, - ) - - user1 = User.create_or_update( - login: 'assets1@example.org', - firstname: 'assets1', - lastname: 'assets1', - email: 'assets1@example.org', - password: 'some_pass', - active: true, - updated_by_id: 1, - created_by_id: 1, - organization_id: org.id, - roles: roles, - ) - - user2 = User.create_or_update( - login: 'assets2@example.org', - firstname: 'assets2', - lastname: 'assets2', - email: 'assets2@example.org', - password: 'some_pass', - active: true, - updated_by_id: 1, - created_by_id: 1, - organization_id: org.id, - roles: roles, - ) - - user3 = User.create_or_update( - login: 'assets3@example.org', - firstname: 'assets3', - lastname: 'assets3', - email: 'assets3@example.org', - password: 'some_pass', - active: true, - updated_by_id: user1.id, - created_by_id: user2.id, - roles: roles, - ) - - org = Organization.find(org.id) - assets = org.assets({}) - attributes = org.attributes_with_association_ids - attributes.delete('user_ids') - assert( diff(attributes, assets[:Organization][org.id]), 'check assets' ) - - admin1 = User.find(admin1.id) - attributes = admin1.attributes_with_association_ids - attributes['accounts'] = {} - attributes.delete('password') - attributes.delete('token_ids') - attributes.delete('authorization_ids') - assert( diff(attributes, assets[:User][admin1.id]), 'check assets' ) - - user1 = User.find(user1.id) - attributes = user1.attributes_with_association_ids - attributes['accounts'] = {} - attributes.delete('password') - attributes.delete('token_ids') - attributes.delete('authorization_ids') - assert( diff(attributes, assets[:User][user1.id]), 'check assets' ) - - user2 = User.find(user2.id) - attributes = user2.attributes_with_association_ids - attributes['accounts'] = {} - attributes.delete('password') - attributes.delete('token_ids') - attributes.delete('authorization_ids') - assert( diff(attributes, assets[:User][user2.id]), 'check assets' ) - - user3 = User.find(user3.id) - attributes = user3.attributes_with_association_ids - attributes['accounts'] = {} - attributes.delete('password') - attributes.delete('token_ids') - attributes.delete('authorization_ids') - assert_nil( assets[:User][user3.id], 'check assets' ) - - # touch user 2, check if org has changed - travel 2.seconds - user_new_2 = User.find(user2.id) - user_new_2.lastname = 'assets2' - user_new_2.save! - - org_new = Organization.find(org.id) - attributes = org_new.attributes_with_association_ids - attributes.delete('user_ids') - assert( !diff(attributes, assets[:Organization][org_new.id]), 'check assets' ) - - attributes = user_new_2.attributes_with_association_ids - attributes['accounts'] = {} - attributes.delete('password') - attributes.delete('token_ids') - attributes.delete('authorization_ids') - assert( diff(attributes, assets[:User][user_new_2.id]), 'check assets' ) - - # check new assets lookup - assets = org_new.assets({}) - attributes = org_new.attributes_with_association_ids - attributes.delete('user_ids') - assert( diff(attributes, assets[:Organization][org_new.id]), 'check assets' ) - - attributes = user_new_2.attributes_with_association_ids - attributes['accounts'] = {} - attributes.delete('password') - attributes.delete('token_ids') - attributes.delete('authorization_ids') - assert( diff(attributes, assets[:User][user_new_2.id]), 'check assets' ) - travel_back - - user3.destroy! - user2.destroy! - user1.destroy! - org.destroy! - assert_not(Organization.find_by(id: org_new.id)) - end - - def diff(o1, o2) - return true if o1 == o2 - %w(updated_at created_at).each do |item| - if o1[item] - o1[item] = o1[item].to_s - end - if o2[item] - o2[item] = o2[item].to_s - end - end - return true if (o1.to_a - o2.to_a).empty? - #puts "ERROR: difference \n1: #{o1.inspect}\n2: #{o2.inspect}\ndiff: #{(o1.to_a - o2.to_a).inspect}" - false - end - - test 'overview' do - - UserInfo.current_user_id = 1 - roles = Role.where(name: %w(Customer)) - - user1 = User.create_or_update( - login: 'assets_overview1@example.org', - firstname: 'assets_overview1', - lastname: 'assets_overview1', - email: 'assets_overview1@example.org', - password: 'some_pass', - active: true, - roles: roles, - ) - user2 = User.create_or_update( - login: 'assets_overview2@example.org', - firstname: 'assets_overview2', - lastname: 'assets_overview2', - email: 'assets_overview2@example.org', - password: 'some_pass', - active: true, - roles: roles, - ) - user3 = User.create_or_update( - login: 'assets_overview3@example.org', - firstname: 'assets_overview3', - lastname: 'assets_overview3', - email: 'assets_overview3@example.org', - password: 'some_pass', - active: true, - roles: roles, - ) - user4 = User.create_or_update( - login: 'assets_overview4@example.org', - firstname: 'assets_overview4', - lastname: 'assets_overview4', - email: 'assets_overview4@example.org', - password: 'some_pass', - active: true, - roles: roles, - ) - user5 = User.create_or_update( - login: 'assets_overview5@example.org', - firstname: 'assets_overview5', - lastname: 'assets_overview5', - email: 'assets_overview5@example.org', - password: 'some_pass', - active: true, - roles: roles, - ) - - ticket_state1 = Ticket::State.find_by(name: 'new') - ticket_state2 = Ticket::State.find_by(name: 'open') - overview_role = Role.find_by(name: 'Agent') - overview = Overview.create_or_update( - name: 'my asset test', - link: 'my_asset_test', - prio: 1000, - role_ids: [overview_role.id], - user_ids: [user4.id, user5.id], - condition: { - 'ticket.state_id' => { - operator: 'is', - value: [ ticket_state1.id, ticket_state2.id ], - }, - 'ticket.owner_id' => { - operator: 'is', - pre_condition: 'specific', - value: user1.id, - value_completion: 'John Smith ' - }, - }, - order: { - by: 'created_at', - direction: 'ASC', - }, - view: { - d: %w(title customer group created_at), - s: %w(title customer group created_at), - m: %w(number title customer group created_at), - view_mode_default: 's', - }, - ) - assets = overview.assets({}) - assert(assets[:User][user1.id], 'check assets') - assert_not(assets[:User][user2.id], 'check assets') - assert_not(assets[:User][user3.id], 'check assets') - assert(assets[:User][user4.id], 'check assets') - assert(assets[:User][user5.id], 'check assets') - assert(assets[:TicketState][ticket_state1.id], 'check assets') - assert(assets[:TicketState][ticket_state2.id], 'check assets') - - overview = Overview.create_or_update( - name: 'my asset test', - link: 'my_asset_test', - prio: 1000, - role_ids: [overview_role.id], - user_ids: [user4.id], - condition: { - 'ticket.state_id' => { - operator: 'is', - value: ticket_state1.id, - }, - 'ticket.owner_id' => { - operator: 'is', - pre_condition: 'specific', - value: [user1.id, user2.id], - }, - }, - order: { - by: 'created_at', - direction: 'ASC', - }, - view: { - d: %w(title customer group created_at), - s: %w(title customer group created_at), - m: %w(number title customer group created_at), - view_mode_default: 's', - }, - ) - assets = overview.assets({}) - assert(assets[:User][user1.id], 'check assets') - assert(assets[:User][user2.id], 'check assets') - assert_not(assets[:User][user3.id], 'check assets') - assert(assets[:User][user4.id], 'check assets') - assert_not(assets[:User][user5.id], 'check assets') - assert(assets[:TicketState][ticket_state1.id], 'check assets') - assert_not(assets[:TicketState][ticket_state2.id], 'check assets') - overview.destroy! - end - - test 'sla' do - - UserInfo.current_user_id = 1 - roles = Role.where(name: %w(Customer)) - - user1 = User.create_or_update( - login: 'assets_sla1@example.org', - firstname: 'assets_sla1', - lastname: 'assets_sla1', - email: 'assets_sla1@example.org', - password: 'some_pass', - active: true, - roles: roles, - ) - user2 = User.create_or_update( - login: 'assets_sla2@example.org', - firstname: 'assets_sla2', - lastname: 'assets_sla2', - email: 'assets_sla2@example.org', - password: 'some_pass', - active: true, - roles: roles, - ) - - calendar1 = Calendar.create_or_update( - name: 'US 1', - timezone: 'America/Los_Angeles', - business_hours: { - mon: { '09:00' => '17:00' }, - tue: { '09:00' => '17:00' }, - wed: { '09:00' => '17:00' }, - thu: { '09:00' => '17:00' }, - fri: { '09:00' => '17:00' } - }, - default: true, - ical_url: nil, - updated_by_id: 1, - created_by_id: 1, - ) - ticket_state1 = Ticket::State.find_by(name: 'new') - ticket_state2 = Ticket::State.find_by(name: 'open') - sla = Sla.create_or_update( - name: 'my asset test', - calendar_id: calendar1.id, - condition: { - 'ticket.state_id' => { - operator: 'is', - value: [ ticket_state1.id, ticket_state2.id ], - }, - 'ticket.owner_id' => { - operator: 'is', - pre_condition: 'specific', - value: user1.id, - value_completion: 'John Smith ' - }, - }, - ) - assets = sla.assets({}) - assert(assets[:User][user1.id], 'check assets') - assert_not(assets[:User][user2.id], 'check assets') - assert(assets[:TicketState][ticket_state1.id], 'check assets') - assert(assets[:TicketState][ticket_state2.id], 'check assets') - assert(assets[:Calendar][calendar1.id], 'check assets') - - end - - test 'job' do - - UserInfo.current_user_id = 1 - roles = Role.where(name: %w(Customer)) - - user1 = User.create_or_update( - login: 'assets_job1@example.org', - firstname: 'assets_job1', - lastname: 'assets_job1', - email: 'assets_job1@example.org', - password: 'some_pass', - active: true, - roles: roles, - ) - user2 = User.create_or_update( - login: 'assets_job2@example.org', - firstname: 'assets_job2', - lastname: 'assets_job2', - email: 'assets_job2@example.org', - password: 'some_pass', - active: true, - roles: roles, - ) - user3 = User.create_or_update( - login: 'assets_job3@example.org', - firstname: 'assets_job3', - lastname: 'assets_job3', - email: 'assets_job3@example.org', - password: 'some_pass', - active: true, - roles: roles, - ) - - ticket_state1 = Ticket::State.find_by(name: 'new') - ticket_state2 = Ticket::State.find_by(name: 'open') - ticket_priority2 = Ticket::Priority.find_by(name: '2 normal') - job = Job.create_or_update( - name: 'my job', - timeplan: { - mon: true, - }, - condition: { - 'ticket.state_id' => { - operator: 'is', - value: [ ticket_state1.id, ticket_state2.id ], - }, - 'ticket.owner_id' => { - operator: 'is', - pre_condition: 'specific', - value: user1.id, - value_completion: 'John Smith ' - }, - }, - perform: { - 'ticket.priority_id' => { - value: ticket_priority2.id, - }, - 'ticket.owner_id' => { - pre_condition: 'specific', - value: user2.id, - value_completion: 'metest123@znuny.com ' - }, - }, - disable_notification: true, - ) - assets = job.assets({}) - assert(assets[:User][user1.id], 'check assets') - assert(assets[:User][user2.id], 'check assets') - assert_not(assets[:User][user3.id], 'check assets') - assert(assets[:TicketState][ticket_state1.id], 'check assets') - assert(assets[:TicketState][ticket_state2.id], 'check assets') - assert(assets[:TicketPriority][ticket_priority2.id], 'check assets') - - end - -end diff --git a/test/unit/auth_test.rb b/test/unit/auth_test.rb index f982e4e6e..151782666 100644 --- a/test/unit/auth_test.rb +++ b/test/unit/auth_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class AuthTest < ActiveSupport::TestCase diff --git a/test/unit/cache_test.rb b/test/unit/cache_test.rb index 37992bdaf..76b8bdc27 100644 --- a/test/unit/cache_test.rb +++ b/test/unit/cache_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class CacheTest < ActiveSupport::TestCase diff --git a/test/unit/calendar_subscription_test.rb b/test/unit/calendar_subscription_test.rb index 3e31dbab1..36292b148 100644 --- a/test/unit/calendar_subscription_test.rb +++ b/test/unit/calendar_subscription_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class CalendarSubscriptionTest < ActiveSupport::TestCase diff --git a/test/unit/calendar_test.rb b/test/unit/calendar_test.rb index 0b33fa1b2..ac57ce9cf 100644 --- a/test/unit/calendar_test.rb +++ b/test/unit/calendar_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class CalendarTest < ActiveSupport::TestCase diff --git a/test/unit/chat_test.rb b/test/unit/chat_test.rb index fe406d23b..488c56211 100644 --- a/test/unit/chat_test.rb +++ b/test/unit/chat_test.rb @@ -1,11 +1,11 @@ -# encoding: utf-8 + require 'test_helper' class ChatTest < ActiveSupport::TestCase setup do groups = Group.all - roles = Role.where( name: %w(Agent) ) + roles = Role.where(name: %w[Agent]) @agent1 = User.create_or_update( login: 'ticket-chat-agent1@example.com', firstname: 'Notification', @@ -352,4 +352,38 @@ class ChatTest < ActiveSupport::TestCase travel_back end + test 'blocked ip test' do + chat = Chat.create!( + name: 'ip test', + max_queue: 5, + note: '', + block_ip: '127.0.0.1;127.0.0.2;127.1.0.*', + active: true, + updated_by_id: 1, + created_by_id: 1, + ) + + assert_not(chat.blocked_ip?('128.0.0.1')) + assert_not(chat.blocked_ip?('127.0.0.30')) + assert(chat.blocked_ip?('127.0.0.1')) + assert(chat.blocked_ip?('127.0.0.2')) + assert(chat.blocked_ip?('127.1.0.1')) + assert(chat.blocked_ip?('127.1.0.100')) + end + + test 'blocked country test' do + chat = Chat.create!( + name: 'country test', + max_queue: 5, + note: '', + block_country: 'AU;CH', + active: true, + updated_by_id: 1, + created_by_id: 1, + ) + + assert_not(chat.blocked_country?('127.0.0.1')) + assert(chat.blocked_country?('1.1.1.8')) + end + end diff --git a/test/unit/cti_caller_id_test.rb b/test/unit/cti_caller_id_test.rb index 94c08c078..7a899f9e7 100644 --- a/test/unit/cti_caller_id_test.rb +++ b/test/unit/cti_caller_id_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class CtiCallerIdTest < ActiveSupport::TestCase diff --git a/test/unit/db_auto_increment_test.rb b/test/unit/db_auto_increment_test.rb index 4872b33ae..0f5edcc39 100644 --- a/test/unit/db_auto_increment_test.rb +++ b/test/unit/db_auto_increment_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class DbAutoIncrementTest < ActiveSupport::TestCase diff --git a/test/unit/email_address_test.rb b/test/unit/email_address_test.rb index 261cd033e..4a6ccf588 100644 --- a/test/unit/email_address_test.rb +++ b/test/unit/email_address_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class EmailAddressTest < ActiveSupport::TestCase diff --git a/test/unit/email_build_test.rb b/test/unit/email_build_test.rb index c293bcd98..cf6585e4d 100644 --- a/test/unit/email_build_test.rb +++ b/test/unit/email_build_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class EmailBuildTest < ActiveSupport::TestCase @@ -73,21 +73,19 @@ class EmailBuildTest < ActiveSupport::TestCase assert_equal(2, data[:attachments].length) # check attachments - if data[:attachments] - data[:attachments].each do |attachment| - if attachment[:filename] == 'message.html' - assert_nil(attachment[:preferences]['Content-ID']) - assert_equal(true, attachment[:preferences]['content-alternative']) - assert_equal('text/html', attachment[:preferences]['Mime-Type']) - assert_equal('UTF-8', attachment[:preferences]['Charset']) - elsif attachment[:filename] == 'somename.png' - assert_nil(attachment[:preferences]['Content-ID']) - assert_nil(attachment[:preferences]['content-alternative']) - assert_equal('image/png', attachment[:preferences]['Mime-Type']) - assert_equal('UTF-8', attachment[:preferences]['Charset']) - else - assert(false, "invalid attachment, should not be there, #{attachment.inspect}") - end + data[:attachments]&.each do |attachment| + if attachment[:filename] == 'message.html' + assert_nil(attachment[:preferences]['Content-ID']) + assert_equal(true, attachment[:preferences]['content-alternative']) + assert_equal('text/html', attachment[:preferences]['Mime-Type']) + assert_equal('UTF-8', attachment[:preferences]['Charset']) + elsif attachment[:filename] == 'somename.png' + assert_nil(attachment[:preferences]['Content-ID']) + assert_nil(attachment[:preferences]['content-alternative']) + assert_equal('image/png', attachment[:preferences]['Mime-Type']) + assert_equal('UTF-8', attachment[:preferences]['Charset']) + else + assert(false, "invalid attachment, should not be there, #{attachment.inspect}") end end end @@ -127,16 +125,14 @@ class EmailBuildTest < ActiveSupport::TestCase assert_equal(1, data[:attachments].length) # check attachments - if data[:attachments] - data[:attachments].each do |attachment| - if attachment[:filename] == 'somename.png' - assert_nil(attachment[:preferences]['Content-ID']) - assert_nil(attachment[:preferences]['content-alternative']) - assert_equal('image/png', attachment[:preferences]['Mime-Type']) - assert_equal('UTF-8', attachment[:preferences]['Charset']) - else - assert(false, "invalid attachment, should not be there, #{attachment.inspect}") - end + data[:attachments]&.each do |attachment| + if attachment[:filename] == 'somename.png' + assert_nil(attachment[:preferences]['Content-ID']) + assert_nil(attachment[:preferences]['content-alternative']) + assert_equal('image/png', attachment[:preferences]['Mime-Type']) + assert_equal('UTF-8', attachment[:preferences]['Charset']) + else + assert(false, "invalid attachment, should not be there, #{attachment.inspect}") end end end diff --git a/test/unit/email_parser_test.rb b/test/unit/email_parser_test.rb index 1bfa8f3f6..1cff01280 100644 --- a/test/unit/email_parser_test.rb +++ b/test/unit/email_parser_test.rb @@ -1,4 +1,3 @@ -# encoding: utf-8 # rubocop:disable all require 'test_helper' @@ -43,7 +42,7 @@ Old programmers never die. They just branch to a new address. }, { data: IO.binread('test/fixtures/mail3.box'), - body_md5: '4681e5d8ee07ea0b53dfeaf5789c5a00', + body_md5: '0b6eb998e8903ba69a3528dedb5a5476', params: { from: '"Günther John | Example GmbH" ', from_email: 'k.guenther@example.com', @@ -51,7 +50,7 @@ Old programmers never die. They just branch to a new address. subject: 'Ticket Templates', content_type: 'text/html', body: "
    -

    Hallo Martin,

     

    ich möchte mich gern für den Beta-Test für die Ticket Templates unter XXXX 2.4 anmelden.

     

     

    Mit freundlichen Grüßen

    John Günther

     

    example.com (http://www.GeoFachDatenServer.de) – profitieren Sie vom umfangreichen Daten-Netzwerk

     

    _ __ ___ ____________________________ ___ __ _

     

    Example GmbH

    Some What

     

    Sitz: Someware-Straße 9, XXXXX Someware

     

    M: +49 (0) XXX XX XX 70

    T: +49 (0) XXX XX XX 22

    F: +49 (0) XXX XX XX 11

    W: http://www.example.de

     

    Geschäftsführer: John Smith

    HRB XXXXXX AG Someware

    St.-Nr.: 112/107/05858

     

    ISO 9001:2008 Zertifiziert -Qualitätsstandard mit Zukunft

    _ __ ___ ____________________________ ___ __ _

     

    Diese Information ist ausschließlich für den Adressaten bestimmt und kann vertrauliche oder gesetzlich geschützte Informationen enthalten. Wenn Sie nicht der bestimmungsgemäße Adressat sind, unterrichten Sie bitte den Absender und vernichten Sie diese Mail. Anderen als dem bestimmungsgemäßen Adressaten ist es untersagt, diese E-Mail zu lesen, zu speichern, weiterzuleiten oder ihren Inhalt auf welche Weise auch immer zu verwenden.

     

    +

    Hallo Martin,

     

    ich möchte mich gern für den Beta-Test für die Ticket Templates unter XXXX 2.4 anmelden.

     

     

    Mit freundlichen Grüßen

    John Günther

     

    example.com – profitieren Sie vom umfangreichen Daten-Netzwerk

     

    _ __ ___ ____________________________ ___ __ _

     

    Example GmbH

    Some What

     

    Sitz: Someware-Straße 9, XXXXX Someware

     

    M: +49 (0) XXX XX XX 70

    T: +49 (0) XXX XX XX 22

    F: +49 (0) XXX XX XX 11

    W: http://www.example.de

     

    Geschäftsführer: John Smith

    HRB XXXXXX AG Someware

    St.-Nr.: 112/107/05858

     

    ISO 9001:2008 Zertifiziert -Qualitätsstandard mit Zukunft

    _ __ ___ ____________________________ ___ __ _

     

    Diese Information ist ausschließlich für den Adressaten bestimmt und kann vertrauliche oder gesetzlich geschützte Informationen enthalten. Wenn Sie nicht der bestimmungsgemäße Adressat sind, unterrichten Sie bitte den Absender und vernichten Sie diese Mail. Anderen als dem bestimmungsgemäßen Adressaten ist es untersagt, diese E-Mail zu lesen, zu speichern, weiterzuleiten oder ihren Inhalt auf welche Weise auch immer zu verwenden.

     

    Von: Fritz Bauer [mailto:me@example.com]
    Gesendet: Donnerstag, 3. Mai 2012 11:51
    An: John Smith
    Cc: Smith, John Marian; johnel.fratczak@example.com; ole.brei@example.com; Günther John | Example GmbH; bkopon@example.com; john.heisterhagen@team.example.com; sven.rocked@example.com; michael.house@example.com; tgutzeit@example.com
    Betreff: Re: OTRS::XXX Erweiterung - Anhänge an CI's

     

    Hallo,

     

    ich versuche an den Punkten anzuknüpfen.

     

    a) LDAP Muster Konfigdatei

     

    @@ -116,14 +115,14 @@ Liebe Grüße! }, { data: IO.binread('test/fixtures/mail6.box'), - body_md5: 'a05afcf7de7be17e74f191a58974f682', + body_md5: '849105bdee623b4314b4c3daa2495471', params: { from: '"Hans BÄKOSchönland" ', from_email: 'me@bogen.net', from_display_name: 'Hans BÄKOSchönland', subject: 'utf8: 使って / ISO-8859-1: Priorität" / cp-1251: Сергей Углицких', content_type: 'text/html', - body: "

    this is a test


    Compare Cable, DSL or Satellite plans: As low as $2.95. (http://localhost/8HMZENUS/2737??PS=)

    Test1:–
    Test2:&
    Test3:∋
    Test4:&
    Test5:=", + body: "

    this is a test


    Compare Cable, DSL or Satellite plans: As low as $2.95.

    Test1:–
    Test2:&
    Test3:∋
    Test4:&
    Test5:=", }, }, #

    @@ -321,7 +320,7 @@ Managing Director: Martin Edenhofer }, { data: IO.binread('test/fixtures/mail11.box'), - body_md5: 'b211c9c28282ad0dd3fccbbf37d9928d', + body_md5: '260a815b0a7897e4219d210010008202', attachments: [ { md5: '08660cd33ce8c64b95bcf0207ff6c4d6', @@ -341,26 +340,29 @@ Managing Director: Martin Edenhofer
    +P.S. Damit Sie keinen Tag versäumen, empfehlen wir Ihnen den Link des Adventkalenders in
    Ihrer Lesezeichen-Symbolleiste zu ergänzen.

     

    -/- <%- @T('Groups') %> @@ -73,7 +73,7 @@ <%- @Icon('checkmark') %>
    -/- <%- @T('Organizations') %> @@ -82,7 +82,7 @@ <%- @Icon('checkmark') %>
    -/- <%- @T('Users') %> @@ -91,7 +91,7 @@ <%- @Icon('checkmark') %>
    -/- <%- @T('Tickets') %> diff --git a/app/assets/javascripts/app/views/integration/exchange_last_import.jst.eco b/app/assets/javascripts/app/views/integration/exchange_last_import.jst.eco index 8323972ad..4ded44e85 100644 --- a/app/assets/javascripts/app/views/integration/exchange_last_import.jst.eco +++ b/app/assets/javascripts/app/views/integration/exchange_last_import.jst.eco @@ -20,18 +20,18 @@ <% if @job.result && @job.result.error: %>

    <%- @Ttimestamp(@job.started_at) %>

    - <% else if !@countDone: %> + <% else if @job.result && !@job.result.sum: %>

    <%- @Ttimestamp(@job.started_at) %> - <%- @T('Counting entries. This may take a while.') %>

    <% else: %>

    <%- @Ttimestamp(@job.started_at) %> - <%- @T('Running...') %>

    - +
    <% end %> <% end %> - <% if !_.isEmpty(@job.result) && @countDone: %> + <% if !_.isEmpty(@job.result) && @job.result.sum: %>
      -
    • <%- @T('%s user to %s user', 'Exchange', 'Zammad') %> (<%= @countDone %>/<%= @job.result.sum %>): +
    • <%- @T('%s user to %s user', 'Exchange', 'Zammad') %> (<%= @job.result.sum %>/<%= @job.result.total %>):
      • <%- @T('Users') %>: <%= @job.result.created %> <%- @T('created') %>, <%= @job.result.updated %> <%- @T('updated') %>, <%= @job.result.unchanged %> <%- @T('untouched') %>, <%= @job.result.skipped %> <%- @T('skipped') %>, <%= @job.result.failed %> <%- @T('failed') %>
      diff --git a/app/assets/javascripts/app/views/integration/exchange_summary.jst.eco b/app/assets/javascripts/app/views/integration/exchange_summary.jst.eco index 0abf47bdf..4407c355b 100644 --- a/app/assets/javascripts/app/views/integration/exchange_summary.jst.eco +++ b/app/assets/javascripts/app/views/integration/exchange_summary.jst.eco @@ -1,5 +1,5 @@
        -
      • <%- @T('%s user to %s user', 'Exchange', 'Zammad') %> (<%= @countDone %>): +
      • <%- @T('%s user to %s user', 'Exchange', 'Zammad') %> (<%= @job.result.total %>):
        • <%- @T('Users') %>: <%= @job.result.created %> <%- @T('created') %>, <%= @job.result.updated %> <%- @T('updated') %>, <%= @job.result.unchanged %> <%- @T('untouched') %>, <%= @job.result.skipped %> <%- @T('skipped') %>, <%= @job.result.failed %> <%- @T('failed') %>
        diff --git a/app/assets/javascripts/app/views/integration/idoit_object_result.jst.eco b/app/assets/javascripts/app/views/integration/idoit_object_result.jst.eco index e2d4dbe76..99ffc1292 100644 --- a/app/assets/javascripts/app/views/integration/idoit_object_result.jst.eco +++ b/app/assets/javascripts/app/views/integration/idoit_object_result.jst.eco @@ -5,19 +5,17 @@ - + - - + <% for item in @items: %> - - + + - <% end %> diff --git a/app/assets/javascripts/app/views/integration/ldap_last_import.jst.eco b/app/assets/javascripts/app/views/integration/ldap_last_import.jst.eco index 75c44a713..a6c5e817a 100644 --- a/app/assets/javascripts/app/views/integration/ldap_last_import.jst.eco +++ b/app/assets/javascripts/app/views/integration/ldap_last_import.jst.eco @@ -20,18 +20,18 @@ <% if @job.result && @job.result.error: %>

        <%- @Ttimestamp(@job.started_at) %>

        - <% else if !@countDone: %> + <% else if !@job.result.sum: %>

        <%- @Ttimestamp(@job.started_at) %> - <%- @T('Counting entries. This may take a while.') %>

        <% else: %>

        <%- @Ttimestamp(@job.started_at) %> - <%- @T('Running...') %>

        - +
        <% end %> <% end %> - <% if !_.isEmpty(@job.result) && @countDone: %> + <% if !_.isEmpty(@job.result) && @job.result.sum: %>
          -
        • <%- @T('%s user to %s user', 'LDAP', 'Zammad') %> (<%= @countDone %>/<%= @job.result.sum %>): +
        • <%- @T('%s user to %s user', 'LDAP', 'Zammad') %> (<%= @job.result.sum %>/<%= @job.result.total %>):
          • <%- @T('Users') %>: <%= @job.result.created %> <%- @T('created') %>, <%= @job.result.updated %> <%- @T('updated') %>, <%= @job.result.unchanged %> <%- @T('untouched') %>, <%= @job.result.skipped %> <%- @T('skipped') %>, <%= @job.result.failed %> <%- @T('failed') %>, <%= @job.result.deactivated %> <%- @T('deactivated') %>
          diff --git a/app/assets/javascripts/app/views/integration/ldap_summary.jst.eco b/app/assets/javascripts/app/views/integration/ldap_summary.jst.eco index 2b79071c1..f4d5b6aec 100644 --- a/app/assets/javascripts/app/views/integration/ldap_summary.jst.eco +++ b/app/assets/javascripts/app/views/integration/ldap_summary.jst.eco @@ -1,5 +1,5 @@
            -
          • <%- @T('%s user to %s user', 'LDAP', 'Zammad') %> (<%= @countDone %>): +
          • <%- @T('%s user to %s user', 'LDAP', 'Zammad') %> (<%= @job.result.sum %>):
            • <%- @T('Users') %>: <%= @job.result.created %> <%- @T('created') %>, <%= @job.result.updated %> <%- @T('updated') %>, <%= @job.result.unchanged %> <%- @T('untouched') %>, <%= @job.result.skipped %> <%- @T('skipped') %>, <%= @job.result.failed %> <%- @T('failed') %>, <%= @job.result.deactivated %> <%- @T('deactivated') %>
            diff --git a/app/assets/javascripts/app/views/layout_ref/twitter_conversation.jst.eco b/app/assets/javascripts/app/views/layout_ref/twitter_conversation.jst.eco index c909828a8..7761ae209 100644 --- a/app/assets/javascripts/app/views/layout_ref/twitter_conversation.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/twitter_conversation.jst.eco @@ -440,7 +440,7 @@
            /je
            -
            140
            +
            280
            diff --git a/app/assets/javascripts/app/views/report/download_button.jst.eco b/app/assets/javascripts/app/views/report/download_button.jst.eco new file mode 100644 index 000000000..715a38609 --- /dev/null +++ b/app/assets/javascripts/app/views/report/download_button.jst.eco @@ -0,0 +1 @@ +<%- @Icon('download') %><%- @T('Download %s record(s)', @count) %> diff --git a/app/assets/javascripts/app/views/report/download_content.jst.eco b/app/assets/javascripts/app/views/report/download_content.jst.eco new file mode 100644 index 000000000..01965b7bc --- /dev/null +++ b/app/assets/javascripts/app/views/report/download_content.jst.eco @@ -0,0 +1,6 @@ +
            +
            +
            +
            +
            +
            \ No newline at end of file diff --git a/app/assets/javascripts/app/views/report/download_header.jst.eco b/app/assets/javascripts/app/views/report/download_header.jst.eco index 7769d2b54..8998b0067 100644 --- a/app/assets/javascripts/app/views/report/download_header.jst.eco +++ b/app/assets/javascripts/app/views/report/download_header.jst.eco @@ -1,14 +1,9 @@ -
            - -
              - <% for profile in @profiles: %> - <% for backend in @metric.backend: %> - <% if backend.dataDownload: %> -
            • class="is-active active"<% end %>><%- @T(backend.display) %>
              • - <% end %> +
                + <% for profile in @profiles: %> + <% for backend in @metric.backend: %> + <% if backend.dataDownload: %> +
              • class="is-active active"<% end %>><%- @T(backend.display) %>
                • <% end %> <% end %> -
              - -
              -
            \ No newline at end of file + <% end %> +
          diff --git a/app/assets/javascripts/app/views/report/download_list.jst.eco b/app/assets/javascripts/app/views/report/download_list.jst.eco deleted file mode 100644 index f22dc8983..000000000 --- a/app/assets/javascripts/app/views/report/download_list.jst.eco +++ /dev/null @@ -1,24 +0,0 @@ -<%- @Icon('download') %><%- @T('Download %s record(s)', @count) %> -
          -
        <%- @T('ID') %><%- @T('ID') %> <%- @T('Name') %><%- @T('Status') %><%- @T('Link') %><%- @T('Status') %>
        <%= item.id %><%= item.title %><%= item.id %><%= item.title %> <%= item.cmdb_status_title %>i-doit
        - - - - - - - - - - -<% for ticket in @tickets: %> - - - - - - - -<% end %> - -
        <%- @T('Number') %><%- @T('Title') %><%- @T('State') %><%- @T('Group') %><%- @T('Created') %>
        target="_blank"<% end %> href="<%= @url %><%= ticket.id %>"><%- @P(ticket, 'number') %><%- @P(ticket, 'title') %><%- @P(ticket, 'state') %><%- @P(ticket, 'group') %><%- @P(ticket, 'created_at') %>
        diff --git a/app/assets/javascripts/app/views/signup.jst.eco b/app/assets/javascripts/app/views/signup.jst.eco index 3bdc7e9b6..521794be8 100644 --- a/app/assets/javascripts/app/views/signup.jst.eco +++ b/app/assets/javascripts/app/views/signup.jst.eco @@ -1,11 +1,11 @@
      • "+t(this).html()+"
        • "),t(this).remove(),n=e}return n=0}),t("[style]",e).removeAttr("style"),t("[align]",e).removeAttr("align"),t("span",e).replaceWith(function(){return t(this).contents()}),t("span:empty",e).remove(),t("[class^='Mso']",e).removeAttr("class"),t("p:empty",e).remove(),e},a.prototype.removeAttribute=function(e){var s,n,i,o,a;if(e){for(s=t(e),i=0,o=(a=e.attributes).length;i/g,">").replace(/"/g,""")}),function(){(function(){e.push('
        \n
        \n
        \n \n \n \n \n \n
        \n
        \n
        \n
        \n \n '),e.push(this.T(this.title)),e.push('\n
        \n
        \n
        \n \n
        \n
        \n
        \n \n
        \n
        ")}).call(this)}.call(t),t.safe=n,t.escape=i,e.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.customer_timeout=function(t){t||(t={});var e=[],s=function(t){return t&&t.ecoSafe?t:void 0!==t&&null!=t?i(t):""},n=t.safe,i=t.escape;return t.safe=function(t){if(t&&t.ecoSafe)return t;void 0!==t&&null!=t||(t="");var e=new String(t);return e.ecoSafe=!0,e},i||(i=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){e.push('
        \n '),this.agent?(e.push("\n "),e.push(this.T("Since you didn't respond in the last %s minutes your conversation with %s got closed.",this.delay,this.agent)),e.push("\n ")):(e.push("\n "),e.push(this.T("Since you didn't respond in the last %s minutes your conversation got closed.",this.delay)),e.push("\n ")),e.push('\n
        \n
        "),e.push(this.T("Start new conversation")),e.push("
        \n
        ")}).call(this)}.call(t),t.safe=n,t.escape=i,e.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.loader=function(t){t||(t={});var e=[],s=t.safe,n=t.escape;return t.safe=function(t){if(t&&t.ecoSafe)return t;void 0!==t&&null!=t||(t="");var e=new String(t);return e.ecoSafe=!0,e},n||(n=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){e.push('\n \n \n \n\n'),e.push(this.T("Connecting")),e.push("")}).call(this)}.call(t),t.safe=s,t.escape=n,e.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.message=function(t){t||(t={});var e=[],s=function(t){return t&&t.ecoSafe?t:void 0!==t&&null!=t?i(t):""},n=t.safe,i=t.escape;return t.safe=function(t){if(t&&t.ecoSafe)return t;void 0!==t&&null!=t||(t="");var e=new String(t);return e.ecoSafe=!0,e},i||(i=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){e.push('
        \n "),e.push(this.message),e.push("\n
        ")}).call(this)}.call(t),t.safe=n,t.escape=i,e.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.status=function(t){t||(t={});var e=[],s=t.safe,n=t.escape;return t.safe=function(t){if(t&&t.ecoSafe)return t;void 0!==t&&null!=t||(t="");var e=new String(t);return e.ecoSafe=!0,e},n||(n=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){e.push('
        \n
        \n '),e.push(this.status),e.push("\n
        \n
        ")}).call(this)}.call(t),t.safe=s,t.escape=n,e.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.timestamp=function(t){t||(t={});var e=[],s=function(t){return t&&t.ecoSafe?t:void 0!==t&&null!=t?i(t):""},n=t.safe,i=t.escape;return t.safe=function(t){if(t&&t.ecoSafe)return t;void 0!==t&&null!=t||(t="");var e=new String(t);return e.ecoSafe=!0,e},i||(i=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){e.push('
        '),e.push(s(this.label)),e.push(" "),e.push(s(this.time)),e.push("
        ")}).call(this)}.call(t),t.safe=n,t.escape=i,e.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.typingIndicator=function(t){t||(t={});var e=[],s=t.safe,n=t.escape;return t.safe=function(t){if(t&&t.ecoSafe)return t;void 0!==t&&null!=t||(t="");var e=new String(t);return e.ecoSafe=!0,e},n||(n=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){e.push('
        \n \n \n \n \n \n \n \n
        ')}).call(this)}.call(t),t.safe=s,t.escape=n,e.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.waiting=function(t){t||(t={});var e=[],s=t.safe,n=t.escape;return t.safe=function(t){if(t&&t.ecoSafe)return t;void 0!==t&&null!=t||(t="");var e=new String(t);return e.ecoSafe=!0,e},n||(n=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){e.push('
        \n \n \n \n \n \n '),e.push(this.T("All colleagues are busy.")),e.push("
        \n "),e.push(this.T("You are on waiting list position %s.",this.position)),e.push("\n
        ")}).call(this)}.call(t),t.safe=s,t.escape=n,e.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.waiting_list_timeout=function(t){t||(t={});var e=[],s=function(t){return t&&t.ecoSafe?t:void 0!==t&&null!=t?i(t):""},n=t.safe,i=t.escape;return t.safe=function(t){if(t&&t.ecoSafe)return t;void 0!==t&&null!=t||(t="");var e=new String(t);return e.ecoSafe=!0,e},i||(i=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){e.push('
        \n '),e.push(this.T("We are sorry, it takes longer as expected to get an empty slot. Please try again later or send us an email. Thank you!")),e.push('\n
        \n
        "),e.push(this.T("Start new conversation")),e.push("
        \n
        ")}).call(this)}.call(t),t.safe=n,t.escape=i,e.join("")}; \ No newline at end of file +window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.agent=function(t){t||(t={});var e,n=[],s=function(t){return t&&t.ecoSafe?t:"undefined"!=typeof t&&null!=t?o(t):""},i=t.safe,o=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;"undefined"!=typeof t&&null!=t||(t="");var e=new String(t);return e.ecoSafe=!0,e},o||(o=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){this.agent.avatar&&(n.push('\n\n')),n.push('\n\n '),n.push(s(this.agent.name)),n.push("\n")}).call(this)}.call(t),t.safe=i,t.escape=o,n.join("")};var bind=function(t,e){return function(){return t.apply(e,arguments)}},slice=[].slice,extend=function(t,e){function n(){this.constructor=t}for(var s in e)hasProp.call(e,s)&&(t[s]=e[s]);return n.prototype=e.prototype,t.prototype=new n,t.__super__=e.prototype,t},hasProp={}.hasOwnProperty;!function(t,e){var n,s,i,o,a,r,l,c,h;return h=document.getElementsByTagName("script"),r=h[h.length-1],l=r.src.match(".*://([^:/]*).*")[1],c=r.src.match("(.*)://[^:/]*.*")[1],n=function(){function e(e){this.options=t.extend({},this.defaults,e),this.log=new i({debug:this.options.debug,logPrefix:this.options.logPrefix||this.logPrefix})}return e.prototype.defaults={debug:!1},e}(),i=function(){function e(e){this.log=bind(this.log,this),this.error=bind(this.error,this),this.notice=bind(this.notice,this),this.debug=bind(this.debug,this),this.options=t.extend({},this.defaults,e)}return e.prototype.defaults={debug:!1},e.prototype.debug=function(){var t;if(t=1<=arguments.length?slice.call(arguments,0):[],this.options.debug)return this.log("debug",t)},e.prototype.notice=function(){var t;return t=1<=arguments.length?slice.call(arguments,0):[],this.log("notice",t)},e.prototype.error=function(){var t;return t=1<=arguments.length?slice.call(arguments,0):[],this.log("error",t)},e.prototype.log=function(e,n){var s,i,o,a;if(n.unshift("||"),n.unshift(e),n.unshift(this.options.logPrefix),console.log.apply(console,n),this.options.debug){for(a="",i=0,o=n.length;i"+a+"")}},e}(),o=function(t){function e(t){this.stop=bind(this.stop,this),this.start=bind(this.start,this),e.__super__.constructor.call(this,t)}return extend(e,t),e.prototype.timeoutStartedAt=null,e.prototype.logPrefix="timeout",e.prototype.defaults={debug:!1,timeout:4,timeoutIntervallCheck:.5},e.prototype.start=function(){var t,e;return this.stop(),e=new Date,t=function(t){return function(){var n;if(n=new Date-new Date(e.getTime()+1e3*t.options.timeout*60),t.log.debug("Timeout check for "+t.options.timeout+" minutes (left "+n/1e3+" sec.)"),!(n<0))return t.stop(),t.options.callback()}}(this),this.log.debug("Start timeout in "+this.options.timeout+" minutes"),this.intervallId=setInterval(t,1e3*this.options.timeoutIntervallCheck*60)},e.prototype.stop=function(){if(this.intervallId)return this.log.debug("Stop timeout of "+this.options.timeout+" minutes"),clearInterval(this.intervallId)},e}(n),s=function(t){function n(t){this.ping=bind(this.ping,this),this.send=bind(this.send,this),this.reconnect=bind(this.reconnect,this),this.close=bind(this.close,this),this.connect=bind(this.connect,this),this.set=bind(this.set,this),n.__super__.constructor.call(this,t)}return extend(n,t),n.prototype.logPrefix="io",n.prototype.set=function(t){var e,n,s;n=[];for(e in t)s=t[e],n.push(this.options[e]=s);return n},n.prototype.connect=function(){return this.log.debug("Connecting to "+this.options.host),this.ws=new e.WebSocket(""+this.options.host),this.ws.onopen=function(t){return function(e){return t.log.debug("onOpen",e),t.options.onOpen(e),t.ping()}}(this),this.ws.onmessage=function(t){return function(e){var n,s,i,o;for(o=JSON.parse(e.data),t.log.debug("onMessage",e.data),n=0,s=o.length;nChat with us!",scrollHint:"Scroll down to see new messages",idleTimeout:6,idleTimeoutIntervallCheck:.5,inactiveTimeout:8,inactiveTimeoutIntervallCheck:.5,waitingListTimeout:4,waitingListTimeoutIntervallCheck:.5},i.prototype.logPrefix="chat",i.prototype._messageCount=0,i.prototype.isOpen=!1,i.prototype.blinkOnlineInterval=null,i.prototype.stopBlinOnlineStateTimeout=null,i.prototype.showTimeEveryXMinutes=2,i.prototype.lastTimestamp=null,i.prototype.lastAddedType=null,i.prototype.inputTimeout=null,i.prototype.isTyping=!1,i.prototype.state="offline",i.prototype.initialQueueDelay=1e4,i.prototype.translations={de:{"Chat with us!":"Chatte mit uns!","Scroll down to see new messages":"Scrolle nach unten um neue Nachrichten zu sehen",Online:"Online",Offline:"Offline",Connecting:"Verbinden","Connection re-established":"Verbindung wiederhergestellt",Today:"Heute",Send:"Senden","Chat closed by %s":"Chat beendet von %s","Compose your message...":"Ihre Nachricht...","All colleagues are busy.":"Alle Kollegen sind belegt.","You are on waiting list position %s.":"Sie sind in der Warteliste an der Position %s.","Start new conversation":"Neue Konversation starten","Since you didn't respond in the last %s minutes your conversation with %s got closed.":"Da Sie in den letzten %s Minuten nichts geschrieben haben wurde Ihre Konversation mit %s geschlossen.","Since you didn't respond in the last %s minutes your conversation got closed.":"Da Sie in den letzten %s Minuten nichts geschrieben haben wurde Ihre Konversation geschlossen.","We are sorry, it takes longer as expected to get an empty slot. Please try again later or send us an email. Thank you!":"Es tut uns leid, es dauert länger als erwartet, um einen freien Platz zu erhalten. Bitte versuchen Sie es zu einem späteren Zeitpunkt noch einmal oder schicken Sie uns eine E-Mail. Vielen Dank!"},es:{"Chat with us!":"Chatee con nosotros!","Scroll down to see new messages":"Haga scroll hacia abajo para ver nuevos mensajes",Online:"En linea",Offline:"Desconectado",Connecting:"Conectando","Connection re-established":"Conexión restablecida",Today:"Hoy",Send:"Enviar","Chat closed by %s":"Chat cerrado por %s","Compose your message...":"Escriba su mensaje...","All colleagues are busy.":"Todos los agentes están ocupados.","You are on waiting list position %s.":"Usted está en la posición %s de la lista de espera.","Start new conversation":"Iniciar nueva conversación","Since you didn't respond in the last %s minutes your conversation with %s got closed.":"Puesto que usted no respondió en los últimos %s minutos su conversación con %s se ha cerrado.","Since you didn't respond in the last %s minutes your conversation got closed.":"Puesto que usted no respondió en los últimos %s minutos su conversación se ha cerrado.","We are sorry, it takes longer as expected to get an empty slot. Please try again later or send us an email. Thank you!":"Lo sentimos, se tarda más tiempo de lo esperado para ser atendido por un agente. Inténtelo de nuevo más tarde o envíenos un correo electrónico. ¡Gracias!"},fr:{"Chat with us!":"Chattez avec nous!","Scroll down to see new messages":"Faites défiler pour lire les nouveaux messages",Online:"En-ligne",Offline:"Hors-ligne",Connecting:"Connexion en cours","Connection re-established":"Connexion rétablie",Today:"Aujourdhui",Send:"Envoyer","Chat closed by %s":"Chat fermé par %s","Compose your message...":"Composez votre message...","All colleagues are busy.":"Tous les collègues sont actuellement occupés.","You are on waiting list position %s.":"Vous êtes actuellement en %s position dans la file d'attente.","Start new conversation":"Démarrer une nouvelle conversation","Since you didn't respond in the last %s minutes your conversation with %s got closed.":"Si vous ne répondez pas dans les %s minutes, votre conversation avec %s va être fermée.","Since you didn't respond in the last %s minutes your conversation got closed.":"Si vous ne répondez pas dans les %s minutes, votre conversation va être fermée.","We are sorry, it takes longer as expected to get an empty slot. Please try again later or send us an email. Thank you!":"Nous sommes désolés, il faut plus de temps que prévu pour obtenir un emplacement vide. Veuillez réessayer ultérieurement ou nous envoyer un courriel. Je vous remercie!"},nl:{"Chat with us!":"Chat met ons!","Scroll down to see new messages":"Scrol naar beneden om nieuwe berichten te zien",Online:"Online",Offline:"Offline",Connecting:"Verbinden","Connection re-established":"Verbinding herstelt",Today:"Vandaag",Send:"Verzenden","Chat closed by %s":"Chat gesloten door %s","Compose your message...":"Typ uw bericht...","All colleagues are busy.":"Alle medewerkers zijn bezet.","You are on waiting list position %s.":"U bent %s in de wachtrij.","Start new conversation":"Nieuwe conversatie starten","Since you didn't respond in the last %s minutes your conversation with %s got closed.":"Omdat u in de laatste %s minuten niets geschreven heeft wordt de conversatie met %s gesloten.","Since you didn't respond in the last %s minutes your conversation got closed.":"Omdat u in de laatste %s minuten niets geschreven heeft is de conversatie gesloten.","We are sorry, it takes longer as expected to get an empty slot. Please try again later or send us an email. Thank you!":"Het spijt ons, het duurt langer dan verwacht om te antwoorden. Alstublieft probeer het later nogmaals of stuur ons een email. Hartelijk dank!"},it:{"Chat with us!":"Chatta con noi!","Scroll down to see new messages":"Scorrere verso il basso per vedere i nuovi messaggi",Online:"Online",Offline:"Offline",Connecting:"Collegamento","Connection re-established":"Collegamento ristabilito",Today:"Oggi",Send:"Invio","Chat closed by %s":"Conversazione chiusa da %s","Compose your message...":"Comporre il tuo messaggio...","All colleagues are busy.":"Tutti i colleghi sono occupati.","You are on waiting list position %s.":"Siete in posizione lista d' attesa %s.","Start new conversation":"Avviare una nuova conversazione","Since you didn't respond in the last %s minutes your conversation with %s got closed.":"Dal momento che non hai risposto negli ultimi %s minuti la tua conversazione con %s si è chiusa.","Since you didn't respond in the last %s minutes your conversation got closed.":"Dal momento che non hai risposto negli ultimi %s minuti la tua conversazione si è chiusa.","We are sorry, it takes longer as expected to get an empty slot. Please try again later or send us an email. Thank you!":"Ci dispiace, ci vuole più tempo come previsto per ottenere uno slot vuoto. Per favore riprova più tardi o inviaci un' e-mail. Grazie!"},pl:{"Chat with us!":"Czatuj z nami!","Scroll down to see new messages":"Przewiń w dół, aby wyświetlić nowe wiadomości",Online:"Online",Offline:"Offline",Connecting:"Łączenie","Connection re-established":"Ponowne nawiązanie połączenia",Today:"dzisiejszy",Send:"Wyślij","Chat closed by %s":"Czat zamknięty przez %s","Compose your message...":"Utwórz swoją wiadomość...","All colleagues are busy.":"Wszyscy koledzy są zajęci.","You are on waiting list position %s.":"Na liście oczekujących znajduje się pozycja %s.","Start new conversation":"Rozpoczęcie nowej konwersacji","Since you didn't respond in the last %s minutes your conversation with %s got closed.":"Ponieważ w ciągu ostatnich %s minut nie odpowiedziałeś, Twoja rozmowa z %s została zamknięta.","Since you didn't respond in the last %s minutes your conversation got closed.":"Ponieważ nie odpowiedziałeś w ciągu ostatnich %s minut, Twoja rozmowa została zamknięta.","We are sorry, it takes longer as expected to get an empty slot. Please try again later or send us an email. Thank you!":"Przykro nam, ale to trwa dłużej niż się spodziewamy. Spróbuj ponownie później lub wyślij nam wiadomość e-mail. Dziękuję!"},"zh-cn":{"Chat with us!":"发起即时对话!","Scroll down to see new messages":"向下滚动以查看新消息",Online:"在线",Offline:"离线",Connecting:"连接中","Connection re-established":"正在重新建立连接",Today:"今天",Send:"发送","Chat closed by %s":"Chat closed by %s","Compose your message...":"正在输入信息...","All colleagues are busy.":"所有工作人员都在忙碌中.","You are on waiting list position %s.":"您目前的等候位置是第 %s 位.","Start new conversation":"开始新的会话","Since you didn't respond in the last %s minutes your conversation with %s got closed.":"由于您超过 %s 分钟没有回复, 您与 %s 的会话已被关闭.","Since you didn't respond in the last %s minutes your conversation got closed.":"由于您超过 %s 分钟没有任何回复, 该对话已被关闭.","We are sorry, it takes longer as expected to get an empty slot. Please try again later or send us an email. Thank you!":"非常抱歉, 目前需要等候更长的时间才能接入对话, 请稍后重试或向我们发送电子邮件. 谢谢!"},"zh-tw":{"Chat with us!":"開始即時對话!","Scroll down to see new messages":"向下滑動以查看新訊息",Online:"線上",Offline:"离线",Connecting:"連線中","Connection re-established":"正在重新建立連線中",Today:"今天",Send:"發送","Chat closed by %s":"Chat closed by %s","Compose your message...":"正在輸入訊息...","All colleagues are busy.":"所有服務人員都在忙碌中.","You are on waiting list position %s.":"你目前的等候位置是第 %s 順位.","Start new conversation":"開始新的對話","Since you didn't respond in the last %s minutes your conversation with %s got closed.":"由於你超過 %s 分鐘沒有回應, 你與 %s 的對話已被關閉.","Since you didn't respond in the last %s minutes your conversation got closed.":"由於你超過 %s 分鐘沒有任何回應, 該對話已被關閉.","We are sorry, it takes longer as expected to get an empty slot. Please try again later or send us an email. Thank you!":"非常抱歉, 當前需要等候更長的時間方可排入對話程序, 請稍後重試或向我們寄送電子郵件. 謝謝!"}},i.prototype.sessionId=void 0,i.prototype.scrolledToBottom=!0,i.prototype.scrollSnapTolerance=10,i.prototype.richTextFormatKey={66:!0,73:!0,85:!0,83:!0},i.prototype.T=function(){var t,e,n,s,i,o;if(i=arguments[0],e=2<=arguments.length?slice.call(arguments,1):[],this.options.lang&&"en"!==this.options.lang&&(this.translations[this.options.lang]?(o=this.translations[this.options.lang],o[i]||this.log.notice("Translation needed for '"+i+"'"),i=o[i]||i):this.log.notice("Translation '"+this.options.lang+"' needed!")),e)for(n=0,s=e.length;nn?e:document.body)},i.prototype.render=function(){return this.el&&t(".zammad-chat").get(0)||this.renderBase(),t("."+this.options.buttonClass).addClass(this.inactiveClass),this.setAgentOnlineState("online"),this.log.debug("widget rendered"),this.startTimeoutObservers(),this.idleTimeout.start(),this.sessionId=sessionStorage.getItem("sessionId"),this.send("chat_status_customer",{session_id:this.sessionId,url:e.location.href})},i.prototype.renderBase=function(){if(this.el=t(this.view("chat")({title:this.options.title,scrollHint:this.options.scrollHint})),this.options.target.append(this.el),this.input=this.el.find(".zammad-chat-input"),this.el.find(".js-chat-open").click(this.open),this.el.find(".js-chat-toggle").click(this.toggle),this.el.find(".zammad-chat-controls").on("submit",this.onSubmit),this.el.find(".zammad-chat-body").on("scroll",this.detectScrolledtoBottom),this.el.find(".zammad-scroll-hint").click(this.onScrollHintClick),this.input.on({keydown:this.checkForEnter,input:this.onInput}),this.input.on("keydown",function(t){return function(e){var n;if(n=!1,e.altKey||e.ctrlKey||!e.metaKey?e.altKey||!e.ctrlKey||e.metaKey||(n=!0):n=!0,n&&t.richTextFormatKey[e.keyCode]){if(e.preventDefault(),66===e.keyCode)return document.execCommand("bold"),!0;if(73===e.keyCode)return document.execCommand("italic"),!0;if(85===e.keyCode)return document.execCommand("underline"),!0;if(83===e.keyCode)return document.execCommand("strikeThrough"),!0}}}(this)),this.input.on("paste",function(n){return function(s){var i,o,a,r,l,c,h,d,u,p,m,g;if(s.stopPropagation(),s.preventDefault(),s.clipboardData)i=s.clipboardData;else if(e.clipboardData)i=e.clipboardData;else{if(!s.originalEvent.clipboardData)throw"No clipboardData support";i=s.originalEvent.clipboardData}if(c=!1,i&&i.items&&i.items[0]&&(h=i.items[0],"file"!==h.kind||"image/png"!==h.type&&"image/jpeg"!==h.type||(l=h.getAsFile(),u=new FileReader,u.onload=function(t){var e,s,i;return i=t.target.result,e=document.createElement("img"),e.src=i,s=function(t,s,o,a){return n.isRetina()&&(s/=2,o/=2),i=t,e='',document.execCommand("insertHTML",!1,e)},n.resizeImage(e.src,460,"auto",2,"image/jpeg","auto",s)},u.readAsDataURL(l),c=!0)),!c){g=void 0,o=void 0;try{g=i.getData("text/html"),o="html",g&&0!==g.length||(o="text",g=i.getData("text/plain")),g&&0!==g.length||(o="text2",g=i.getData("text"))}catch(f){s=f,console.log("Sorry, can't insert markup because browser is not supporting it."),o="text3",g=i.getData("text")}return"text"!==o&&"text2"!==o&&"text3"!==o||(g="
        "+g.replace(/\n/g,"
        ")+"
        ",g=g.replace(/
        <\/div>/g,"

        ")),console.log("p",o,g),"html"===o&&(a=t("
        "+g+"
        "),d=!1,r=g,p=new RegExp("<(/w|w):[A-Za-z]"),r.match(p)&&(d=!0,r=r.replace(p,"")),p=new RegExp("<(/o|o):[A-Za-z]"),r.match(p)&&(d=!0,r=r.replace(p,"")),d&&(a=n.wordFilter(a)),a=t(a),a.contents().each(function(){if(8===this.nodeType)return t(this).remove()}),a.find("a, font, small, time, form, label").replaceWith(function(){return t(this).contents()}),m="div",a.find("textarea").each(function(){var e,n;return n=this.outerHTML,p=new RegExp("<"+this.tagName,"i"),e=n.replace(p,"<"+m),p=new RegExp("'),s=s.get(0),document.caretPositionFromPoint?(h=document.caretPositionFromPoint(r,l),d=document.createRange(),d.setStart(h.offsetNode,h.offset),d.collapse(),d.insertNode(s)):document.caretRangeFromPoint?(d=document.caretRangeFromPoint(r,l),d.insertNode(s)):console.log("could not find carat")},n.resizeImage(s.src,460,"auto",2,"image/jpeg","auto",i)},a.readAsDataURL(o)}}(this)),t(e).on("beforeunload",function(t){return function(){return t.onLeaveTemporary()}}(this)),t(e).bind("hashchange",function(t){return function(){return t.isOpen?void(t.sessionId&&t.send("chat_session_notice",{session_id:t.sessionId,message:e.location.href})):t.idleTimeout.start()}}(this)),this.isFullscreen)return this.input.on({focus:this.onFocus,focusout:this.onFocusOut})},i.prototype.checkForEnter=function(t){if(!t.shiftKey&&13===t.keyCode)return t.preventDefault(),this.sendMessage()},i.prototype.send=function(t,e){return null==e&&(e={}),e.chat_id=this.options.chatId,this.io.send(t,e)},i.prototype.onWebSocketMessage=function(t){var e,n,s;for(e=0,n=t.length;e0,t(e).scrollTop(0),n)return this.log.notice("virtual keyboard shown")},i.prototype.onFocusOut=function(){},i.prototype.onTyping=function(){if(!(this.isTyping&&this.isTyping>new Date((new Date).getTime()-1500)))return this.isTyping=new Date,this.send("chat_session_typing",{session_id:this.sessionId}),this.inactiveTimeout.start()},i.prototype.onSubmit=function(t){return t.preventDefault(),this.sendMessage()},i.prototype.sendMessage=function(){var t,e;if(t=this.input.html())return this.inactiveTimeout.start(),sessionStorage.removeItem("unfinished_message"),e=this.view("message")({message:t,from:"customer",id:this._messageCount++,unreadClass:""}),this.maybeAddTimestamp(),this.el.find(".zammad-chat-message--typing").get(0)?(this.lastAddedType="typing-placeholder",this.el.find(".zammad-chat-message--typing").before(e)):(this.lastAddedType="message--customer",this.el.find(".zammad-chat-body").append(e)),this.input.html(""),this.scrollToBottom(),this.send("chat_session_message",{content:t,id:this._messageCount,session_id:this.sessionId})},i.prototype.receiveMessage=function(t){return this.inactiveTimeout.start(),this.onAgentTypingEnd(),this.maybeAddTimestamp(),this.renderMessage({message:t.message.content,id:t.id,from:"agent"}),this.scrollToBottom({showHint:!0})},i.prototype.renderMessage=function(t){return this.lastAddedType="message--"+t.from,t.unreadClass=document.hidden?" zammad-chat-message--unread":"",this.el.find(".zammad-chat-body").append(this.view("message")(t))},i.prototype.open=function(){var t;return this.isOpen?void this.log.debug("widget already open, block"):(this.isOpen=!0,this.log.debug("open widget"),this.sessionId||this.showLoader(),this.el.addClass("zammad-chat-is-open"),t=this.el.height()-this.el.find(".zammad-chat-header").outerHeight(),this.el.css("bottom",-t),this.sessionId?(this.el.css("bottom",0),this.onOpenAnimationEnd()):(this.el.animate({bottom:0},500,this.onOpenAnimationEnd),this.send("chat_session_init",{url:e.location.href})))},i.prototype.onOpenAnimationEnd=function(){if(this.idleTimeout.stop(),this.isFullscreen)return this.disableScrollOnRoot()},i.prototype.sessionClose=function(){return this.send("chat_session_close",{session_id:this.sessionId}),this.inactiveTimeout.stop(),this.waitingListTimeout.stop(),sessionStorage.removeItem("unfinished_message"),this.onInitialQueueDelayId&&clearTimeout(this.onInitialQueueDelayId),this.setSessionId(void 0)},i.prototype.toggle=function(t){return this.isOpen?this.close(t):this.open(t)},i.prototype.close=function(t){var e;return this.isOpen?(this.initDelayId&&clearTimeout(this.initDelayId),this.sessionId?(this.log.debug("close widget"),t&&t.stopPropagation(),this.sessionClose(),this.isFullscreen&&this.enableScrollOnRoot(),e=this.el.height()-this.el.find(".zammad-chat-header").outerHeight(),this.el.animate({bottom:-e},500,this.onCloseAnimationEnd)):void this.log.debug("can't close widget without sessionId")):void this.log.debug("can't close widget, it's not open")},i.prototype.onCloseAnimationEnd=function(){return this.el.css("bottom",""),this.el.removeClass("zammad-chat-is-open"),this.showLoader(),this.el.find(".zammad-chat-welcome").removeClass("zammad-chat-is-hidden"),this.el.find(".zammad-chat-agent").addClass("zammad-chat-is-hidden"),this.el.find(".zammad-chat-agent-status").addClass("zammad-chat-is-hidden"),this.isOpen=!1,this.io.reconnect()},i.prototype.onWebSocketClose=function(){if(!this.isOpen)return this.el?(this.el.removeClass("zammad-chat-is-shown"),this.el.removeClass("zammad-chat-is-loaded")):void 0},i.prototype.show=function(){if("offline"!==this.state)return this.el.addClass("zammad-chat-is-loaded"),this.el.addClass("zammad-chat-is-shown")},i.prototype.disableInput=function(){return this.input.prop("disabled",!0),this.el.find(".zammad-chat-send").prop("disabled",!0)},i.prototype.enableInput=function(){return this.input.prop("disabled",!1),this.el.find(".zammad-chat-send").prop("disabled",!1)},i.prototype.hideModal=function(){return this.el.find(".zammad-chat-modal").html("")},i.prototype.onQueueScreen=function(t){var e;return this.setSessionId(t.session_id),e=function(e){return function(){return e.onQueue(t),e.waitingListTimeout.start()}}(this),this.initialQueueDelay&&!this.onInitialQueueDelayId?void(this.onInitialQueueDelayId=setTimeout(e,this.initialQueueDelay)):(this.onInitialQueueDelayId&&clearTimeout(this.onInitialQueueDelayId),e())},i.prototype.onQueue=function(t){return this.log.notice("onQueue",t.position),this.inQueue=!0,this.el.find(".zammad-chat-modal").html(this.view("waiting")({position:t.position}))},i.prototype.onAgentTypingStart=function(){if(this.stopTypingId&&clearTimeout(this.stopTypingId),this.stopTypingId=setTimeout(this.onAgentTypingEnd,3e3),!this.el.find(".zammad-chat-message--typing").get(0)&&(this.maybeAddTimestamp(),this.el.find(".zammad-chat-body").append(this.view("typingIndicator")()),this.isVisible(this.el.find(".zammad-chat-message--typing"),!0)))return this.scrollToBottom()},i.prototype.onAgentTypingEnd=function(){return this.el.find(".zammad-chat-message--typing").remove()},i.prototype.onLeaveTemporary=function(){if(this.sessionId)return this.send("chat_session_leave_temporary",{ +session_id:this.sessionId})},i.prototype.maybeAddTimestamp=function(){var t,e,n;if(n=Date.now(),!this.lastTimestamp||n-this.lastTimestamp>6e4*this.showTimeEveryXMinutes)return t=this.T("Today"),e=(new Date).toTimeString().substr(0,5),"timestamp"===this.lastAddedType?(this.updateLastTimestamp(t,e),this.lastTimestamp=n):(this.el.find(".zammad-chat-body").append(this.view("timestamp")({label:t,time:e})),this.lastTimestamp=n,this.lastAddedType="timestamp",this.scrollToBottom())},i.prototype.updateLastTimestamp=function(t,e){if(this.el)return this.el.find(".zammad-chat-body").find(".zammad-chat-timestamp").last().replaceWith(this.view("timestamp")({label:t,time:e}))},i.prototype.addStatus=function(t){if(this.el)return this.maybeAddTimestamp(),this.el.find(".zammad-chat-body").append(this.view("status")({status:t})),this.scrollToBottom()},i.prototype.detectScrolledtoBottom=function(){var t;if(t=this.el.find(".zammad-chat-body").scrollTop()+this.el.find(".zammad-chat-body").outerHeight(),this.scrolledToBottom=Math.abs(t-this.el.find(".zammad-chat-body").prop("scrollHeight"))<=this.scrollSnapTolerance,this.scrolledToBottom)return this.el.find(".zammad-scroll-hint").addClass("is-hidden")},i.prototype.showScrollHint=function(){return this.el.find(".zammad-scroll-hint").removeClass("is-hidden"),this.el.find(".zammad-chat-body").scrollTop(this.el.find(".zammad-chat-body").scrollTop()+this.el.find(".zammad-scroll-hint").outerHeight())},i.prototype.onScrollHintClick=function(){return this.el.find(".zammad-chat-body").animate({scrollTop:this.el.find(".zammad-chat-body").prop("scrollHeight")},300)},i.prototype.scrollToBottom=function(e){var n;return n=(null!=e?e:{showHint:!1}).showHint,this.scrolledToBottom?this.el.find(".zammad-chat-body").scrollTop(t(".zammad-chat-body").prop("scrollHeight")):n?this.showScrollHint():void 0},i.prototype.destroy=function(t){return null==t&&(t={}),this.log.debug("destroy widget",t),this.setAgentOnlineState("offline"),t.remove&&this.el&&this.el.remove(),this.waitingListTimeout&&this.waitingListTimeout.stop(),this.inactiveTimeout&&this.inactiveTimeout.stop(),this.idleTimeout&&this.idleTimeout.stop(),this.io.close()},i.prototype.reconnect=function(){return this.log.notice("reconnecting"),this.disableInput(),this.lastAddedType="status",this.setAgentOnlineState("connecting"),this.addStatus(this.T("Connection lost"))},i.prototype.onConnectionReestablished=function(){return this.lastAddedType="status",this.setAgentOnlineState("online"),this.addStatus(this.T("Connection re-established"))},i.prototype.onSessionClosed=function(t){return this.addStatus(this.T("Chat closed by %s",t.realname)),this.disableInput(),this.setAgentOnlineState("offline"),this.inactiveTimeout.stop()},i.prototype.setSessionId=function(t){return this.sessionId=t,void 0===t?sessionStorage.removeItem("sessionId"):sessionStorage.setItem("sessionId",t)},i.prototype.onConnectionEstablished=function(t){return this.onInitialQueueDelayId&&clearTimeout(this.onInitialQueueDelayId),this.inQueue=!1,t.agent&&(this.agent=t.agent),t.session_id&&this.setSessionId(t.session_id),this.el.find(".zammad-chat-body").html(""),this.el.find(".zammad-chat-agent").html(this.view("agent")({agent:this.agent})),this.enableInput(),this.hideModal(),this.el.find(".zammad-chat-welcome").addClass("zammad-chat-is-hidden"),this.el.find(".zammad-chat-agent").removeClass("zammad-chat-is-hidden"),this.el.find(".zammad-chat-agent-status").removeClass("zammad-chat-is-hidden"),this.isFullscreen||this.input.focus(),this.setAgentOnlineState("online"),this.waitingListTimeout.stop(),this.idleTimeout.stop(),this.inactiveTimeout.start()},i.prototype.showCustomerTimeout=function(){var t;return this.el.find(".zammad-chat-modal").html(this.view("customer_timeout")({agent:this.agent.name,delay:this.options.inactiveTimeout})),t=function(){return location.reload()},this.el.find(".js-restart").click(t),this.sessionClose()},i.prototype.showWaitingListTimeout=function(){var t;return this.el.find(".zammad-chat-modal").html(this.view("waiting_list_timeout")({delay:this.options.watingListTimeout})),t=function(){return location.reload()},this.el.find(".js-restart").click(t),this.sessionClose()},i.prototype.showLoader=function(){return this.el.find(".zammad-chat-modal").html(this.view("loader")())},i.prototype.setAgentOnlineState=function(t){var e;if(this.state=t,this.el)return e=t.charAt(0).toUpperCase()+t.slice(1),this.el.find(".zammad-chat-agent-status").attr("data-status",t).text(this.T(e))},i.prototype.detectHost=function(){var t;return t="ws://","https"===c&&(t="wss://"),this.options.host=""+t+l+"/ws"},i.prototype.loadCss=function(){var t,e,n;if(this.options.cssAutoload)return n=this.options.cssUrl,n||(n=this.options.host.replace(/^wss/i,"https").replace(/^ws/i,"http").replace(/\/ws/i,""),n+="/assets/chat/chat.css"),this.log.debug("load css from '"+n+"'"),e="@import url('"+n+"');",t=document.createElement("link"),t.onload=this.onCssLoaded,t.rel="stylesheet",t.href="data:text/css,"+escape(e),document.getElementsByTagName("head")[0].appendChild(t)},i.prototype.onCssLoaded=function(){return this.socketReady?this.onReady():this.cssLoaded=!0},i.prototype.startTimeoutObservers=function(){return this.idleTimeout=new o({logPrefix:"idleTimeout",debug:this.options.debug,timeout:this.options.idleTimeout,timeoutIntervallCheck:this.options.idleTimeoutIntervallCheck,callback:function(t){return function(){return t.log.debug("Idle timeout reached, hide widget",new Date),t.destroy({remove:!0})}}(this)}),this.inactiveTimeout=new o({logPrefix:"inactiveTimeout",debug:this.options.debug,timeout:this.options.inactiveTimeout,timeoutIntervallCheck:this.options.inactiveTimeoutIntervallCheck,callback:function(t){return function(){return t.log.debug("Inactive timeout reached, show timeout screen.",new Date),t.showCustomerTimeout(),t.destroy({remove:!1})}}(this)}),this.waitingListTimeout=new o({logPrefix:"waitingListTimeout",debug:this.options.debug,timeout:this.options.waitingListTimeout,timeoutIntervallCheck:this.options.waitingListTimeoutIntervallCheck,callback:function(t){return function(){return t.log.debug("Waiting list timeout reached, show timeout screen.",new Date),t.showWaitingListTimeout(),t.destroy({remove:!1})}}(this)})},i.prototype.disableScrollOnRoot=function(){return this.rootScrollOffset=this.scrollRoot.scrollTop(),this.scrollRoot.css({overflow:"hidden",position:"fixed"})},i.prototype.enableScrollOnRoot=function(){return this.scrollRoot.scrollTop(this.rootScrollOffset),this.scrollRoot.css({overflow:"",position:""})},i.prototype.isVisible=function(n,s,i,o){var a,r,l,c,h,d,u,p,m,g,f,y,v,b,w,T,C,z,S,k,I,A,x,_,O,E;if(!(n.length<1))if(r=t(e),a=n.length>1?n.eq(0):n,z=a.get(0),E=r.width(),O=r.height(),o=o?o:"both",p=i!==!0||z.offsetWidth*z.offsetHeight,"function"==typeof z.getBoundingClientRect){if(C=z.getBoundingClientRect(),S=C.top>=0&&C.top0&&C.bottom<=O,b=C.left>=0&&C.left0&&C.right<=E,k=s?S||u:S&&u,v=s?b||T:b&&T,"both"===o)return p&&k&&v;if("vertical"===o)return p&&k;if("horizontal"===o)return p&&v}else{if(_=r.scrollTop(),I=_+O,A=r.scrollLeft(),x=A+E,w=a.offset(),d=w.top,l=d+a.height(),c=w.left,h=c+a.width(),y=s===!0?l:d,m=s===!0?d:l,g=s===!0?h:c,f=s===!0?c:h,"both"===o)return!!p&&m<=I&&y>=_&&f<=x&&g>=A;if("vertical"===o)return!!p&&m<=I&&y>=_;if("horizontal"===o)return!!p&&f<=x&&g>=A}},i.prototype.isRetina=function(){var t;return!!e.matchMedia&&(t=e.matchMedia("only screen and (min--moz-device-pixel-ratio: 1.3), only screen and (-o-min-device-pixel-ratio: 2.6/2), only screen and (-webkit-min-device-pixel-ratio: 1.3), only screen and (min-device-pixel-ratio: 1.3), only screen and (min-resolution: 1.3dppx)"),t&&t.matches||e.devicePixelRatio>1)},i.prototype.resizeImage=function(t,e,n,s,i,o,a,r){var l;return null==e&&(e="auto"),null==n&&(n="auto"),null==s&&(s=1),null==r&&(r=!0),l=new Image,l.onload=function(){var t,r,c,h,d,u,p;return d=l.width,h=l.height,console.log("ImageService","current size",d,h),"auto"===n&&"auto"===e&&(e=d,n=h),"auto"===n&&(c=d/e,n=h/c),"auto"===e&&(c=d/n,e=h/c),p=!1,e/gi,""),n=n.replace(/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,""),n=n.replace(/<(\/?)s>/gi,"<$1strike>"),n=n.replace(/ /gi," "),e.html(n),t("p",e).each(function(){var e,n;if(n=t(this).attr("style"),e=/mso-list:\w+ \w+([0-9]+)/.exec(n))return t(this).data("_listLevel",parseInt(e[1],10))}),s=0,i=null,t("p",e).each(function(){var e,n,o,a,r,l,c,h,d,u;if(e=t(this).data("_listLevel"),void 0!==e){if(u=t(this).text(),a="
          ",/^\s*\w+\./.test(u)&&(r=/([0-9])\./.exec(u),r?(d=parseInt(r[1],10),a=null!=(l=d>1)?l:'
            ':"
              "}):a="
                "),e>s&&(0===s?(t(this).before(a),i=t(this).prev()):i=t(a).appendTo(i)),e=h;n=c<=h?++o:--o)i=i.parent();return t("span:first",this).remove(),i.append("
              1. "+t(this).html()+"
                2. "),t(this).remove(),s=e}return s=0}),t("[style]",e).removeAttr("style"),t("[align]",e).removeAttr("align"),t("span",e).replaceWith(function(){return t(this).contents()}),t("span:empty",e).remove(),t("[class^='Mso']",e).removeAttr("class"),t("p:empty",e).remove(),e},i.prototype.removeAttribute=function(e){var n,s,i,o,a;if(e){for(n=t(e),a=e.attributes,i=0,o=a.length;i/g,">").replace(/"/g,""")}),function(){(function(){n.push('
                \n
                \n
                \n \n \n \n \n \n
                \n
                \n
                \n
                \n \n '),n.push(this.T(this.title)),n.push('\n
                \n
                \n
                \n \n
                \n
                \n
                \n \n
                \n
                ")}).call(this)}.call(t),t.safe=i,t.escape=o,n.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.customer_timeout=function(t){t||(t={});var e,n=[],s=function(t){return t&&t.ecoSafe?t:"undefined"!=typeof t&&null!=t?o(t):""},i=t.safe,o=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;"undefined"!=typeof t&&null!=t||(t="");var e=new String(t);return e.ecoSafe=!0,e},o||(o=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){n.push('
                \n '),this.agent?(n.push("\n "),n.push(this.T("Since you didn't respond in the last %s minutes your conversation with %s got closed.",this.delay,this.agent)),n.push("\n ")):(n.push("\n "),n.push(this.T("Since you didn't respond in the last %s minutes your conversation got closed.",this.delay)),n.push("\n ")),n.push('\n
                \n
                "),n.push(this.T("Start new conversation")),n.push("
                \n
                ")}).call(this)}.call(t),t.safe=i,t.escape=o,n.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.loader=function(t){t||(t={});var e,n=[],s=t.safe,i=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;"undefined"!=typeof t&&null!=t||(t="");var e=new String(t);return e.ecoSafe=!0,e},i||(i=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){n.push('\n \n \n \n\n'),n.push(this.T("Connecting")),n.push("")}).call(this)}.call(t),t.safe=s,t.escape=i,n.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.message=function(t){t||(t={});var e,n=[],s=function(t){return t&&t.ecoSafe?t:"undefined"!=typeof t&&null!=t?o(t):""},i=t.safe,o=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;"undefined"!=typeof t&&null!=t||(t="");var e=new String(t);return e.ecoSafe=!0,e},o||(o=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){n.push('
                \n "),n.push(this.message),n.push("\n
                ")}).call(this)}.call(t),t.safe=i,t.escape=o,n.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.status=function(t){t||(t={});var e,n=[],s=t.safe,i=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;"undefined"!=typeof t&&null!=t||(t="");var e=new String(t);return e.ecoSafe=!0,e},i||(i=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){n.push('
                \n
                \n '),n.push(this.status),n.push("\n
                \n
                ")}).call(this)}.call(t),t.safe=s,t.escape=i,n.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.timestamp=function(t){t||(t={});var e,n=[],s=function(t){return t&&t.ecoSafe?t:"undefined"!=typeof t&&null!=t?o(t):""},i=t.safe,o=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;"undefined"!=typeof t&&null!=t||(t="");var e=new String(t);return e.ecoSafe=!0,e},o||(o=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){n.push('
                '),n.push(s(this.label)),n.push(" "),n.push(s(this.time)),n.push("
                ")}).call(this)}.call(t),t.safe=i,t.escape=o,n.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.typingIndicator=function(t){t||(t={});var e,n=[],s=t.safe,i=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;"undefined"!=typeof t&&null!=t||(t="");var e=new String(t);return e.ecoSafe=!0,e},i||(i=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){n.push('
                \n \n \n \n \n \n \n \n
                ')}).call(this)}.call(t),t.safe=s,t.escape=i,n.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.waiting=function(t){t||(t={});var e,n=[],s=t.safe,i=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;"undefined"!=typeof t&&null!=t||(t="");var e=new String(t);return e.ecoSafe=!0,e},i||(i=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){n.push('
                \n \n \n \n \n \n '),n.push(this.T("All colleagues are busy.")),n.push("
                \n "),n.push(this.T("You are on waiting list position %s.",this.position)),n.push("\n
                ")}).call(this)}.call(t),t.safe=s,t.escape=i,n.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.waiting_list_timeout=function(t){t||(t={});var e,n=[],s=function(t){return t&&t.ecoSafe?t:"undefined"!=typeof t&&null!=t?o(t):""},i=t.safe,o=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;"undefined"!=typeof t&&null!=t||(t="");var e=new String(t);return e.ecoSafe=!0,e},o||(o=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){n.push('
                \n '),n.push(this.T("We are sorry, it takes longer as expected to get an empty slot. Please try again later or send us an email. Thank you!")),n.push('\n
                \n
                "),n.push(this.T("Start new conversation")),n.push("
                \n
                ")}).call(this)}.call(t),t.safe=i,t.escape=o,n.join("")}; \ No newline at end of file diff --git a/public/assets/chat/chat.scss b/public/assets/chat/chat.scss index 64f0c4cca..2c85d78fc 100644 --- a/public/assets/chat/chat.scss +++ b/public/assets/chat/chat.scss @@ -80,8 +80,13 @@ height: 100%; width: 3.4em; text-align: center; - line-height: 3.5em; + line-height: 3.4em; cursor: pointer; + + &:before { // force the icon to align to center + content: ""; + display: inline-block; + } } .zammad-chat-header-icon-open, @@ -125,7 +130,7 @@ } .zammad-chat-agent-status { - margin: 0 1em; + margin: 0.25em 1em; display: inline-block; line-height: 2em; padding: 0 .7em; diff --git a/public/assets/form/form.js b/public/assets/form/form.js index b8d0456fd..df238b7df 100644 --- a/public/assets/form/form.js +++ b/public/assets/form/form.js @@ -124,6 +124,33 @@ $(function() { 'Attachments': 'Pièces jointes', 'Your Message...': 'Votre message...', }, + 'nl': { + 'Name': 'Naam', + 'Your Name': 'Uw naam', + 'Email': 'Email adres', + 'Your Email': 'Uw Email adres', + 'Message': 'Bericht', + 'Attachments': 'Bijlage', + 'Your Message...': 'Uw bericht...', + }, + 'it': { + 'Name': 'Nome', + 'Your Name': 'Il tuo nome', + 'Email': 'E-mail', + 'Your Email': 'Il tuo indirizzo e-mail', + 'Message': 'Messaggio', + 'Attachments': 'Allegati', + 'Your Message...': 'Il tuo messaggio...', + }, + 'pl': { + 'Name': 'Nazwa', + 'Your Name': 'Imię i nazwisko', + 'Email': 'Email adres', + 'Your Email': 'Adres e-mail', + 'Message': 'Wiadomość', + 'Attachments': 'Załączniki', + 'Your Message...': 'Twoja wiadomość...', + }, 'zh-cn': { 'Name': '联系人', 'Your Name': '您的尊姓大名', diff --git a/public/assets/images/icons.svg b/public/assets/images/icons.svg index 698cab350..5f9feffe3 100644 --- a/public/assets/images/icons.svg +++ b/public/assets/images/icons.svg @@ -1 +1,681 @@ -arrow-downarrow-leftarrow-rightarrow-upchatcheckbox-checkedcheckbox-indeterminatecheckboxcheckmarkclipboardclockcloudcogcrowndashboarddiagonal-crossdownloaddraggabledropdown-listemail-buttonemaileyedropperfacebook-buttonfacebookformgithub-buttongitlab-buttongoogle-buttongrouphelpimportantin-processinfoline-left-arrowline-right-arrowlinkedin-buttonlistloadinglock-openlocklogotypelong-arrow-rightmagnifiermarkermessageminus-smallminusmood-badmood-goodmood-okmood-superbadmood-supergoodmutenoteoauth2-buttonoffice365-buttonone-ticketorganizationoutbound-callsoverviewspackagepaperclippenpersonphoneplus-smallplusprinterradio-checkedradioreceived-callsreloadreopeningreply-allreplyreportsearchdetailsignoutsmall-dotsplitstatus-modified-outer-circlestatusstopwatchswitchViewtask-stateteamtelegramtemplatestoolstotal-ticketstrashtwitter-buttontwitterunmuteuserwebzoom-inzoom-outicon-weibo-buttonCreated with Sketch. + + + arrow-down + + + + + arrow-left + + + + + arrow-right + + + + + arrow-up + + + + + chat + + + + + checkbox-checked + + + + + + + + + checkbox-indeterminate + + + + + + + + + checkbox + + + + + + + + checkmark + + + + + clipboard + + + + + clock + + + + + + + + cloud + + + + + cog + + + + + crown + + + + + dashboard + + + + + diagonal-cross + + + + + download + + + + + draggable + + + + + + + dropdown-list + + + + + email-button + + + + + email + + + + + eyedropper + + + + + facebook-button + + + + + + + + facebook + + + + + form + + + + + forward + + + + + github-button + + + + + gitlab-button + + + + + + + + + + + + + + google-button + + + + + + + + + + + group + + + + + help + + + + + important + + + + + in-process + + + + + + + + info + + + + + line-left-arrow + + + + + + + + line-right-arrow + + + + + linkedin-button + + + + + list + + + + + loading + + + + + lock-open + + + + + lock + + + + + logotype + + + + + long-arrow-right + + + + + magnifier + + + + + marker + + + + + message + + + + + minus-small + + + + + minus + + + + + mood-bad + + + + + mood-good + + + + + mood-ok + + + + + mood-superbad + + + + + mood-supergood + + + + + mute + + + + + + + note + + + + + + + + oauth2-button + + + + + office365-button + + + + + one-ticket + + + + + + + + organization + + + + + outbound-calls + + + + + + + + overviews + + + + + package + + + + + paperclip + + + + + pen + + + + + person + + + + + phone + + + + + plus-small + + + + + plus + + + + + printer + + + + + + + + + radio-checked + + + + + + + + radio + + + + + + + + received-calls + + + + + + + + reload + + + + + reopening + + + + + + + + + reply-all + + + + + reply + + + + + report + + + + + searchdetail + + + + + + + + signout + + + + + + + + small-dot + + + + + split + + + + + status-modified-outer-circle + + + + + status + + + + + stopwatch + + + + + + + + switchView + + + + + task-state + + + + + team + + + + + telegram + + + + + + + + + templates + + + + + tools + + + + + total-tickets + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + trash + + + + + twitter-button + + + + + twitter + + + + + unmute + + + + + + + user + + + + + web + + + + + + + + + + + + + + + + icon-weibo-button + + + + + + + + zoom-in + + + + + + + + zoom-out + + + + + + \ No newline at end of file diff --git a/public/assets/images/icons/forward.svg b/public/assets/images/icons/forward.svg new file mode 100644 index 000000000..43cff410b --- /dev/null +++ b/public/assets/images/icons/forward.svg @@ -0,0 +1,12 @@ + + + + forward + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/public/assets/images/icons/lock-open.svg b/public/assets/images/icons/lock-open.svg index ca7499119..bc039cb1e 100644 --- a/public/assets/images/icons/lock-open.svg +++ b/public/assets/images/icons/lock-open.svg @@ -1,6 +1,6 @@ - - + + lock-open Created with Sketch. diff --git a/public/assets/images/icons/lock.svg b/public/assets/images/icons/lock.svg index 33211aa92..9703ff5b7 100644 --- a/public/assets/images/icons/lock.svg +++ b/public/assets/images/icons/lock.svg @@ -1,6 +1,6 @@ - - + + lock Created with Sketch. diff --git a/public/assets/images/icons/reply-all.svg b/public/assets/images/icons/reply-all.svg index 696bcba72..a993747ed 100644 --- a/public/assets/images/icons/reply-all.svg +++ b/public/assets/images/icons/reply-all.svg @@ -1,12 +1,12 @@ - - + + reply-all Created with Sketch. - + \ No newline at end of file diff --git a/public/assets/images/icons/reply.svg b/public/assets/images/icons/reply.svg index e0001e08a..8309d2d46 100644 --- a/public/assets/images/icons/reply.svg +++ b/public/assets/images/icons/reply.svg @@ -1,12 +1,12 @@ - - + + reply Created with Sketch. - + \ No newline at end of file diff --git a/public/assets/images/icons/split.svg b/public/assets/images/icons/split.svg index 4568443d5..c996d2f54 100644 --- a/public/assets/images/icons/split.svg +++ b/public/assets/images/icons/split.svg @@ -1,12 +1,12 @@ - - + + split Created with Sketch. - + \ No newline at end of file diff --git a/public/assets/tests/html_utils.js b/public/assets/tests/html_utils.js index 4c60dd4f6..bc8316d5b 100644 --- a/public/assets/tests/html_utils.js +++ b/public/assets/tests/html_utils.js @@ -269,6 +269,16 @@ test("linkify", function() { result = App.Utils.linkify(source) equal(result, should, source) + source = "test@example.com some text" + should = 'test@example.com some text' + result = App.Utils.linkify(source) + equal(result, should, source) + + source = "abc test@example.com some text" + should = 'abc test@example.com some text' + result = App.Utils.linkify(source) + equal(result, should, source) + /* source = "example.com" should = 'http://example.com' @@ -522,12 +532,12 @@ test("htmlCleanup", function() { var source = "" //var should = "
                test
                " - var should = "test" + var should = "test" var result = App.Utils.htmlCleanup($(source)) equal(result.html(), should, source) source = "" - should = "test" + should = "test" result = App.Utils.htmlCleanup(source) equal(result.html(), should, source) @@ -546,6 +556,11 @@ test("htmlCleanup", function() { result = App.Utils.htmlCleanup($(source)) equal(result.html(), should, source) + source = "

                some link to somewhere

                " + should = "some link to somewhere" + result = App.Utils.htmlCleanup($(source)) + equal(result.html(), should, source) + source = "

                some link to somewhere

                " should = "

                some link to somewhere

                " result = App.Utils.htmlCleanup($(source)) @@ -1967,34 +1982,106 @@ test('check getRecipientArticle format', function() { lastname: 'lastname', email: 'customer@example.com', } - agent = { - login: 'login', - firstname: 'firstname', - lastname: 'lastname', - email: 'agent@example.com', - } ticket = { customer: customer, } article = { message_id: 'message_id7', - created_by: agent, type: { name: 'email', }, sender: { - name: 'Agent', + name: 'Customer', }, - from: 'customer2@example.com', - to: 'customer@example.com', + from: 'some other invalid part, ' + customer.email, + to: 'some group', + created_by: { + login: 'login', + firstname: 'firstname', + lastname: 'lastname', + email: 'article_created_by@example.com', + } } result = { - to: 'customer2@example.com', + to: 'customer@example.com', cc: '', body: '', in_reply_to: 'message_id7', } verify = App.Utils.getRecipientArticle(ticket, article, article.created_by, article.type) + console.log(verify) + deepEqual(verify, result) + + customer = { + login: 'login', + firstname: 'firstname', + lastname: 'lastname', + email: 'customer@example.com', + } + ticket = { + customer: customer, + } + article = { + message_id: 'message_id7.1', + type: { + name: 'email', + }, + sender: { + name: 'Customer', + }, + from: 'some other invalid part, Some Realname ' + customer.email, + to: 'some group', + created_by: { + login: 'login', + firstname: 'firstname', + lastname: 'lastname', + email: 'article_created_by@example.com', + } + } + result = { + to: 'customer@example.com', + cc: '', + body: '', + in_reply_to: 'message_id7.1', + } + verify = App.Utils.getRecipientArticle(ticket, article, article.created_by, article.type) + console.log(verify) + deepEqual(verify, result) + + customer = { + login: 'login', + firstname: 'firstname', + lastname: 'lastname', + email: 'customer@example.com', + } + ticket = { + customer: customer, + } + article = { + message_id: 'message_id7.2', + type: { + name: 'email', + }, + sender: { + name: 'Customer', + }, + from: 'some other invalid part, Some Realname ' + customer.email + ' , abc', + to: 'some group', + created_by: { + login: 'login', + firstname: 'firstname', + lastname: 'lastname', + email: 'article_created_by@example.com', + } + } + result = { + to: 'customer@example.com', + cc: '', + body: '', + in_reply_to: 'message_id7.2', + } + verify = App.Utils.getRecipientArticle(ticket, article, article.created_by, article.type) + console.log(verify) deepEqual(verify, result) customer = { @@ -2021,11 +2108,11 @@ test('check getRecipientArticle format', function() { sender: { name: 'Agent', }, - from: 'agent@example.com', + from: 'customer2@example.com', to: 'customer@example.com', } result = { - to: 'customer@example.com', + to: 'customer2@example.com', cc: '', body: '', in_reply_to: 'message_id8', @@ -2057,9 +2144,8 @@ test('check getRecipientArticle format', function() { sender: { name: 'Agent', }, - from: 'Agent@Example.com', + from: 'agent@example.com', to: 'customer@example.com', - cc: 'zammad@example.com', } result = { to: 'customer@example.com', @@ -2095,16 +2181,16 @@ test('check getRecipientArticle format', function() { name: 'Agent', }, from: 'Agent@Example.com', - to: 'customer@example.com, agent@example.com', + to: 'customer@example.com', cc: 'zammad@example.com', } result = { - to: 'customer@example.com, agent@example.com', - cc: 'zammad@example.com', + to: 'customer@example.com', + cc: '', body: '', in_reply_to: 'message_id10', } - verify = App.Utils.getRecipientArticle(ticket, article, article.created_by, article.type, [], true) + verify = App.Utils.getRecipientArticle(ticket, article, article.created_by, article.type) deepEqual(verify, result) customer = { @@ -2132,8 +2218,8 @@ test('check getRecipientArticle format', function() { name: 'Agent', }, from: 'Agent@Example.com', - to: 'customeR@EXAMPLE.com, agent@example.com', - cc: 'zammad@example.com, customer@example.com', + to: 'customer@example.com, agent@example.com', + cc: 'zammad@example.com', } result = { to: 'customer@example.com, agent@example.com', @@ -2141,7 +2227,7 @@ test('check getRecipientArticle format', function() { body: '', in_reply_to: 'message_id11', } - verify = App.Utils.getRecipientArticle(ticket, article, agent, article.type, [], true) + verify = App.Utils.getRecipientArticle(ticket, article, article.created_by, article.type, [], true) deepEqual(verify, result) customer = { @@ -2169,24 +2255,16 @@ test('check getRecipientArticle format', function() { name: 'Agent', }, from: 'Agent@Example.com', - to: 'customeR@EXAMPLE.com, agent@example.com, zammad2@EXAMPLE.com', - cc: 'zammad@example.com, customer2@example.com', + to: 'customeR@EXAMPLE.com, agent@example.com', + cc: 'zammad@example.com, customer@example.com', } result = { to: 'customer@example.com, agent@example.com', - cc: 'customer2@example.com', + cc: 'zammad@example.com', body: '', in_reply_to: 'message_id12', } - email_addresses = [ - { - email: 'zammad@example.com', - }, - { - email: 'zammad2@example.com', - } - ] - verify = App.Utils.getRecipientArticle(ticket, article, agent, article.type, email_addresses, true) + verify = App.Utils.getRecipientArticle(ticket, article, agent, article.type, [], true) deepEqual(verify, result) customer = { @@ -2199,7 +2277,7 @@ test('check getRecipientArticle format', function() { login: 'login', firstname: 'firstname', lastname: 'lastname', - email: 'AGENT@example.com', + email: 'agent@example.com', } ticket = { customer: customer, @@ -2238,21 +2316,27 @@ test('check getRecipientArticle format', function() { login: 'login', firstname: 'firstname', lastname: 'lastname', - email: 'zammad@example.com', + email: 'customer@example.com', + } + agent = { + login: 'login', + firstname: 'firstname', + lastname: 'lastname', + email: 'AGENT@example.com', } ticket = { customer: customer, } article = { message_id: 'message_id14', - created_by: customer, + created_by: agent, type: { name: 'email', }, sender: { name: 'Agent', }, - from: 'zammad@EXAMPLE.com', + from: 'Agent@Example.com', to: 'customeR@EXAMPLE.com, agent@example.com, zammad2@EXAMPLE.com', cc: 'zammad@example.com, customer2@example.com', } @@ -2277,7 +2361,7 @@ test('check getRecipientArticle format', function() { login: 'login', firstname: 'firstname', lastname: 'lastname', - email: 'customer@example.com', + email: 'zammad@example.com', } ticket = { customer: customer, @@ -2291,13 +2375,13 @@ test('check getRecipientArticle format', function() { sender: { name: 'Agent', }, - from: 'customer@example.com', - to: 'customer1@example.com, customer2@example.com, zammad@example.com', - cc: '', + from: 'zammad@EXAMPLE.com', + to: 'customeR@EXAMPLE.com, agent@example.com, zammad2@EXAMPLE.com', + cc: 'zammad@example.com, customer2@example.com', } result = { - to: 'customer1@example.com, customer2@example.com, customer@example.com', - cc: '', + to: 'customer@example.com, agent@example.com', + cc: 'customer2@example.com', body: '', in_reply_to: 'message_id15', } @@ -2331,11 +2415,11 @@ test('check getRecipientArticle format', function() { name: 'Agent', }, from: 'customer@example.com', - to: 'customer1@example.com, customer2@example.com, zammad@example.com, customer2+2@example.com', + to: 'customer1@example.com, customer2@example.com, zammad@example.com', cc: '', } result = { - to: 'customer1@example.com, customer2@example.com, customer2+2@example.com, customer@example.com', + to: 'customer1@example.com, customer2@example.com, customer@example.com', cc: '', body: '', in_reply_to: 'message_id16', @@ -2357,30 +2441,24 @@ test('check getRecipientArticle format', function() { lastname: 'lastname', email: 'customer@example.com', } - agent = { - login: 'login', - firstname: 'firstname', - lastname: 'lastname', - email: 'zammad@example.com', - } ticket = { customer: customer, } article = { message_id: 'message_id17', - created_by: agent, + created_by: customer, type: { name: 'email', }, sender: { name: 'Agent', }, - from: 'zammad@example.com', - to: 'customer@example.com', + from: 'customer@example.com', + to: 'customer1@example.com, customer2@example.com, zammad@example.com, customer2+2@example.com', cc: '', } result = { - to: 'customer@example.com', + to: 'customer1@example.com, customer2@example.com, customer2+2@example.com, customer@example.com', cc: '', body: '', in_reply_to: 'message_id17', @@ -2420,6 +2498,51 @@ test('check getRecipientArticle format', function() { sender: { name: 'Agent', }, + from: 'zammad@example.com', + to: 'customer@example.com', + cc: '', + } + result = { + to: 'customer@example.com', + cc: '', + body: '', + in_reply_to: 'message_id18', + } + email_addresses = [ + { + email: 'zammad@example.com', + }, + { + email: 'zammad2@example.com', + } + ] + verify = App.Utils.getRecipientArticle(ticket, article, agent, article.type, email_addresses, true) + deepEqual(verify, result) + + customer = { + login: 'login', + firstname: 'firstname', + lastname: 'lastname', + email: 'customer@example.com', + } + agent = { + login: 'login', + firstname: 'firstname', + lastname: 'lastname', + email: 'zammad@example.com', + } + ticket = { + customer: customer, + } + article = { + message_id: 'message_id19', + created_by: agent, + type: { + name: 'email', + }, + sender: { + name: 'Agent', + }, from: 'Sender ', to: 'Customer ', cc: '', @@ -2428,7 +2551,7 @@ test('check getRecipientArticle format', function() { to: 'customer@example.com', cc: '', body: '', - in_reply_to: 'message_id18', + in_reply_to: 'message_id19', } email_addresses = [ { @@ -2451,7 +2574,7 @@ test('check getRecipientArticle format', function() { customer: agent, } article = { - message_id: 'message_id19', + message_id: 'message_id20', created_by: agent, type: { name: 'email', @@ -2467,7 +2590,7 @@ test('check getRecipientArticle format', function() { to: 'agent@example.com', cc: '', body: '', - in_reply_to: 'message_id19', + in_reply_to: 'message_id20', } email_addresses = [ { diff --git a/public/assets/tests/table_extended.js b/public/assets/tests/table_extended.js index 63a8c1476..082861c2f 100644 --- a/public/assets/tests/table_extended.js +++ b/public/assets/tests/table_extended.js @@ -1646,4 +1646,63 @@ test('table new - initial list', function() { equal(el.find('tbody > tr:nth-child(4) > td').length, 0, 'check row 3') + $('#table').append('

                table with data 11

                ') + var el = $('#table-new11') + + App.TicketPriority.refresh([ + { + id: 1, + name: '1 low', + note: 'some note 1', + active: true, + created_at: '2014-06-10T11:17:34.000Z', + }, + { + id: 2, + name: '2 normal', + note: 'some note 2', + active: false, + created_at: '2014-06-10T10:17:34.000Z', + }, + ], {clear: true}) + + var table = new App.ControllerTable({ + el: el, + overviewAttributes: ['name', 'created_at', 'active'], + model: App.TicketPriority, + objects: App.TicketPriority.search({sortBy:'name', order: 'ASC'}), + checkbox: false, + radio: false, + frontendTimeUpdateExecute: false, + }) + //equal(el.find('table').length, 0, 'row count') + //table.render() + equal(el.find('table > thead > tr').length, 1, 'row count') + equal(el.find('table > thead > tr > th:nth-child(1)').text().trim(), 'Name', 'check header') + equal(el.find('table > thead > tr > th:nth-child(2)').text().trim(), 'Erstellt', 'check header') + equal(el.find('table > thead > tr > th:nth-child(3)').text().trim(), 'Aktiv', 'check header') + equal(el.find('tbody > tr:nth-child(1) > td').length, 3, 'check row 1') + equal(el.find('tbody > tr:nth-child(1) > td:first').text().trim(), '1 niedrig', 'check row 1') + equal(el.find('tbody > tr:nth-child(1) > td:nth-child(2)').text().trim(), '', 'check row 1') + equal(el.find('tbody > tr:nth-child(1) > td:nth-child(3)').text().trim(), 'true', 'check row 1') + equal(el.find('tbody > tr:nth-child(2) > td').length, 3, 'check row 2') + equal(el.find('tbody > tr:nth-child(2) > td:first').text().trim(), '2 normal', 'check row 2') + equal(el.find('tbody > tr:nth-child(2) > td:nth-child(2)').text().trim(), '', 'check row 2') + equal(el.find('tbody > tr:nth-child(3) > td').length, 0, 'check row 3') + + result = table.update({sync: true, objects: App.TicketPriority.search({sortBy:'name', order: 'ASC'})}) + equal(result[0], 'noChanges') + + equal(el.find('table > thead > tr').length, 1, 'row count') + equal(el.find('table > thead > tr > th:nth-child(1)').text().trim(), 'Name', 'check header') + equal(el.find('table > thead > tr > th:nth-child(2)').text().trim(), 'Erstellt', 'check header') + equal(el.find('table > thead > tr > th:nth-child(3)').text().trim(), 'Aktiv', 'check header') + equal(el.find('tbody > tr:nth-child(1) > td').length, 3, 'check row 1') + equal(el.find('tbody > tr:nth-child(1) > td:first').text().trim(), '1 niedrig', 'check row 1') + equal(el.find('tbody > tr:nth-child(1) > td:nth-child(2)').text().trim(), '', 'check row 1') + equal(el.find('tbody > tr:nth-child(1) > td:nth-child(3)').text().trim(), 'true', 'check row 1') + equal(el.find('tbody > tr:nth-child(2) > td').length, 3, 'check row 2') + equal(el.find('tbody > tr:nth-child(2) > td:first').text().trim(), '2 normal', 'check row 2') + equal(el.find('tbody > tr:nth-child(2) > td:nth-child(2)').text().trim(), '', 'check row 2') + }) diff --git a/public/assets/tests/ticket_selector.js b/public/assets/tests/ticket_selector.js index e9783afba..9254ce4ad 100644 --- a/public/assets/tests/ticket_selector.js +++ b/public/assets/tests/ticket_selector.js @@ -130,6 +130,7 @@ window.onload = function() { "vip": false, "id": 434 }, + "tags": ["tag a", "tag b"], "escalation_at": "2017-02-09T09:16:56.192Z", "last_contact_agent_at": "2017-02-09T09:16:56.192Z", "last_contact_agent_at": "2017-02-09T09:16:56.192Z", @@ -191,7 +192,7 @@ window.onload = function() { }, } }; - result = App.Ticket.selector(ticket, setting['condition'] ); + result = App.Ticket.selector(ticket, setting['condition']); equal(result, true, result); setting = { @@ -202,7 +203,7 @@ window.onload = function() { }, } }; - result = App.Ticket.selector(ticket, setting['condition'] ); + result = App.Ticket.selector(ticket, setting['condition']); equal(result, false, result); }; @@ -215,7 +216,7 @@ window.onload = function() { }, } }; - result = App.Ticket.selector(ticket, setting['condition'] ); + result = App.Ticket.selector(ticket, setting['condition']); equal(result, true, result); setting = { @@ -226,7 +227,7 @@ window.onload = function() { }, } }; - result = App.Ticket.selector(ticket, setting['condition'] ); + result = App.Ticket.selector(ticket, setting['condition']); equal(result, false, result); }; @@ -243,7 +244,7 @@ window.onload = function() { }, } }; - result = App.Ticket.selector(ticket, setting['condition'] ); + result = App.Ticket.selector(ticket, setting['condition']); equal(result, true, result); setting = { @@ -256,7 +257,7 @@ window.onload = function() { }, } }; - result = App.Ticket.selector(ticket, setting['condition'] ); + result = App.Ticket.selector(ticket, setting['condition']); equal(result, false, result); setting = { @@ -270,7 +271,7 @@ window.onload = function() { } }; - result = App.Ticket.selector(ticket, setting['condition'] ); + result = App.Ticket.selector(ticket, setting['condition']); equal(result, true, result); setting = { @@ -283,7 +284,7 @@ window.onload = function() { } } }; - result = App.Ticket.selector(ticket, setting['condition'] ); + result = App.Ticket.selector(ticket, setting['condition']); equal(result, false, result); setting = { @@ -296,7 +297,7 @@ window.onload = function() { } } }; - result = App.Ticket.selector(ticket, setting['condition'] ); + result = App.Ticket.selector(ticket, setting['condition']); equal(result, false, result); setting = { @@ -307,7 +308,7 @@ window.onload = function() { } } }; - result = App.Ticket.selector(ticket, setting['condition'] ); + result = App.Ticket.selector(ticket, setting['condition']); equal(result, false, result); setting = { @@ -318,7 +319,7 @@ window.onload = function() { } } }; - result = App.Ticket.selector(ticket, setting['condition'] ); + result = App.Ticket.selector(ticket, setting['condition']); equal(result, true, result); }; @@ -335,7 +336,7 @@ window.onload = function() { }, } }; - result = App.Ticket.selector(ticket, setting['condition'] ); + result = App.Ticket.selector(ticket, setting['condition']); equal(result, true, result); setting = { @@ -348,7 +349,7 @@ window.onload = function() { }, } }; - result = App.Ticket.selector(ticket, setting['condition'] ); + result = App.Ticket.selector(ticket, setting['condition']); equal(result, false, result); setting = { @@ -362,7 +363,7 @@ window.onload = function() { } }; - result = App.Ticket.selector(ticket, setting['condition'] ); + result = App.Ticket.selector(ticket, setting['condition']); equal(result, true, result); setting = { @@ -375,7 +376,7 @@ window.onload = function() { } } }; - result = App.Ticket.selector(ticket, setting['condition'] ); + result = App.Ticket.selector(ticket, setting['condition']); equal(result, false, result); setting = { @@ -388,7 +389,7 @@ window.onload = function() { } } }; - result = App.Ticket.selector(ticket, setting['condition'] ); + result = App.Ticket.selector(ticket, setting['condition']); equal(result, false, result); setting = { @@ -399,7 +400,7 @@ window.onload = function() { } } }; - result = App.Ticket.selector(ticket, setting['condition'] ); + result = App.Ticket.selector(ticket, setting['condition']); equal(result, false, result); setting = { @@ -410,10 +411,148 @@ window.onload = function() { } } }; - result = App.Ticket.selector(ticket, setting['condition'] ); + result = App.Ticket.selector(ticket, setting['condition']); equal(result, true, result); }; + var testPreConditionTags = function (key, ticket) { + App.Session.set(sessionData); + + setting = { + "condition": { + "ticket.tags": { + "operator": "contains one", + "value": "tag a", + }, + } + }; + result = App.Ticket.selector(ticket, setting['condition']); + equal(result, true, result); + + setting = { + "condition": { + "ticket.tags": { + "operator": "contains one", + "value": "tag aa", + }, + } + }; + result = App.Ticket.selector(ticket, setting['condition']); + equal(result, false, result); + + setting = { + "condition": { + "ticket.tags": { + "operator": "contains all", + "value": "tag a", + }, + } + }; + result = App.Ticket.selector(ticket, setting['condition']); + equal(result, true, result); + + setting = { + "condition": { + "ticket.tags": { + "operator": "contains all", + "value": ["tag a", "not existing"], + }, + } + }; + result = App.Ticket.selector(ticket, setting['condition']); + equal(result, false, result); + + setting = { + "condition": { + "ticket.tags": { + "operator": "contains all not", + "value": "tag a", + }, + } + }; + result = App.Ticket.selector(ticket, setting['condition']); + equal(result, false, result); + + setting = { + "condition": { + "ticket.tags": { + "operator": "contains all not", + "value": ["tag a", "tag b"], + }, + } + }; + result = App.Ticket.selector(ticket, setting['condition']); + equal(result, false, result); + + setting = { + "condition": { + "ticket.tags": { + "operator": "contains all not", + "value": ["tag a", "tag b", "tag c"], + }, + } + }; + result = App.Ticket.selector(ticket, setting['condition']); + equal(result, false, result); + + setting = { + "condition": { + "ticket.tags": { + "operator": "contains all not", + "value": ["tag c", "tag d"], + }, + } + }; + result = App.Ticket.selector(ticket, setting['condition']); + equal(result, true, result); + + setting = { + "condition": { + "ticket.tags": { + "operator": "contains one not", + "value": "tag a", + }, + } + }; + + result = App.Ticket.selector(ticket, setting['condition']); + equal(result, true, result); + + setting = { + "condition": { + "ticket.tags": { + "operator": "contains one not", + "value": ["tag a", "tag b"], + }, + } + }; + result = App.Ticket.selector(ticket, setting['condition']); + equal(result, false, result); + + setting = { + "condition": { + "ticket.tags": { + "operator": "contains one not", + "value": ["tag a", "tag c"], + }, + } + }; + result = App.Ticket.selector(ticket, setting['condition']); + equal(result, true, result); + + setting = { + "condition": { + "ticket.tags": { + "operator": "contains one not", + "value": ["tag c"], + }, + } + }; + result = App.Ticket.selector(ticket, setting['condition']); + equal(result, true, result); + + }; + var testTime = function (key, value, ticket) { valueDate = new Date(value); compareDate = new Date( valueDate.setHours( valueDate.getHours() - 1 ) ).toISOString(); @@ -425,7 +564,7 @@ window.onload = function() { }, } }; - result = App.Ticket.selector(ticket, setting['condition'] ); + result = App.Ticket.selector(ticket, setting['condition']); equal(result, true, result); valueDate = new Date(value); @@ -438,7 +577,7 @@ window.onload = function() { }, } }; - result = App.Ticket.selector(ticket, setting['condition'] ); + result = App.Ticket.selector(ticket, setting['condition']); equal(result, false, result); valueDate = new Date(value); @@ -451,7 +590,7 @@ window.onload = function() { }, } }; - result = App.Ticket.selector(ticket, setting['condition'] ); + result = App.Ticket.selector(ticket, setting['condition']); equal(result, false, result); valueDate = new Date(value); @@ -464,7 +603,7 @@ window.onload = function() { }, } }; - result = App.Ticket.selector(ticket, setting['condition'] ); + result = App.Ticket.selector(ticket, setting['condition']); equal(result, true, result); valueDate = new Date(value); @@ -478,7 +617,7 @@ window.onload = function() { }, } }; - result = App.Ticket.selector(ticket, setting['condition'] ); + result = App.Ticket.selector(ticket, setting['condition']); equal(result, true, result); }; @@ -492,7 +631,7 @@ window.onload = function() { }, } }; - result = App.Ticket.selector(ticket, setting['condition'] ); + result = App.Ticket.selector(ticket, setting['condition']); equal(result, expectedResult, result); }; @@ -506,7 +645,7 @@ window.onload = function() { }, } }; - result = App.Ticket.selector(ticket, setting['condition'] ); + result = App.Ticket.selector(ticket, setting['condition']); equal(result, expectedResult, result); }; @@ -520,7 +659,7 @@ window.onload = function() { }, } }; - result = App.Ticket.selector(ticket, setting['condition'] ); + result = App.Ticket.selector(ticket, setting['condition']); equal(result, expectedResult, result); }; @@ -534,7 +673,7 @@ window.onload = function() { }, } }; - result = App.Ticket.selector(ticket, setting['condition'] ); + result = App.Ticket.selector(ticket, setting['condition']); equal(result, expectedResult, result); }; @@ -612,7 +751,7 @@ window.onload = function() { testTimeBeforeRelative('ticket.pending_time', 1, 'hour', false, ticket); compareDate = new Date(); - compareDate.setTime( compareDate.getTime() - 60 * 60 * 2 * 1000 ); + compareDate.setTime( compareDate.getTime() - 60 * 60 * 2 * 1000); ticket.pending_time = compareDate.toISOString(); testTimeBeforeRelative('ticket.pending_time', 1, 'hour', true, ticket); @@ -621,7 +760,7 @@ window.onload = function() { testTimeBeforeRelative('ticket.pending_time', 1, 'day', false, ticket); compareDate = new Date(); - compareDate.setTime( compareDate.getTime() - 60 * 60 * 48 * 1000 ); + compareDate.setTime( compareDate.getTime() - 60 * 60 * 48 * 1000); ticket.pending_time = compareDate.toISOString(); testTimeBeforeRelative('ticket.pending_time', 1, 'day', true, ticket); @@ -630,7 +769,7 @@ window.onload = function() { testTimeBeforeRelative('ticket.pending_time', 1, 'year', false, ticket); compareDate = new Date(); - compareDate.setTime( compareDate.getTime() - 60 * 60 * 365 * 2 * 1000 ); + compareDate.setTime( compareDate.getTime() - 60 * 60 * 365 * 2 * 1000); ticket.pending_time = compareDate.toISOString(); testTimeBeforeRelative('ticket.pending_time', 1, 'year', true, ticket); @@ -643,7 +782,7 @@ window.onload = function() { testTimeAfterRelative('ticket.pending_time', 1, 'hour', false, ticket); compareDate = new Date(); - compareDate.setTime( compareDate.getTime() + 60 * 60 * 2 * 1000 ); + compareDate.setTime( compareDate.getTime() + 60 * 60 * 2 * 1000); ticket.pending_time = compareDate.toISOString(); testTimeAfterRelative('ticket.pending_time', 1, 'hour', true, ticket); @@ -652,7 +791,7 @@ window.onload = function() { testTimeAfterRelative('ticket.pending_time', 1, 'day', false, ticket); compareDate = new Date(); - compareDate.setTime( compareDate.getTime() + 60 * 60 * 48 * 1000 ); + compareDate.setTime( compareDate.getTime() + 60 * 60 * 48 * 1000); ticket.pending_time = compareDate.toISOString(); testTimeAfterRelative('ticket.pending_time', 1, 'day', true, ticket); @@ -661,7 +800,7 @@ window.onload = function() { testTimeAfterRelative('ticket.pending_time', 1, 'year', false, ticket); compareDate = new Date(); - compareDate.setTime( compareDate.getTime() + 60 * 60 * 365 * 2 * 1000 ); + compareDate.setTime( compareDate.getTime() + 60 * 60 * 365 * 2 * 1000); ticket.pending_time = compareDate.toISOString(); testTimeAfterRelative('ticket.pending_time', 1, 'year', true, ticket); @@ -672,12 +811,12 @@ window.onload = function() { // hour compareDate = new Date(); - compareDate.setTime( compareDate.getTime() - 60 * 60 * 0.5 * 1000 ); + compareDate.setTime( compareDate.getTime() - 60 * 60 * 0.5 * 1000); ticket.pending_time = compareDate.toISOString(); testTimeWithinLastRelative('ticket.pending_time', 1, 'hour', true, ticket); compareDate = new Date(); - compareDate.setTime( compareDate.getTime() - 60 * 60 * 2 * 1000 ); + compareDate.setTime( compareDate.getTime() - 60 * 60 * 2 * 1000); ticket.pending_time = compareDate.toISOString(); testTimeWithinLastRelative('ticket.pending_time', 1, 'hour', false, ticket); @@ -687,12 +826,12 @@ window.onload = function() { // hour compareDate = new Date(); - compareDate.setTime( compareDate.getTime() + 60 * 60 * 0.5 * 1000 ); + compareDate.setTime( compareDate.getTime() + 60 * 60 * 0.5 * 1000); ticket.pending_time = compareDate.toISOString(); testTimeWithinNextRelative('ticket.pending_time', 1, 'hour', true, ticket); compareDate = new Date(); - compareDate.setTime( compareDate.getTime() + 60 * 60 * 2 * 1000 ); + compareDate.setTime( compareDate.getTime() + 60 * 60 * 2 * 1000); ticket.pending_time = compareDate.toISOString(); testTimeWithinNextRelative('ticket.pending_time', 1, 'hour', false, ticket); }); @@ -778,6 +917,13 @@ window.onload = function() { testPreConditionUser('ticket.updated_by_id', '6', ticket, sessionData); }); + test("ticket tags", function() { + ticket = new App.Ticket(); + ticket.load(ticketData); + + testPreConditionTags('ticket.tags', ticket); + }); + test("article from", function() { ticket = new App.Ticket(); ticket.load(ticketData); diff --git a/script/build/test_slice_tests.sh b/script/build/test_slice_tests.sh index 34e837538..559f49fa0 100755 --- a/script/build/test_slice_tests.sh +++ b/script/build/test_slice_tests.sh @@ -20,6 +20,7 @@ if [ "$LEVEL" == '1' ]; then rm test/browser/admin_role_test.rb # test/browser/agent_navigation_and_title_test.rb rm test/browser/agent_ticket_attachment_test.rb + rm test/browser/agent_ticket_create_reset_customer_selection_test.rb rm test/browser/agent_ticket_email_reply_keep_body_test.rb rm test/browser/agent_ticket_email_signature_test.rb rm test/browser/agent_ticket_link_test.rb @@ -78,6 +79,7 @@ elif [ "$LEVEL" == '2' ]; then rm test/browser/agent_navigation_and_title_test.rb rm test/browser/agent_organization_profile_test.rb rm test/browser/agent_ticket_attachment_test.rb + rm test/browser/agent_ticket_create_reset_customer_selection_test.rb rm test/browser/agent_ticket_email_reply_keep_body_test.rb rm test/browser/agent_ticket_email_signature_test.rb rm test/browser/agent_ticket_link_test.rb @@ -136,6 +138,7 @@ elif [ "$LEVEL" == '3' ]; then rm test/browser/agent_navigation_and_title_test.rb rm test/browser/agent_organization_profile_test.rb # test/browser/agent_ticket_attachment_test.rb + # test/browser/agent_ticket_create_reset_customer_selection_test.rb # test/browser/agent_ticket_email_reply_keep_body_test.rb # test/browser/agent_ticket_email_signature_test.rb # test/browser/agent_ticket_link_test.rb @@ -194,6 +197,7 @@ elif [ "$LEVEL" == '4' ]; then rm test/browser/agent_navigation_and_title_test.rb rm test/browser/agent_organization_profile_test.rb rm test/browser/agent_ticket_attachment_test.rb + rm test/browser/agent_ticket_create_reset_customer_selection_test.rb rm test/browser/agent_ticket_email_reply_keep_body_test.rb rm test/browser/agent_ticket_email_signature_test.rb rm test/browser/agent_ticket_link_test.rb @@ -251,6 +255,7 @@ elif [ "$LEVEL" == '5' ]; then rm test/browser/agent_navigation_and_title_test.rb # test/browser/agent_organization_profile_test.rb rm test/browser/agent_ticket_attachment_test.rb + rm test/browser/agent_ticket_create_reset_customer_selection_test.rb rm test/browser/agent_ticket_email_reply_keep_body_test.rb rm test/browser/agent_ticket_email_signature_test.rb rm test/browser/agent_ticket_link_test.rb @@ -311,6 +316,7 @@ elif [ "$LEVEL" == '6' ]; then rm test/browser/agent_navigation_and_title_test.rb rm test/browser/agent_organization_profile_test.rb rm test/browser/agent_ticket_attachment_test.rb + rm test/browser/agent_ticket_create_reset_customer_selection_test.rb rm test/browser/agent_ticket_email_reply_keep_body_test.rb rm test/browser/agent_ticket_email_signature_test.rb rm test/browser/agent_ticket_link_test.rb diff --git a/script/websocket-server.rb b/script/websocket-server.rb index 8882aacac..6199a089b 100755 --- a/script/websocket-server.rb +++ b/script/websocket-server.rb @@ -169,7 +169,7 @@ EventMachine.run do # check if connection not already exists next if !@clients[client_id] - Sessions.touch(client_id) + Sessions.touch(client_id) # rubocop:disable Rails/SkipsModelValidations @clients[client_id][:last_ping] = Time.now.utc.to_i # spool messages for new connects @@ -211,14 +211,14 @@ EventMachine.run do # websocket log 'notice', "Status: websocket clients: #{@clients.size}" - @clients.each do |client_id, _client| + @clients.each_key do |client_id| log 'notice', 'working...', client_id end # ajax client_list = Sessions.list clients = 0 - client_list.each do |_client_id, client| + client_list.each_value do |client| next if client[:meta][:type] == 'websocket' clients = clients + 1 end @@ -242,7 +242,6 @@ EventMachine.run do log 'notice', 'send data to client', client_id websocket_send(client_id, queue) rescue => e - log 'error', 'problem:' + e.inspect, client_id # disconnect client diff --git a/spec/factories/group.rb b/spec/factories/group.rb index 41470d89c..b2a673ee1 100644 --- a/spec/factories/group.rb +++ b/spec/factories/group.rb @@ -1,10 +1,10 @@ -FactoryGirl.define do +FactoryBot.define do sequence :test_group_name do |n| "TestGroup#{n}" end end -FactoryGirl.define do +FactoryBot.define do factory :group do name { generate(:test_group_name) } diff --git a/spec/factories/import_job.rb b/spec/factories/import_job.rb index ce4ed05e3..228093a1d 100644 --- a/spec/factories/import_job.rb +++ b/spec/factories/import_job.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :import_job do name 'Import::Test' payload {} diff --git a/spec/factories/link.rb b/spec/factories/link.rb index a9fb7195a..5365c4ade 100644 --- a/spec/factories/link.rb +++ b/spec/factories/link.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :link do link_type_id { Link::Type.find_by(name: 'normal').id } link_object_source_id { Link::Object.find_by(name: 'Ticket').id } diff --git a/spec/factories/online_notification.rb b/spec/factories/online_notification.rb index 37ef435f9..00e43c1d0 100644 --- a/spec/factories/online_notification.rb +++ b/spec/factories/online_notification.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :online_notification do object_lookup_id { ObjectLookup.by_name('Ticket') } type_lookup_id { TypeLookup.by_name('Assigned to you') } diff --git a/spec/factories/role.rb b/spec/factories/role.rb index 6a8cd742f..23d0c4463 100644 --- a/spec/factories/role.rb +++ b/spec/factories/role.rb @@ -1,10 +1,10 @@ -FactoryGirl.define do +FactoryBot.define do sequence :test_role_name do |n| "TestRole#{n}" end end -FactoryGirl.define do +FactoryBot.define do factory :role do name { generate(:test_role_name) } diff --git a/spec/factories/scheduler.rb b/spec/factories/scheduler.rb index 5b484c9a1..5f2cc2e36 100644 --- a/spec/factories/scheduler.rb +++ b/spec/factories/scheduler.rb @@ -1,10 +1,10 @@ -FactoryGirl.define do +FactoryBot.define do sequence :test_scheduler_name do |n| "Testscheduler#{n}" end end -FactoryGirl.define do +FactoryBot.define do factory :scheduler do name { generate(:test_scheduler_name) } diff --git a/spec/factories/signature.rb b/spec/factories/signature.rb index acbee4f72..296992c1c 100644 --- a/spec/factories/signature.rb +++ b/spec/factories/signature.rb @@ -1,13 +1,13 @@ -FactoryGirl.define do +FactoryBot.define do sequence :test_signature_name do |n| "Test signature #{n}" end end -FactoryGirl.define do +FactoryBot.define do factory :signature do name { generate(:test_signature_name) } - body '#{user.firstname} #{user.lastname}'.text2html + body '#{user.firstname} #{user.lastname}'.text2html # rubocop:disable Lint/InterpolationCheck created_by_id 1 updated_by_id 1 end diff --git a/spec/factories/tag.rb b/spec/factories/tag.rb index 04e00c15d..3794e6f2b 100644 --- a/spec/factories/tag.rb +++ b/spec/factories/tag.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :tag do tag_object_id { Tag::Object.lookup_by_name_and_create('Ticket').id } tag_item_id { Tag::Item.lookup_by_name_and_create('blub').id } diff --git a/spec/factories/ticket.rb b/spec/factories/ticket.rb index a9161d77f..35b03275c 100644 --- a/spec/factories/ticket.rb +++ b/spec/factories/ticket.rb @@ -1,8 +1,8 @@ -FactoryGirl.define do +FactoryBot.define do factory :ticket do title 'Test Ticket' group { Group.lookup(name: 'Users') } - customer { FactoryGirl.create(:customer_user) } + customer { FactoryBot.create(:customer_user) } state { Ticket::State.lookup(name: 'new') } priority { Ticket::Priority.lookup(name: '2 normal') } updated_by_id 1 diff --git a/spec/factories/ticket/article.rb b/spec/factories/ticket/article.rb index be26f9c3f..efcd7f845 100644 --- a/spec/factories/ticket/article.rb +++ b/spec/factories/ticket/article.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :ticket_article, class: Ticket::Article do from 'factory-customer-1@example.com' to 'factory-customer-1@example.com' diff --git a/spec/factories/token.rb b/spec/factories/token.rb index bdd77e6f3..f87477ef1 100644 --- a/spec/factories/token.rb +++ b/spec/factories/token.rb @@ -1,6 +1,6 @@ -FactoryGirl.define do +FactoryBot.define do factory :token do - user_id { FactoryGirl.create(:user).id } + user_id { FactoryBot.create(:user).id } end factory :token_password_reset, parent: :token do diff --git a/spec/factories/user.rb b/spec/factories/user.rb index 8077e61be..4272f225d 100644 --- a/spec/factories/user.rb +++ b/spec/factories/user.rb @@ -1,10 +1,10 @@ -FactoryGirl.define do +FactoryBot.define do sequence :email do |n| "nicole.braun#{n}@zammad.org" end end -FactoryGirl.define do +FactoryBot.define do factory :user do login 'nicole.braun' diff --git a/spec/factories/vendor/net/ldap/entry.rb b/spec/factories/vendor/net/ldap/entry.rb index 605b368eb..5dc4fa729 100644 --- a/spec/factories/vendor/net/ldap/entry.rb +++ b/spec/factories/vendor/net/ldap/entry.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do # add custom attributes via: # mocked_entry = build(:ldap_entry) diff --git a/spec/fixtures/import/otrs/customer_user/camel_case_login.json b/spec/fixtures/import/otrs/customer_user/camel_case_login.json new file mode 100644 index 000000000..71dc42eca --- /dev/null +++ b/spec/fixtures/import/otrs/customer_user/camel_case_login.json @@ -0,0 +1,348 @@ +{ + "CustomerCompanyCity": "test712259", + "Config": { + "CustomerUserEmailUniqCheck": 1, + "CustomerUserSearchListLimit": 250, + "CustomerCompanySupport": 1, + "CustomerValid": "valid_id", + "CustomerUserSearchFields": [ + "login", + "first_name", + "last_name", + "customer_id" + ], + "CustomerUserSearchPrefix": "*", + "Params": { + "Table": "customer_user", + "CaseSensitive": 0 + }, + "CustomerUserListFields": [ + "first_name", + "last_name", + "email" + ], + "Map": [ + [ + "UserTitle", + "Title", + "title", + 1, + 0, + "var", + "", + 0 + ], + [ + "UserFirstname", + "Firstname", + "first_name", + 1, + 1, + "var", + "", + 0 + ], + [ + "UserLastname", + "Lastname", + "last_name", + 1, + 1, + "var", + "", + 0 + ], + [ + "UserLogin", + "Username", + "login", + 1, + 1, + "var", + "", + 0 + ], + [ + "UserPassword", + "Password", + "pw", + 0, + 0, + "var", + "", + 0 + ], + [ + "UserEmail", + "Email", + "email", + 1, + 1, + "var", + "", + 0 + ], + [ + "UserCustomerID", + "CustomerID", + "customer_id", + 0, + 1, + "var", + "", + 0 + ], + [ + "UserPhone", + "Phone", + "phone", + 1, + 0, + "var", + "", + 0 + ], + [ + "UserFax", + "Fax", + "fax", + 1, + 0, + "var", + "", + 0 + ], + [ + "UserMobile", + "Mobile", + "mobile", + 1, + 0, + "var", + "", + 0 + ], + [ + "UserStreet", + "Street", + "street", + 1, + 0, + "var", + "", + 0 + ], + [ + "UserZip", + "Zip", + "zip", + 1, + 0, + "var", + "", + 0 + ], + [ + "UserCity", + "City", + "city", + 1, + 0, + "var", + "", + 0 + ], + [ + "UserCountry", + "Country", + "country", + 1, + 0, + "var", + "", + 0 + ], + [ + "UserComment", + "Comment", + "comments", + 1, + 0, + "var", + "", + 0 + ], + [ + "ValidID", + "Valid", + "valid_id", + 0, + 1, + "int", + "", + 0 + ] + ], + "CustomerKey": "login", + "CustomerUserSearchSuffix": "*", + "Module": "Kernel::System::CustomerUser::DB", + "CacheTTL": 86400, + "Selections": {}, + "CustomerID": "customer_id", + "Name": "Database Backend", + "CustomerUserPostMasterSearchFields": [ + "email" + ], + "CustomerUserNameFields": [ + "title", + "first_name", + "last_name" + ] + }, + "UserCustomerID": "test712259", + "CustomerCompanyComment": "test712259", + "Source": "CustomerUser", + "UserTitle": "", + "CompanyConfig": { + "CustomerCompanySearchFields": [ + "customer_id", + "name" + ], + "CustomerCompanyListFields": [ + "customer_id", + "name" + ], + "Module": "Kernel::System::CustomerCompany::DB", + "CustomerCompanyKey": "customer_id", + "CustomerCompanySearchSuffix": "*", + "CacheTTL": 86400, + "CustomerCompanySearchListLimit": 250, + "CustomerCompanySearchPrefix": "", + "CustomerCompanyValid": "valid_id", + "Params": { + "Table": "customer_company", + "CaseSensitive": 0 + }, + "Map": [ + [ + "CustomerID", + "CustomerID", + "customer_id", + 0, + 1, + "var", + "", + 0 + ], + [ + "CustomerCompanyName", + "Customer", + "name", + 1, + 1, + "var", + "", + 0 + ], + [ + "CustomerCompanyStreet", + "Street", + "street", + 1, + 0, + "var", + "", + 0 + ], + [ + "CustomerCompanyZIP", + "Zip", + "zip", + 1, + 0, + "var", + "", + 0 + ], + [ + "CustomerCompanyCity", + "City", + "city", + 1, + 0, + "var", + "", + 0 + ], + [ + "CustomerCompanyCountry", + "Country", + "country", + 1, + 0, + "var", + "", + 0 + ], + [ + "CustomerCompanyURL", + "URL", + "url", + 1, + 0, + "var", + "[% Data.CustomerCompanyURL | html %]", + 0 + ], + [ + "CustomerCompanyComment", + "Comment", + "comments", + 1, + 0, + "var", + "", + 0 + ], + [ + "ValidID", + "Valid", + "valid_id", + 0, + 1, + "int", + "", + 0 + ] + ], + "Name": "Database Backend" + }, + "UserZip": null, + "UserLastname": "test669673", + "ChangeBy": "1", + "CreateTime": "2014-06-07 02:31:31", + "UserLogin": "TeSt669673", + "UserPhone": null, + "CustomerID": "test712259", + "CustomerCompanyValidID": "1", + "CustomerCompanyZIP": "test712259", + "UserCountry": null, + "UserPassword": "f8be19af2f25837a31eff9131b0e47a5173290652c04a48b49b86474d48825ee", + "ValidID": "1", + "UserRefreshTime": "0", + "UserEmail": "QA100@t-Online.de", + "UserComment": "", + "UserID": "test669673", + "UserFirstname": "test669673", + "CustomerCompanyCountry": "test712259", + "UserFax": null, + "CreateBy": "1", + "ChangeTime": "2014-06-07 02:31:31", + "UserShowTickets": "25", + "UserStreet": null, + "CustomerCompanyURL": "test712259", + "CustomerCompanyName": "test712259", + "UserMobile": null, + "CustomerCompanyStreet": "test712259", + "UserCity": null +} diff --git a/spec/fixtures/import/otrs/user/camel_case_login.json b/spec/fixtures/import/otrs/user/camel_case_login.json new file mode 100644 index 000000000..49d6d4aeb --- /dev/null +++ b/spec/fixtures/import/otrs/user/camel_case_login.json @@ -0,0 +1,135 @@ +{ + "OutOfOffice": "1", + "OutOfOfficeStartMonth": "9", + "UserStoredFilterColumns-AgentTicketLockedView": "{}", + "UserTicketOverviewSmallPageShown": "35", + "UserCreateWorkOrderNextMask": "AgentITSMWorkOrderZoom", + "OutOfOfficeEndYear": "2014", + "UserDashboardTicketGenericFilter0110-TicketEscalation": "All", + "UserDashboardPref0120-TicketNew-Columns": "{\"Columns\":{\"Changed\":0,\"CustomerID\":0,\"CustomerName\":0,\"CustomerUserID\":0,\"DynamicField_CustomerLocation\":0,\"EscalationResponseTime\":0,\"EscalationSolutionTime\":0,\"EscalationTime\":0,\"EscalationUpdateTime\":0,\"Lock\":0,\"Owner\":0,\"PendingTime\":0,\"Priority\":0,\"Responsible\":0,\"SLA\":0,\"State\":0,\"Type\":0,\"Age\":1,\"Title\":1,\"Queue\":1,\"Service\":1,\"TicketNumber\":1},\"Order\":[\"Age\",\"Title\",\"Queue\",\"Service\",\"TicketNumber\"]}", + "UserLastUsedZoomViewType": "", + "OutOfOfficeStartDay": "10", + "UserStoredFilterColumns-AgentTicketStatusView": "{}", + "UserTitle": null, + "UserLastname": "OTRS", + "UserTicketOverviewMediumPageShown": "20", + "OutOfOfficeEndDay": "12", + "CreateTime": "2014-04-28 10:53:18", + "UserTicketOverviewPreviewPageShown": "15", + "UserLogin": "rOoT@LoCaLhOsT", + "UserFilterColumnsEnabled-AgentTicketEscalationView": "[\"TicketNumber\",\"Age\",\"EscalationTime\",\"EscalationResponseTime\",\"EscalationSolutionTime\",\"EscalationUpdateTime\",\"Title\",\"State\",\"Lock\",\"Queue\",\"Owner\",\"CustomerID\"]", + "UserLanguage": "de", + "UserDashboardPref0110-TicketEscalation-Columns": "{\"Columns\":{\"Changed\":0,\"CustomerID\":0,\"CustomerUserID\":0,\"EscalationResponseTime\":0,\"EscalationSolutionTime\":0,\"EscalationTime\":0,\"EscalationUpdateTime\":0,\"Lock\":0,\"Owner\":0,\"PendingTime\":0,\"Priority\":0,\"Queue\":0,\"Responsible\":0,\"SLA\":0,\"Service\":0,\"State\":0,\"Type\":0,\"Age\":1,\"Title\":1,\"CustomerName\":1,\"TicketNumber\":1},\"Order\":[\"Age\",\"Title\",\"CustomerName\",\"TicketNumber\"]}", + "OutOfOfficeStartYear": "2014", + "UserDashboardPref0120-TicketNew-Shown": "10", + "UserFullname": "Admin OTRS", + "UserLastLoginTimestamp": "2016-08-10 19:37:44", + "UserLastLogin": "1470850664", + "UserMarkTicketUnseenRedirectURL": "Action=AgentTicketZoom;TicketID=###TicketID####1", + "AdminDynamicFieldsOverviewPageShown": "35", + "UserChangeOverviewSmallPageShown": "25", + "RoleIDs": [], + "ValidID": "1", + "UserStoredFilterColumns-AgentTicketQueue": "{}", + "UserEmail": "ROOT@loCalhosT", + "UserRefreshTime": "0", + "UserDashboardPref0130-TicketOpen-Shown": "10", + "UserTicketOverviewAgentTicketQueue": "Small", + "UserID": "1", + "UserDashboardTicketGenericColumnFiltersRealKeys0120-TicketNew": "{\"QueueIDs\":[\"1\"]}", + "wpt22": "1", + "UserMarkTicketSeenRedirectURL": "Action=AgentTicketZoom;TicketID=###TicketID####1", + "UserStoredFilterColumns-AgentTicketEscalationView": "{}", + "UserDashboardTicketGenericFilter0120-TicketNew": "MyQueues", + "UserCreateNextMask": "", + "UserFirstname": "Admin", + "UserPw": "9faaba2ab242a99bbb6992e9424386375f6757c17e6484ae570f39d9cad9f28ea", + "UserDashboardPref0110-TicketEscalation-Shown": "10", + "UserFilterColumnsEnabled-AgentTicketQueue": "[\"TicketNumber\",\"Age\",\"Title\",\"State\",\"Lock\",\"DynamicField_CustomerLocation\",\"Queue\",\"Owner\",\"CustomerID\",\"DynamicField_Hostname\"]", + "OutOfOfficeEndMonth": "9", + "ChangeTime": "2014-04-28 10:53:18", + "UserDashboardPref0130-TicketOpen-Columns": "{\"Columns\":{\"Changed\":0,\"CustomerID\":0,\"CustomerUserID\":0,\"EscalationResponseTime\":0,\"EscalationTime\":0,\"EscalationUpdateTime\":0,\"Lock\":0,\"Owner\":0,\"PendingTime\":0,\"Priority\":0,\"Queue\":0,\"Responsible\":0,\"SLA\":0,\"Service\":0,\"State\":0,\"Type\":0,\"Age\":1,\"DynamicField_CustomerLocation\":1,\"Title\":1,\"CustomerName\":1,\"EscalationSolutionTime\":1,\"TicketNumber\":1},\"Order\":[\"Age\",\"DynamicField_CustomerLocation\",\"Title\",\"CustomerName\",\"EscalationSolutionTime\",\"TicketNumber\"]}", + "UserTicketOverviewAgentTicketSearch": "Small", + "UserTicketOverviewAgentCustomerSearch": "Small", + "UserDashboardTicketGenericColumnFilters0120-TicketNew": "{\"Queue\":\"1\"}", + "GroupIDs": { + "6": [ + "ro", + "move_into", + "create", + "note", + "owner", + "priority", + "rw" + ], + "3": [ + "ro", + "move_into", + "create", + "note", + "owner", + "priority", + "rw" + ], + "7": [ + "ro", + "move_into", + "create", + "note", + "owner", + "priority", + "rw" + ], + "2": [ + "ro", + "move_into", + "create", + "note", + "owner", + "priority", + "rw" + ], + "8": [ + "ro", + "move_into", + "create", + "note", + "owner", + "priority", + "rw" + ], + "1": [ + "ro", + "move_into", + "create", + "note", + "owner", + "priority", + "rw" + ], + "4": [ + "ro", + "move_into", + "create", + "note", + "owner", + "priority", + "rw" + ], + "5": [ + "ro", + "move_into", + "create", + "note", + "owner", + "priority", + "rw" + ] + }, + "UserConfigItemOverviewSmallPageShown": "25", + "UserAuthBackend": "", + "UserTicketOverviewAgentTicketLockedView": "Small", + "UserTicketOverviewAgentTicketEscalationView": "Small", + "UserTicketOverviewAgentTicketStatusView": "Small", + "UserLoginFailed": "0" +} diff --git a/spec/lib/auth/ldap_spec.rb b/spec/lib/auth/ldap_spec.rb index d14294fe5..c3dfdc22f 100644 --- a/spec/lib/auth/ldap_spec.rb +++ b/spec/lib/auth/ldap_spec.rb @@ -30,7 +30,7 @@ RSpec.describe ::Auth::Ldap do instance = described_class.new( adapter: described_class.name, - login_attributes: %w(firstname), + login_attributes: %w[firstname], ) ldap_user = double diff --git a/spec/lib/import/base_resource_spec.rb b/spec/lib/import/base_resource_spec.rb deleted file mode 100644 index d2392051c..000000000 --- a/spec/lib/import/base_resource_spec.rb +++ /dev/null @@ -1,149 +0,0 @@ -require 'rails_helper' - -RSpec.describe Import::BaseResource do - - it "needs an implementation of the 'import_class' method" do - expect do - described_class.new(attributes_for(:group)) - end.to raise_error(NoMethodError) - end - - context "implemented 'import_class' method" do - - before do - module Import - class Test < Import::Base - class Group < Import::BaseResource - - def import_class - ::Group - end - - def source - 'RSpec-TEST' - end - end - end - end - end - - after do - Import::Test.send(:remove_const, :Group) - end - - let(:attributes) do - attributes = attributes_for(:group) - attributes[:id] = 1337 - attributes - end - - context 'live run' do - - it 'creates new resources' do - expect do - Import::Test::Group.new(attributes) - end - .to change { - Group.count - }.by(1) - .and change { - ExternalSync.count - }.by(1) - end - - it 'updates existing resources' do - - # initial import - Import::Test::Group.new(attributes) - group = Group.last - - # simulate next import run - travel 20.minutes - - attributes[:note] = 'TEST' - - expect do - Import::Test::Group.new(attributes) - group.reload - end - .to change { - group.note - } - end - end - - context 'dry run' do - - it "doesn't create new resources" do - expect do - Import::Test::Group.new(attributes, dry_run: true) - end - .to not_change { - Group.count - } - .and not_change { - ExternalSync.count - } - end - - it "doesn't update existing resources" do - - # initial import - Import::Test::Group.new(attributes) - group = Group.last - - # simulate next import run - travel 20.minutes - - attributes[:note] = 'TEST' - - expect do - Import::Test::Group.new(attributes, dry_run: true) - group.reload - end - .to not_change { - group.note - } - .and not_change { - Group.count - } - .and not_change { - ExternalSync.count - } - end - - it "doesn't update associations of existing resources" do - - # initial import - Import::Test::Group.new(attributes) - group = Group.last - - old_signature = create(:signature) - old_users = create_list(:user, 2) - - group.update!(signature_id: old_signature.id) - group.update!(user_ids: old_users.collect(&:id)) - - # simulate next import run - travel 20.minutes - - new_signature = create(:signature) - new_users = create_list(:user, 2) - attributes[:signature_id] = new_signature.id - attributes[:user_ids] = new_users.collect(&:id) - - expect do - Import::Test::Group.new(attributes, dry_run: true) - group.reload - end - .to not_change { - group.signature_id - } - .and not_change { - group.user_ids - } - end - end - end - -end diff --git a/spec/lib/import/ldap/user_factory_spec.rb b/spec/lib/import/ldap/user_factory_spec.rb deleted file mode 100644 index d0ea4b2f3..000000000 --- a/spec/lib/import/ldap/user_factory_spec.rb +++ /dev/null @@ -1,546 +0,0 @@ -require 'rails_helper' - -RSpec.describe Import::Ldap::UserFactory do - - describe '.import' do - - it 'responds to .import' do - expect(described_class).to respond_to(:import) - end - - it 'imports users matching the configured filter' do - - config = { - user_filter: '(objectClass=user)', - group_filter: '(objectClass=group)', - user_uid: 'uid', - user_attributes: { - 'uid' => 'login', - 'email' => 'email', - } - } - - mocked_entry = build(:ldap_entry) - - mocked_entry['uid'] = ['exampleuid'] - mocked_entry['email'] = ['example@example.com'] - - mocked_ldap = double( - host: 'ldap.example.com', - port: 636, - ssl: true, - base_dn: 'dc=example,dc=com' - ) - - # group user role mapping - expect(mocked_ldap).to receive(:search) - # user counting - allow(mocked_ldap).to receive(:count).and_return(1) - # user search - expect(mocked_ldap).to receive(:search).and_yield(mocked_entry) - - expect do - described_class.import( - config: config, - ldap: mocked_ldap - ) - end.to change { - User.count - }.by(1) - end - - it 'deactivates lost users' do - - config = { - user_filter: '(objectClass=user)', - group_filter: '(objectClass=group)', - user_uid: 'uid', - user_attributes: { - 'uid' => 'login', - 'email' => 'email', - } - } - - persistent_entry = build(:ldap_entry) - persistent_entry['uid'] = ['exampleuid'] - persistent_entry['email'] = ['example@example.com'] - - lost_entry = build(:ldap_entry) - lost_entry['uid'] = ['exampleuid_lost'] - lost_entry['email'] = ['lost@example.com'] - - mocked_ldap = double( - host: 'ldap.example.com', - port: 636, - ssl: true, - base_dn: 'dc=example,dc=com' - ) - - # group user role mapping - expect(mocked_ldap).to receive(:search) - # user counting - expect(mocked_ldap).to receive(:count).and_return(2) - # user search - expect(mocked_ldap).to receive(:search).and_yield(persistent_entry).and_yield(lost_entry) - - described_class.import( - config: config, - ldap: mocked_ldap, - ) - - # group user role mapping - expect(mocked_ldap).to receive(:search) - # user counting - expect(mocked_ldap).to receive(:count).and_return(1) - # user search - expect(mocked_ldap).to receive(:search).and_yield(persistent_entry) - - expect do - described_class.import( - config: config, - ldap: mocked_ldap, - ) - end.to change { - User.find_by(email: 'lost@example.com').active - } - end - - it 're-activates previously lost users' do - - config = { - user_filter: '(objectClass=user)', - group_filter: '(objectClass=group)', - user_uid: 'uid', - user_attributes: { - 'uid' => 'login', - 'email' => 'email', - } - } - - persistent_entry = build(:ldap_entry) - persistent_entry['uid'] = ['exampleuid'] - persistent_entry['email'] = ['example@example.com'] - - lost_entry = build(:ldap_entry) - lost_entry['uid'] = ['exampleuid_lost'] - lost_entry['email'] = ['lost@example.com'] - - mocked_ldap = double( - host: 'ldap.example.com', - port: 636, - ssl: true, - base_dn: 'dc=example,dc=com' - ) - - # group user role mapping - expect(mocked_ldap).to receive(:search) - # user counting - expect(mocked_ldap).to receive(:count).and_return(2) - # user search - expect(mocked_ldap).to receive(:search).and_yield(persistent_entry).and_yield(lost_entry) - - described_class.import( - config: config, - ldap: mocked_ldap, - ) - - # group user role mapping - expect(mocked_ldap).to receive(:search) - # user counting - expect(mocked_ldap).to receive(:count).and_return(1) - # user search - expect(mocked_ldap).to receive(:search).and_yield(persistent_entry) - - described_class.import( - config: config, - ldap: mocked_ldap, - ) - - # group user role mapping - expect(mocked_ldap).to receive(:search) - # user counting - expect(mocked_ldap).to receive(:count).and_return(2) - # user search - expect(mocked_ldap).to receive(:search).and_yield(persistent_entry).and_yield(lost_entry) - - expect do - described_class.import( - config: config, - ldap: mocked_ldap, - ) - end.to change { - User.find_by(email: 'lost@example.com').active - } - end - - it 'deactivates skipped users' do - - config = { - user_filter: '(objectClass=user)', - group_filter: '(objectClass=group)', - user_uid: 'uid', - user_attributes: { - 'uid' => 'login', - 'email' => 'email', - }, - } - - lost_entry = build(:ldap_entry) - lost_entry['uid'] = ['exampleuid'] - lost_entry['email'] = ['example@example.com'] - - mocked_ldap = double( - host: 'ldap.example.com', - port: 636, - ssl: true, - base_dn: 'dc=example,dc=com' - ) - - # group user role mapping - expect(mocked_ldap).to receive(:search) - # user counting - expect(mocked_ldap).to receive(:count).and_return(2) - # user search - expect(mocked_ldap).to receive(:search).and_yield(lost_entry) - - described_class.import( - config: config, - ldap: mocked_ldap, - ) - - # activate skipping - config[:unassigned_users] = 'skip_sync' - config[:group_role_map] = { - 'dummy' => %w(1 2), - } - - # group user role mapping - mocked_entry = build(:ldap_entry) - mocked_entry['dn'] = 'dummy' - mocked_entry['member'] = ['dummy'] - expect(mocked_ldap).to receive(:search).and_yield(mocked_entry) - - # user counting - expect(mocked_ldap).to receive(:count).and_return(1) - # user search - expect(mocked_ldap).to receive(:search).and_yield(lost_entry) - - expect do - described_class.import( - config: config, - ldap: mocked_ldap, - ) - end.to change { - User.find_by(email: 'example@example.com').active - } - end - - context 'dry run' do - - it "doesn't sync users" do - - config = { - user_filter: '(objectClass=user)', - group_filter: '(objectClass=group)', - user_uid: 'uid', - user_attributes: { - 'uid' => 'login', - 'email' => 'email', - } - } - - mocked_entry = build(:ldap_entry) - - mocked_entry['uid'] = ['exampleuid'] - mocked_entry['email'] = ['example@example.com'] - - mocked_ldap = double( - host: 'ldap.example.com', - port: 636, - ssl: true, - base_dn: 'dc=example,dc=com' - ) - - # group user role mapping - expect(mocked_ldap).to receive(:search) - # user counting - expect(mocked_ldap).to receive(:count).and_return(1) - # user search - expect(mocked_ldap).to receive(:search).and_yield(mocked_entry) - - expect do - described_class.import( - config: config, - ldap: mocked_ldap, - dry_run: true - ) - end.not_to change { - User.count - } - end - - it "doesn't deactivates lost users" do - - config = { - user_filter: '(objectClass=user)', - group_filter: '(objectClass=group)', - user_uid: 'uid', - user_attributes: { - 'uid' => 'login', - 'email' => 'email', - } - } - - persistent_entry = build(:ldap_entry) - persistent_entry['uid'] = ['exampleuid'] - persistent_entry['email'] = ['example@example.com'] - - lost_entry = build(:ldap_entry) - lost_entry['uid'] = ['exampleuid'] - lost_entry['email'] = ['example@example.com'] - - mocked_ldap = double( - host: 'ldap.example.com', - port: 636, - ssl: true, - base_dn: 'dc=example,dc=com' - ) - - # group user role mapping - expect(mocked_ldap).to receive(:search) - # user counting - expect(mocked_ldap).to receive(:count).and_return(2) - # user search - expect(mocked_ldap).to receive(:search).and_yield(persistent_entry).and_yield(lost_entry) - - described_class.import( - config: config, - ldap: mocked_ldap, - dry_run: true - ) - - # group user role mapping - expect(mocked_ldap).to receive(:search) - # user counting - expect(mocked_ldap).to receive(:count).and_return(1) - # user search - expect(mocked_ldap).to receive(:search).and_yield(persistent_entry) - - expect do - described_class.import( - config: config, - ldap: mocked_ldap, - dry_run: true - ) - end.not_to change { - User.count - } - end - end - end - - describe '.add_to_statistics' do - - it 'responds to .add_to_statistics' do - expect(described_class).to respond_to(:add_to_statistics) - end - - it 'adds statistics per user role' do - - mocked_backend_instance = double( - action: :created, - resource: double( - role_ids: [1, 2] - ) - ) - - # initialize empty statistic - described_class.reset_statistics - - described_class.add_to_statistics(mocked_backend_instance) - - expected = { - role_ids: { - 1 => { - created: 1, - updated: 0, - unchanged: 0, - failed: 0, - deactivated: 0, - }, - 2 => { - created: 1, - updated: 0, - unchanged: 0, - failed: 0, - deactivated: 0, - }, - }, - skipped: 0, - created: 1, - updated: 0, - unchanged: 0, - failed: 0, - deactivated: 0, - } - - expect(described_class.statistics).to include(expected) - end - - it 'adds deactivated users' do - config = { - user_filter: '(objectClass=user)', - group_filter: '(objectClass=group)', - user_uid: 'uid', - user_attributes: { - 'uid' => 'login', - 'email' => 'email', - } - } - - persistent_entry = build(:ldap_entry) - persistent_entry['uid'] = ['exampleuid'] - persistent_entry['email'] = ['example@example.com'] - - lost_entry = build(:ldap_entry) - lost_entry['uid'] = ['exampleuid_lost'] - lost_entry['email'] = ['lost@example.com'] - - mocked_ldap = double( - host: 'ldap.example.com', - port: 636, - ssl: true, - base_dn: 'dc=example,dc=com' - ) - - # group user role mapping - expect(mocked_ldap).to receive(:search) - # user counting - allow(mocked_ldap).to receive(:count).and_return(2) - # user search - expect(mocked_ldap).to receive(:search).and_yield(persistent_entry).and_yield(lost_entry) - - described_class.import( - config: config, - ldap: mocked_ldap, - ) - - # simulate new import - described_class.reset_statistics - - # group user role mapping - expect(mocked_ldap).to receive(:search) - # user counting - allow(mocked_ldap).to receive(:count).and_return(1) - # user search - expect(mocked_ldap).to receive(:search).and_yield(persistent_entry) - - described_class.import( - config: config, - ldap: mocked_ldap, - ) - - expected = { - skipped: 0, - created: 0, - updated: 0, - unchanged: 1, - failed: 0, - deactivated: 1, - } - - expect(described_class.statistics).to include(expected) - end - - it 'skips not created instances' do - - mocked_backend_instance = double( - action: :skipped, - resource: nil, - ) - - # initialize empty statistic - described_class.reset_statistics - - described_class.add_to_statistics(mocked_backend_instance) - - expected = { - skipped: 1, - created: 0, - updated: 0, - unchanged: 0, - failed: 0, - deactivated: 0, - } - - expect(described_class.statistics).to include(expected) - end - - it 'skips unwanted actions instances' do - - mocked_backend_instance = double( - action: :skipped, - resource: double( - role_ids: [1, 2] - ) - ) - - # initialize empty statistic - described_class.reset_statistics - - described_class.add_to_statistics(mocked_backend_instance) - - expected = { - skipped: 1, - created: 0, - updated: 0, - unchanged: 0, - failed: 0, - deactivated: 0, - } - - expect(described_class.statistics).to include(expected) - end - - end - - describe '.user_roles' do - - it 'responds to .user_roles' do - expect(described_class).to respond_to(:user_roles) - end - - it 'fetches the user DN to local role mapping' do - - group_dn = 'dn=... admin group...' - user_dn = 'dn=... admin user...' - - config = { - group_filter: '(objectClass=group)', - group_role_map: { - group_dn => %w(1 2), - } - } - - mocked_entry = build(:ldap_entry) - - mocked_entry['dn'] = group_dn - mocked_entry['member'] = [user_dn] - - mocked_ldap = double() - expect(mocked_ldap).to receive(:search).and_yield(mocked_entry) - - user_roles = described_class.user_roles( - ldap: mocked_ldap, - config: config, - ) - - expected = { - user_dn => [1, 2] - } - - expect(user_roles).to be_a(Hash) - expect(user_roles).to eq(expected) - end - end -end diff --git a/spec/lib/import/ldap/user_spec.rb b/spec/lib/import/ldap/user_spec.rb deleted file mode 100644 index 6fe2ea46c..000000000 --- a/spec/lib/import/ldap/user_spec.rb +++ /dev/null @@ -1,293 +0,0 @@ -require 'rails_helper' -require 'import/ldap/user' - -RSpec.describe Import::Ldap::User do - - let(:uid) { 'exampleuid' } - - let(:ldap_config) do - { - user_uid: 'uid', - user_attributes: { - 'uid' => 'login', - 'email' => 'email', - } - } - end - - let(:user_entry) do - user_entry = build(:ldap_entry) - - user_entry['uid'] = [uid] - user_entry['email'] = ['example@example.com'] - - user_entry - end - - let(:user_roles) do - { - user_entry.dn => [ - Role.find_by(name: 'Admin').id, - Role.find_by(name: 'Agent').id - ] - } - end - - let(:signup_role_ids) do - Role.signup_role_ids.sort - end - - context 'create' do - - it 'creates users from LDAP Entry' do - expect do - described_class.new(user_entry, ldap_config, user_roles, signup_role_ids) - end.to change { - User.count - }.by(1).and change { - ExternalSync.count - }.by(1) - end - - it "doesn't contact avatar webservice" do - # sadly we can't ensure that there are no - # outgoing HTTP calls with WebMock - expect(Avatar).not_to receive(:auto_detection) - described_class.new(user_entry, ldap_config, user_roles, signup_role_ids) - end - - it 'creates an HTTP Log entry' do - expect do - described_class.new(user_entry, ldap_config, user_roles, signup_role_ids) - end.to change { - HttpLog.count - }.by(1) - - expect(HttpLog.last.status).to eq('success') - end - - it 'logs failures to HTTP Log' do - expect_any_instance_of(User).to receive(:save!).and_raise('SOME ERROR') - described_class.new(user_entry, ldap_config, user_roles, signup_role_ids) - - expect(HttpLog.last.status).to eq('failed') - end - - context 'role assignment' do - - it 'uses mapped roles from group role' do - described_class.new(user_entry, ldap_config, user_roles, signup_role_ids) - expect(User.last.role_ids).not_to eq(signup_role_ids) - end - - context 'no mapping entry' do - - before(:each) do - # create mapping that won't match - # since dn will change below - # this is needed since if 'user_roles' - # gets called later it will get initialized - # with the changed dn - user_roles[ user_entry.dn ] = [ - Role.find_by(name: 'Admin').id, - Role.find_by(name: 'Agent').id - ] - - # change dn so no mapping will match - user_entry['dn'] = ['some_unmapped_dn'] - end - - it 'uses signup roles by default' do - described_class.new(user_entry, ldap_config, user_roles, signup_role_ids) - expect(User.last.role_ids).to eq(signup_role_ids) - end - - it 'uses signup roles if configured' do - - ldap_config[:unassigned_users] = 'sigup_roles' - - described_class.new(user_entry, ldap_config, user_roles, signup_role_ids) - expect(User.last.role_ids).to eq(signup_role_ids) - end - - it 'skips user if configured' do - - ldap_config[:unassigned_users] = 'skip_sync' - - instance = nil - expect do - instance = described_class.new(user_entry, ldap_config, user_roles, signup_role_ids) - end.not_to change { - User.count - } - expect(instance.action).to eq(:skipped) - end - end - end - end - - context 'update' do - - before(:each) do - user = create(:user, - login: uid, - role_ids: [ - Role.find_by(name: 'Agent').id, - Role.find_by(name: 'Admin').id - ]) - - ExternalSync.create( - source: 'Ldap::User', - source_id: uid, - object: 'User', - o_id: user.id - ) - end - - it 'updates users from LDAP Entry' do - expect do - described_class.new(user_entry, ldap_config, user_roles, signup_role_ids) - end.to not_change { - User.count - }.and not_change { - ExternalSync.count - } - end - - it "doesn't contact avatar webservice" do - # sadly we can't ensure that there are no - # outgoing HTTP calls with WebMock - expect(Avatar).not_to receive(:auto_detection) - described_class.new(user_entry, ldap_config, user_roles, signup_role_ids) - end - - it 'creates an HTTP Log entry' do - expect do - described_class.new(user_entry, ldap_config, user_roles, signup_role_ids) - end.to change { - HttpLog.count - }.by(1) - - expect(HttpLog.last.status).to eq('success') - end - - it 'finds existing Users without ExternalSync entries' do - ExternalSync.find_by( - source: 'Ldap::User', - source_id: uid, - object: 'User', - ).destroy - - expect do - described_class.new(user_entry, ldap_config, user_roles, signup_role_ids) - end.to not_change { - User.count - }.and change { - ExternalSync.count - }.by(1) - end - - it 'logs failures to HTTP Log' do - expect_any_instance_of(User).to receive(:save!).and_raise('SOME ERROR') - described_class.new(user_entry, ldap_config, user_roles, signup_role_ids) - - expect(HttpLog.last.status).to eq('failed') - end - - context 'no mapping entry' do - - before(:each) do - # create mapping that won't match - # since dn will change below - # this is needed since if 'user_roles' - # gets called later it will get initialized - # with the changed dn - user_roles[ user_entry.dn ] = [ - Role.find_by(name: 'Agent').id, - Role.find_by(name: 'Admin').id - ] - - # change dn so no mapping will match - user_entry['dn'] = ['some_unmapped_dn'] - end - - it 'keeps local roles by default' do - expect do - described_class.new(user_entry, ldap_config, user_roles, signup_role_ids) - end.not_to change { - User.last.role_ids - } - end - - it 'skips user if configured' do - - ldap_config[:unassigned_users] = 'skip_sync' - - instance = nil - expect do - instance = described_class.new(user_entry, ldap_config, user_roles, signup_role_ids) - end.not_to change { - User.count - } - expect(instance.action).to eq(:skipped) - end - - context 'signup roles configuration' do - it 'keeps local roles' do - - ldap_config[:unassigned_users] = 'sigup_roles' - expect do - described_class.new(user_entry, ldap_config, user_roles, signup_role_ids) - end.not_to change { - User.last.role_ids - } - end - - it "doesn't detect false changes" do - # make sure that the nothing has changed - User.find_by(login: uid).update!(email: 'example@example.com') - - expect_any_instance_of(User).not_to receive(:save!) - instance = described_class.new(user_entry, ldap_config, user_roles, signup_role_ids) - expect(instance.action).to eq(:unchanged) - end - end - end - end - - context 'skipped' do - - it 'skips entries without login' do - skip_entry = build(:ldap_entry) - instance = nil - - expect do - instance = described_class.new(skip_entry, ldap_config, user_roles, signup_role_ids) - end.to not_change { - User.count - } - expect(instance.action).to eq(:skipped) - end - - it 'skips entries without attributes' do - skip_entry = build(:ldap_entry) - skip_entry['uid'] = [uid] - instance = nil - - expect do - instance = described_class.new(skip_entry, ldap_config, user_roles, signup_role_ids) - end.to not_change { - User.count - } - expect(instance.action).to eq(:skipped) - end - - it 'logs skips to HTTP Log' do - skip_entry = build(:ldap_entry) - described_class.new(skip_entry, ldap_config, user_roles, signup_role_ids) - - expect(HttpLog.last.status).to eq('success') - expect(HttpLog.last.url).to start_with('skipped') - end - end -end diff --git a/spec/lib/import/ldap_spec.rb b/spec/lib/import/ldap_spec.rb index 1359c8904..05672b236 100644 --- a/spec/lib/import/ldap_spec.rb +++ b/spec/lib/import/ldap_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' require 'lib/import/import_job_backend_examples' -RSpec.describe Import::Ldap do +RSpec.describe Import::Ldap, sequencer: :caller do it_behaves_like 'ImportJob backend' describe '.queueable?' do @@ -32,7 +32,8 @@ RSpec.describe Import::Ldap do allow(Setting).to receive(:get).with('ldap_integration').and_return(true) allow(Setting).to receive(:get).with('ldap_config').and_return(true) - expect(Import::Ldap::UserFactory).to receive(:import) + + expect_sequence instance.start end @@ -43,7 +44,7 @@ RSpec.describe Import::Ldap do import_job = create(:import_job, dry_run: true) instance = described_class.new(import_job) - expect(Import::Ldap::UserFactory).to receive(:import) + expect_sequence instance.start end @@ -54,7 +55,7 @@ RSpec.describe Import::Ldap do allow(Setting).to receive(:get).with('ldap_integration').and_return(false) - expect(Import::Ldap::UserFactory).not_to receive(:import) + expect_no_sequence expect do instance.start @@ -73,7 +74,7 @@ RSpec.describe Import::Ldap do allow(Setting).to receive(:get).with('ldap_integration').and_return(true) allow(Setting).to receive(:get).with('ldap_config').and_return({}) - expect(Import::Ldap::UserFactory).not_to receive(:import) + expect_no_sequence expect do instance.start diff --git a/spec/lib/import/model_resource_spec.rb b/spec/lib/import/model_resource_spec.rb deleted file mode 100644 index 58b6be07f..000000000 --- a/spec/lib/import/model_resource_spec.rb +++ /dev/null @@ -1,48 +0,0 @@ -require 'rails_helper' - -RSpec.describe Import::ModelResource do - - before do - module Import - class Test < Import::Base - class Group < Import::ModelResource - def source - 'RSpec-Test' - end - end - end - end - end - - after do - Import::Test.send(:remove_const, :Group) - end - - let(:group_data) { attributes_for(:group).merge(id: 1337) } - - it 'creates model Objects by class name' do - expect do - Import::Test::Group.new(group_data) - end.to change { Group.count }.by(1) - end - - it 'updates model Objects by class name' do - - expect do - Import::Test::Group.new(group_data) - end - .to change { - Group.count - }.by(1) - - expect do - Import::Test::Group.new(group_data.merge(note: 'Updated')) - end - .to change { - Group.count - }.by(0) - .and change { - Group.last.note - } - end -end diff --git a/spec/lib/import/otrs/customer_user_spec.rb b/spec/lib/import/otrs/customer_user_spec.rb index 51374dd4b..5f43a51b2 100644 --- a/spec/lib/import/otrs/customer_user_spec.rb +++ b/spec/lib/import/otrs/customer_user_spec.rb @@ -158,4 +158,42 @@ RSpec.describe Import::OTRS::CustomerUser do updates_with(zammad_structure) end end + + context 'regular user with camelcase login' do + + let(:object_structure) { load_customer_json('camel_case_login') } + let(:zammad_structure) do + { + created_by_id: '1', + updated_by_id: '1', + active: true, + source: 'OTRS Import', + organization_id: 1337, + role_ids: [3], + updated_at: '2014-06-07 02:31:31', + created_at: '2014-06-07 02:31:31', + note: '', + email: 'qa100@t-online.de', + firstname: 'test669673', + lastname: 'test669673', + login: 'test669673', + password: 'f8be19af2f25837a31eff9131b0e47a5173290652c04a48b49b86474d48825ee', + phone: nil, + fax: nil, + mobile: nil, + street: nil, + zip: nil, + city: nil, + country: nil + } + end + + it 'creates' do + creates_with(zammad_structure) + end + + it 'updates' do + updates_with(zammad_structure) + end + end end diff --git a/spec/lib/import/otrs/state_factory_spec.rb b/spec/lib/import/otrs/state_factory_spec.rb index 1b50b8181..2bf2806a4 100644 --- a/spec/lib/import/otrs/state_factory_spec.rb +++ b/spec/lib/import/otrs/state_factory_spec.rb @@ -15,7 +15,7 @@ RSpec.describe Import::OTRS::StateFactory do it 'updates ObjectManager Ticket state_id and pending_time filter' do - states = %w(new open merged pending_reminder pending_auto_close_p pending_auto_close_n pending_auto_close_p closed_successful closed_unsuccessful closed_successful removed) + states = %w[new open merged pending_reminder pending_auto_close_p pending_auto_close_n pending_auto_close_p closed_successful closed_unsuccessful closed_successful removed] state_backend_param = [] states.each do |state| @@ -110,7 +110,7 @@ RSpec.describe Import::OTRS::StateFactory do context 'changing Ticket::State IDs' do let(:state_backend_param) do - states = %w(new open merged pending_reminder pending_auto_close_p pending_auto_close_n pending_auto_close_p closed_successful closed_unsuccessful closed_successful removed) + states = %w[new open merged pending_reminder pending_auto_close_p pending_auto_close_n pending_auto_close_p closed_successful closed_unsuccessful closed_successful removed] state_backend_param = [] states.each do |state| diff --git a/spec/lib/import/otrs/user_spec.rb b/spec/lib/import/otrs/user_spec.rb index 92423aef6..5c590578d 100644 --- a/spec/lib/import/otrs/user_spec.rb +++ b/spec/lib/import/otrs/user_spec.rb @@ -21,8 +21,7 @@ RSpec.describe Import::OTRS::User do start_import_test end - def role_delete_expecations(role_ids) - end + def role_delete_expecations(role_ids); end def load_user_json(file) json_fixture("import/otrs/user/#{file}") @@ -111,7 +110,7 @@ RSpec.describe Import::OTRS::User do updated_by_id: 1, active: true, source: 'OTRS Import', - role_ids: [2], + role_ids: [2, 1], group_ids: [], password: '{sha2}9edb001ad7900daea0622d89225c9ca729749fd12ae5ea044f072d1b7c56c8cc', updated_at: '2014-11-14 00:53:20', @@ -167,4 +166,38 @@ RSpec.describe Import::OTRS::User do updates_with(zammad_structure) end end + + context 'regular user with camel case login' do + + let(:object_structure) { load_user_json('camel_case_login') } + let(:zammad_structure) do + { + created_by_id: 1, + updated_by_id: 1, + active: true, + source: 'OTRS Import', + role_ids: [2, 1], + group_ids: ['1'], + password: '{sha2}9faaba2ab242a99bbb6992e9424386375f6757c17e6484ae570f39d9cad9f28ea', + updated_at: '2014-04-28 10:53:18', + created_at: '2014-04-28 10:53:18', + id: '1', + email: 'root@localhost', + firstname: 'Admin', + lastname: 'OTRS', + login: 'root@localhost' + } + end + + it 'creates' do + prepare_expectations + creates_with(zammad_structure) + end + + it 'updates' do + prepare_expectations + updates_with(zammad_structure) + end + end + end diff --git a/spec/lib/import/statistical_factory_spec.rb b/spec/lib/import/statistical_factory_spec.rb deleted file mode 100644 index da72a7a51..000000000 --- a/spec/lib/import/statistical_factory_spec.rb +++ /dev/null @@ -1,264 +0,0 @@ -require 'rails_helper' -require 'lib/import/factory_examples' - -RSpec.describe Import::StatisticalFactory do - it_behaves_like 'Import::Factory' - - before do - module Import - class Test < Import::Base - - module GroupFactory - extend Import::StatisticalFactory - end - - class Group < Import::ModelResource - def source - 'RSpec-Test' - end - end - end - end - end - - after do - Import::Test.send(:remove_const, :GroupFactory) - Import::Test.send(:remove_const, :Group) - end - - before(:each) do - Import::Test::GroupFactory.reset_statistics - end - - let(:attributes) do - attributes = attributes_for(:group) - attributes[:id] = 1337 - attributes - end - - context 'statistics' do - - context 'live run' do - - it 'tracks created instances' do - - Import::Test::GroupFactory.import([attributes]) - - statistics = { - created: 1, - updated: 0, - unchanged: 0, - skipped: 0, - failed: 0, - deactivated: 0, - } - expect(Import::Test::GroupFactory.statistics).to eq(statistics) - end - - context 'updated instances' do - it 'tracks by regular attributes' do - - Import::Test::GroupFactory.import([attributes]) - - # simulate next import run - travel 20.minutes - Import::Test::GroupFactory.reset_statistics - - attributes[:note] = 'TEST' - Import::Test::GroupFactory.import([attributes]) - - statistics = { - created: 0, - updated: 1, - unchanged: 0, - skipped: 0, - failed: 0, - deactivated: 0, - } - expect(Import::Test::GroupFactory.statistics).to eq(statistics) - end - - it 'tracks by has_many association attributes' do - - Import::Test::GroupFactory.import([attributes]) - - # simulate next import run - travel 20.minutes - Import::Test::GroupFactory.reset_statistics - - new_users = create_list(:user, 2) - attributes[:user_ids] = new_users.collect(&:id) - - Import::Test::GroupFactory.import([attributes]) - - statistics = { - created: 0, - updated: 1, - unchanged: 0, - skipped: 0, - failed: 0, - deactivated: 0, - } - expect(Import::Test::GroupFactory.statistics).to eq(statistics) - end - - it 'tracks by belongs_to association attributes' do - - Import::Test::GroupFactory.import([attributes]) - - # simulate next import run - travel 20.minutes - Import::Test::GroupFactory.reset_statistics - - new_signature = create(:signature) - attributes[:signature_id] = new_signature.id - - Import::Test::GroupFactory.import([attributes]) - - statistics = { - created: 0, - updated: 1, - unchanged: 0, - skipped: 0, - failed: 0, - deactivated: 0, - } - expect(Import::Test::GroupFactory.statistics).to eq(statistics) - end - end - - it 'tracks unchanged instances' do - - Import::Test::GroupFactory.import([attributes]) - - # simulate next import run - travel 20.minutes - Import::Test::GroupFactory.reset_statistics - - Import::Test::GroupFactory.import([attributes]) - - statistics = { - created: 0, - updated: 0, - unchanged: 1, - skipped: 0, - failed: 0, - deactivated: 0, - } - expect(Import::Test::GroupFactory.statistics).to eq(statistics) - end - end - - context 'dry run' do - - it 'tracks created instances' do - - Import::Test::GroupFactory.import([attributes], dry_run: true) - - statistics = { - created: 1, - updated: 0, - unchanged: 0, - skipped: 0, - failed: 0, - deactivated: 0, - } - expect(Import::Test::GroupFactory.statistics).to eq(statistics) - end - - context 'updated instances' do - - let(:local_group) { create(:group) } - - before(:each) do - ExternalSync.create( - source: 'RSpec-Test', - source_id: local_group.id, - object: 'Group', - o_id: local_group.id - ) - end - - it 'tracks by regular attributes' do - - update_attributes = local_group.attributes - update_attributes[:note] = 'TEST' - - Import::Test::GroupFactory.import([update_attributes], dry_run: true) - - statistics = { - created: 0, - updated: 1, - unchanged: 0, - skipped: 0, - failed: 0, - deactivated: 0, - } - expect(Import::Test::GroupFactory.statistics).to eq(statistics) - end - - it 'tracks by has_many association attributes' do - - update_attributes = local_group.attributes - new_users = create_list(:user, 2) - update_attributes[:user_ids] = new_users.collect(&:id) - - Import::Test::GroupFactory.import([update_attributes], dry_run: true) - - statistics = { - created: 0, - updated: 1, - unchanged: 0, - skipped: 0, - failed: 0, - deactivated: 0, - } - expect(Import::Test::GroupFactory.statistics).to eq(statistics) - end - - it 'tracks by belongs_to association attributes' do - - update_attributes = local_group.attributes - new_signature = create(:signature) - update_attributes[:signature_id] = new_signature.id - - Import::Test::GroupFactory.import([update_attributes], dry_run: true) - - statistics = { - created: 0, - updated: 1, - unchanged: 0, - skipped: 0, - failed: 0, - deactivated: 0, - } - expect(Import::Test::GroupFactory.statistics).to eq(statistics) - end - end - - it 'tracks unchanged instances' do - - local_group = create(:group) - - ExternalSync.create( - source: 'RSpec-Test', - source_id: local_group.id, - object: 'Group', - o_id: local_group.id - ) - - Import::Test::GroupFactory.import([local_group.attributes], dry_run: true) - - statistics = { - created: 0, - updated: 0, - unchanged: 1, - skipped: 0, - failed: 0, - deactivated: 0, - } - expect(Import::Test::GroupFactory.statistics).to eq(statistics) - end - end - end -end diff --git a/spec/lib/import/zendesk/base_factory_examples.rb b/spec/lib/import/zendesk/base_factory_examples.rb deleted file mode 100644 index bc38c2063..000000000 --- a/spec/lib/import/zendesk/base_factory_examples.rb +++ /dev/null @@ -1,23 +0,0 @@ -require 'lib/import/factory_examples' - -RSpec.shared_examples 'Import::Zendesk::BaseFactory' do - it_behaves_like 'Import::Factory' - - it 'calls .all! on parameter object' do - parameter = double() - expect(parameter).to receive('all!') - described_class.import(parameter) - end - - it 'calls new on determined backend object' do - expect(described_class).to receive(:backend_class).and_return(Class) - expect(described_class).to receive('skip?') - expect(described_class).to receive(:pre_import_hook) - expect(described_class).to receive(:post_import_hook) - record = double() - expect(Class).to receive(:new).with(record, any_args) - parameter = double() - expect(parameter).to receive('all!').and_yield(record) - described_class.import(parameter) - end -end diff --git a/spec/lib/import/zendesk/base_factory_spec.rb b/spec/lib/import/zendesk/base_factory_spec.rb deleted file mode 100644 index d0f00e68a..000000000 --- a/spec/lib/import/zendesk/base_factory_spec.rb +++ /dev/null @@ -1,6 +0,0 @@ -require 'rails_helper' -require 'lib/import/zendesk/base_factory_examples' - -RSpec.describe Import::Zendesk::BaseFactory do - it_behaves_like 'Import::Zendesk::BaseFactory' -end diff --git a/spec/lib/import/zendesk/group_factory_spec.rb b/spec/lib/import/zendesk/group_factory_spec.rb deleted file mode 100644 index dd34d6174..000000000 --- a/spec/lib/import/zendesk/group_factory_spec.rb +++ /dev/null @@ -1,8 +0,0 @@ -require 'rails_helper' -require 'lib/import/zendesk/base_factory_examples' -require 'lib/import/zendesk/local_id_mapper_hook_examples' - -RSpec.describe Import::Zendesk::GroupFactory do - it_behaves_like 'Import::Zendesk::BaseFactory' - it_behaves_like 'Import::Zendesk::LocalIDMapperHook' -end diff --git a/spec/lib/import/zendesk/group_spec.rb b/spec/lib/import/zendesk/group_spec.rb deleted file mode 100644 index 014f0e405..000000000 --- a/spec/lib/import/zendesk/group_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -require 'rails_helper' - -RSpec.describe Import::Zendesk::Group do - - it 'creates a group if not exists' do - - group = double( - id: 31_337, - name: 'Test Group', - deleted: true - ) - - local_group = instance_double(::Group, id: 1337) - - expect(::Group).to receive(:create_if_not_exists).with(hash_including(name: group.name, active: !group.deleted)).and_return(local_group) - - created_instance = described_class.new(group) - - expect(created_instance).to respond_to(:id) - expect(created_instance.id).to eq(local_group.id) - - expect(created_instance).to respond_to(:zendesk_id) - expect(created_instance.zendesk_id).to eq(group.id) - end -end diff --git a/spec/lib/import/zendesk/local_id_mapper_hook_examples.rb b/spec/lib/import/zendesk/local_id_mapper_hook_examples.rb deleted file mode 100644 index 27dfddfe8..000000000 --- a/spec/lib/import/zendesk/local_id_mapper_hook_examples.rb +++ /dev/null @@ -1,20 +0,0 @@ -RSpec.shared_examples 'Import::Zendesk::LocalIDMapperHook' do - - it 'responds to local_id' do - expect(described_class).to respond_to('local_id') - end - - it 'responds to post_import_hook' do - expect(described_class).to respond_to('post_import_hook') - end - - it 'stores an ID mapping and makes it accessable' do - backend_instance = double( - zendesk_id: 31_337, - id: 1337, - ) - - described_class.post_import_hook(nil, backend_instance) - expect(described_class.local_id(backend_instance.zendesk_id)).to eq(backend_instance.id) - end -end diff --git a/spec/lib/import/zendesk/local_id_mapper_hook_spec.rb b/spec/lib/import/zendesk/local_id_mapper_hook_spec.rb deleted file mode 100644 index bf5c2ff46..000000000 --- a/spec/lib/import/zendesk/local_id_mapper_hook_spec.rb +++ /dev/null @@ -1,6 +0,0 @@ -require 'rails_helper' -require 'lib/import/zendesk/local_id_mapper_hook_examples' - -RSpec.describe Import::Zendesk::LocalIDMapperHook do - it_behaves_like 'Import::Zendesk::LocalIDMapperHook' -end diff --git a/spec/lib/import/zendesk/lookup_backend_examples.rb b/spec/lib/import/zendesk/lookup_backend_examples.rb deleted file mode 100644 index f1e8220ff..000000000 --- a/spec/lib/import/zendesk/lookup_backend_examples.rb +++ /dev/null @@ -1,5 +0,0 @@ -RSpec.shared_examples 'Lookup backend' do - it 'responds to lookup' do - expect(described_class).to respond_to('lookup') - end -end diff --git a/spec/lib/import/zendesk/object_attribute_spec.rb b/spec/lib/import/zendesk/object_attribute/base_spec.rb similarity index 94% rename from spec/lib/import/zendesk/object_attribute_spec.rb rename to spec/lib/import/zendesk/object_attribute/base_spec.rb index 0539fa263..a253f0ce0 100644 --- a/spec/lib/import/zendesk/object_attribute_spec.rb +++ b/spec/lib/import/zendesk/object_attribute/base_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -RSpec.describe Import::Zendesk::ObjectAttribute do +RSpec.describe Import::Zendesk::ObjectAttribute::Base do it 'extends ObjectManager Attribute exception text' do diff --git a/spec/lib/import/zendesk/object_field_examples.rb b/spec/lib/import/zendesk/object_field_examples.rb deleted file mode 100644 index 6ad9993d6..000000000 --- a/spec/lib/import/zendesk/object_field_examples.rb +++ /dev/null @@ -1,22 +0,0 @@ -RSpec.shared_examples 'Import::Zendesk::ObjectField' do - - it 'initializes a object field backend import' do - - object_field = double(id: 31_337, title: 'Example Field') - allow(object_field).to receive(:[]).with('key').and_return(object_field.title) - - dummy_instance = double() - - local_name = 'example_field' - dummy_backend = instance_double(Class) - expect(dummy_backend).to receive(:new).with(kind_of(String), local_name, object_field).and_return(dummy_instance) - expect_any_instance_of(described_class).to receive(:backend_class).and_return(dummy_backend) - created_instance = described_class.new(object_field) - - expect(created_instance).to respond_to(:id) - expect(created_instance.id).to eq(local_name) - - expect(created_instance).to respond_to(:zendesk_id) - expect(created_instance.zendesk_id).to eq(object_field.id) - end -end diff --git a/spec/lib/import/zendesk/object_field_spec.rb b/spec/lib/import/zendesk/object_field_spec.rb deleted file mode 100644 index 035129ddb..000000000 --- a/spec/lib/import/zendesk/object_field_spec.rb +++ /dev/null @@ -1,6 +0,0 @@ -require 'rails_helper' -require 'lib/import/zendesk/object_field_examples' - -RSpec.describe Import::Zendesk::ObjectField do - it_behaves_like 'Import::Zendesk::ObjectField' -end diff --git a/spec/lib/import/zendesk/organization_factory_spec.rb b/spec/lib/import/zendesk/organization_factory_spec.rb deleted file mode 100644 index 380ccb064..000000000 --- a/spec/lib/import/zendesk/organization_factory_spec.rb +++ /dev/null @@ -1,8 +0,0 @@ -require 'rails_helper' -require 'lib/import/factory_examples' -require 'lib/import/zendesk/local_id_mapper_hook_examples' - -RSpec.describe Import::Zendesk::OrganizationFieldFactory do - it_behaves_like 'Import::Factory' - it_behaves_like 'Import::Zendesk::LocalIDMapperHook' -end diff --git a/spec/lib/import/zendesk/organization_field_factory_spec.rb b/spec/lib/import/zendesk/organization_field_factory_spec.rb deleted file mode 100644 index d48fb5ccb..000000000 --- a/spec/lib/import/zendesk/organization_field_factory_spec.rb +++ /dev/null @@ -1,8 +0,0 @@ -require 'rails_helper' -require 'lib/import/zendesk/base_factory_examples' -require 'lib/import/zendesk/local_id_mapper_hook_examples' - -RSpec.describe Import::Zendesk::OrganizationFieldFactory do - it_behaves_like 'Import::Zendesk::BaseFactory' - it_behaves_like 'Import::Zendesk::LocalIDMapperHook' -end diff --git a/spec/lib/import/zendesk/organization_field_spec.rb b/spec/lib/import/zendesk/organization_field_spec.rb deleted file mode 100644 index 01b6264ef..000000000 --- a/spec/lib/import/zendesk/organization_field_spec.rb +++ /dev/null @@ -1,6 +0,0 @@ -require 'rails_helper' -require 'lib/import/zendesk/object_field_examples' - -RSpec.describe Import::Zendesk::OrganizationField do - it_behaves_like 'Import::Zendesk::ObjectField' -end diff --git a/spec/lib/import/zendesk/organization_spec.rb b/spec/lib/import/zendesk/organization_spec.rb deleted file mode 100644 index 24ba4f850..000000000 --- a/spec/lib/import/zendesk/organization_spec.rb +++ /dev/null @@ -1,27 +0,0 @@ -require 'rails_helper' - -RSpec.describe Import::Zendesk::Organization do - - it 'creates a organization if not exists' do - - organization = double( - id: 31_337, - name: 'Test Organization', - note: 'Test Organization note', - shared_tickets: true, - organization_fields: nil - ) - - local_organization = instance_double(::Organization, id: 1337) - - expect(::Organization).to receive(:create_if_not_exists).with(hash_including(name: organization.name, note: organization.note, shared: organization.shared_tickets)).and_return(local_organization) - - created_instance = described_class.new(organization) - - expect(created_instance).to respond_to(:id) - expect(created_instance).to respond_to(:zendesk_id) - - expect(created_instance.id).to eq(local_organization.id) - expect(created_instance.zendesk_id).to eq(organization.id) - end -end diff --git a/spec/lib/import/zendesk/priority_spec.rb b/spec/lib/import/zendesk/priority_spec.rb deleted file mode 100644 index 711d8cc96..000000000 --- a/spec/lib/import/zendesk/priority_spec.rb +++ /dev/null @@ -1,14 +0,0 @@ -require 'rails_helper' -require 'lib/import/zendesk/lookup_backend_examples' - -RSpec.describe Import::Zendesk::Priority do - it_behaves_like 'Lookup backend' - - it 'looks up ticket priority' do - - ticket = double(priority: nil) - dummy_result = 'dummy result' - expect(::Ticket::Priority).to receive(:lookup).and_return(dummy_result) - expect(described_class.lookup(ticket)).to eq(dummy_result) - end -end diff --git a/spec/lib/import/zendesk/state_spec.rb b/spec/lib/import/zendesk/state_spec.rb deleted file mode 100644 index efcb4622a..000000000 --- a/spec/lib/import/zendesk/state_spec.rb +++ /dev/null @@ -1,14 +0,0 @@ -require 'rails_helper' -require 'lib/import/zendesk/lookup_backend_examples' - -RSpec.describe Import::Zendesk::State do - it_behaves_like 'Lookup backend' - - it 'looks up ticket state' do - - ticket = double(status: nil) - dummy_result = 'dummy result' - expect(::Ticket::State).to receive(:lookup).and_return(dummy_result) - expect(described_class.lookup(ticket)).to eq(dummy_result) - end -end diff --git a/spec/lib/import/zendesk/ticket/comment/attachment_factory_spec.rb b/spec/lib/import/zendesk/ticket/comment/attachment_factory_spec.rb deleted file mode 100644 index 706d6ba64..000000000 --- a/spec/lib/import/zendesk/ticket/comment/attachment_factory_spec.rb +++ /dev/null @@ -1,18 +0,0 @@ -require 'rails_helper' -require 'lib/import/factory_examples' - -RSpec.describe Import::Zendesk::Ticket::Comment::AttachmentFactory do - it_behaves_like 'Import::Factory' - - it 'tunnels attachment and local article to backend' do - expect(described_class).to receive(:backend_class).and_return(Class) - expect(described_class).to receive('skip?') - expect(described_class).to receive(:pre_import_hook) - expect(described_class).to receive(:post_import_hook) - record = double() - local_article = double(attachments: []) - expect(Class).to receive(:new).with(record, local_article) - parameter = [record] - described_class.import(parameter, local_article) - end -end diff --git a/spec/lib/import/zendesk/ticket/comment/attachment_spec.rb b/spec/lib/import/zendesk/ticket/comment/attachment_spec.rb deleted file mode 100644 index 5376e8059..000000000 --- a/spec/lib/import/zendesk/ticket/comment/attachment_spec.rb +++ /dev/null @@ -1,37 +0,0 @@ -require 'rails_helper' - -RSpec.describe Import::Zendesk::Ticket::Comment::Attachment do - - it 'downloads and stores attachments' do - - local_article = double(id: 1337) - - attachment = double( - file_name: 'Example.zip', - content_type: 'application/zip', - content_url: 'https://dl.remote.tld/394r0eifwskfjwlw3slf' - ) - - response = double( - body: 'content', - success?: true, - ) - - expect(UserAgent).to receive(:get).with(attachment.content_url, any_args).and_return(response) - - add_args = { - object: 'Ticket::Article', - o_id: local_article.id, - data: response.body, - filename: attachment.file_name, - preferences: { - 'Content-Type' => attachment.content_type - }, - created_by_id: 1 - } - - expect(Store).to receive(:add).with(add_args) - - described_class.new(attachment, local_article) - end -end diff --git a/spec/lib/import/zendesk/ticket/comment/local_id_lookup_backend_examples.rb b/spec/lib/import/zendesk/ticket/comment/local_id_lookup_backend_examples.rb deleted file mode 100644 index 254eaaa9b..000000000 --- a/spec/lib/import/zendesk/ticket/comment/local_id_lookup_backend_examples.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'rails_helper' - -RSpec.shared_examples 'local_id lookup backend' do - it 'responds to local_id' do - expect(described_class).to respond_to(:local_id) - end -end diff --git a/spec/lib/import/zendesk/ticket/comment/sender_spec.rb b/spec/lib/import/zendesk/ticket/comment/sender_spec.rb deleted file mode 100644 index af88a3380..000000000 --- a/spec/lib/import/zendesk/ticket/comment/sender_spec.rb +++ /dev/null @@ -1,6 +0,0 @@ -require 'rails_helper' -require 'lib/import/zendesk/ticket/comment/local_id_lookup_backend_examples' - -RSpec.describe Import::Zendesk::Ticket::Comment::Sender do - it_behaves_like 'local_id lookup backend' -end diff --git a/spec/lib/import/zendesk/ticket/comment/type_spec.rb b/spec/lib/import/zendesk/ticket/comment/type_spec.rb deleted file mode 100644 index 526ceb8a6..000000000 --- a/spec/lib/import/zendesk/ticket/comment/type_spec.rb +++ /dev/null @@ -1,6 +0,0 @@ -require 'rails_helper' -require 'lib/import/zendesk/ticket/comment/local_id_lookup_backend_examples' - -RSpec.describe Import::Zendesk::Ticket::Comment::Type do - it_behaves_like 'local_id lookup backend' -end diff --git a/spec/lib/import/zendesk/ticket/comment_factory_spec.rb b/spec/lib/import/zendesk/ticket/comment_factory_spec.rb deleted file mode 100644 index 13ab0aa82..000000000 --- a/spec/lib/import/zendesk/ticket/comment_factory_spec.rb +++ /dev/null @@ -1,6 +0,0 @@ -require 'rails_helper' -require 'lib/import/zendesk/ticket/sub_object_factory_examples' - -RSpec.describe Import::Zendesk::Ticket::CommentFactory do - it_behaves_like 'Import::Zendesk::Ticket::SubObjectFactory' -end diff --git a/spec/lib/import/zendesk/ticket/comment_spec.rb b/spec/lib/import/zendesk/ticket/comment_spec.rb deleted file mode 100644 index 354f057d4..000000000 --- a/spec/lib/import/zendesk/ticket/comment_spec.rb +++ /dev/null @@ -1,637 +0,0 @@ -require 'rails_helper' - -RSpec.describe Import::Zendesk::Ticket::Comment do - - context 'email' do - - it 'creates' do - - comment = double( - id: 1337, - author_id: 42, - public: true, - html_body: '
                Hello World!
                ', - via: double( - channel: 'email', - source: double( - from: double(address: 'from@sender.tld'), - to: double(address: 'to@receiver.tld') - ), - ), - attachments: [] - ) - - local_ticket = double(id: 31_337) - - local_user_id = 99 - - create_structure = { - from: comment.via.source.from.address, - to: comment.via.source.to.address, - ticket_id: local_ticket.id, - body: comment.html_body, - content_type: 'text/html', - internal: !comment.public, - message_id: comment.id, - updated_by_id: local_user_id, - created_by_id: local_user_id, - sender_id: 23, - type_id: 1, - } - - expect(Import::Zendesk::UserFactory).to receive(:local_id).with( comment.author_id ).and_return(local_user_id) - expect(Import::Zendesk::Ticket::Comment::Sender).to receive(:local_id).with(local_user_id).and_return(create_structure[:sender_id]) - - expect(::Ticket::Article).to receive(:find_by).with(message_id: comment.id) - - expect(::Ticket::Article).to receive(:create).with(create_structure) - - described_class.new(comment, local_ticket, nil) - end - - it 'updates' do - - comment = double( - id: 1337, - author_id: 42, - public: true, - html_body: '
                Hello World!
                ', - via: double( - channel: 'email', - source: double( - from: double(address: 'from@sender.tld'), - to: double(address: 'to@receiver.tld') - ), - ), - attachments: [] - ) - - local_ticket = double(id: 31_337) - - local_user_id = 99 - - update_structure = { - from: comment.via.source.from.address, - to: comment.via.source.to.address, - ticket_id: local_ticket.id, - body: comment.html_body, - content_type: 'text/html', - internal: !comment.public, - message_id: comment.id, - updated_by_id: local_user_id, - created_by_id: local_user_id, - sender_id: 23, - type_id: 1, - } - - expect(Import::Zendesk::UserFactory).to receive(:local_id).with( comment.author_id ).and_return(local_user_id) - expect(Import::Zendesk::Ticket::Comment::Sender).to receive(:local_id).with(local_user_id).and_return(update_structure[:sender_id]) - - local_article = double() - expect(local_article).to receive(:update!).with(update_structure) - - expect(::Ticket::Article).to receive(:find_by).with(message_id: comment.id).and_return(local_article) - - described_class.new(comment, local_ticket, nil) - end - end - - context 'facebook' do - - context 'post' do - - it 'creates' do - - comment = double( - id: 1337, - author_id: 42, - public: true, - html_body: '
                Hello World!
                ', - via: double( - channel: 'facebook', - source: double( - from: double(facebook_id: 3_129_033), - to: double(facebook_id: 1_230_920), - rel: 'post', - ), - ), - attachments: [] - ) - - local_ticket = double(id: 31_337) - - local_user_id = 99 - - create_structure = { - from: comment.via.source.from.facebook_id, - to: comment.via.source.to.facebook_id, - ticket_id: local_ticket.id, - body: comment.html_body, - content_type: 'text/html', - internal: !comment.public, - message_id: comment.id, - updated_by_id: local_user_id, - created_by_id: local_user_id, - sender_id: 23, - type_id: 8, - } - - expect(Import::Zendesk::UserFactory).to receive(:local_id).with( comment.author_id ).and_return(local_user_id) - expect(Import::Zendesk::Ticket::Comment::Sender).to receive(:local_id).with(local_user_id).and_return(create_structure[:sender_id]) - - expect(::Ticket::Article).to receive(:find_by).with(message_id: comment.id) - - expect(::Ticket::Article).to receive(:create).with(create_structure) - - described_class.new(comment, local_ticket, nil) - end - - it 'updates' do - - comment = double( - id: 1337, - author_id: 42, - public: true, - html_body: '
                Hello World!
                ', - via: double( - channel: 'facebook', - source: double( - from: double(facebook_id: 3_129_033), - to: double(facebook_id: 1_230_920), - rel: 'post', - ), - ), - attachments: [] - ) - - local_ticket = double(id: 31_337) - - local_user_id = 99 - - update_structure = { - from: comment.via.source.from.facebook_id, - to: comment.via.source.to.facebook_id, - ticket_id: local_ticket.id, - body: comment.html_body, - content_type: 'text/html', - internal: !comment.public, - message_id: comment.id, - updated_by_id: local_user_id, - created_by_id: local_user_id, - sender_id: 23, - type_id: 8, - } - - expect(Import::Zendesk::UserFactory).to receive(:local_id).with( comment.author_id ).and_return(local_user_id) - expect(Import::Zendesk::Ticket::Comment::Sender).to receive(:local_id).with(local_user_id).and_return(update_structure[:sender_id]) - - local_article = double() - expect(local_article).to receive(:update!).with(update_structure) - - expect(::Ticket::Article).to receive(:find_by).with(message_id: comment.id).and_return(local_article) - - described_class.new(comment, local_ticket, nil) - end - end - - context 'comment' do - - it 'creates' do - - comment = double( - id: 1337, - author_id: 42, - public: true, - html_body: '
                Hello World!
                ', - via: double( - channel: 'facebook', - source: double( - from: double(facebook_id: 3_129_033), - to: double(facebook_id: 1_230_920), - rel: 'comment', - ), - ), - attachments: [] - ) - - local_ticket = double(id: 31_337) - - local_user_id = 99 - - create_structure = { - from: comment.via.source.from.facebook_id, - to: comment.via.source.to.facebook_id, - ticket_id: local_ticket.id, - body: comment.html_body, - content_type: 'text/html', - internal: !comment.public, - message_id: comment.id, - updated_by_id: local_user_id, - created_by_id: local_user_id, - sender_id: 23, - type_id: 9, - } - - expect(Import::Zendesk::UserFactory).to receive(:local_id).with( comment.author_id ).and_return(local_user_id) - expect(Import::Zendesk::Ticket::Comment::Sender).to receive(:local_id).with(local_user_id).and_return(create_structure[:sender_id]) - - expect(::Ticket::Article).to receive(:find_by).with(message_id: comment.id) - - expect(::Ticket::Article).to receive(:create).with(create_structure) - - described_class.new(comment, local_ticket, nil) - end - - it 'updates' do - - comment = double( - id: 1337, - author_id: 42, - public: true, - html_body: '
                Hello World!
                ', - via: double( - channel: 'facebook', - source: double( - from: double(facebook_id: 3_129_033), - to: double(facebook_id: 1_230_920), - rel: 'comment', - ), - ), - attachments: [] - ) - - local_ticket = double(id: 31_337) - - local_user_id = 99 - - update_structure = { - from: comment.via.source.from.facebook_id, - to: comment.via.source.to.facebook_id, - ticket_id: local_ticket.id, - body: comment.html_body, - content_type: 'text/html', - internal: !comment.public, - message_id: comment.id, - updated_by_id: local_user_id, - created_by_id: local_user_id, - sender_id: 23, - type_id: 9, - } - - expect(Import::Zendesk::UserFactory).to receive(:local_id).with( comment.author_id ).and_return(local_user_id) - expect(Import::Zendesk::Ticket::Comment::Sender).to receive(:local_id).with(local_user_id).and_return(update_structure[:sender_id]) - - local_article = double() - expect(local_article).to receive(:update!).with(update_structure) - - expect(::Ticket::Article).to receive(:find_by).with(message_id: comment.id).and_return(local_article) - - described_class.new(comment, local_ticket, nil) - end - end - end - - context 'twitter' do - - context 'mention' do - - it 'creates' do - - comment = double( - id: 1337, - author_id: 42, - public: true, - html_body: '
                Hello World!
                ', - via: double( - channel: 'twitter', - source: double( - rel: 'mention', - ), - ), - attachments: [] - ) - - local_ticket = double(id: 31_337) - - local_user_id = 99 - - create_structure = { - ticket_id: local_ticket.id, - body: comment.html_body, - content_type: 'text/html', - internal: !comment.public, - message_id: comment.id, - updated_by_id: local_user_id, - created_by_id: local_user_id, - sender_id: 23, - type_id: 6, - } - - expect(Import::Zendesk::UserFactory).to receive(:local_id).with( comment.author_id ).and_return(local_user_id) - expect(Import::Zendesk::Ticket::Comment::Sender).to receive(:local_id).with(local_user_id).and_return(create_structure[:sender_id]) - - expect(::Ticket::Article).to receive(:find_by).with(message_id: comment.id) - - expect(::Ticket::Article).to receive(:create).with(create_structure) - - described_class.new(comment, local_ticket, nil) - end - - it 'updates' do - - comment = double( - id: 1337, - author_id: 42, - public: true, - html_body: '
                Hello World!
                ', - via: double( - channel: 'twitter', - source: double( - rel: 'mention', - ), - ), - attachments: [] - ) - - local_ticket = double(id: 31_337) - - local_user_id = 99 - - update_structure = { - ticket_id: local_ticket.id, - body: comment.html_body, - content_type: 'text/html', - internal: !comment.public, - message_id: comment.id, - updated_by_id: local_user_id, - created_by_id: local_user_id, - sender_id: 23, - type_id: 6, - } - - expect(Import::Zendesk::UserFactory).to receive(:local_id).with( comment.author_id ).and_return(local_user_id) - expect(Import::Zendesk::Ticket::Comment::Sender).to receive(:local_id).with(local_user_id).and_return(update_structure[:sender_id]) - - local_article = double() - expect(local_article).to receive(:update!).with(update_structure) - - expect(::Ticket::Article).to receive(:find_by).with(message_id: comment.id).and_return(local_article) - - described_class.new(comment, local_ticket, nil) - end - end - - context 'direct_message' do - - it 'creates' do - - comment = double( - id: 1337, - author_id: 42, - public: true, - html_body: '
                Hello World!
                ', - via: double( - channel: 'twitter', - source: double( - rel: 'direct_message', - ), - ), - attachments: [] - ) - - local_ticket = double(id: 31_337) - - local_user_id = 99 - - create_structure = { - ticket_id: local_ticket.id, - body: comment.html_body, - content_type: 'text/html', - internal: !comment.public, - message_id: comment.id, - updated_by_id: local_user_id, - created_by_id: local_user_id, - sender_id: 23, - type_id: 7, - } - - expect(Import::Zendesk::UserFactory).to receive(:local_id).with( comment.author_id ).and_return(local_user_id) - expect(Import::Zendesk::Ticket::Comment::Sender).to receive(:local_id).with(local_user_id).and_return(create_structure[:sender_id]) - - expect(::Ticket::Article).to receive(:find_by).with(message_id: comment.id) - - expect(::Ticket::Article).to receive(:create).with(create_structure) - - described_class.new(comment, local_ticket, nil) - end - - it 'updates' do - - comment = double( - id: 1337, - author_id: 42, - public: true, - html_body: '
                Hello World!
                ', - via: double( - channel: 'twitter', - source: double( - rel: 'direct_message', - ), - ), - attachments: [] - ) - - local_ticket = double(id: 31_337) - - local_user_id = 99 - - update_structure = { - ticket_id: local_ticket.id, - body: comment.html_body, - content_type: 'text/html', - internal: !comment.public, - message_id: comment.id, - updated_by_id: local_user_id, - created_by_id: local_user_id, - sender_id: 23, - type_id: 7, - } - - expect(Import::Zendesk::UserFactory).to receive(:local_id).with( comment.author_id ).and_return(local_user_id) - expect(Import::Zendesk::Ticket::Comment::Sender).to receive(:local_id).with(local_user_id).and_return(update_structure[:sender_id]) - - local_article = double() - expect(local_article).to receive(:update!).with(update_structure) - - expect(::Ticket::Article).to receive(:find_by).with(message_id: comment.id).and_return(local_article) - - described_class.new(comment, local_ticket, nil) - end - end - end - - context 'web' do - - it 'creates' do - - comment = double( - id: 1337, - author_id: 42, - public: true, - html_body: '
                Hello World!
                ', - via: double( - channel: 'web', - ), - attachments: [] - ) - - local_ticket = double(id: 31_337) - - local_user_id = 99 - - create_structure = { - ticket_id: local_ticket.id, - body: comment.html_body, - content_type: 'text/html', - internal: !comment.public, - message_id: comment.id, - updated_by_id: local_user_id, - created_by_id: local_user_id, - sender_id: 23, - type_id: 11, - } - - expect(Import::Zendesk::UserFactory).to receive(:local_id).with( comment.author_id ).and_return(local_user_id) - expect(Import::Zendesk::Ticket::Comment::Sender).to receive(:local_id).with(local_user_id).and_return(create_structure[:sender_id]) - - expect(::Ticket::Article).to receive(:find_by).with(message_id: comment.id) - - expect(::Ticket::Article).to receive(:create).with(create_structure) - - described_class.new(comment, local_ticket, nil) - end - - it 'updates' do - - comment = double( - id: 1337, - author_id: 42, - public: true, - html_body: '
                Hello World!
                ', - via: double( - channel: 'web', - ), - attachments: [] - ) - - local_ticket = double(id: 31_337) - - local_user_id = 99 - - update_structure = { - ticket_id: local_ticket.id, - body: comment.html_body, - content_type: 'text/html', - internal: !comment.public, - message_id: comment.id, - updated_by_id: local_user_id, - created_by_id: local_user_id, - sender_id: 23, - type_id: 11, - } - - expect(Import::Zendesk::UserFactory).to receive(:local_id).with( comment.author_id ).and_return(local_user_id) - expect(Import::Zendesk::Ticket::Comment::Sender).to receive(:local_id).with(local_user_id).and_return(update_structure[:sender_id]) - - local_article = double() - expect(local_article).to receive(:update!).with(update_structure) - - expect(::Ticket::Article).to receive(:find_by).with(message_id: comment.id).and_return(local_article) - - described_class.new(comment, local_ticket, nil) - end - end - - context 'sample_ticket' do - - it 'creates' do - - comment = double( - id: 1337, - author_id: 42, - public: true, - html_body: '
                Hello World!
                ', - via: double( - channel: 'sample_ticket', - ), - attachments: [] - ) - - local_ticket = double(id: 31_337) - - local_user_id = 99 - - create_structure = { - ticket_id: local_ticket.id, - body: comment.html_body, - content_type: 'text/html', - internal: !comment.public, - message_id: comment.id, - updated_by_id: local_user_id, - created_by_id: local_user_id, - sender_id: 23, - type_id: 10, - } - - expect(Import::Zendesk::UserFactory).to receive(:local_id).with( comment.author_id ).and_return(local_user_id) - expect(Import::Zendesk::Ticket::Comment::Sender).to receive(:local_id).with(local_user_id).and_return(create_structure[:sender_id]) - - expect(::Ticket::Article).to receive(:find_by).with(message_id: comment.id) - - expect(::Ticket::Article).to receive(:create).with(create_structure) - - described_class.new(comment, local_ticket, nil) - end - - it 'updates' do - - comment = double( - id: 1337, - author_id: 42, - public: true, - html_body: '
                Hello World!
                ', - via: double( - channel: 'sample_ticket', - ), - attachments: [] - ) - - local_ticket = double(id: 31_337) - - local_user_id = 99 - - update_structure = { - ticket_id: local_ticket.id, - body: comment.html_body, - content_type: 'text/html', - internal: !comment.public, - message_id: comment.id, - updated_by_id: local_user_id, - created_by_id: local_user_id, - sender_id: 23, - type_id: 10, - } - - expect(Import::Zendesk::UserFactory).to receive(:local_id).with( comment.author_id ).and_return(local_user_id) - expect(Import::Zendesk::Ticket::Comment::Sender).to receive(:local_id).with(local_user_id).and_return(update_structure[:sender_id]) - - local_article = double() - expect(local_article).to receive(:update!).with(update_structure) - - expect(::Ticket::Article).to receive(:find_by).with(message_id: comment.id).and_return(local_article) - - described_class.new(comment, local_ticket, nil) - end - end - -end diff --git a/spec/lib/import/zendesk/ticket/sub_object_factory_examples.rb b/spec/lib/import/zendesk/ticket/sub_object_factory_examples.rb deleted file mode 100644 index 89564b600..000000000 --- a/spec/lib/import/zendesk/ticket/sub_object_factory_examples.rb +++ /dev/null @@ -1,21 +0,0 @@ -require 'rails_helper' -require 'lib/import/factory_examples' - -RSpec.shared_examples 'Import::Zendesk::Ticket::SubObjectFactory' do - it_behaves_like 'Import::Factory' - - it 'tunnels local and remote ticket object to backend' do - - expect(described_class).to receive(:backend_class).and_return(Class) - expect(described_class).to receive('skip?') - expect(described_class).to receive(:pre_import_hook) - expect(described_class).to receive(:post_import_hook) - record = double() - local_ticket = double() - zendesk_ticket = double() - expect(Class).to receive(:new).with(record, local_ticket, zendesk_ticket) - parameter = double() - expect(parameter).to receive(:each).and_yield(record) - described_class.import(parameter, local_ticket, zendesk_ticket) - end -end diff --git a/spec/lib/import/zendesk/ticket/tag_factory_spec.rb b/spec/lib/import/zendesk/ticket/tag_factory_spec.rb deleted file mode 100644 index 9b893b229..000000000 --- a/spec/lib/import/zendesk/ticket/tag_factory_spec.rb +++ /dev/null @@ -1,6 +0,0 @@ -require 'rails_helper' -require 'lib/import/zendesk/ticket/sub_object_factory_examples' - -RSpec.describe Import::Zendesk::Ticket::TagFactory do - it_behaves_like 'Import::Zendesk::Ticket::SubObjectFactory' -end diff --git a/spec/lib/import/zendesk/ticket/tag_spec.rb b/spec/lib/import/zendesk/ticket/tag_spec.rb deleted file mode 100644 index 62bad3e2c..000000000 --- a/spec/lib/import/zendesk/ticket/tag_spec.rb +++ /dev/null @@ -1,21 +0,0 @@ -require 'rails_helper' - -# required due to some of rails autoloading issues -require 'import/zendesk/ticket/tag' - -RSpec.describe Import::Zendesk::Ticket::Tag do - - it 'creates ticket tags' do - - tag = double(id: 'Test Tag') - - local_ticket = instance_double(::Ticket, id: 1337) - - zendesk_ticket = double(requester_id: 31_337) - - expect(Import::Zendesk::UserFactory).to receive(:local_id).with(zendesk_ticket.requester_id) - expect(::Tag).to receive(:tag_add).with(hash_including(item: tag.id, o_id: local_ticket.id)) - - described_class.new(tag, local_ticket, zendesk_ticket) - end -end diff --git a/spec/lib/import/zendesk/ticket_factory_spec.rb b/spec/lib/import/zendesk/ticket_factory_spec.rb deleted file mode 100644 index 6bfe6e105..000000000 --- a/spec/lib/import/zendesk/ticket_factory_spec.rb +++ /dev/null @@ -1,6 +0,0 @@ -require 'rails_helper' -require 'lib/import/zendesk/base_factory_examples' - -RSpec.describe Import::Zendesk::TicketFactory do - it_behaves_like 'Import::Zendesk::BaseFactory' -end diff --git a/spec/lib/import/zendesk/ticket_field_factory_spec.rb b/spec/lib/import/zendesk/ticket_field_factory_spec.rb deleted file mode 100644 index f39a2df6e..000000000 --- a/spec/lib/import/zendesk/ticket_field_factory_spec.rb +++ /dev/null @@ -1,8 +0,0 @@ -require 'rails_helper' -require 'lib/import/zendesk/base_factory_examples' -require 'lib/import/zendesk/local_id_mapper_hook_examples' - -RSpec.describe Import::Zendesk::TicketFieldFactory do - it_behaves_like 'Import::Zendesk::BaseFactory' - it_behaves_like 'Import::Zendesk::LocalIDMapperHook' -end diff --git a/spec/lib/import/zendesk/ticket_field_spec.rb b/spec/lib/import/zendesk/ticket_field_spec.rb deleted file mode 100644 index 327acc058..000000000 --- a/spec/lib/import/zendesk/ticket_field_spec.rb +++ /dev/null @@ -1,34 +0,0 @@ -require 'rails_helper' -require 'lib/import/zendesk/object_field_examples' - -RSpec.describe Import::Zendesk::TicketField do - it_behaves_like 'Import::Zendesk::ObjectField' - - it 'handles fields with dashes in title' do - - zendesk_object = double( - id: 1337, - title: 'Priority - Simple', - key: 'priority_simple', - type: 'text', - removable: true, - active: true, - position: 1, - required_in_portal: true, - visible_in_portal: true, - required: true, - description: 'Example field', - ) - - expect(ObjectManager::Attribute).to receive(:migration_execute).and_return(true) - - expect do - described_class.new(zendesk_object) - end.not_to raise_error - - ObjectManager::Attribute.remove( - object: 'Ticket', - name: zendesk_object.key, - ) - end -end diff --git a/spec/lib/import/zendesk/ticket_spec.rb b/spec/lib/import/zendesk/ticket_spec.rb deleted file mode 100644 index 3ffaec04b..000000000 --- a/spec/lib/import/zendesk/ticket_spec.rb +++ /dev/null @@ -1,129 +0,0 @@ -require 'rails_helper' - -# required due to some of rails autoloading issues -require 'import/zendesk/ticket' - -RSpec.describe Import::Zendesk::Ticket do - - it 'creates' do - - ticket = double( - id: 1337, - subject: 'The ticket title', - description: 'An example ticket', - assignee: 69, - requester_id: 42, - group_id: 909, - organization_id: 101, - due_at: DateTime.tomorrow, - updated_at: DateTime.yesterday, - created_at: DateTime.yesterday, - tags: [], - comments: [], - custom_fields: [], - ) - - local_user_id = 23 - - expected_structure = { - id: ticket.id, - title: ticket.subject, - note: ticket.description, - group_id: 3, - owner_id: 101, - customer_id: local_user_id, - organization_id: 89, - state: 13, - priority: 7, - pending_time: ticket.due_at, - updated_at: ticket.updated_at, - created_at: ticket.created_at, - updated_by_id: local_user_id, - created_by_id: local_user_id, - create_article_sender_id: 21, - create_article_type_id: 555, - } - - expect(Import::Zendesk::UserFactory).to receive(:local_id).with( ticket.requester_id ).and_return(local_user_id) - expect(Import::Zendesk::UserFactory).to receive(:local_id).with( ticket.assignee ).and_return(expected_structure[:owner_id]) - - expect(Import::Zendesk::GroupFactory).to receive(:local_id).with( ticket.group_id ).and_return(expected_structure[:group_id]) - expect(Import::Zendesk::OrganizationFactory).to receive(:local_id).with( ticket.organization_id ).and_return(expected_structure[:organization_id]) - expect(Import::Zendesk::Priority).to receive(:lookup).with(ticket).and_return(expected_structure[:priority]) - expect(Import::Zendesk::State).to receive(:lookup).with(ticket).and_return(expected_structure[:state]) - expect(Import::Zendesk::Ticket::Comment::Sender).to receive(:local_id).with(local_user_id).and_return(expected_structure[:create_article_sender_id]) - expect(Import::Zendesk::Ticket::Comment::Type).to receive(:local_id).with(ticket).and_return(expected_structure[:create_article_type_id]) - - local_ticket = double() - - expect(Import::Zendesk::Ticket::TagFactory).to receive(:import).with(ticket.tags, local_ticket, ticket) - expect(Import::Zendesk::Ticket::CommentFactory).to receive(:import).with(ticket.comments, local_ticket, ticket) - - expect(::Ticket).to receive(:find_by).with(id: expected_structure[:id]) - expect(::Ticket).to receive(:create).with(expected_structure).and_return(local_ticket) - - expect_any_instance_of(described_class).to receive(:reset_primary_key_sequence) - - created_instance = described_class.new(ticket) - end - - it 'updates' do - - ticket = double( - id: 1337, - subject: 'The ticket title', - description: 'An example ticket', - assignee: 69, - requester_id: 42, - group_id: 909, - organization_id: 101, - due_at: DateTime.tomorrow, - updated_at: DateTime.yesterday, - created_at: DateTime.yesterday, - tags: [], - comments: [], - custom_fields: [], - ) - - local_user_id = 23 - - expected_structure = { - id: ticket.id, - title: ticket.subject, - note: ticket.description, - group_id: 3, - owner_id: 101, - customer_id: local_user_id, - organization_id: 89, - state: 13, - priority: 7, - pending_time: ticket.due_at, - updated_at: ticket.updated_at, - created_at: ticket.created_at, - updated_by_id: local_user_id, - created_by_id: local_user_id, - create_article_sender_id: 21, - create_article_type_id: 555, - } - - expect(Import::Zendesk::UserFactory).to receive(:local_id).with( ticket.requester_id ).and_return(local_user_id) - expect(Import::Zendesk::UserFactory).to receive(:local_id).with( ticket.assignee ).and_return(expected_structure[:owner_id]) - - expect(Import::Zendesk::GroupFactory).to receive(:local_id).with( ticket.group_id ).and_return(expected_structure[:group_id]) - expect(Import::Zendesk::OrganizationFactory).to receive(:local_id).with( ticket.organization_id ).and_return(expected_structure[:organization_id]) - expect(Import::Zendesk::Priority).to receive(:lookup).with(ticket).and_return(expected_structure[:priority]) - expect(Import::Zendesk::State).to receive(:lookup).with(ticket).and_return(expected_structure[:state]) - expect(Import::Zendesk::Ticket::Comment::Sender).to receive(:local_id).with(local_user_id).and_return(expected_structure[:create_article_sender_id]) - expect(Import::Zendesk::Ticket::Comment::Type).to receive(:local_id).with(ticket).and_return(expected_structure[:create_article_type_id]) - - local_ticket = double() - - expect(Import::Zendesk::Ticket::TagFactory).to receive(:import).with(ticket.tags, local_ticket, ticket) - expect(Import::Zendesk::Ticket::CommentFactory).to receive(:import).with(ticket.comments, local_ticket, ticket) - - expect(::Ticket).to receive(:find_by).with(id: expected_structure[:id]).and_return(local_ticket) - expect(local_ticket).to receive(:update!).with(expected_structure) - - created_instance = described_class.new(ticket) - end -end diff --git a/spec/lib/import/zendesk/user/group_spec.rb b/spec/lib/import/zendesk/user/group_spec.rb deleted file mode 100644 index 97ae249f8..000000000 --- a/spec/lib/import/zendesk/user/group_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'rails_helper' -require 'lib/import/zendesk/user/lookup_backend_examples' - -# required due to some of rails autoloading issues -require 'import/zendesk/user/group' - -RSpec.describe Import::Zendesk::User::Group do - it_behaves_like 'lookup backend' -end diff --git a/spec/lib/import/zendesk/user/lookup_backend_examples.rb b/spec/lib/import/zendesk/user/lookup_backend_examples.rb deleted file mode 100644 index 47ef2f94c..000000000 --- a/spec/lib/import/zendesk/user/lookup_backend_examples.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'rails_helper' - -RSpec.shared_examples 'lookup backend' do - it 'responds to for' do - expect(described_class).to respond_to(:for) - end -end diff --git a/spec/lib/import/zendesk/user/role_spec.rb b/spec/lib/import/zendesk/user/role_spec.rb deleted file mode 100644 index 9a0dff009..000000000 --- a/spec/lib/import/zendesk/user/role_spec.rb +++ /dev/null @@ -1,13 +0,0 @@ -require 'rails_helper' -require 'lib/import/zendesk/user/lookup_backend_examples' - -# required due to some of rails autoloading issues -require 'import/zendesk/user/role' - -RSpec.describe Import::Zendesk::User::Role do - it_behaves_like 'lookup backend' - - it 'responds to map' do - expect(described_class).to respond_to(:map) - end -end diff --git a/spec/lib/import/zendesk/user_factory_spec.rb b/spec/lib/import/zendesk/user_factory_spec.rb deleted file mode 100644 index 294a3f656..000000000 --- a/spec/lib/import/zendesk/user_factory_spec.rb +++ /dev/null @@ -1,8 +0,0 @@ -require 'rails_helper' -require 'lib/import/zendesk/base_factory_examples' -require 'lib/import/zendesk/local_id_mapper_hook_examples' - -RSpec.describe Import::Zendesk::UserFactory do - it_behaves_like 'Import::Zendesk::BaseFactory' - it_behaves_like 'Import::Zendesk::LocalIDMapperHook' -end diff --git a/spec/lib/import/zendesk/user_field_factory_spec.rb b/spec/lib/import/zendesk/user_field_factory_spec.rb deleted file mode 100644 index 601b0ab25..000000000 --- a/spec/lib/import/zendesk/user_field_factory_spec.rb +++ /dev/null @@ -1,8 +0,0 @@ -require 'rails_helper' -require 'lib/import/zendesk/base_factory_examples' -require 'lib/import/zendesk/local_id_mapper_hook_examples' - -RSpec.describe Import::Zendesk::UserFieldFactory do - it_behaves_like 'Import::Zendesk::BaseFactory' - it_behaves_like 'Import::Zendesk::LocalIDMapperHook' -end diff --git a/spec/lib/import/zendesk/user_field_spec.rb b/spec/lib/import/zendesk/user_field_spec.rb deleted file mode 100644 index 2325622b7..000000000 --- a/spec/lib/import/zendesk/user_field_spec.rb +++ /dev/null @@ -1,6 +0,0 @@ -require 'rails_helper' -require 'lib/import/zendesk/object_field_examples' - -RSpec.describe Import::Zendesk::UserField do - it_behaves_like 'Import::Zendesk::ObjectField' -end diff --git a/spec/lib/import/zendesk/user_spec.rb b/spec/lib/import/zendesk/user_spec.rb deleted file mode 100644 index 3c3d43eaa..000000000 --- a/spec/lib/import/zendesk/user_spec.rb +++ /dev/null @@ -1,165 +0,0 @@ -require 'rails_helper' - -# required due to some of rails autoloading issues -require 'import/zendesk/user' - -RSpec.describe Import::Zendesk::User do - - it 'create_or_updates user' do - - user = double( - id: 1337, - name: 'Example User', - email: 'user@example.com', - phone: '+49-123-345673', - suspended: false, - notes: 'Nice guy', - verified: true, - organization_id: 42, - last_login_at: DateTime.yesterday, - photo: double(content_url: 'https://img.remote.tld/w40293402zz394eed'), - user_fields: [], - ) - - expected_structure = { - login: user.email, - firstname: user.name, - email: user.email, - phone: user.phone, - password: '', - active: !user.suspended, - groups: [1, 2, 3], - roles: [3], - note: user.notes, - verified: user.verified, - organization_id: 101, - last_login: user.last_login_at, - image_source: user.photo.content_url, - updated_by_id: 1, - created_by_id: 1 - } - - local_user = double(id: 31_337) - - expect(Import::Zendesk::User::Group).to receive(:for).with(user).and_return(expected_structure[:groups]) - expect(Import::Zendesk::User::Role).to receive(:for).with(user).and_return(expected_structure[:roles]) - expect(Import::Zendesk::OrganizationFactory).to receive(:local_id).with( user.organization_id ).and_return(expected_structure[:organization_id]) - - expect(::User).to receive(:create_or_update).with( expected_structure ).and_return(local_user) - - created_instance = described_class.new(user) - - expect(created_instance).to respond_to(:id) - expect(created_instance.id).to eq(local_user.id) - - expect(created_instance).to respond_to(:zendesk_id) - expect(created_instance.zendesk_id).to eq(user.id) - end - - it 'imports id as login if no email address is available' do - - user = double( - id: 1337, - name: 'Example User', - email: nil, - phone: '+49-123-345673', - suspended: false, - notes: 'Nice guy', - verified: true, - organization_id: 42, - last_login_at: DateTime.yesterday, - photo: double(content_url: 'https://img.remote.tld/w40293402zz394eed'), - user_fields: [], - ) - - expected_structure = { - login: user.id.to_s, - firstname: user.name, - email: user.email, - phone: user.phone, - password: '', - active: !user.suspended, - groups: [1, 2, 3], - roles: [3], - note: user.notes, - verified: user.verified, - organization_id: 101, - last_login: user.last_login_at, - image_source: user.photo.content_url, - updated_by_id: 1, - created_by_id: 1 - } - - local_user = double(id: 31_337) - - expect(Import::Zendesk::User::Group).to receive(:for).with(user).and_return(expected_structure[:groups]) - expect(Import::Zendesk::User::Role).to receive(:for).with(user).and_return(expected_structure[:roles]) - expect(Import::Zendesk::OrganizationFactory).to receive(:local_id).with( user.organization_id ).and_return(expected_structure[:organization_id]) - - expect(::User).to receive(:create_or_update).with( expected_structure ).and_return(local_user) - - created_instance = described_class.new(user) - - expect(created_instance).to respond_to(:id) - expect(created_instance.id).to eq(local_user.id) - - expect(created_instance).to respond_to(:zendesk_id) - expect(created_instance.zendesk_id).to eq(user.id) - end - - it 'handles import user credentials and privileges specially' do - - user = double( - id: 1337, - name: 'Example User', - email: 'user@example.com', - phone: '+49-123-345673', - suspended: false, - notes: 'Nice guy', - verified: true, - organization_id: 42, - last_login_at: DateTime.yesterday, - photo: double(content_url: 'https://img.remote.tld/w40293402zz394eed'), - user_fields: [], - ) - - password = 'apikeyprovidedfortheimportbytheuser' - - expected_structure = { - login: user.email, - firstname: user.name, - email: user.email, - phone: user.phone, - password: password, - active: !user.suspended, - groups: [1, 2, 3], - roles: [1, 2], - note: user.notes, - verified: user.verified, - organization_id: 101, - last_login: user.last_login_at, - image_source: user.photo.content_url, - updated_by_id: 1, - created_by_id: 1 - } - - local_user = double(id: 31_337) - - expect(Import::Zendesk::User::Group).to receive(:for).with(user).and_return(expected_structure[:groups]) - expect(Import::Zendesk::User::Role).to receive(:map).with(user, 'admin').and_return(expected_structure[:roles]) - expect(Import::Zendesk::OrganizationFactory).to receive(:local_id).with( user.organization_id ).and_return(expected_structure[:organization_id]) - - expect(Setting).to receive(:get).with('import_zendesk_endpoint_username').twice.and_return(user.email) - expect(Setting).to receive(:get).with('import_zendesk_endpoint_key').and_return(password) - - expect(::User).to receive(:create_or_update).with( expected_structure ).and_return(local_user) - - created_instance = described_class.new(user) - - expect(created_instance).to respond_to(:id) - expect(created_instance.id).to eq(local_user.id) - - expect(created_instance).to respond_to(:zendesk_id) - expect(created_instance.zendesk_id).to eq(user.id) - end -end diff --git a/spec/lib/import/zendesk_spec.rb b/spec/lib/import/zendesk_spec.rb deleted file mode 100644 index 153fe393b..000000000 --- a/spec/lib/import/zendesk_spec.rb +++ /dev/null @@ -1,12 +0,0 @@ -require 'rails_helper' -require 'lib/import/helper_examples' -require 'lib/import/importer_examples' -require 'lib/import/async_examples' -require 'lib/import/import_stats_examples' - -RSpec.describe Import::Zendesk do - it_behaves_like 'Import backend' - it_behaves_like 'Import::Helper' - it_behaves_like 'Import::Async' - it_behaves_like 'Import::ImportStats' -end diff --git a/spec/lib/ldap/guid_spec.rb b/spec/lib/ldap/guid_spec.rb new file mode 100644 index 000000000..aed19ecf7 --- /dev/null +++ b/spec/lib/ldap/guid_spec.rb @@ -0,0 +1,82 @@ +require 'rails_helper' + +RSpec.describe Ldap::Guid do + + let(:string) { 'f742b361-32c6-4a92-baaa-eaae7df657ee' } + let(:hex) { "a\xB3B\xF7\xC62\x92J\xBA\xAA\xEA\xAE}\xF6W\xEE".b } + + context '.valid?' do + + it 'responds to .valid?' do + expect(described_class).to respond_to(:valid?) + end + + it 'detects valid uid string' do + expect(described_class.valid?(string)).to be true + end + + it 'detects invalid uid string' do + invalid = 'AC2342' + expect(described_class.valid?(invalid)).to be false + end + end + + context '.hex' do + + it 'responds to .hex' do + expect(described_class).to respond_to(:hex) + end + + it 'tunnels to instance method' do + + instance = double() + expect(instance).to receive(:hex) + expect(described_class).to receive(:new).with(string).and_return(instance) + + described_class.hex(string) + end + end + + context '.string' do + + it 'responds to .string' do + expect(described_class).to respond_to(:string) + end + + it 'tunnels to instance method' do + + instance = double() + expect(instance).to receive(:string) + expect(described_class).to receive(:new).with(hex).and_return(instance) + + described_class.string(hex) + end + end + + context '#string' do + + let(:instance) { described_class.new(hex) } + + it 'responds to #string' do + expect(instance).to respond_to(:string) + end + + it 'converts to string' do + expect(instance.string).to eq(string) + end + end + + context '#hex' do + + let(:instance) { described_class.new(string) } + + it 'responds to #hex' do + expect(instance).to respond_to(:hex) + end + + it 'converts to hex' do + expect(instance.hex).to eq(hex) + end + end + +end diff --git a/spec/lib/ldap/user_spec.rb b/spec/lib/ldap/user_spec.rb index 3f06e9b21..8bf5657ec 100644 --- a/spec/lib/ldap/user_spec.rb +++ b/spec/lib/ldap/user_spec.rb @@ -13,10 +13,10 @@ RSpec.describe Ldap::User do it 'returns uid attribute string from given attribute strucutre' do attributes = { - samaccountname: 'TEST', - custom: 'value', + objectguid: 'TEST', + custom: 'value', } - expect(described_class.uid_attribute(attributes)).to eq('samaccountname') + expect(described_class.uid_attribute(attributes)).to eq('objectguid') end it 'returns nil if no attribute could be found' do @@ -54,7 +54,7 @@ RSpec.describe Ldap::User do it 'takes optional uid_attribute' do - uid_attribute = 'samaccountname' + uid_attribute = 'objectguid' config = { uid_attribute: uid_attribute } @@ -74,7 +74,7 @@ RSpec.describe Ldap::User do let(:initialization_config) do { - uid_attribute: 'samaccountname', + uid_attribute: 'objectguid', filter: '(objectClass=user)', } end @@ -147,7 +147,7 @@ RSpec.describe Ldap::User do let(:initialization_config) do { - uid_attribute: 'samaccountname', + uid_attribute: 'objectguid', } end @@ -182,7 +182,7 @@ RSpec.describe Ldap::User do ldap_entry = build(:ldap_entry) # selectable attribute - ldap_entry['samaccountname'] = 'test@example.com' + ldap_entry['objectguid'] = 'f742b361-32c6-4a92-baaa-eaae7df657ee' expect(mocked_ldap).to receive(:search).and_yield(ldap_entry) diff --git a/spec/lib/migration_job/ldap_samaccountname_to_uid_spec.rb b/spec/lib/migration_job/ldap_samaccountname_to_uid_spec.rb new file mode 100644 index 000000000..fe9558ae1 --- /dev/null +++ b/spec/lib/migration_job/ldap_samaccountname_to_uid_spec.rb @@ -0,0 +1,49 @@ +require 'rails_helper' + +RSpec.describe MigrationJob::LdapSamaccountnameToUid do + + it 'performs no changes if no LDAP config present' do + expect(Setting).to_not receive(:set) + expect(Import::Ldap).to receive(:config).and_return(nil) + + described_class.new.perform + end + + it 'performs no changes if uid attributes equals' do + expect(Setting).to_not receive(:set) + + ldap_config = { + 'user_uid' => 'samaccountname' + } + expect(Import::Ldap).to receive(:config).and_return(ldap_config) + + ldap_user = double() + expect(ldap_user).to receive(:uid_attribute).and_return('samaccountname') + expect(::Ldap::User).to receive(:new).and_return(ldap_user) + + allow(::Ldap).to receive(:new) + + described_class.new.perform + end + + it 'performs Setting change if uid attribute differ' do + ldap_config_new = { + 'user_uid' => 'objectguid' + } + ldap_config_obsolete = { + 'user_uid' => 'samaccountname' + } + + expect(Setting).to receive(:set).with('ldap_config', ldap_config_new) + + expect(Import::Ldap).to receive(:config).and_return(ldap_config_obsolete) + + ldap_user = double() + expect(ldap_user).to receive(:uid_attribute).and_return('objectguid') + expect(::Ldap::User).to receive(:new).and_return(ldap_user) + + allow(::Ldap).to receive(:new) + + described_class.new.perform + end +end diff --git a/spec/lib/sequencer/sequence/import/ldap/users_spec.rb b/spec/lib/sequencer/sequence/import/ldap/users_spec.rb new file mode 100644 index 000000000..6e32ca609 --- /dev/null +++ b/spec/lib/sequencer/sequence/import/ldap/users_spec.rb @@ -0,0 +1,194 @@ +require 'rails_helper' + +RSpec.describe ::Sequencer::Sequence::Import::Ldap::Users, sequencer: :sequence do + + context 'lost group assignment' do + + context 'config "unassigned_users": "skip_sync"' do + + it 'disables user' do + + user_entry = build(:ldap_entry) + user_entry['objectguid'] = ['user1337'] + user_entry['samaccountname'] = ['login123'] + user_entry['first_name'] = ['Hans'] + + group_entry = build(:ldap_entry) + group_entry['member'] = [user_entry.dn] + + payload = { + ldap_config: { + user_filter: 'user=filter', + group_role_map: { + group_entry.dn => [1, 2] + }, + user_attributes: { + 'first_name' => 'firstname', + }, + user_uid: 'objectguid', + unassigned_users: 'skip_sync', + } + } + + import_job = build_stubbed(:import_job, name: 'Import::Ldap', payload: payload) + + connection = double( + host: 'example.com', + port: 1337, + ssl: true, + base_dn: 'test' + ) + + # LDAP::Group + expect(connection).to receive(:search).and_yield(group_entry) + expect(connection).to receive(:entries?).and_return(true) + + # Sequencer::Unit::Import::Ldap::Users::Total + expect(connection).to receive(:count).and_return(1) + + # Sequencer::Unit::Import::Ldap::Users::SubSequence + expect(connection).to receive(:search).and_yield(user_entry) + + expect do + process( + ldap_connection: connection, + import_job: import_job, + ) + end.to change { + User.count + }.by(1) + + imported_user = User.last + + expect(imported_user.active).to be true + + connection = double( + host: 'example.com', + port: 1337, + ssl: true, + base_dn: 'test' + ) + + group_entry['member'] = ['some.other.dn'] + + # LDAP::Group + expect(connection).to receive(:search).and_yield(group_entry) + expect(connection).to receive(:entries?).and_return(true) + + # Sequencer::Unit::Import::Ldap::Users::Total + # cached + # expect(connection).to receive(:count).and_return(1) + + # Sequencer::Unit::Import::Ldap::Users::SubSequence + expect(connection).to receive(:search).and_yield(user_entry) + + expect do + process( + ldap_connection: connection, + import_job: import_job, + ) + end.not_to change { + User.count + } + + imported_user.reload + + expect(imported_user.active).to be false + end + end + + context 'config "unassigned_users": nil / "sigup_roles"' do + + it 'assigns signup roles' do + + user_entry = build(:ldap_entry) + user_entry['objectguid'] = ['user1337'] + user_entry['samaccountname'] = ['login123'] + user_entry['first_name'] = ['Hans'] + + group_entry = build(:ldap_entry) + group_entry['member'] = [user_entry.dn] + + agent_admin_role_ids = [1, 2] + + payload = { + ldap_config: { + user_filter: 'user=filter', + group_role_map: { + group_entry.dn => agent_admin_role_ids + }, + user_attributes: { + 'first_name' => 'firstname', + }, + user_uid: 'objectguid', + } + } + + import_job = build_stubbed(:import_job, name: 'Import::Ldap', payload: payload) + + connection = double( + host: 'example.com', + port: 1337, + ssl: true, + base_dn: 'test' + ) + + # LDAP::Group + expect(connection).to receive(:search).and_yield(group_entry) + expect(connection).to receive(:entries?).and_return(true) + + # Sequencer::Unit::Import::Ldap::Users::Total + expect(connection).to receive(:count).and_return(1) + + # Sequencer::Unit::Import::Ldap::Users::SubSequence + expect(connection).to receive(:search).and_yield(user_entry) + + expect do + process( + ldap_connection: connection, + import_job: import_job, + ) + end.to change { + User.count + }.by(1) + + imported_user = User.last + + expect(imported_user.role_ids).to eq(agent_admin_role_ids) + + connection = double( + host: 'example.com', + port: 1337, + ssl: true, + base_dn: 'test' + ) + + group_entry['member'] = ['some.other.dn'] + + # LDAP::Group + expect(connection).to receive(:search).and_yield(group_entry) + expect(connection).to receive(:entries?).and_return(true) + + # Sequencer::Unit::Import::Ldap::Users::Total + # cached + # expect(connection).to receive(:count).and_return(1) + + # Sequencer::Unit::Import::Ldap::Users::SubSequence + expect(connection).to receive(:search).and_yield(user_entry) + + expect do + process( + ldap_connection: connection, + import_job: import_job, + ) + end.not_to change { + User.count + } + + imported_user.reload + + expect(imported_user.roles).to eq(Role.signup_roles) + end + end + end +end diff --git a/spec/lib/sequencer/unit/import/common/model/attributes/remote_id_spec.rb b/spec/lib/sequencer/unit/import/common/model/attributes/remote_id_spec.rb new file mode 100644 index 000000000..130165da8 --- /dev/null +++ b/spec/lib/sequencer/unit/import/common/model/attributes/remote_id_spec.rb @@ -0,0 +1,71 @@ +require 'rails_helper' + +RSpec.describe Sequencer::Unit::Import::Common::Model::Attributes::RemoteId, sequencer: :unit do + + it 'takes remote_id from id' do + parameters = { + resource: { + id: '123abc', + } + } + + provided = process(parameters) + + expect(provided).to include(remote_id: '123abc') + end + + it 'takes remote_id from attribute method result' do + parameters = { + resource: { + other_attribute: '123abc', + } + } + + provided = process(parameters) do |instance| + expect(instance).to receive(:attribute).and_return(:other_attribute) + end + + expect(provided).to include(remote_id: '123abc') + end + + it 'converts value to a String' do + parameters = { + resource: { + id: 1337, + } + } + + provided = process(parameters) + + expect(provided).to include(remote_id: '1337') + expect(provided[:remote_id]).to be_a(String) + end + + it 'does not change the value to prevent id collision issues' do + parameters = { + resource: { + id: 'AbCdEfG', + } + } + + provided = process(parameters) + + expect(provided[:remote_id]).to eq(parameters[:resource][:id]) + end + + it 'duplicates the value to prevent attribute changes' do + parameters = { + resource: { + id: 'this is', + } + } + + provided = process(parameters) + + expect(provided[:remote_id]).to eq(parameters[:resource][:id]) + + parameters[:resource][:id] += ' a test' + + expect(provided[:remote_id]).not_to eq(parameters[:resource][:id]) + end +end diff --git a/spec/lib/sequencer/unit/import/common/model/lookup/external_sync_spec.rb b/spec/lib/sequencer/unit/import/common/model/lookup/external_sync_spec.rb new file mode 100644 index 000000000..e2a2e666e --- /dev/null +++ b/spec/lib/sequencer/unit/import/common/model/lookup/external_sync_spec.rb @@ -0,0 +1,25 @@ +require 'rails_helper' + +RSpec.describe Sequencer::Unit::Import::Common::Model::Lookup::ExternalSync, sequencer: :unit do + + it 'finds model_class instance by remote_id' do + user = create(:user) + external_sync_source = 'test' + remote_id = '1337' + + ExternalSync.create( + source: external_sync_source, + source_id: remote_id, + o_id: user.id, + object: user.class, + ) + + provided = process( + remote_id: remote_id, + model_class: user.class, + external_sync_source: external_sync_source, + ) + + expect(provided[:instance]).to eq(user) + end +end 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 new file mode 100644 index 000000000..9305c1490 --- /dev/null +++ b/spec/lib/sequencer/unit/import/common/model/reset_primary_key_sequence_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +RSpec.describe Sequencer::Unit::Import::Common::Model::ResetPrimaryKeySequence, sequencer: :unit do + + it 'calls DbHelper.import_post for given model_class' do + + model_class = ::User + + expect(DbHelper).to receive(:import_post).with(model_class.table_name) + + provided = process( + model_class: model_class, + ) + end +end diff --git a/spec/lib/sequencer/unit/import/common/object_attribute/sanitized_name_spec.rb b/spec/lib/sequencer/unit/import/common/object_attribute/sanitized_name_spec.rb new file mode 100644 index 000000000..ea4d43c40 --- /dev/null +++ b/spec/lib/sequencer/unit/import/common/object_attribute/sanitized_name_spec.rb @@ -0,0 +1,46 @@ +require 'rails_helper' + +RSpec.describe Sequencer::Unit::Import::Common::ObjectAttribute::SanitizedName, sequencer: :unit do + + it 'requires implementation of .unsanitized_name' do + + expect do + process + end.to raise_error(RuntimeError) + end + + context 'sanitizes' do + + it 'whitespaces' do + provided = process do |instance| + expect(instance).to receive(:unsanitized_name).and_return('model name') + end + + expect(provided[:sanitized_name]).to eq('model_name') + end + + it 'dashes' do + provided = process do |instance| + expect(instance).to receive(:unsanitized_name).and_return('model-name') + end + + expect(provided[:sanitized_name]).to eq('model_name') + end + + it 'ids suffix' do + provided = process do |instance| + expect(instance).to receive(:unsanitized_name).and_return('Model Ids') + end + + expect(provided[:sanitized_name]).to eq('model_nos') + end + + it 'id suffix' do + provided = process do |instance| + expect(instance).to receive(:unsanitized_name).and_return('Model Id') + end + + expect(provided[:sanitized_name]).to eq('model_no') + end + end +end diff --git a/spec/lib/sequencer/unit/import/common/remote_id/case_insensitive_spec.rb b/spec/lib/sequencer/unit/import/common/remote_id/case_insensitive_spec.rb new file mode 100644 index 000000000..cc4ffd2ee --- /dev/null +++ b/spec/lib/sequencer/unit/import/common/remote_id/case_insensitive_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +RSpec.describe Sequencer::Unit::Import::Common::RemoteId::CaseInsensitive, sequencer: :unit do + + it 'overwrites the remote_id with the downcased version of it' do + + remote_id = 'SomeRandom@EmailExample.com' + + provided = process( + remote_id: remote_id, + ) + + expect(provided[:remote_id]).to eq(remote_id.downcase) + end +end diff --git a/spec/lib/sequencer/unit/import/common/remote_id/case_sensitive_spec.rb b/spec/lib/sequencer/unit/import/common/remote_id/case_sensitive_spec.rb new file mode 100644 index 000000000..fe4096046 --- /dev/null +++ b/spec/lib/sequencer/unit/import/common/remote_id/case_sensitive_spec.rb @@ -0,0 +1,16 @@ +require 'rails_helper' + +RSpec.describe Sequencer::Unit::Import::Common::RemoteId::CaseSensitive, sequencer: :unit do + + it 'overwrites the remote_id with the the SHA-2 hashed version of it' do + + remote_id = 'Zammad!' + hashed = '07071585f063b37b8288021f541d8c3cee3265f34e258c8b0bd926378ce03c97' + + provided = process( + remote_id: remote_id, + ) + + expect(provided[:remote_id]).to eq(hashed) + end +end diff --git a/spec/lib/sequencer/unit/import/ldap/user/attributes/role_ids/signup_spec.rb b/spec/lib/sequencer/unit/import/ldap/user/attributes/role_ids/signup_spec.rb new file mode 100644 index 000000000..29698336f --- /dev/null +++ b/spec/lib/sequencer/unit/import/ldap/user/attributes/role_ids/signup_spec.rb @@ -0,0 +1,54 @@ +require 'rails_helper' + +RSpec.describe Sequencer::Unit::Import::Ldap::User::Attributes::RoleIds::Signup, sequencer: :unit do + + it "doesn't provide mapped role_ids if already provided" do + + ldap_config = { + group_role_map: { + 'a' => 'b' + } + } + + mapped = { + role_ids: [1, 2] + } + + provided = process( + ldap_config: ldap_config, + mapped: mapped, + ) + + expect(provided[:mapped][:role_ids]).to eq(mapped[:role_ids]) + end + + it "doesn't provide mapped role_ids if no LDAP Group <-> Zammad Role mapping is configured" do + + ldap_config = { + group_role_map: {} + } + + provided = process( + ldap_config: ldap_config, + mapped: {}, + ) + + expect(provided[:mapped]).not_to have_key(:role_ids) + end + + it 'ensures Signup Roles if no mapped role_ids are assigned' do + + ldap_config = { + group_role_map: { + 'a' => 'b' + } + } + + provided = process( + ldap_config: ldap_config, + mapped: {}, + ) + + expect(provided[:mapped][:role_ids]).not_to be_nil + end +end diff --git a/spec/lib/sequencer/unit/import/ldap/user/lookup/attributes_spec.rb b/spec/lib/sequencer/unit/import/ldap/user/lookup/attributes_spec.rb new file mode 100644 index 000000000..a3ba06c4e --- /dev/null +++ b/spec/lib/sequencer/unit/import/ldap/user/lookup/attributes_spec.rb @@ -0,0 +1,64 @@ +require 'rails_helper' + +RSpec.describe Sequencer::Unit::Import::Ldap::User::Lookup::Attributes, sequencer: :unit do + + let(:model_class) { ::User } + let(:external_sync_source) { 'test' } + + it 'finds entries via lookup attributes' do + + current_user = create(:user) + + # ExternalSync.create( + # source: external_sync_source, + # source_id: remote_id, + # o_id: user.id, + # object: user.class, + # ) + + provided = process( + found_ids: [], + model_class: model_class, + external_sync_source: external_sync_source, + mapped: { + login: current_user.login, + email: current_user.email, + } + ) + + expect(provided[:instance]).to eq(current_user) + end + + it "doesn't find already synced/found entries with same lookup attributes" do + + other_user = create(:user) + + provided = process( + found_ids: [other_user.id], + model_class: model_class, + external_sync_source: external_sync_source, + mapped: { + login: other_user.login, + email: other_user.email, + } + ) + + expect(provided[:instance]).to be_nil + end + + it "doesn't not synced users" do + + provided = process( + found_ids: [], + model_class: model_class, + external_sync_source: external_sync_source, + mapped: { + login: 'example.login', + email: 'test@example.com', + } + ) + + expect(provided[:instance]).to be_nil + end + +end diff --git a/spec/lib/sequencer/unit/import/ldap/user/mapping_spec.rb b/spec/lib/sequencer/unit/import/ldap/user/mapping_spec.rb new file mode 100644 index 000000000..8ec256d92 --- /dev/null +++ b/spec/lib/sequencer/unit/import/ldap/user/mapping_spec.rb @@ -0,0 +1,27 @@ +require 'rails_helper' + +RSpec.describe Sequencer::Unit::Import::Ldap::User::Mapping, sequencer: :unit do + + it 'ensures to unset attribute value if none is provided' do + + ldap_config = { + user_attributes: { + firstName: 'firstname', + lastName: 'lastname', + samaccountname: 'login', + } + } + + resource = { + samaccountname: 'Some41', + firstName: 'Some', + } + + provided = process( + ldap_config: ldap_config, + resource: resource, + ) + + expect(provided['lastname']).to be_nil + end +end diff --git a/spec/lib/sequencer/unit/import/ldap/user/remote_id/unhex_spec.rb b/spec/lib/sequencer/unit/import/ldap/user/remote_id/unhex_spec.rb new file mode 100644 index 000000000..a514acfb6 --- /dev/null +++ b/spec/lib/sequencer/unit/import/ldap/user/remote_id/unhex_spec.rb @@ -0,0 +1,24 @@ +require 'rails_helper' + +RSpec.describe Sequencer::Unit::Import::Ldap::User::RemoteId::Unhex, sequencer: :unit do + + it 'unhexes hexed UID remote_ids' do + + provided = process( + remote_id: "a\xB3B\xF7\xC62\x92J\xBA\xAA\xEA\xAE}\xF6W\xEE", + ) + + expect(provided[:remote_id]).to eq('f742b361-32c6-4a92-baaa-eaae7df657ee') + end + + it 'ignores not hexed remote_ids' do + + remote_id = 'f742b361-32c6-4a92-baaa-eaae7df657ee' + + provided = process( + remote_id: remote_id, + ) + + expect(provided[:remote_id]).to eq(remote_id) + end +end diff --git a/spec/models/concerns/has_groups_examples.rb b/spec/models/concerns/has_groups_examples.rb index 331bca593..a547208f4 100644 --- a/spec/models/concerns/has_groups_examples.rb +++ b/spec/models/concerns/has_groups_examples.rb @@ -55,7 +55,7 @@ RSpec.shared_examples 'HasGroups' do group_access_instance.group_names_access_map = { group_full.name => 'full', group_read.name => 'read', - group_inactive.name => 'write', + group_inactive.name => 'change', } end @@ -72,7 +72,7 @@ RSpec.shared_examples 'HasGroups' do end it 'filters for given access list parameter' do - expect(group_access_instance.groups.access('read', 'write')).to include(group_read, group_inactive) + expect(group_access_instance.groups.access('read', 'change')).to include(group_read, group_inactive) end it 'always includes full access groups' do @@ -161,7 +161,7 @@ RSpec.shared_examples 'HasGroups' do end it "doesn't list for no access" do - result = group_access_instance.group_ids_access('write') + result = group_access_instance.group_ids_access('change') expect(result).not_to include(group_read.id) end end @@ -169,12 +169,12 @@ RSpec.shared_examples 'HasGroups' do context 'access list' do it 'lists access Group IDs' do - result = group_access_instance.group_ids_access(%w(read write)) + result = group_access_instance.group_ids_access(%w[read edit]) expect(result).to include(group_read.id) end it "doesn't list for no access" do - result = group_access_instance.group_ids_access(%w(write create)) + result = group_access_instance.group_ids_access(%w[edit create]) expect(result).not_to include(group_read.id) end end @@ -223,7 +223,7 @@ RSpec.shared_examples 'HasGroups' do expect do group_access_instance.group_names_access_map = { group_full.name => 'full', - group_read.name => %w(read write), + group_read.name => %w[read edit], } end.to change { described_class.group_through.klass.count @@ -309,7 +309,7 @@ RSpec.shared_examples 'HasGroups' do expect do group_access_instance.group_ids_access_map = { group_full.id => 'full', - group_read.id => %w(read write), + group_read.id => %w[read edit], } end.to change { described_class.group_through.klass.count @@ -497,7 +497,7 @@ RSpec.shared_examples 'HasGroups' do group_access_instance.group_names_access_map = { group_full.name => 'full', group_read.name => 'read', - group_inactive.name => 'write', + group_inactive.name => 'change', } expect do group_access_instance.destroy @@ -516,18 +516,18 @@ RSpec.shared_examples '#group_access? call' do end it 'checks negative' do - expect(group_access_instance.group_access?(group_parameter, 'write')).to be false + expect(group_access_instance.group_access?(group_parameter, 'change')).to be false end end context 'access list' do it 'checks positive' do - expect(group_access_instance.group_access?(group_parameter, %w(read write))).to be true + expect(group_access_instance.group_access?(group_parameter, %w[read edit])).to be true end it 'checks negative' do - expect(group_access_instance.group_access?(group_parameter, %w(write create))).to be false + expect(group_access_instance.group_access?(group_parameter, %w[edit create])).to be false end end end @@ -540,18 +540,18 @@ RSpec.shared_examples '.group_access call' do end it 'excludes non access IDs' do - expect(described_class.group_access(group_parameter, 'write')).not_to include(group_access_instance) + expect(described_class.group_access(group_parameter, 'change')).not_to include(group_access_instance) end end context 'access list' do it 'lists access IDs' do - expect(described_class.group_access(group_parameter, %w(read write))).to include(group_access_instance) + expect(described_class.group_access(group_parameter, %w[read edit])).to include(group_access_instance) end it 'excludes non access IDs' do - expect(described_class.group_access(group_parameter, %w(write create))).not_to include(group_access_instance) + expect(described_class.group_access(group_parameter, %w[edit create])).not_to include(group_access_instance) end end end diff --git a/spec/models/concerns/has_roles_examples.rb b/spec/models/concerns/has_roles_examples.rb index cc86565e4..38d9f9446 100644 --- a/spec/models/concerns/has_roles_examples.rb +++ b/spec/models/concerns/has_roles_examples.rb @@ -165,7 +165,7 @@ RSpec.shared_examples 'HasRoles' do end it "doesn't list for no access" do - result = group_access_instance.group_ids_access('write') + result = group_access_instance.group_ids_access('change') expect(result).not_to include(group_role.id) end @@ -182,12 +182,12 @@ RSpec.shared_examples 'HasRoles' do context 'access list' do it 'lists access Group IDs' do - result = group_access_instance.group_ids_access(%w(read write)) + result = group_access_instance.group_ids_access(%w[read change]) expect(result).to include(group_role.id) end it "doesn't list for no access" do - result = group_access_instance.group_ids_access(%w(write create)) + result = group_access_instance.group_ids_access(%w[change create]) expect(result).not_to include(group_role.id) end @@ -196,7 +196,7 @@ RSpec.shared_examples 'HasRoles' do group_role.name => 'read', } - result = group_access_instance.group_ids_access(%w(read create)) + result = group_access_instance.group_ids_access(%w[read create]) expect(result.uniq).to eq(result) end end @@ -230,18 +230,18 @@ RSpec.shared_examples '#role_access? call' do end it 'checks negative' do - expect(group_access_instance.role_access?(group_parameter, 'write')).to be false + expect(group_access_instance.role_access?(group_parameter, 'change')).to be false end end context 'access list' do it 'checks positive' do - expect(group_access_instance.role_access?(group_parameter, %w(read write))).to be true + expect(group_access_instance.role_access?(group_parameter, %w[read change])).to be true end it 'checks negative' do - expect(group_access_instance.role_access?(group_parameter, %w(write create))).to be false + expect(group_access_instance.role_access?(group_parameter, %w[change create])).to be false end end end @@ -254,18 +254,18 @@ RSpec.shared_examples '.role_access_ids call' do end it 'excludes non access IDs' do - expect(described_class.role_access_ids(group_parameter, 'write')).not_to include(group_access_instance.id) + expect(described_class.role_access_ids(group_parameter, 'change')).not_to include(group_access_instance.id) end end context 'access list' do it 'lists access IDs' do - expect(described_class.role_access_ids(group_parameter, %w(read write))).to include(group_access_instance.id) + expect(described_class.role_access_ids(group_parameter, %w[read change])).to include(group_access_instance.id) end it 'excludes non access IDs' do - expect(described_class.role_access_ids(group_parameter, %w(write create))).not_to include(group_access_instance.id) + expect(described_class.role_access_ids(group_parameter, %w[change create])).not_to include(group_access_instance.id) end end end diff --git a/spec/models/cti/caller_id_spec.rb b/spec/models/cti/caller_id_spec.rb index f7c7a5bd1..8d450ba1f 100644 --- a/spec/models/cti/caller_id_spec.rb +++ b/spec/models/cti/caller_id_spec.rb @@ -5,9 +5,9 @@ RSpec.describe Cti::CallerId do describe 'extract_numbers' do it { expect(described_class.extract_numbers("some text\ntest 123")).to eq [] } it { expect(described_class.extract_numbers('Lorem ipsum dolor sit amet, consectetuer +49 (0) 30 60 00 00 00-0 adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel.')).to eq ['4930600000000'] } - it { expect(described_class.extract_numbers("GS Oberalteich\nTelefon 09422 1000 Telefax 09422 805000\nE-Mail: ")).to eq %w(4994221000 499422805000) } - it { expect(described_class.extract_numbers('Tel +41 81 288 63 93 / +41 76 346 72 14 ...')).to eq %w(41812886393 41763467214) } - it { expect(described_class.extract_numbers("P: +1 (949) 431 0000\nF: +1 (949) 431 0001\nW: http://znuny")).to eq %w(19494310000 19494310001) } + it { expect(described_class.extract_numbers("GS Oberalteich\nTelefon 09422 1000 Telefax 09422 805000\nE-Mail: ")).to eq %w[4994221000 499422805000] } + it { expect(described_class.extract_numbers('Tel +41 81 288 63 93 / +41 76 346 72 14 ...')).to eq %w[41812886393 41763467214] } + it { expect(described_class.extract_numbers("P: +1 (949) 431 0000\nF: +1 (949) 431 0001\nW: http://znuny")).to eq %w[19494310000 19494310001] } end describe 'normalize_number' do diff --git a/spec/models/taskbar_spec.rb b/spec/models/taskbar_spec.rb index 83d5e3e58..346e246d5 100644 --- a/spec/models/taskbar_spec.rb +++ b/spec/models/taskbar_spec.rb @@ -27,7 +27,7 @@ RSpec.describe Taskbar do end it 'state' do - expect(taskbar.state.empty?).to eq(true) + expect(taskbar.state.blank?).to eq(true) end it 'check last_contact' do diff --git a/spec/models/translation_spec.rb b/spec/models/translation_spec.rb index 1c78441eb..642207422 100644 --- a/spec/models/translation_spec.rb +++ b/spec/models/translation_spec.rb @@ -99,7 +99,7 @@ RSpec.describe Translation do it 'check download of locales' do version = Version.get directory = Rails.root.join('config') - file = Rails.root.join("#{directory}/locales-#{version}.yml") + file = Rails.root.join(directory, "locales-#{version}.yml") if File.exist?(file) File.delete(file) end @@ -111,11 +111,11 @@ RSpec.describe Translation do it 'check download of translations' do version = Version.get locale = 'de-de' - directory = Rails.root.join('config/translations') + directory = Rails.root.join('config', 'translations') if File.directory?(directory) FileUtils.rm_rf(directory) end - file = Rails.root.join("#{directory}/#{locale}-#{version}.yml") + file = Rails.root.join(directory, "#{locale}-#{version}.yml") expect(File.exist?(file)).to be false Translation.fetch(locale) expect(File.exist?(file)).to be true diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 2fb7affaa..0e350a2ec 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -21,7 +21,7 @@ require 'rspec/rails' # directory. Alternatively, in the individual `*_spec.rb` files, manually # require only the support files necessary. # -Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f } +Dir[Rails.root.join('spec', 'support', '**', '*.rb')].each { |f| require f } # Checks for pending migration and applies them before tests are run. # If you are not using ActiveRecord, you can remove this line. diff --git a/spec/support/factory_bot.rb b/spec/support/factory_bot.rb new file mode 100644 index 000000000..c7890e49c --- /dev/null +++ b/spec/support/factory_bot.rb @@ -0,0 +1,3 @@ +RSpec.configure do |config| + config.include FactoryBot::Syntax::Methods +end diff --git a/spec/support/factory_girl.rb b/spec/support/factory_girl.rb deleted file mode 100644 index eec437fb3..000000000 --- a/spec/support/factory_girl.rb +++ /dev/null @@ -1,3 +0,0 @@ -RSpec.configure do |config| - config.include FactoryGirl::Syntax::Methods -end diff --git a/spec/support/sequencer.rb b/spec/support/sequencer.rb index bbbfa9f8b..ade60d0a1 100644 --- a/spec/support/sequencer.rb +++ b/spec/support/sequencer.rb @@ -1,6 +1,6 @@ module SequencerUnit - def process(parameters, &block) + def process(parameters = {}, &block) Sequencer::Unit.process(described_class.name, parameters, &block) end end @@ -13,7 +13,31 @@ module SequencerSequence end end +module SequencerCaller + + def expect_sequence(sequence_name = nil) + + expected_method_call = receive(:process) + if sequence_name + expected_method_call.with(sequence_name) + end + + expect(Sequencer).to expected_method_call + end + + def expect_no_sequence(sequence_name = nil) + + expected_method_call = receive(:process) + if sequence_name + expected_method_call.with(sequence_name) + end + + expect(Sequencer).not_to expected_method_call + end +end + RSpec.configure do |config| config.include SequencerUnit, sequencer: :unit config.include SequencerSequence, sequencer: :sequence + config.include SequencerCaller, sequencer: :caller end diff --git a/spec/support/system_init.rb b/spec/support/system_init.rb index 3b4bcec18..a7d554f83 100644 --- a/spec/support/system_init.rb +++ b/spec/support/system_init.rb @@ -3,13 +3,13 @@ RSpec.configure do |config| email = 'admin@example.com' if !::User.exists?(email: email) - FactoryGirl.create(:user, - login: 'admin', - firstname: 'Admin', - lastname: 'Admin', - email: email, - password: 'admin', - roles: [Role.lookup(name: 'Admin')],) + FactoryBot.create(:user, + login: 'admin', + firstname: 'Admin', + lastname: 'Admin', + email: email, + password: 'admin', + roles: [Role.lookup(name: 'Admin')],) end end end diff --git a/test/browser/aaa_getting_started_test.rb b/test/browser/aaa_getting_started_test.rb index ebe5588bc..6a6857dbe 100644 --- a/test/browser/aaa_getting_started_test.rb +++ b/test/browser/aaa_getting_started_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AaaGettingStartedTest < TestCase @@ -211,7 +211,7 @@ class AaaGettingStartedTest < TestCase } accounts.push account end - if accounts.empty? + if accounts.blank? #raise "Need min. MAILBOX_AUTO1 as ENV variable like export MAILBOX_AUTO1='nicole.braun2015@gmail.com:somepass'" puts "NOTICE: Need min. MAILBOX_AUTO1 as ENV variable like export MAILBOX_AUTO1='nicole.braun2015@gmail.com:somepass'" return @@ -282,7 +282,7 @@ class AaaGettingStartedTest < TestCase } accounts.push account end - if accounts.empty? + if accounts.blank? #raise "Need min. MAILBOX_MANUAL1 as ENV variable like export MAILBOX_MANUAL1='nicole.bauer2015@yahoo.de:somepass:imap.mail.yahoo.com:smtp.mail.yahoo.com'" puts "NOTICE: Need min. MAILBOX_MANUAL1 as ENV variable like export MAILBOX_MANUAL1='nicole.bauer2015@yahoo.de:somepass:imap.mail.yahoo.com:smtp.mail.yahoo.com'" return diff --git a/test/browser/aab_basic_urls_test.rb b/test/browser/aab_basic_urls_test.rb index 83b106611..5bd5838cf 100644 --- a/test/browser/aab_basic_urls_test.rb +++ b/test/browser/aab_basic_urls_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AABBasicUrlsTest < TestCase diff --git a/test/browser/aab_unit_test.rb b/test/browser/aab_unit_test.rb index 94a960793..fab47d2de 100644 --- a/test/browser/aab_unit_test.rb +++ b/test/browser/aab_unit_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AAbUnitTest < TestCase diff --git a/test/browser/aac_basic_richtext_test.rb b/test/browser/aac_basic_richtext_test.rb index 46d276e18..c3e026954 100644 --- a/test/browser/aac_basic_richtext_test.rb +++ b/test/browser/aac_basic_richtext_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AACBasicRichtextTest < TestCase diff --git a/test/browser/abb_one_group_test.rb b/test/browser/abb_one_group_test.rb index 13de33b8a..a24cac5fb 100644 --- a/test/browser/abb_one_group_test.rb +++ b/test/browser/abb_one_group_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AgentTicketActionLevel0Test < TestCase diff --git a/test/browser/admin_channel_email_test.rb b/test/browser/admin_channel_email_test.rb index 78acf93d2..3ff92b526 100644 --- a/test/browser/admin_channel_email_test.rb +++ b/test/browser/admin_channel_email_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AdminChannelEmailTest < TestCase diff --git a/test/browser/admin_object_manager_test.rb b/test/browser/admin_object_manager_test.rb index 0e93c0cd3..691cb5a55 100644 --- a/test/browser/admin_object_manager_test.rb +++ b/test/browser/admin_object_manager_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 +# rubocop:disable Lint/BooleanSymbol require 'browser_test_helper' class AdminObjectManagerTest < TestCase diff --git a/test/browser/admin_overview_test.rb b/test/browser/admin_overview_test.rb index 94a577ea7..87b6791f5 100644 --- a/test/browser/admin_overview_test.rb +++ b/test/browser/admin_overview_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AdminOverviewTest < TestCase diff --git a/test/browser/admin_role_test.rb b/test/browser/admin_role_test.rb index 5c34baffa..da4e862b0 100644 --- a/test/browser/admin_role_test.rb +++ b/test/browser/admin_role_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AdminRoleTest < TestCase diff --git a/test/browser/agent_navigation_and_title_test.rb b/test/browser/agent_navigation_and_title_test.rb index d2b141d8c..499ca87b0 100644 --- a/test/browser/agent_navigation_and_title_test.rb +++ b/test/browser/agent_navigation_and_title_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AgentNavigationAndTitleTest < TestCase diff --git a/test/browser/agent_organization_profile_test.rb b/test/browser/agent_organization_profile_test.rb index 6c8051509..89826290d 100644 --- a/test/browser/agent_organization_profile_test.rb +++ b/test/browser/agent_organization_profile_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AgentOrganizationProfileTest < TestCase diff --git a/test/browser/agent_ticket_attachment_test.rb b/test/browser/agent_ticket_attachment_test.rb index 2e35f5f56..e309ca91c 100644 --- a/test/browser/agent_ticket_attachment_test.rb +++ b/test/browser/agent_ticket_attachment_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AgentTicketAttachmentTest < TestCase diff --git a/test/browser/agent_ticket_create_reset_customer_selection_test.rb b/test/browser/agent_ticket_create_reset_customer_selection_test.rb new file mode 100644 index 000000000..29ebe49dc --- /dev/null +++ b/test/browser/agent_ticket_create_reset_customer_selection_test.rb @@ -0,0 +1,244 @@ + +require 'browser_test_helper' + +class AgentTicketCreateResetCustomerSelectionTest < TestCase + def test_clear_customer + @browser = browser_instance + login( + username: 'master@example.com', + password: 'test', + url: browser_url, + ) + tasks_close_all() + + click(css: 'a[href="#new"]') + click(css: 'a[href="#ticket/create"]') + sleep 2 + + exists(css: '.content.active .newTicket') + exists(css: '.content.active .tabsSidebar .sidebar[data-tab="template"]') + exists(css: '.content.active .tabsSidebar .tabsSidebar-tab.active[data-tab="template"]') + + exists_not(css: '.content.active .tabsSidebar .sidebar[data-tab="customer"]') + exists_not(css: '.content.active .tabsSidebar .tabsSidebar-tab[data-tab="customer"]') + + click(css: '.content.active .newTicket [name="customer_id_completion"]') + + # check if pulldown is open, it's not working stable via selenium + @browser.execute_script( "$('.content.active .newTicket .js-recipientDropdown').addClass('open')" ) + + set( + css: '.content.active .newTicket input[name="customer_id_completion"]', + value: 'nicole', + ) + + sleep 2 + sendkey(value: :enter) + sleep 1 + + exists(css: '.content.active .newTicket') + exists(css: '.content.active .tabsSidebar .sidebar[data-tab="template"]') + exists(css: '.content.active .tabsSidebar .tabsSidebar-tab.active[data-tab="template"]') + + exists(css: '.content.active .tabsSidebar .sidebar[data-tab="customer"]') + exists(css: '.content.active .tabsSidebar .tabsSidebar-tab[data-tab="customer"]') + + set( + css: '.content.active .newTicket input[name="customer_id_completion"]', + value: '', + ) + sendkey(value: :backspace) + + sleep 1 + + exists(css: '.content.active .newTicket') + exists(css: '.content.active .tabsSidebar .sidebar[data-tab="template"]') + exists(css: '.content.active .tabsSidebar .tabsSidebar-tab.active[data-tab="template"]') + + exists_not(css: '.content.active .tabsSidebar .sidebar[data-tab="customer"]') + exists_not(css: '.content.active .tabsSidebar .tabsSidebar-tab[data-tab="customer"]') + + set( + css: '.content.active .newTicket input[name="title"]', + value: 'some title', + ) + + set( + css: '.content.active .newTicket div[data-name="body"]', + value: 'some body', + ) + + select( + css: '.content.active .newTicket select[name="group_id"]', + value: 'Users', + ) + + click(css: '.content.active .newTicket .js-submit') + + watch_for( + css: '.content.active .newTicket .user_autocompletion.form-group.has-error', + ) + + # cleanup + tasks_close_all() + end + + def test_clear_customer_use_email + @browser = browser_instance + login( + username: 'master@example.com', + password: 'test', + url: browser_url, + ) + tasks_close_all() + + click(css: 'a[href="#new"]') + click(css: 'a[href="#ticket/create"]') + sleep 2 + + exists(css: '.content.active .newTicket') + exists(css: '.content.active .tabsSidebar .sidebar[data-tab="template"]') + exists(css: '.content.active .tabsSidebar .tabsSidebar-tab.active[data-tab="template"]') + + exists_not(css: '.content.active .tabsSidebar .sidebar[data-tab="customer"]') + exists_not(css: '.content.active .tabsSidebar .tabsSidebar-tab[data-tab="customer"]') + + click(css: '.content.active .newTicket [name="customer_id_completion"]') + + # check if pulldown is open, it's not working stable via selenium + @browser.execute_script( "$('.content.active .newTicket .js-recipientDropdown').addClass('open')" ) + + set( + css: '.content.active .newTicket input[name="customer_id_completion"]', + value: 'nicole', + ) + + sleep 2 + sendkey(value: :enter) + sleep 1 + + exists(css: '.content.active .newTicket') + exists(css: '.content.active .tabsSidebar .sidebar[data-tab="template"]') + exists(css: '.content.active .tabsSidebar .tabsSidebar-tab.active[data-tab="template"]') + + exists(css: '.content.active .tabsSidebar .sidebar[data-tab="customer"]') + exists(css: '.content.active .tabsSidebar .tabsSidebar-tab[data-tab="customer"]') + + set( + css: '.content.active .newTicket input[name="customer_id_completion"]', + value: '', + ) + sendkey(value: :backspace) + + sleep 1 + + exists(css: '.content.active .newTicket') + exists(css: '.content.active .tabsSidebar .sidebar[data-tab="template"]') + exists(css: '.content.active .tabsSidebar .tabsSidebar-tab.active[data-tab="template"]') + + exists_not(css: '.content.active .tabsSidebar .sidebar[data-tab="customer"]') + exists_not(css: '.content.active .tabsSidebar .tabsSidebar-tab[data-tab="customer"]') + + set( + css: '.content.active .newTicket input[name="customer_id_completion"]', + value: 'somecustomer_not_existing_right_now@example.com', + ) + + set( + css: '.content.active .newTicket input[name="title"]', + value: 'some title', + ) + + set( + css: '.content.active .newTicket div[data-name="body"]', + value: 'some body', + ) + + select( + css: '.content.active .newTicket select[name="group_id"]', + value: 'Users', + ) + + click(css: '.content.active .newTicket .js-submit') + + watch_for( + css: '.content.active .ticketZoom-header .ticket-number', + value: '\d', + ) + + click(css: '.content.active .tabsSidebar-tabs .tabsSidebar-tab[data-tab="customer"]') + + match( + css: '.content.active .tabsSidebar .sidebar[data-tab="customer"]', + value: 'somecustomer_not_existing_right_now@example.com', + ) + + click(css: '.content.active .tabsSidebar .sidebar[data-tab="customer"] .js-actions') + click(css: '.content.active .tabsSidebar .sidebar[data-tab="customer"] .js-actions li[data-type="customer-change"]') + + watch_for( + css: '.content.active .modal', + ) + + exists_not( + css: '.content.active .modal .user_autocompletion.form-group.has-error', + ) + + click(css: '.content.active .modal .js-submit') + + watch_for( + css: '.content.active .modal .user_autocompletion.form-group.has-error', + ) + + set( + css: '.content.active .modal input[name="customer_id_completion"]', + value: 'master', + ) + + click(css: '.content.active .modal .js-submit') + + watch_for( + css: '.content.active .modal .user_autocompletion.form-group.has-error', + ) + + set( + css: '.content.active .modal input[name="customer_id_completion"]', + value: 'master', + ) + + sendkey(value: :enter) + sleep 1 + + set( + css: '.content.active .modal input[name="customer_id_completion"]', + value: '', + ) + sendkey(value: :backspace) + sleep 1 + + click(css: '.content.active .modal .js-submit') + + watch_for( + css: '.content.active .modal .user_autocompletion.form-group.has-error', + ) + + set( + css: '.content.active .modal input[name="customer_id_completion"]', + value: 'master', + ) + + sendkey(value: :enter) + sleep 1 + + click(css: '.content.active .modal .js-submit') + #click(css: '.content.active .tabsSidebar-tabs .tabsSidebar-tab[data-tab="customer"]') + + watch_for( + css: '.content.active .tabsSidebar .sidebar[data-tab="customer"]', + value: 'master@example.com', + ) + + # cleanup + tasks_close_all() + end +end 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 20f793241..3878d2e85 100644 --- a/test/browser/agent_ticket_email_reply_keep_body_test.rb +++ b/test/browser/agent_ticket_email_reply_keep_body_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AgentTicketEmailReplyKeepBodyTest < TestCase diff --git a/test/browser/agent_ticket_email_signature_test.rb b/test/browser/agent_ticket_email_signature_test.rb index 3e8ad43cb..e5cd13b5f 100644 --- a/test/browser/agent_ticket_email_signature_test.rb +++ b/test/browser/agent_ticket_email_signature_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AgentTicketEmailSignatureTest < TestCase diff --git a/test/browser/agent_ticket_link_test.rb b/test/browser/agent_ticket_link_test.rb index 60769d51d..5eb964a11 100644 --- a/test/browser/agent_ticket_link_test.rb +++ b/test/browser/agent_ticket_link_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AgentTicketLinkTest < TestCase diff --git a/test/browser/agent_ticket_macro_test.rb b/test/browser/agent_ticket_macro_test.rb index aeff466a0..94a5730d8 100644 --- a/test/browser/agent_ticket_macro_test.rb +++ b/test/browser/agent_ticket_macro_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AgentTicketMacroTest < TestCase diff --git a/test/browser/agent_ticket_merge_test.rb b/test/browser/agent_ticket_merge_test.rb index 4582aa2f0..27ed3b6eb 100644 --- a/test/browser/agent_ticket_merge_test.rb +++ b/test/browser/agent_ticket_merge_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AgentTicketMergeTest < TestCase diff --git a/test/browser/agent_ticket_online_notification_test.rb b/test/browser/agent_ticket_online_notification_test.rb index 7300e6560..db0bd9e0e 100644 --- a/test/browser/agent_ticket_online_notification_test.rb +++ b/test/browser/agent_ticket_online_notification_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AgentTicketOnlineNotificationTest < TestCase diff --git a/test/browser/agent_ticket_overview_level0_test.rb b/test/browser/agent_ticket_overview_level0_test.rb index 3385b6dca..8c1fc1e72 100644 --- a/test/browser/agent_ticket_overview_level0_test.rb +++ b/test/browser/agent_ticket_overview_level0_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AgentTicketOverviewLevel0Test < TestCase diff --git a/test/browser/agent_ticket_overview_level1_test.rb b/test/browser/agent_ticket_overview_level1_test.rb index 4200c37a3..2f6ebdc7c 100644 --- a/test/browser/agent_ticket_overview_level1_test.rb +++ b/test/browser/agent_ticket_overview_level1_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AgentTicketOverviewLevel1Test < TestCase diff --git a/test/browser/agent_ticket_overview_tab_test.rb b/test/browser/agent_ticket_overview_tab_test.rb index 80d495d26..b38a524f5 100644 --- a/test/browser/agent_ticket_overview_tab_test.rb +++ b/test/browser/agent_ticket_overview_tab_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AgentTicketOverviewTabTest < TestCase diff --git a/test/browser/agent_ticket_tag_test.rb b/test/browser/agent_ticket_tag_test.rb index 337d2ab13..1d881b5e7 100644 --- a/test/browser/agent_ticket_tag_test.rb +++ b/test/browser/agent_ticket_tag_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AgentTicketTagTest < TestCase diff --git a/test/browser/agent_ticket_text_module_test.rb b/test/browser/agent_ticket_text_module_test.rb index 4a32f5c8b..47324b771 100644 --- a/test/browser/agent_ticket_text_module_test.rb +++ b/test/browser/agent_ticket_text_module_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AgentTicketTextModuleTest < TestCase @@ -101,7 +101,7 @@ class AgentTicketTextModuleTest < TestCase data: { name: 'some name' + random, keywords: random, - content: 'some content #{ticket.customer.lastname}' + random, + content: "some content \#{ticket.customer.lastname}#{random}", }, ) diff --git a/test/browser/agent_ticket_time_accounting_test.rb b/test/browser/agent_ticket_time_accounting_test.rb index 983355938..fcfc2ef84 100644 --- a/test/browser/agent_ticket_time_accounting_test.rb +++ b/test/browser/agent_ticket_time_accounting_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AgentTicketTimeAccountingTest < TestCase diff --git a/test/browser/agent_ticket_update1_test.rb b/test/browser/agent_ticket_update1_test.rb index c758ee841..5f9be5085 100644 --- a/test/browser/agent_ticket_update1_test.rb +++ b/test/browser/agent_ticket_update1_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AgentTicketUpdate1Test < TestCase diff --git a/test/browser/agent_ticket_update2_test.rb b/test/browser/agent_ticket_update2_test.rb index 6b70eac23..6a1c0ace1 100644 --- a/test/browser/agent_ticket_update2_test.rb +++ b/test/browser/agent_ticket_update2_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AgentTicketUpdate2Test < TestCase diff --git a/test/browser/agent_ticket_update3_test.rb b/test/browser/agent_ticket_update3_test.rb index ddf3b9dd7..9dc52755b 100644 --- a/test/browser/agent_ticket_update3_test.rb +++ b/test/browser/agent_ticket_update3_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AgentTicketUpdate3Test < TestCase diff --git a/test/browser/agent_ticket_update_and_reload_test.rb b/test/browser/agent_ticket_update_and_reload_test.rb index 27a5583d1..9f8d3083d 100644 --- a/test/browser/agent_ticket_update_and_reload_test.rb +++ b/test/browser/agent_ticket_update_and_reload_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AgentTicketUpdateAndReloadTest < TestCase diff --git a/test/browser/agent_user_manage_test.rb b/test/browser/agent_user_manage_test.rb index 282dcbd38..4c82d1b16 100644 --- a/test/browser/agent_user_manage_test.rb +++ b/test/browser/agent_user_manage_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AgentUserManageTest < TestCase @@ -19,17 +19,17 @@ class AgentUserManageTest < TestCase sleep 1 # create customer - click( css: 'a[href="#new"]' ) - click( css: 'a[href="#ticket/create"]' ) - click( css: '.active .newTicket [name="customer_id_completion"]' ) + click(css: 'a[href="#new"]') + click(css: 'a[href="#ticket/create"]') + click(css: '.active .newTicket [name="customer_id_completion"]') # check if pulldown is open, it's not working stable via selenium @browser.execute_script( "$('.active .newTicket .js-recipientDropdown').addClass('open')" ) sleep 1 - sendkey( value: :arrow_down ) + sendkey(value: :arrow_down) sleep 0.5 - click( css: '.active .newTicket .recipientList-entry.js-objectNew' ) + click(css: '.active .newTicket .recipientList-entry.js-objectNew') sleep 1 set( @@ -45,7 +45,7 @@ class AgentUserManageTest < TestCase value: customer_user_email, ) - click( css: '.modal button.js-submit' ) + click(css: '.modal button.js-submit') sleep 4 # check is used to check selected @@ -75,8 +75,8 @@ class AgentUserManageTest < TestCase # call new ticket screen again tasks_close_all() - click( css: 'a[href="#new"]' ) - click( css: 'a[href="#ticket/create"]' ) + click(css: 'a[href="#new"]') + click(css: 'a[href="#ticket/create"]') sleep 2 match( @@ -93,7 +93,7 @@ class AgentUserManageTest < TestCase ) sleep 3 - click( css: '.active .newTicket .recipientList-entry.js-object.is-active' ) + click(css: '.active .newTicket .recipientList-entry.js-object.is-active') sleep 1 # check is used to check selected diff --git a/test/browser/agent_user_profile_test.rb b/test/browser/agent_user_profile_test.rb index a53a28566..664a03d0f 100644 --- a/test/browser/agent_user_profile_test.rb +++ b/test/browser/agent_user_profile_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AgentUserProfileTest < TestCase diff --git a/test/browser/auth_test.rb b/test/browser/auth_test.rb index ee09c79cf..2ea4238c5 100644 --- a/test/browser/auth_test.rb +++ b/test/browser/auth_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AuthTest < TestCase diff --git a/test/browser/chat_test.rb b/test/browser/chat_test.rb index 5fa781d37..f7ea8a66e 100644 --- a/test/browser/chat_test.rb +++ b/test/browser/chat_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class ChatTest < TestCase @@ -397,7 +397,7 @@ class ChatTest < TestCase watch_for( browser: customer, css: '.zammad-chat', - value: 'Chat closed by', + value: '(Chat closed by|Chat beendet von)', ) click( browser: customer, diff --git a/test/browser/customer_ticket_create_test.rb b/test/browser/customer_ticket_create_test.rb index c538d420a..e7f15f162 100644 --- a/test/browser/customer_ticket_create_test.rb +++ b/test/browser/customer_ticket_create_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class CustomerTicketCreateTest < TestCase diff --git a/test/browser/first_steps_test.rb b/test/browser/first_steps_test.rb index 2ed6827c2..2506abbda 100644 --- a/test/browser/first_steps_test.rb +++ b/test/browser/first_steps_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class FirstStepsTest < TestCase diff --git a/test/browser/form_test.rb b/test/browser/form_test.rb index 8b6f35a91..140abdb5c 100644 --- a/test/browser/form_test.rb +++ b/test/browser/form_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class FormTest < TestCase diff --git a/test/browser/integration_test.rb b/test/browser/integration_test.rb index d6bb6beb7..3154d012d 100644 --- a/test/browser/integration_test.rb +++ b/test/browser/integration_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class IntegrationTest < TestCase diff --git a/test/browser/keyboard_shortcuts_test.rb b/test/browser/keyboard_shortcuts_test.rb index 6a394e060..c266cb85d 100644 --- a/test/browser/keyboard_shortcuts_test.rb +++ b/test/browser/keyboard_shortcuts_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class KeyboardShortcutsTest < TestCase diff --git a/test/browser/maintenance_app_version_test.rb b/test/browser/maintenance_app_version_test.rb index e8d322cc8..2370bd88c 100644 --- a/test/browser/maintenance_app_version_test.rb +++ b/test/browser/maintenance_app_version_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class MaintenanceAppVersionTest < TestCase diff --git a/test/browser/maintenance_login_message_test.rb b/test/browser/maintenance_login_message_test.rb index d08077dc0..90423b034 100644 --- a/test/browser/maintenance_login_message_test.rb +++ b/test/browser/maintenance_login_message_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class MaintenanceLoginMessageTest < TestCase diff --git a/test/browser/maintenance_mode_test.rb b/test/browser/maintenance_mode_test.rb index a214a5409..f00952423 100644 --- a/test/browser/maintenance_mode_test.rb +++ b/test/browser/maintenance_mode_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class MaintenanceModeTest < TestCase diff --git a/test/browser/maintenance_session_message_test.rb b/test/browser/maintenance_session_message_test.rb index 3df03ae8f..5ea58c808 100644 --- a/test/browser/maintenance_session_message_test.rb +++ b/test/browser/maintenance_session_message_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class MaintenanceSessionMessageTest < TestCase diff --git a/test/browser/manage_test.rb b/test/browser/manage_test.rb index 631114ee4..0ecc13415 100644 --- a/test/browser/manage_test.rb +++ b/test/browser/manage_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class ManageTest < TestCase diff --git a/test/browser/monitoring_test.rb b/test/browser/monitoring_test.rb index d4e79b4db..695c4a87e 100644 --- a/test/browser/monitoring_test.rb +++ b/test/browser/monitoring_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class MonitoringTest < TestCase diff --git a/test/browser/preferences_language_test.rb b/test/browser/preferences_language_test.rb index 2dfa5ef87..59903391a 100644 --- a/test/browser/preferences_language_test.rb +++ b/test/browser/preferences_language_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class PreferencesLanguageTest < TestCase diff --git a/test/browser/preferences_permission_check_test.rb b/test/browser/preferences_permission_check_test.rb index 3723708a3..a08e69af1 100644 --- a/test/browser/preferences_permission_check_test.rb +++ b/test/browser/preferences_permission_check_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class PreferencesPermissionCheckTest < TestCase diff --git a/test/browser/preferences_token_access_test.rb b/test/browser/preferences_token_access_test.rb index 11f153440..d6d97cfee 100644 --- a/test/browser/preferences_token_access_test.rb +++ b/test/browser/preferences_token_access_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class PreferencesTokenAccessTest < TestCase diff --git a/test/browser/setting_test.rb b/test/browser/setting_test.rb index 2cbd02b40..5783bd097 100644 --- a/test/browser/setting_test.rb +++ b/test/browser/setting_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class SettingTest < TestCase diff --git a/test/browser/signup_password_change_and_reset_test.rb b/test/browser/signup_password_change_and_reset_test.rb index c72f1d598..b174f2cb7 100644 --- a/test/browser/signup_password_change_and_reset_test.rb +++ b/test/browser/signup_password_change_and_reset_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class SignupPasswordChangeAndResetTest < TestCase diff --git a/test/browser/switch_to_user_test.rb b/test/browser/switch_to_user_test.rb index 6148dcb05..6c953d111 100644 --- a/test/browser/switch_to_user_test.rb +++ b/test/browser/switch_to_user_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class SwitchToUserTest < TestCase diff --git a/test/browser/taskbar_session_test.rb b/test/browser/taskbar_session_test.rb index 7ef161e0b..f289d0d37 100644 --- a/test/browser/taskbar_session_test.rb +++ b/test/browser/taskbar_session_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class TaskbarSessionTest < TestCase diff --git a/test/browser/taskbar_task_test.rb b/test/browser/taskbar_task_test.rb index 5702f4f4b..959008134 100644 --- a/test/browser/taskbar_task_test.rb +++ b/test/browser/taskbar_task_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class TaskbarTaskTest < TestCase diff --git a/test/browser/translation_test.rb b/test/browser/translation_test.rb index c05041895..be17b75b5 100644 --- a/test/browser/translation_test.rb +++ b/test/browser/translation_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class TranslationTest < TestCase diff --git a/test/browser/user_switch_cache_test.rb b/test/browser/user_switch_cache_test.rb index 7b700c7ab..576fdbb4d 100644 --- a/test/browser/user_switch_cache_test.rb +++ b/test/browser/user_switch_cache_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class UserSwitchCache < TestCase diff --git a/test/browser_test_helper.rb b/test/browser_test_helper.rb index f8f12fb19..3f4decb00 100644 --- a/test/browser_test_helper.rb +++ b/test/browser_test_helper.rb @@ -1,5 +1,5 @@ ENV['RAILS_ENV'] = 'test' -# rubocop:disable HandleExceptions, ClassVars, NonLocalExitFromIterator +# rubocop:disable HandleExceptions, ClassVars, NonLocalExitFromIterator, Style/GuardClause require File.expand_path('../../config/environment', __FILE__) require 'selenium-webdriver' @@ -33,7 +33,7 @@ class TestCase < Test::Unit::TestCase end def browser_support_cookies - if browser =~ /(internet_explorer|ie)/i + if browser.match?(/(internet_explorer|ie)/i) return false end true @@ -47,7 +47,7 @@ class TestCase < Test::Unit::TestCase if !@browsers @browsers = {} end - if !ENV['REMOTE_URL'] || ENV['REMOTE_URL'].empty? + if ENV['REMOTE_URL'].blank? local_browser = Selenium::WebDriver.for(browser.to_sym, profile: profile) @browsers[local_browser.hash] = local_browser browser_instance_preferences(local_browser) @@ -116,7 +116,7 @@ class TestCase < Test::Unit::TestCase def teardown return if !@browsers - @browsers.each do |_hash, local_browser| + @browsers.each_value do |local_browser| screenshot(browser: local_browser, comment: 'teardown') browser_instance_close(local_browser) end @@ -874,14 +874,12 @@ class TestCase < Test::Unit::TestCase instance = params[:browser] || @browser element = instance.find_elements(css: params[:css])[0] - if params[:css] =~ /select/ + if params[:css].match?(/select/) dropdown = Selenium::WebDriver::Support::Select.new(element) success = false - if dropdown.selected_options - dropdown.selected_options.each do |option| - if option.text == params[:value] - success = true - end + dropdown.selected_options&.each do |option| + if option.text == params[:value] + success = true end end if params[:should_not_match] @@ -901,13 +899,12 @@ class TestCase < Test::Unit::TestCase begin text = if params[:attribute] element.attribute(params[:attribute]) - elsif params[:css] =~ /(input|textarea)/i + elsif params[:css].match?(/(input|textarea)/i) element.attribute('value') else element.text end rescue => e - # just try again if !fallback return match(params, true) @@ -928,7 +925,7 @@ class TestCase < Test::Unit::TestCase if text =~ /#{params[:value]}/i match = $1 || true end - elsif text =~ /#{Regexp.quote(params[:value])}/i + elsif text.match?(/#{Regexp.quote(params[:value])}/i) match = true end @@ -1020,7 +1017,6 @@ set type of task (closeTab, closeNextInOverview, stayOnTab) cookies = instance.manage.all_cookies cookies.each do |cookie| - #puts "CCC #{cookie.inspect}" # :name=>"_zammad_session_c25832f4de2", :value=>"adc31cd21615cb0a7ab269184ec8b76f", :path=>"/", :domain=>"localhost", :expires=>nil, :secure=>false} next if cookie[:name] !~ /#{params[:name]}/i @@ -1062,7 +1058,7 @@ set type of task (closeTab, closeNextInOverview, stayOnTab) instance = params[:browser] || @browser title = instance.title - if title =~ /#{params[:value]}/i + if title.match?(/#{params[:value]}/i) assert(true, "matching '#{params[:value]}' in title '#{title}'") else raise "not matching '#{params[:value]}' in title '#{title}'" @@ -1091,11 +1087,10 @@ set type of task (closeTab, closeNextInOverview, stayOnTab) sleep 1 begin - # verify title if data[:title] title = instance.find_elements(css: '.tasks .is-active')[0].text.strip - if title =~ /#{data[:title]}/i + if title.match?(/#{data[:title]}/i) assert(true, "matching '#{data[:title]}' in title '#{title}'") else screenshot(browser: instance, comment: 'verify_task_failed') @@ -1135,7 +1130,6 @@ set type of task (closeTab, closeNextInOverview, stayOnTab) end end rescue => e - # just try again if !fallback verify_task(params, true) @@ -1228,7 +1222,7 @@ set type of task (closeTab, closeNextInOverview, stayOnTab) instance = params[:browser] || @browser params[:files].each do |file| - instance.find_elements(css: params[:css])[0].send_keys "#{Rails.root}/#{file}" + instance.find_elements(css: params[:css])[0].send_keys(Rails.root.join(file)) end sleep 2 * params[:files].count end @@ -1261,23 +1255,22 @@ set type of task (closeTab, closeNextInOverview, stayOnTab) element = instance.find_elements(css: params[:css])[0] if element #&& element.displayed? begin - # watch for selector if !params[:attribute] && !params[:value] assert(true, "'#{params[:css]}' found") sleep 0.5 return true - # match pn attribute + # match an attribute else text = if params[:attribute] element.attribute(params[:attribute]) - elsif params[:css] =~ /(input|textarea)/i + elsif params[:css].match?(/(input|textarea)/i) element.attribute('value') else element.text end - if text =~ /#{params[:value]}/i + if text.match?(/#{params[:value]}/i) assert(true, "'#{params[:value]}' found in '#{text}'") sleep 0.5 return true @@ -1499,9 +1492,7 @@ wait untill text in selector disabppears instance.mouse.move_to(instance.find_elements(css: '.js-notificationsContainer .js-item:first-child')[0]) sleep 0.1 click_element = instance.find_elements(css: '.js-notificationsContainer .js-item:first-child .js-remove')[0] - if click_element - click_element.click - end + click_element&.click else break end @@ -1530,7 +1521,6 @@ wait untill text in selector disabppears begin instance.find_elements(css: '.search .js-emptySearch')[0].click rescue - # in issues with ff & selenium, sometimes exeption appears # "Element is not currently visible and so may not be interacted with" log('empty_search via js') @@ -1636,23 +1626,21 @@ wait untill text in selector disabppears end end - if data[:selector] - data[:selector].each do |key, value| - select( - browser: instance, - css: '.modal .ticket_selector .js-attributeSelector select', - value: key, - mute_log: true, - ) - sleep 0.5 - select( - browser: instance, - css: '.modal .ticket_selector .js-value select', - value: value, - deselect_all: true, - mute_log: true, - ) - end + data[:selector]&.each do |key, value| + select( + browser: instance, + css: '.modal .ticket_selector .js-attributeSelector select', + value: key, + mute_log: true, + ) + sleep 0.5 + select( + browser: instance, + css: '.modal .ticket_selector .js-value select', + value: value, + deselect_all: true, + mute_log: true, + ) end if data['order::direction'] @@ -1669,7 +1657,7 @@ wait untill text in selector disabppears 11.times do element = instance.find_elements(css: 'body')[0] text = element.text - if text =~ /#{Regexp.quote(data[:name])}/ + if text.match?(/#{Regexp.quote(data[:name])}/) assert(true, 'overview created') overview = { name: name, @@ -1742,23 +1730,21 @@ wait untill text in selector disabppears end end - if data[:selector] - data[:selector].each do |key, value| - select( - browser: instance, - css: '.modal .ticket_selector .js-attributeSelector select', - value: key, - mute_log: true, - ) - sleep 0.5 - select( - browser: instance, - css: '.modal .ticket_selector .js-value select', - value: value, - deselect_all: true, - mute_log: true, - ) - end + data[:selector]&.each do |key, value| + select( + browser: instance, + css: '.modal .ticket_selector .js-attributeSelector select', + value: key, + mute_log: true, + ) + sleep 0.5 + select( + browser: instance, + css: '.modal .ticket_selector .js-value select', + value: value, + deselect_all: true, + mute_log: true, + ) end if data['order::direction'] @@ -1775,7 +1761,7 @@ wait untill text in selector disabppears 11.times do element = instance.find_elements(css: 'body')[0] text = element.text - if text =~ /#{Regexp.quote(data[:name])}/ + if text.match?(/#{Regexp.quote(data[:name])}/) assert(true, 'overview updated') overview = { name: name, @@ -1963,24 +1949,20 @@ wait untill text in selector disabppears end end - if params[:custom_data_select] - params[:custom_data_select].each do |local_key, local_value| - select( - browser: instance, - css: ".content.active .newTicket select[name=\"#{local_key}\"]", - value: local_value, - ) - end + params[:custom_data_select]&.each do |local_key, local_value| + select( + browser: instance, + css: ".content.active .newTicket select[name=\"#{local_key}\"]", + value: local_value, + ) end - if params[:custom_data_input] - params[:custom_data_input].each do |local_key, local_value| - set( - browser: instance, - css: ".content.active .newTicket input[name=\"#{local_key}\"]", - value: local_value, - clear: true, - ) - end + params[:custom_data_input]&.each do |local_key, local_value| + set( + browser: instance, + css: ".content.active .newTicket input[name=\"#{local_key}\"]", + value: local_value, + clear: true, + ) end if data[:attachment] @@ -2005,7 +1987,7 @@ wait untill text in selector disabppears sleep 1 9.times do - if instance.current_url =~ /#{Regexp.quote('#ticket/zoom/')}/ + if instance.current_url.match?(/#{Regexp.quote('#ticket/zoom/')}/) assert(true, 'ticket created') sleep 2.5 id = instance.current_url @@ -2197,27 +2179,23 @@ wait untill text in selector disabppears ) end - if params[:custom_data_select] - params[:custom_data_select].each do |local_key, local_value| - select( - browser: instance, - css: ".active .sidebar select[name=\"#{local_key}\"]", - value: local_value, - ) - end + params[:custom_data_select]&.each do |local_key, local_value| + select( + browser: instance, + css: ".active .sidebar select[name=\"#{local_key}\"]", + value: local_value, + ) end - if params[:custom_data_input] - params[:custom_data_input].each do |local_key, local_value| - set( - browser: instance, - css: ".active .sidebar input[name=\"#{local_key}\"]", - value: local_value, - clear: true, - ) - end + params[:custom_data_input]&.each do |local_key, local_value| + set( + browser: instance, + css: ".active .sidebar input[name=\"#{local_key}\"]", + value: local_value, + clear: true, + ) end - if data[:state] || data[:group] || data[:body] || !params[:custom_data_select].empty? || !params[:custom_data_input].empty? + if data[:state] || data[:group] || data[:body] || params[:custom_data_select].present? || params[:custom_data_input].present? found = nil 9.times do @@ -2225,7 +2203,7 @@ wait untill text in selector disabppears begin text = instance.find_elements(css: '.content.active .js-reset')[0].text - if text =~ /(Discard your unsaved changes.|Verwerfen der)/ + if text.match?(/(Discard your unsaved changes.|Verwerfen der)/) found = true end rescue @@ -2304,7 +2282,7 @@ wait untill text in selector disabppears if data[:title] title = instance.find_elements(css: '.content.active .ticketZoom-header .js-objectTitle').first.text.strip - if title =~ /#{data[:title]}/i + if title.match?(/#{data[:title]}/i) assert(true, "matching '#{data[:title]}' in title '#{title}'") else raise "not matching '#{data[:title]}' in title '#{title}'" @@ -2313,33 +2291,29 @@ wait untill text in selector disabppears if data[:body] body = instance.find_elements(css: '.content.active [data-name="body"]').first.text.strip - if body =~ /#{data[:body]}/i + if body.match?(/#{data[:body]}/i) assert(true, "matching '#{data[:body]}' in body '#{body}'") else raise "not matching '#{data[:body]}' in body '#{body}'" end end - if params[:custom_data_select] - params[:custom_data_select].each do |local_key, local_value| - element = instance.find_elements(css: ".active .sidebar select[name=\"#{local_key}\"] option[selected]").first - value = element.text.strip - if value =~ /#{local_value}/i - assert(true, "matching '#{value}' in #{local_key} '#{local_value}'") - else - raise "not matching '#{value}' in #{local_key} '#{local_value}'" - end + params[:custom_data_select]&.each do |local_key, local_value| + element = instance.find_elements(css: ".active .sidebar select[name=\"#{local_key}\"] option[selected]").first + value = element.text.strip + if value.match?(/#{local_value}/i) + assert(true, "matching '#{value}' in #{local_key} '#{local_value}'") + else + raise "not matching '#{value}' in #{local_key} '#{local_value}'" end end - if params[:custom_data_input] - params[:custom_data_input].each do |local_key, local_value| - element = instance.find_elements(css: ".active .sidebar input[name=\"#{local_key}\"]").first - value = element.text.strip - if value =~ /#{local_value}/i - assert(true, "matching '#{value}' in #{local_key} '#{local_value}'") - else - raise "not matching '#{value}' in #{local_key} '#{local_value}'" - end + params[:custom_data_input]&.each do |local_key, local_value| + element = instance.find_elements(css: ".active .sidebar input[name=\"#{local_key}\"]").first + value = element.text.strip + if value.match?(/#{local_value}/i) + assert(true, "matching '#{value}' in #{local_key} '#{local_value}'") + else + raise "not matching '#{value}' in #{local_key} '#{local_value}'" end end @@ -2528,7 +2502,7 @@ wait untill text in selector disabppears #puts url.inspect #puts element.inspect end - overviews.each do |url, _value| + overviews.each_key do |url| count = instance.find_elements(css: ".content.active .sidebar a[href=\"#{url}\"] .badge")[0].text overviews[url] = count.to_i end @@ -2735,7 +2709,7 @@ wait untill text in selector disabppears 7.times do element = instance.find_elements(css: 'body')[0] text = element.text - if text =~ /#{Regexp.quote(data[:name])}/ + if text.match?(/#{Regexp.quote(data[:name])}/) assert(true, 'sla created') sleep 1 return true @@ -2802,7 +2776,7 @@ wait untill text in selector disabppears 7.times do element = instance.find_elements(css: 'body')[0] text = element.text - if text =~ /#{Regexp.quote(data[:name])}/ + if text.match?(/#{Regexp.quote(data[:name])}/) assert(true, 'text module created') sleep 1 return true @@ -2869,7 +2843,7 @@ wait untill text in selector disabppears 11.times do element = instance.find_elements(css: 'body')[0] text = element.text - if text =~ /#{Regexp.quote(data[:name])}/ + if text.match?(/#{Regexp.quote(data[:name])}/) assert(true, 'signature created') sleep 1 return true @@ -2938,30 +2912,28 @@ wait untill text in selector disabppears 11.times do element = instance.find_elements(css: 'body')[0] text = element.text - if text =~ /#{Regexp.quote(data[:name])}/ + if text.match?(/#{Regexp.quote(data[:name])}/) assert(true, 'group created') modal_disappear(browser: instance) # wait until modal has gone # add member - if data[:member] - data[:member].each do |member| - instance.find_elements(css: 'a[href="#manage"]')[0].click - sleep 1 - instance.find_elements(css: '.content.active a[href="#manage/users"]')[0].click - sleep 3 - element = instance.find_elements(css: '.content.active [name="search"]')[0] - element.clear - element.send_keys(member[:login]) - sleep 3 - #instance.find_elements(:css => '.content.active table [data-id]')[0].click - instance.execute_script('$(".content.active table [data-id] td").first().click()') - modal_ready(browser: instance) - #instance.find_elements(:css => 'label:contains(" ' + action[:name] + '")')[0].click - instance.execute_script('$(".js-groupList tr:contains(\"' + data[:name] + '\") .js-groupListItem[value=' + member[:access] + ']").prop("checked", true)') - screenshot(browser: instance, comment: 'group_create_member') - instance.find_elements(css: '.modal button.js-submit')[0].click - modal_disappear(browser: instance) - end + data[:member]&.each do |member| + instance.find_elements(css: 'a[href="#manage"]')[0].click + sleep 1 + instance.find_elements(css: '.content.active a[href="#manage/users"]')[0].click + sleep 3 + element = instance.find_elements(css: '.content.active [name="search"]')[0] + element.clear + element.send_keys(member[:login]) + sleep 3 + #instance.find_elements(:css => '.content.active table [data-id]')[0].click + instance.execute_script('$(".content.active table [data-id] td").first().click()') + modal_ready(browser: instance) + #instance.find_elements(:css => 'label:contains(" ' + action[:name] + '")')[0].click + instance.execute_script('$(".js-groupList tr:contains(\"' + data[:name] + '\") .js-groupListItem[value=' + member[:access] + ']").prop("checked", true)') + screenshot(browser: instance, comment: 'group_create_member') + instance.find_elements(css: '.modal button.js-submit')[0].click + modal_disappear(browser: instance) end end sleep 1 @@ -3048,29 +3020,27 @@ wait untill text in selector disabppears 11.times do element = instance.find_elements(css: 'body')[0] text = element.text - if text =~ /#{Regexp.quote(data[:name])}/ + if text.match?(/#{Regexp.quote(data[:name])}/) assert(true, 'role created') modal_disappear(browser: instance) # wait until modal has gone # add member - if data[:member] - data[:member].each do |login| - instance.find_elements(css: 'a[href="#manage"]')[0].click - sleep 1 - instance.find_elements(css: '.content.active a[href="#manage/users"]')[0].click - sleep 3 - element = instance.find_elements(css: '.content.active [name="search"]')[0] - element.clear - element.send_keys(login) - sleep 3 - #instance.find_elements(:css => '.content.active table [data-id]')[0].click - instance.execute_script('$(".content.active table [data-id] td").first().click()') - sleep 3 - #instance.find_elements(:css => 'label:contains(" ' + action[:name] + '")')[0].click - instance.execute_script('$(\'label:contains(" ' + data[:name] + '")\').first().click()') - instance.find_elements(css: '.modal button.js-submit')[0].click - modal_disappear(browser: instance) - end + data[:member]&.each do |login| + instance.find_elements(css: 'a[href="#manage"]')[0].click + sleep 1 + instance.find_elements(css: '.content.active a[href="#manage/users"]')[0].click + sleep 3 + element = instance.find_elements(css: '.content.active [name="search"]')[0] + element.clear + element.send_keys(login) + sleep 3 + #instance.find_elements(:css => '.content.active table [data-id]')[0].click + instance.execute_script('$(".content.active table [data-id] td").first().click()') + sleep 3 + #instance.find_elements(:css => 'label:contains(" ' + action[:name] + '")')[0].click + instance.execute_script('$(\'label:contains(" ' + data[:name] + '")\').first().click()') + instance.find_elements(css: '.modal button.js-submit')[0].click + modal_disappear(browser: instance) end end sleep 1 @@ -3164,29 +3134,27 @@ wait untill text in selector disabppears 11.times do element = instance.find_elements(css: 'body')[0] text = element.text - if text =~ /#{Regexp.quote(data[:name])}/ + if text.match?(/#{Regexp.quote(data[:name])}/) assert(true, 'role created') modal_disappear(browser: instance) # wait until modal has gone # add member - if data[:member] - data[:member].each do |login| - instance.find_elements(css: 'a[href="#manage"]')[0].click - sleep 1 - instance.find_elements(css: '.content.active a[href="#manage/users"]')[0].click - sleep 3 - element = instance.find_elements(css: '.content.active [name="search"]')[0] - element.clear - element.send_keys(login) - sleep 3 - #instance.find_elements(:css => '.content.active table [data-id]')[0].click - instance.execute_script('$(".content.active table [data-id] td").first().click()') - sleep 3 - #instance.find_elements(:css => 'label:contains(" ' + action[:name] + '")')[0].click - instance.execute_script('$(\'label:contains(" ' + data[:name] + '")\').first().click()') - instance.find_elements(css: '.modal button.js-submit')[0].click - modal_disappear(browser: instance) - end + data[:member]&.each do |login| + instance.find_elements(css: 'a[href="#manage"]')[0].click + sleep 1 + instance.find_elements(css: '.content.active a[href="#manage/users"]')[0].click + sleep 3 + element = instance.find_elements(css: '.content.active [name="search"]')[0] + element.clear + element.send_keys(login) + sleep 3 + #instance.find_elements(:css => '.content.active table [data-id]')[0].click + instance.execute_script('$(".content.active table [data-id] td").first().click()') + sleep 3 + #instance.find_elements(:css => 'label:contains(" ' + action[:name] + '")')[0].click + instance.execute_script('$(\'label:contains(" ' + data[:name] + '")\').first().click()') + instance.find_elements(css: '.modal button.js-submit')[0].click + modal_disappear(browser: instance) end end sleep 1 @@ -3332,12 +3300,14 @@ wait untill text in selector disabppears if data[:data_option] if data[:data_option][:options] if data[:data_type] == 'Boolean' + # rubocop:disable Lint/BooleanSymbol element = instance.find_elements(css: '.modal .js-valueTrue').first element.clear element.send_keys(data[:data_option][:options][:true]) element = instance.find_elements(css: '.modal .js-valueFalse').first element.clear element.send_keys(data[:data_option][:options][:false]) + # rubocop:enable Lint/BooleanSymbol else data[:data_option][:options].each do |key, value| element = instance.find_elements(css: '.modal .js-Table .js-key').last @@ -3352,14 +3322,14 @@ wait untill text in selector disabppears end end - [:default, :min, :max, :diff].each do |key| + %i[default min max diff].each do |key| next if !data[:data_option].key?(key) element = instance.find_elements(css: ".modal [name=\"data_option::#{key}\"]").first element.clear element.send_keys(data[:data_option][key]) end - [:future, :past].each do |key| + %i[future past].each do |key| next if !data[:data_option].key?(key) select( browser: instance, @@ -3388,7 +3358,7 @@ wait untill text in selector disabppears 11.times do element = instance.find_elements(css: 'body')[0] text = element.text - if text =~ /#{Regexp.quote(data[:name])}/ + if text.match?(/#{Regexp.quote(data[:name])}/) assert(true, 'object manager attribute created') sleep 1 return true @@ -3454,12 +3424,14 @@ wait untill text in selector disabppears if data[:data_option] if data[:data_option][:options] if data[:data_type] == 'Boolean' + # rubocop:disable Lint/BooleanSymbol element = instance.find_elements(css: '.modal .js-valueTrue').first element.clear element.send_keys(data[:data_option][:options][:true]) element = instance.find_elements(css: '.modal .js-valueFalse').first element.clear element.send_keys(data[:data_option][:options][:false]) + # rubocop:enable Lint/BooleanSymbol else data[:data_option][:options].each do |key, value| element = instance.find_elements(css: '.modal .js-Table .js-key').last @@ -3474,14 +3446,14 @@ wait untill text in selector disabppears end end - [:default, :min, :max, :diff].each do |key| + %i[default min max diff].each do |key| next if !data[:data_option].key?(key) element = instance.find_elements(css: ".modal [name=\"data_option::#{key}\"]").first element.clear element.send_keys(data[:data_option][key]) end - [:future, :past].each do |key| + %i[future past].each do |key| next if !data[:data_option].key?(key) select( browser: instance, @@ -3510,7 +3482,7 @@ wait untill text in selector disabppears 11.times do element = instance.find_elements(css: 'body')[0] text = element.text - if text =~ /#{Regexp.quote(data[:name])}/ + if text.match?(/#{Regexp.quote(data[:name])}/) assert(true, 'object manager attribute updated') sleep 1 return true @@ -3617,7 +3589,7 @@ wait untill text in selector disabppears assert(tags[0]) tags_found = {} - params[:tags].each do |key, _value| + params[:tags].each_key do |key| tags_found[key] = false end diff --git a/test/controllers/api_auth_controller_test.rb b/test/controllers/api_auth_controller_test.rb index 019ffd696..3bd3f35aa 100644 --- a/test/controllers/api_auth_controller_test.rb +++ b/test/controllers/api_auth_controller_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class ApiAuthControllerTest < ActionDispatch::IntegrationTest @@ -8,7 +8,7 @@ class ApiAuthControllerTest < ActionDispatch::IntegrationTest @headers = { 'ACCEPT' => 'application/json', 'CONTENT_TYPE' => 'application/json' } # create agent - roles = Role.where(name: %w(Admin Agent)) + roles = Role.where(name: %w[Admin Agent]) groups = Group.all UserInfo.current_user_id = 1 diff --git a/test/controllers/basic_controller_test.rb b/test/controllers/basic_controller_test.rb index 7c7c1bf5b..da6306be3 100644 --- a/test/controllers/basic_controller_test.rb +++ b/test/controllers/basic_controller_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class BasicControllerTest < ActionDispatch::IntegrationTest diff --git a/test/controllers/form_controller_test.rb b/test/controllers/form_controller_test.rb index a90844a70..98ea10cee 100644 --- a/test/controllers/form_controller_test.rb +++ b/test/controllers/form_controller_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' require 'rake' @@ -245,8 +245,8 @@ class FormControllerTest < ActionDispatch::IntegrationTest end test '06 - customer_ticket_create false disables form' do - Setting.set('form_ticket_create', true) - Setting.set('customer_ticket_create', false) + Setting.set('form_ticket_create', false) + Setting.set('customer_ticket_create', true) fingerprint = SecureRandom.hex(40) diff --git a/test/controllers/integration_check_mk_controller_test.rb b/test/controllers/integration_check_mk_controller_test.rb index ae0465fe2..d14a7534a 100644 --- a/test/controllers/integration_check_mk_controller_test.rb +++ b/test/controllers/integration_check_mk_controller_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class IntegationCheckMkControllerTest < ActionDispatch::IntegrationTest diff --git a/test/controllers/monitoring_controller_test.rb b/test/controllers/monitoring_controller_test.rb index 26bfe7389..3c656db2f 100644 --- a/test/controllers/monitoring_controller_test.rb +++ b/test/controllers/monitoring_controller_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class MonitoringControllerTest < ActionDispatch::IntegrationTest @@ -12,7 +12,7 @@ class MonitoringControllerTest < ActionDispatch::IntegrationTest Setting.set('monitoring_token', @token) # create agent - roles = Role.where(name: %w(Admin Agent)) + roles = Role.where(name: %w[Admin Agent]) groups = Group.all # channel cleanup @@ -24,7 +24,7 @@ class MonitoringControllerTest < ActionDispatch::IntegrationTest channel.last_log_out = nil channel.save! end - dir = "#{Rails.root}/tmp/unprocessable_mail" + dir = Rails.root.join('tmp', 'unprocessable_mail') Dir.glob("#{dir}/*.eml") do |entry| File.delete(entry) end @@ -374,7 +374,7 @@ class MonitoringControllerTest < ActionDispatch::IntegrationTest assert_equal(false, result['healthy']) assert_equal('Channel: Email::Notification out ;scheduler not running', result['message']) - dir = "#{Rails.root}/tmp/unprocessable_mail" + dir = Rails.root.join('tmp', 'unprocessable_mail') FileUtils.mkdir_p(dir) FileUtils.touch("#{dir}/test.eml") @@ -389,6 +389,29 @@ class MonitoringControllerTest < ActionDispatch::IntegrationTest assert_equal(false, result['healthy']) assert_equal('Channel: Email::Notification out ;unprocessable mails: 1;scheduler not running', result['message']) + Setting.set('ldap_integration', true) + + ImportJob.create( + name: 'Import::Ldap', + started_at: Time.zone.now, + finished_at: Time.zone.now, + result: { + error: 'Some bad error' + } + ) + + # health_check + get "/api/v1/monitoring/health_check?token=#{@token}", params: {}, headers: @headers + assert_response(200) + + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + assert(result['message']) + assert(result['issues']) + assert_equal(false, result['healthy']) + assert_equal("Channel: Email::Notification out ;unprocessable mails: 1;scheduler not running;Failed to run import backend 'Import::Ldap'. Cause: Some bad error", result['message']) + + Setting.set('ldap_integration', false) end test '09 check restart_failed_jobs' do diff --git a/test/controllers/object_manager_attributes_controller.rb b/test/controllers/object_manager_attributes_controller.rb new file mode 100644 index 000000000..7415ff49d --- /dev/null +++ b/test/controllers/object_manager_attributes_controller.rb @@ -0,0 +1,449 @@ +# rubocop:disable Lint/BooleanSymbol +require 'test_helper' +require 'rake' + +class ObjectManagerAttributesControllerTest < ActionDispatch::IntegrationTest + setup do + + # set accept header + @headers = { 'ACCEPT' => 'application/json', 'CONTENT_TYPE' => 'application/json' } + + roles = Role.where(name: %w[Admin Agent]) + groups = Group.all + + UserInfo.current_user_id = 1 + @admin = User.create_or_update( + login: 'tickets-admin', + firstname: 'Tickets', + lastname: 'Admin', + email: 'tickets-admin@example.com', + password: 'adminpw', + active: true, + roles: roles, + groups: groups, + ) + + end + + test 'add new ticket text object' do + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-admin', 'adminpw') + + post '/api/v1/object_manager_attributes', params: {}, headers: @headers + token = @response.headers['CSRF-TOKEN'] + + # token based on headers + params = { + 'name': 'test1', + 'object': 'Ticket', + 'display': 'Test 1', + 'active': true, + 'data_type': 'input', + 'data_option': { + 'default': 'test', + 'type': 'text', + 'maxlength': 120 + }, + 'screens': { + 'create_middle': { + 'ticket.customer': { + 'shown': true, + 'item_class': 'column' + }, + 'ticket.agent': { + 'shown': true, + 'item_class': 'column' + } + }, + 'edit': { + 'ticket.customer': { + 'shown': true + }, + 'ticket.agent': { + 'shown': true + } + } + }, + 'id': 'c-196' + } + + post '/api/v1/object_manager_attributes', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(201) + result = JSON.parse(@response.body) + assert(result) + assert(result['data_option']['null']) + assert_equal(result['data_option']['null'], true) + assert_equal(result['name'], 'test1') + end + + test 'add new ticket text object - no default' do + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-admin', 'adminpw') + + post '/api/v1/object_manager_attributes', params: {}, headers: @headers + token = @response.headers['CSRF-TOKEN'] + + # token based on headers + params = { + 'name': 'test2', + 'object': 'Ticket', + 'display': 'Test 2', + 'active': true, + 'data_type': 'input', + 'data_option': { + 'type': 'text', + 'maxlength': 120 + }, + 'screens': { + 'create_middle': { + 'ticket.customer': { + 'shown': true, + 'item_class': 'column' + }, + 'ticket.agent': { + 'shown': true, + 'item_class': 'column' + } + }, + 'edit': { + 'ticket.customer': { + 'shown': true + }, + 'ticket.agent': { + 'shown': true + } + } + }, + 'id': 'c-196' + } + + post '/api/v1/object_manager_attributes', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(201) + result = JSON.parse(@response.body) + assert(result) + assert(result['data_option']['null']) + assert_equal(result['data_option']['null'], true) + assert_equal(result['name'], 'test2') + end + + test 'update ticket text object' do + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-admin', 'adminpw') + + # add a new object + object = ObjectManager::Attribute.add( + name: 'test3', + object: 'Ticket', + display: 'Test 3', + active: true, + data_type: 'input', + data_option: { + default: 'test', + type: 'text', + maxlength: 120, + null: true + }, + screens: { + create_middle: { + 'ticket.customer' => { + shown: true, + item_class: 'column' + }, + 'ticket.agent' => { + shown: true, + item_class: 'column' + } + }, + edit: { + 'ticket.customer' => { + shown: true + }, + 'ticket.agent' => { + shown: true + } + } + }, + position: 1550, + editable: true + ) + + migration = ObjectManager::Attribute.migration_execute + assert_equal(migration, true) + + post "/api/v1/object_manager_attributes/#{object.id}", params: {}, headers: @headers + token = @response.headers['CSRF-TOKEN'] + + # parameters for updating + params = { + 'name': 'test4', + 'object': 'Ticket', + 'display': 'Test 4', + 'active': true, + 'data_type': 'input', + 'data_option': { + 'default': 'test', + 'type': 'text', + 'maxlength': 120 + }, + 'screens': { + 'create_middle': { + 'ticket.customer': { + 'shown': true, + 'item_class': 'column' + }, + 'ticket.agent': { + 'shown': true, + 'item_class': 'column' + } + }, + 'edit': { + 'ticket.customer': { + 'shown': true + }, + 'ticket.agent': { + 'shown': true + } + } + }, + 'id': 'c-196' + } + + # update the object + put "/api/v1/object_manager_attributes/#{object.id}", params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert(result) + assert(result['data_option']['null']) + assert_equal(result['name'], 'test4') + assert_equal(result['display'], 'Test 4') + end + + test 'add new ticket boolean object' do + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-admin', 'adminpw') + + post '/api/v1/object_manager_attributes', params: {}, headers: @headers + token = @response.headers['CSRF-TOKEN'] + + # token based on headers + params = { + 'active': true, + 'data_option': { + 'options': { + 'false': 'no', + 'true': 'yes' + } + }, + 'data_type': 'boolean', + 'display': 'Boolean 2', + 'id': 'c-200', + 'name': 'bool2', + 'object': 'Ticket', + 'screens': { + 'create_middle': { + 'ticket.agent' => { + 'item_class': 'column', + 'shown': true + }, + 'ticket.customer' => { + 'item_class': 'column', + 'shown': true + } + }, + 'edit': { + 'ticket.agent' => { + 'shown': true + }, + 'ticket.customer' => { + 'shown': true + } + } + } + } + + post '/api/v1/object_manager_attributes', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(201) + result = JSON.parse(@response.body) + assert(result) + assert(result['data_option']['null']) + assert_equal(result['data_option']['null'], true) + assert_equal(result['name'], 'bool2') + end + + test 'add new user select object' do + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-admin', 'adminpw') + + post '/api/v1/object_manager_attributes', params: {}, headers: @headers + token = @response.headers['CSRF-TOKEN'] + + # token based on headers + params = { + 'active': true, + 'data_option': { + 'options': { + 'key1': 'foo' + } + }, + 'data_type': 'select', + 'display': 'Test 5', + 'id': 'c-204', + 'name': 'test5', + 'object': 'User', + 'screens': { + 'create': { + 'admin.user' => { + 'shown': true + }, + 'ticket.agent' => { + 'shown': true + }, + 'ticket.customer' => { + 'shown': true + } + }, + 'edit': { + 'admin.user' => { + 'shown': true + }, + 'ticket.agent' => { + 'shown': true + } + }, + 'view': { + 'admin.user' => { + 'shown': true + }, + 'ticket.agent' => { + 'shown': true + }, + 'ticket.customer' => { + 'shown': true + } + } + } + } + + post '/api/v1/object_manager_attributes', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(201) + result = JSON.parse(@response.body) + assert(result) + assert(result['data_option']['null']) + assert_equal(result['data_option']['null'], true) + assert_equal(result['name'], 'test5') + end + + test 'update user select object' do + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-admin', 'adminpw') + + # add a new object + object = ObjectManager::Attribute.add( + active: true, + data_option: { + options: { + key1: 'foo' + }, + null: true, + default: '', + }, + data_type: 'select', + display: 'Test 6', + id: 'c-204', + name: 'test6', + object: 'User', + screens: { + create: { + 'admin.user' => { + shown: true + }, + 'ticket.agent' => { + shown: true + }, + 'ticket.customer' => { + shown: true + } + }, + edit: { + 'admin.user' => { + shown: true + }, + 'ticket.agent' => { + shown: true + } + }, + view: { + 'admin.user' => { + shown: true + }, + 'ticket.agent' => { + shown: true + }, + 'ticket.customer' => { + shown: true + } + } + }, + position: 1550, + editable: true + ) + + migration = ObjectManager::Attribute.migration_execute + assert_equal(migration, true) + + post "/api/v1/object_manager_attributes/#{object.id}", params: {}, headers: @headers + token = @response.headers['CSRF-TOKEN'] + + # parameters for updating + params = { + active: true, + data_option: { + options: { + key1: 'foo', + key2: 'bar' + } + }, + data_type: 'select', + display: 'Test 7', + id: 'c-204', + name: 'test7', + object: 'User', + screens: { + create: { + 'admin.user' => { + shown: true + }, + 'ticket.agent' => { + shown: true + }, + 'ticket.customer' => { + shown: true + } + }, + edit: { + 'admin.user' => { + shown: true + }, + 'ticket.agent' => { + shown: true + } + }, + view: { + 'admin.user' => { + shown: true + }, + 'ticket.agent' => { + shown: true + }, + 'ticket.customer' => { + shown: true + } + } + } + } + + # update the object + put "/api/v1/object_manager_attributes/#{object.id}", params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert(result) + assert(result['data_option']['options']) + assert_equal(result['name'], 'test7') + assert_equal(result['display'], 'Test 7') + end + +end diff --git a/test/controllers/organization_controller_test.rb b/test/controllers/organization_controller_test.rb new file mode 100644 index 000000000..1ba5f2849 --- /dev/null +++ b/test/controllers/organization_controller_test.rb @@ -0,0 +1,513 @@ + +require 'test_helper' +require 'rake' + +class OrganizationControllerTest < ActionDispatch::IntegrationTest + setup do + + # set accept header + @headers = { 'ACCEPT' => 'application/json', 'CONTENT_TYPE' => 'application/json' } + + # create agent + roles = Role.where(name: %w[Admin Agent]) + groups = Group.all + + UserInfo.current_user_id = 1 + + @backup_admin = User.create_or_update( + login: 'backup-admin', + firstname: 'Backup', + lastname: 'Agent', + email: 'backup-admin@example.com', + password: 'adminpw', + active: true, + roles: roles, + groups: groups, + ) + + @admin = User.create_or_update( + login: 'rest-admin', + firstname: 'Rest', + lastname: 'Agent', + email: 'rest-admin@example.com', + password: 'adminpw', + active: true, + roles: roles, + groups: groups, + ) + + # create agent + roles = Role.where(name: 'Agent') + @agent = User.create_or_update( + login: 'rest-agent@example.com', + firstname: 'Rest', + lastname: 'Agent', + email: 'rest-agent@example.com', + password: 'agentpw', + active: true, + roles: roles, + groups: groups, + ) + + # create customer without org + roles = Role.where(name: 'Customer') + @customer_without_org = User.create_or_update( + login: 'rest-customer1@example.com', + firstname: 'Rest', + lastname: 'Customer1', + email: 'rest-customer1@example.com', + password: 'customer1pw', + active: true, + roles: roles, + ) + + # create orgs + @organization = Organization.create_or_update( + name: 'Rest Org', + ) + @organization2 = Organization.create_or_update( + name: 'Rest Org #2', + ) + @organization3 = Organization.create_or_update( + name: 'Rest Org #3', + ) + + # create customer with org + @customer_with_org = User.create_or_update( + login: 'rest-customer2@example.com', + firstname: 'Rest', + lastname: 'Customer2', + email: 'rest-customer2@example.com', + password: 'customer2pw', + active: true, + roles: roles, + organization_id: @organization.id, + ) + + # configure es + if ENV['ES_URL'].present? + #fail "ERROR: Need ES_URL - hint ES_URL='http://127.0.0.1:9200'" + Setting.set('es_url', ENV['ES_URL']) + + # Setting.set('es_url', 'http://127.0.0.1:9200') + # Setting.set('es_index', 'estest.local_zammad') + # Setting.set('es_user', 'elasticsearch') + # Setting.set('es_password', 'zammad') + + if ENV['ES_INDEX_RAND'].present? + ENV['ES_INDEX'] = "es_index_#{rand(999_999_999)}" + end + if ENV['ES_INDEX'].blank? + raise "ERROR: Need ES_INDEX - hint ES_INDEX='estest.local_zammad'" + end + Setting.set('es_index', ENV['ES_INDEX']) + + travel 1.minute + + # drop/create indexes + Rake::Task.clear + Zammad::Application.load_tasks + #Rake::Task["searchindex:drop"].execute + #Rake::Task["searchindex:create"].execute + Rake::Task['searchindex:rebuild'].execute + + # execute background jobs + Scheduler.worker(true) + + sleep 6 + end + + UserInfo.current_user_id = nil + end + + test 'organization index with agent' do + + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('rest-agent@example.com', 'agentpw') + + # index + get '/api/v1/organizations', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(result.class, Array) + assert_equal(result[0]['member_ids'].class, Array) + assert(result.length >= 3) + + get '/api/v1/organizations?limit=40&page=1&per_page=2', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Array, result.class) + organizations = Organization.order(:id).limit(2) + assert_equal(organizations[0].id, result[0]['id']) + assert_equal(organizations[0].member_ids, result[0]['member_ids']) + assert_equal(organizations[1].id, result[1]['id']) + assert_equal(organizations[1].member_ids, result[1]['member_ids']) + assert_equal(2, result.count) + + get '/api/v1/organizations?limit=40&page=2&per_page=2', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Array, result.class) + organizations = Organization.order(:id).limit(4) + assert_equal(organizations[2].id, result[0]['id']) + assert_equal(organizations[2].member_ids, result[0]['member_ids']) + assert_equal(organizations[3].id, result[1]['id']) + assert_equal(organizations[3].member_ids, result[1]['member_ids']) + + assert_equal(2, result.count) + + # show/:id + get "/api/v1/organizations/#{@organization.id}", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(result.class, Hash) + assert_equal(result['member_ids'].class, Array) + assert_not(result['members']) + assert_equal(result['name'], 'Rest Org') + + get "/api/v1/organizations/#{@organization2.id}", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(result.class, Hash) + assert_equal(result['member_ids'].class, Array) + assert_not(result['members']) + assert_equal(result['name'], 'Rest Org #2') + + # search as agent + Scheduler.worker(true) + get "/api/v1/organizations/search?query=#{CGI.escape('Zammad')}", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Array, result.class) + assert_equal('Zammad Foundation', result[0]['name']) + assert(result[0]['member_ids']) + assert_not(result[0]['members']) + + get "/api/v1/organizations/search?query=#{CGI.escape('Zammad')}&expand=true", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Array, result.class) + assert_equal('Zammad Foundation', result[0]['name']) + assert(result[0]['member_ids']) + assert(result[0]['members']) + + get "/api/v1/organizations/search?query=#{CGI.escape('Zammad')}&label=true", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Array, result.class) + assert_equal('Zammad Foundation', result[0]['label']) + assert_equal('Zammad Foundation', result[0]['value']) + assert_not(result[0]['member_ids']) + assert_not(result[0]['members']) + end + + test 'organization index with customer1' do + + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('rest-customer1@example.com', 'customer1pw') + + # index + get '/api/v1/organizations', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(result.class, Array) + assert_equal(result.length, 0) + + # show/:id + get "/api/v1/organizations/#{@organization.id}", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(result.class, Hash) + assert_nil(result['name']) + + get "/api/v1/organizations/#{@organization2.id}", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(result.class, Hash) + assert_nil(result['name']) + + # search + Scheduler.worker(true) + get "/api/v1/organizations/search?query=#{CGI.escape('Zammad')}", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(401) + end + + test 'organization index with customer2' do + + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('rest-customer2@example.com', 'customer2pw') + + # index + get '/api/v1/organizations', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(result.class, Array) + assert_equal(result.length, 1) + + # show/:id + get "/api/v1/organizations/#{@organization.id}", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(result.class, Hash) + assert_equal(result['name'], 'Rest Org') + + get "/api/v1/organizations/#{@organization2.id}", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(401) + result = JSON.parse(@response.body) + assert_equal(result.class, Hash) + assert_nil(result['name']) + + # search + Scheduler.worker(true) + get "/api/v1/organizations/search?query=#{CGI.escape('Zammad')}", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(401) + end + + test '04.01 organization show and response format' do + organization = Organization.create_or_update( + name: 'Rest Org NEW', + members: [@customer_without_org], + updated_by_id: @admin.id, + created_by_id: @admin.id, + ) + + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('rest-admin@example.com', 'adminpw') + get "/api/v1/organizations/#{organization.id}", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + assert_equal(organization.id, result['id']) + assert_equal(organization.name, result['name']) + assert_not(result['members']) + assert_equal([@customer_without_org.id], result['member_ids']) + assert_equal(@admin.id, result['updated_by_id']) + assert_equal(@admin.id, result['created_by_id']) + + get "/api/v1/organizations/#{organization.id}?expand=true", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + assert_equal(organization.id, result['id']) + assert_equal(organization.name, result['name']) + assert(result['members']) + assert_equal([@customer_without_org.id], result['member_ids']) + assert_equal(@admin.id, result['updated_by_id']) + assert_equal(@admin.id, result['created_by_id']) + + get "/api/v1/organizations/#{organization.id}?expand=false", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + assert_equal(organization.id, result['id']) + assert_equal(organization.name, result['name']) + assert_not(result['members']) + assert_equal([@customer_without_org.id], result['member_ids']) + assert_equal(@admin.id, result['updated_by_id']) + assert_equal(@admin.id, result['created_by_id']) + + get "/api/v1/organizations/#{organization.id}?full=true", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + + assert_equal(Hash, result.class) + assert_equal(organization.id, result['id']) + assert(result['assets']) + assert(result['assets']['Organization']) + assert(result['assets']['Organization'][organization.id.to_s]) + assert_equal(organization.id, result['assets']['Organization'][organization.id.to_s]['id']) + assert_equal(organization.name, result['assets']['Organization'][organization.id.to_s]['name']) + assert_equal(organization.member_ids, result['assets']['Organization'][organization.id.to_s]['member_ids']) + assert_not(result['assets']['Organization'][organization.id.to_s]['members']) + + get "/api/v1/organizations/#{organization.id}?full=false", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + assert_equal(organization.id, result['id']) + assert_equal(organization.name, result['name']) + assert_not(result['members']) + assert_equal([@customer_without_org.id], result['member_ids']) + assert_equal(@admin.id, result['updated_by_id']) + assert_equal(@admin.id, result['created_by_id']) + end + + test '04.02 organization index and response format' do + organization = Organization.create_or_update( + name: 'Rest Org NEW', + members: [@customer_without_org], + updated_by_id: @admin.id, + created_by_id: @admin.id, + ) + + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('rest-admin@example.com', 'adminpw') + get '/api/v1/organizations', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Array, result.class) + assert_equal(Hash, result[0].class) + assert_equal(organization.id, result.last['id']) + assert_equal(organization.name, result.last['name']) + assert_not(result.last['members']) + assert_equal(organization.member_ids, result.last['member_ids']) + assert_equal(@admin.id, result.last['updated_by_id']) + assert_equal(@admin.id, result.last['created_by_id']) + + get '/api/v1/organizations?expand=true', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Array, result.class) + assert_equal(Hash, result[0].class) + assert_equal(organization.id, result.last['id']) + assert_equal(organization.name, result.last['name']) + assert_equal(organization.member_ids, result.last['member_ids']) + assert_equal(organization.members.pluck(:login), [@customer_without_org.login]) + assert_equal(@admin.id, result.last['updated_by_id']) + assert_equal(@admin.id, result.last['created_by_id']) + + get '/api/v1/organizations?expand=false', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Array, result.class) + assert_equal(Hash, result[0].class) + assert_equal(organization.id, result.last['id']) + assert_equal(organization.name, result.last['name']) + assert_not(result.last['members']) + assert_equal(organization.member_ids, result.last['member_ids']) + assert_equal(@admin.id, result.last['updated_by_id']) + assert_equal(@admin.id, result.last['created_by_id']) + + get '/api/v1/organizations?full=true', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + + assert_equal(Hash, result.class) + assert_equal(Array, result['record_ids'].class) + assert_equal(1, result['record_ids'][0]) + assert_equal(organization.id, result['record_ids'].last) + assert(result['assets']) + assert(result['assets']['Organization']) + assert(result['assets']['Organization'][organization.id.to_s]) + assert_equal(organization.id, result['assets']['Organization'][organization.id.to_s]['id']) + assert_equal(organization.name, result['assets']['Organization'][organization.id.to_s]['name']) + assert_equal(organization.member_ids, result['assets']['Organization'][organization.id.to_s]['member_ids']) + assert_not(result['assets']['Organization'][organization.id.to_s]['members']) + + get '/api/v1/organizations?full=false', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Array, result.class) + assert_equal(Hash, result[0].class) + assert_equal(organization.id, result.last['id']) + assert_equal(organization.name, result.last['name']) + assert_not(result.last['members']) + assert_equal(organization.member_ids, result.last['member_ids']) + assert_equal(@admin.id, result.last['updated_by_id']) + assert_equal(@admin.id, result.last['created_by_id']) + end + + test '04.03 ticket create and response format' do + params = { + name: 'Rest Org NEW', + members: [@customer_without_org.login], + } + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('rest-admin@example.com', 'adminpw') + + post '/api/v1/organizations', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(201) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + + organization = Organization.find(result['id']) + assert_equal(organization.name, result['name']) + assert_equal(organization.member_ids, result['member_ids']) + assert_not(result['members']) + assert_equal(@admin.id, result['updated_by_id']) + assert_equal(@admin.id, result['created_by_id']) + + params[:name] = 'Rest Org NEW #2' + post '/api/v1/organizations?expand=true', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(201) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + + organization = Organization.find(result['id']) + assert_equal(organization.name, result['name']) + assert_equal(organization.member_ids, result['member_ids']) + assert_equal(organization.members.pluck(:login), result['members']) + assert_equal(@admin.id, result['updated_by_id']) + assert_equal(@admin.id, result['created_by_id']) + + params[:name] = 'Rest Org NEW #3' + post '/api/v1/organizations?full=true', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(201) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + + organization = Organization.find(result['id']) + assert(result['assets']) + assert(result['assets']['Organization']) + assert(result['assets']['Organization'][organization.id.to_s]) + assert_equal(organization.id, result['assets']['Organization'][organization.id.to_s]['id']) + assert_equal(organization.name, result['assets']['Organization'][organization.id.to_s]['name']) + assert_equal(organization.member_ids, result['assets']['Organization'][organization.id.to_s]['member_ids']) + assert_not(result['assets']['Organization'][organization.id.to_s]['members']) + + end + + test '04.04 ticket update and response formats' do + organization = Organization.create_or_update( + name: 'Rest Org NEW', + members: [@customer_without_org], + updated_by_id: @admin.id, + created_by_id: @admin.id, + ) + + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('rest-admin@example.com', 'adminpw') + + params = { + name: 'a update name #1', + } + put "/api/v1/organizations/#{organization.id}", params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + + organization = Organization.find(result['id']) + assert_equal(params[:name], result['name']) + assert_equal(organization.member_ids, result['member_ids']) + assert_not(result['members']) + assert_equal(@admin.id, result['updated_by_id']) + assert_equal(@admin.id, result['created_by_id']) + + params = { + name: 'a update name #2', + } + put "/api/v1/organizations/#{organization.id}?expand=true", params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + + organization = Organization.find(result['id']) + assert_equal(params[:name], result['name']) + assert_equal(organization.member_ids, result['member_ids']) + assert_equal(organization.members.pluck(:login), [@customer_without_org.login]) + assert_equal(@admin.id, result['updated_by_id']) + assert_equal(@admin.id, result['created_by_id']) + + params = { + name: 'a update name #3', + } + put "/api/v1/organizations/#{organization.id}?full=true", params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + + organization = Organization.find(result['id']) + assert(result['assets']) + assert(result['assets']['Organization']) + assert(result['assets']['Organization'][organization.id.to_s]) + assert_equal(organization.id, result['assets']['Organization'][organization.id.to_s]['id']) + assert_equal(params[:name], result['assets']['Organization'][organization.id.to_s]['name']) + assert_equal(organization.member_ids, result['assets']['Organization'][organization.id.to_s]['member_ids']) + assert_not(result['assets']['Organization'][organization.id.to_s]['members']) + + end + +end diff --git a/test/controllers/overviews_controller_test.rb b/test/controllers/overviews_controller_test.rb new file mode 100644 index 000000000..1ee47955b --- /dev/null +++ b/test/controllers/overviews_controller_test.rb @@ -0,0 +1,184 @@ + +require 'test_helper' + +class OverviewsControllerTest < ActionDispatch::IntegrationTest + setup do + + # set accept header + @headers = { 'ACCEPT' => 'application/json', 'CONTENT_TYPE' => 'application/json' } + + # create agent + roles = Role.where(name: %w[Admin Agent]) + groups = Group.all + + UserInfo.current_user_id = 1 + @admin = User.create_or_update( + login: 'tickets-admin', + firstname: 'Tickets', + lastname: 'Admin', + email: 'tickets-admin@example.com', + password: 'adminpw', + active: true, + roles: roles, + groups: groups, + ) + + # create agent + roles = Role.where(name: 'Agent') + @agent = User.create_or_update( + login: 'tickets-agent@example.com', + firstname: 'Tickets', + lastname: 'Agent', + email: 'tickets-agent@example.com', + password: 'agentpw', + active: true, + roles: roles, + groups: Group.all, + ) + + end + + test 'no permissions' do + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-agent', 'agentpw') + + params = { + name: 'Overview2', + link: 'my_overview', + roles: Role.where(name: 'Agent').pluck(:name), + condition: { + 'ticket.state_id' => { + operator: 'is', + value: [1, 2, 3], + }, + }, + order: { + by: 'created_at', + direction: 'DESC', + }, + view: { + d: %w[title customer state created_at], + s: %w[number title customer state created_at], + m: %w[number title customer state created_at], + view_mode_default: 's', + }, + } + + post '/api/v1/overviews', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(401) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + assert_equal('authentication failed', result['error']) + end + + test 'create overviews' do + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-admin', 'adminpw') + + params = { + name: 'Overview2', + link: 'my_overview', + roles: Role.where(name: 'Agent').pluck(:name), + condition: { + 'ticket.state_id' => { + operator: 'is', + value: [1, 2, 3], + }, + }, + order: { + by: 'created_at', + direction: 'DESC', + }, + view: { + d: %w[title customer state created_at], + s: %w[number title customer state created_at], + m: %w[number title customer state created_at], + view_mode_default: 's', + }, + } + + post '/api/v1/overviews', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(201) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + assert_equal('Overview2', result['name']) + assert_equal('my_overview', result['link']) + + post '/api/v1/overviews', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(201) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + assert_equal('Overview2', result['name']) + assert_equal('my_overview_1', result['link']) + end + + test 'set mass prio' do + roles = Role.where(name: 'Agent') + overview1 = Overview.create!( + name: 'Overview1', + link: 'my_overview', + roles: roles, + condition: { + 'ticket.state_id' => { + operator: 'is', + value: [1, 2, 3], + }, + }, + order: { + by: 'created_at', + direction: 'DESC', + }, + view: { + d: %w[title customer state created_at], + s: %w[number title customer state created_at], + m: %w[number title customer state created_at], + view_mode_default: 's', + }, + prio: 1, + updated_by_id: 1, + created_by_id: 1, + ) + overview2 = Overview.create!( + name: 'Overview2', + link: 'my_overview', + roles: roles, + condition: { + 'ticket.state_id' => { + operator: 'is', + value: [1, 2, 3], + }, + }, + order: { + by: 'created_at', + direction: 'DESC', + }, + view: { + d: %w[title customer state created_at], + s: %w[number title customer state created_at], + m: %w[number title customer state created_at], + view_mode_default: 's', + }, + prio: 2, + updated_by_id: 1, + created_by_id: 1, + ) + + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-admin', 'adminpw') + params = { + prios: [ + [overview2.id, 1], + [overview1.id, 2], + ] + } + post '/api/v1/overviews_prio', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + assert_equal(true, result['success']) + + overview1.reload + overview2.reload + + assert_equal(2, overview1.prio) + assert_equal(1, overview2.prio) + end + +end diff --git a/test/controllers/packages_controller_test.rb b/test/controllers/packages_controller_test.rb index 36d79343e..1eac66ca5 100644 --- a/test/controllers/packages_controller_test.rb +++ b/test/controllers/packages_controller_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class PackagesControllerTest < ActionDispatch::IntegrationTest @@ -8,7 +8,7 @@ class PackagesControllerTest < ActionDispatch::IntegrationTest @headers = { 'ACCEPT' => 'application/json', 'CONTENT_TYPE' => 'application/json' } # create agent - roles = Role.where(name: %w(Admin Agent)) + roles = Role.where(name: %w[Admin Agent]) groups = Group.all UserInfo.current_user_id = 1 diff --git a/test/controllers/search_controller_test.rb b/test/controllers/search_controller_test.rb index c483dab67..e444485e9 100644 --- a/test/controllers/search_controller_test.rb +++ b/test/controllers/search_controller_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' require 'rake' @@ -12,7 +12,7 @@ class SearchControllerTest < ActionDispatch::IntegrationTest @headers = { 'ACCEPT' => 'application/json', 'CONTENT_TYPE' => 'application/json' } # create agent - roles = Role.where(name: %w(Admin Agent)) + roles = Role.where(name: %w[Admin Agent]) groups = Group.all @admin = User.create_or_update( @@ -195,21 +195,21 @@ class SearchControllerTest < ActionDispatch::IntegrationTest assert_response(401) result = JSON.parse(@response.body) assert_equal(Hash, result.class) - assert_not(result.empty?) + assert_not(result.blank?) assert_equal('authentication failed', result['error']) post '/api/v1/search/user', params: params.to_json, headers: @headers assert_response(401) result = JSON.parse(@response.body) assert_equal(Hash, result.class) - assert_not(result.empty?) + assert_not(result.blank?) assert_equal('authentication failed', result['error']) post '/api/v1/search', params: params.to_json, headers: @headers assert_response(401) result = JSON.parse(@response.body) assert_equal(Hash, result.class) - assert_not(result.empty?) + assert_not(result.blank?) assert_equal('authentication failed', result['error']) end diff --git a/test/controllers/settings_controller_test.rb b/test/controllers/settings_controller_test.rb index 93249425b..5930ba0f5 100644 --- a/test/controllers/settings_controller_test.rb +++ b/test/controllers/settings_controller_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class SettingsControllerTest < ActionDispatch::IntegrationTest @@ -8,7 +8,7 @@ class SettingsControllerTest < ActionDispatch::IntegrationTest @headers = { 'ACCEPT' => 'application/json', 'CONTENT_TYPE' => 'application/json' } # create agent - roles = Role.where(name: %w(Admin Agent)) + roles = Role.where(name: %w[Admin Agent]) groups = Group.all UserInfo.current_user_id = 1 diff --git a/test/controllers/taskbars_controller_test.rb b/test/controllers/taskbars_controller_test.rb index 9c3697669..e8a8bf48b 100644 --- a/test/controllers/taskbars_controller_test.rb +++ b/test/controllers/taskbars_controller_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class TaskbarsControllerTest < ActionDispatch::IntegrationTest diff --git a/test/controllers/ticket_article_attachments_controller_test.rb b/test/controllers/ticket_article_attachments_controller_test.rb index 35bbc74eb..abee9e162 100644 --- a/test/controllers/ticket_article_attachments_controller_test.rb +++ b/test/controllers/ticket_article_attachments_controller_test.rb @@ -1,11 +1,11 @@ -# encoding: utf-8 + require 'test_helper' class TicketArticleAttachmentsControllerTest < ActionDispatch::IntegrationTest setup do # create agent - roles = Role.where(name: %w(Admin Agent)) + roles = Role.where(name: %w[Admin Agent]) groups = Group.all UserInfo.current_user_id = 1 @@ -141,4 +141,57 @@ class TicketArticleAttachmentsControllerTest < ActionDispatch::IntegrationTest end + test '01.02 test attachments for split' do + headers = { 'ACCEPT' => 'application/json', 'CONTENT_TYPE' => 'application/json' } + + email_raw_string = IO.binread('test/fixtures/mail24.box') + ticket_p, article_p, user_p = Channel::EmailParser.new.process({}, email_raw_string) + + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-agent@example.com', 'agentpw') + get '/api/v1/ticket_split', params: { form_id: '1234-2', ticket_id: ticket_p.id, article_id: article_p.id }, headers: headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert(result['assets']) + assert_equal(result['attachments'].class, Array) + assert_equal(result['attachments'].count, 1) + assert_equal(result['attachments'][0]['filename'], 'rulesets-report.csv') + + end + + test '01.03 test attachments for forward' do + headers = { 'ACCEPT' => 'application/json', 'CONTENT_TYPE' => 'application/json' } + + email_raw_string = IO.binread('test/fixtures/mail8.box') + ticket_p, article_p, user_p = Channel::EmailParser.new.process({}, email_raw_string) + + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-agent@example.com', 'agentpw') + post "/api/v1/ticket_attachment_upload_clone_by_article/#{article_p.id}", params: {}, headers: headers.merge('Authorization' => credentials) + assert_response(422) + result = JSON.parse(@response.body) + assert_equal(result.class, Hash) + assert(result['error'], 'Need form_id to attach attachments to new form') + + post "/api/v1/ticket_attachment_upload_clone_by_article/#{article_p.id}", params: { form_id: '1234-1' }.to_json, headers: headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(result['attachments'].class, Array) + assert(result['attachments'].blank?) + + email_raw_string = IO.binread('test/fixtures/mail24.box') + 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' }.to_json, headers: headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(result['attachments'].class, Array) + assert_equal(result['attachments'].count, 1) + assert_equal(result['attachments'][0]['filename'], 'rulesets-report.csv') + + post "/api/v1/ticket_attachment_upload_clone_by_article/#{article_p.id}", params: { form_id: '1234-2' }.to_json, headers: headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(result['attachments'].class, Array) + assert(result['attachments'].blank?) + end + end diff --git a/test/controllers/ticket_articles_controller_test.rb b/test/controllers/ticket_articles_controller_test.rb index 9119426bf..4444990e4 100644 --- a/test/controllers/ticket_articles_controller_test.rb +++ b/test/controllers/ticket_articles_controller_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class TicketArticlesControllerTest < ActionDispatch::IntegrationTest @@ -8,7 +8,7 @@ class TicketArticlesControllerTest < ActionDispatch::IntegrationTest @headers = { 'ACCEPT' => 'application/json', 'CONTENT_TYPE' => 'application/json' } # create agent - roles = Role.where(name: %w(Admin Agent)) + roles = Role.where(name: %w[Admin Agent]) groups = Group.all UserInfo.current_user_id = 1 @@ -325,4 +325,194 @@ AAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO article = Ticket::Article.find_by( ticket_id: result['id'] ) assert_nil(article.origin_by_id) end + + test '04.01 ticket split with html - check attachments' do + ticket = Ticket.create!( + title: 'some title', + group: Group.lookup(name: 'Users'), + customer_id: @customer_without_org.id, + state: Ticket::State.lookup(name: 'new'), + priority: Ticket::Priority.lookup(name: '2 normal'), + updated_by_id: @agent.id, + created_by_id: @agent.id, + ) + article = Ticket::Article.create!( + type: Ticket::Article::Type.lookup(name: 'note'), + sender: Ticket::Article::Sender.lookup(name: 'Customer'), + from: 'sender', + subject: 'subject', + body: 'test test ', + content_type: 'text/html', + ticket_id: ticket.id, + updated_by_id: 1, + created_by_id: 1, + ) + Store.add( + object: 'Ticket::Article', + o_id: article.id, + data: 'content_file1_normally_should_be_an_image', + filename: 'some_file1.jpg', + preferences: { + 'Content-Type' => 'image/jpeg', + 'Mime-Type' => 'image/jpeg', + 'Content-ID' => '15.274327094.140938@zammad.example.com', + 'Content-Disposition' => 'inline', + }, + created_by_id: 1, + ) + Store.add( + object: 'Ticket::Article', + o_id: article.id, + data: 'content_file2_normally_should_be_an_image', + filename: 'some_file2.jpg', + preferences: { + 'Content-Type' => 'image/jpeg', + 'Mime-Type' => 'image/jpeg', + 'Content-ID' => '15.274327094.140938.2@zammad.example.com', + 'Content-Disposition' => 'inline', + }, + created_by_id: 1, + ) + Store.add( + object: 'Ticket::Article', + o_id: article.id, + data: 'content_file3_normally_should_be_an_image', + filename: 'some_file3.jpg', + preferences: { + 'Content-Type' => 'image/jpeg', + 'Mime-Type' => 'image/jpeg', + 'Content-ID' => '15.274327094.140938.3@zammad.example.com', + }, + created_by_id: 1, + ) + Store.add( + object: 'Ticket::Article', + o_id: article.id, + data: 'content_file4_normally_should_be_an_image', + filename: 'some_file4.jpg', + preferences: { + 'Content-Type' => 'image/jpeg', + 'Mime-Type' => 'image/jpeg', + 'Content-ID' => '15.274327094.140938.4@zammad.example.com', + }, + created_by_id: 1, + ) + Store.add( + object: 'Ticket::Article', + o_id: article.id, + data: 'content_file1_normally_should_be_an_pdf', + filename: 'Rechnung_RE-2018-200.pdf', + preferences: { + 'Content-Type' => 'application/octet-stream; name="Rechnung_RE-2018-200.pdf"', + 'Mime-Type' => 'application/octet-stream', + 'Content-ID' => '8AB0BEC88984EE4EBEF643C79C8E0346@zammad.example.com', + 'Content-Description' => 'Rechnung_RE-2018-200.pdf', + 'Content-Disposition' => 'attachment', + }, + created_by_id: 1, + ) + + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-agent@example.com', 'agentpw') + + params = { + form_id: 'new_form_id123', + } + post "/api/v1/ticket_attachment_upload_clone_by_article/#{article.id}", params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + assert(result['attachments']) + assert_equal(result['attachments'].count, 3) + + post "/api/v1/ticket_attachment_upload_clone_by_article/#{article.id}", params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + assert(result['attachments']) + assert_equal(result['attachments'].count, 0) + end + + test '04.02 ticket split with plain - check attachments' do + ticket = Ticket.create!( + title: 'some title', + group: Group.lookup(name: 'Users'), + customer_id: @customer_without_org.id, + state: Ticket::State.lookup(name: 'new'), + priority: Ticket::Priority.lookup(name: '2 normal'), + updated_by_id: @agent.id, + created_by_id: @agent.id, + ) + article = Ticket::Article.create!( + type: Ticket::Article::Type.lookup(name: 'note'), + sender: Ticket::Article::Sender.lookup(name: 'Customer'), + from: 'sender', + subject: 'subject', + body: 'test ', + content_type: 'text/plain', + ticket_id: ticket.id, + updated_by_id: 1, + created_by_id: 1, + ) + Store.add( + object: 'Ticket::Article', + o_id: article.id, + data: 'content_file1_normally_should_be_an_image', + filename: 'some_file1.jpg', + preferences: { + 'Content-Type' => 'image/jpeg', + 'Mime-Type' => 'image/jpeg', + 'Content-ID' => '15.274327094.140938@zammad.example.com', + 'Content-Disposition' => 'inline', + }, + created_by_id: 1, + ) + Store.add( + object: 'Ticket::Article', + o_id: article.id, + data: 'content_file1_normally_should_be_an_image', + filename: 'some_file2.jpg', + preferences: { + 'Content-Type' => 'image/jpeg', + 'Mime-Type' => 'image/jpeg', + 'Content-ID' => '15.274327094.140938.2@zammad.example.com', + 'Content-Disposition' => 'inline', + }, + created_by_id: 1, + ) + Store.add( + object: 'Ticket::Article', + o_id: article.id, + data: 'content_file1_normally_should_be_an_pdf', + filename: 'Rechnung_RE-2018-200.pdf', + preferences: { + 'Content-Type' => 'application/octet-stream; name="Rechnung_RE-2018-200.pdf"', + 'Mime-Type' => 'application/octet-stream', + 'Content-ID' => '8AB0BEC88984EE4EBEF643C79C8E0346@zammad.example.com', + 'Content-Description' => 'Rechnung_RE-2018-200.pdf', + 'Content-Disposition' => 'attachment', + }, + created_by_id: 1, + ) + + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-agent@example.com', 'agentpw') + + params = { + form_id: 'new_form_id123', + } + post "/api/v1/ticket_attachment_upload_clone_by_article/#{article.id}", params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + assert(result['attachments']) + assert_equal(result['attachments'].count, 3) + + post "/api/v1/ticket_attachment_upload_clone_by_article/#{article.id}", params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + assert(result['attachments']) + assert_equal(result['attachments'].count, 0) + + end + end diff --git a/test/controllers/tickets_controller_test.rb b/test/controllers/tickets_controller_test.rb index d63bac89e..785ab7001 100644 --- a/test/controllers/tickets_controller_test.rb +++ b/test/controllers/tickets_controller_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class TicketsControllerTest < ActionDispatch::IntegrationTest @@ -8,7 +8,7 @@ class TicketsControllerTest < ActionDispatch::IntegrationTest @headers = { 'ACCEPT' => 'application/json', 'CONTENT_TYPE' => 'application/json' } # create agent - roles = Role.where(name: %w(Admin Agent)) + roles = Role.where(name: %w[Admin Agent]) groups = Group.all UserInfo.current_user_id = 1 @@ -47,7 +47,7 @@ class TicketsControllerTest < ActionDispatch::IntegrationTest active: true, roles: roles, ) - + UserInfo.current_user_id = nil end test '01.01 ticket create with agent - missing group' do @@ -127,7 +127,30 @@ class TicketsControllerTest < ActionDispatch::IntegrationTest assert_equal(@agent.id, result['created_by_id']) end - test '01.04 ticket create with agent - wrong owner_id - 0' do + test '01.04 ticket create with agent - minimal article and customer.email' do + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-agent@example.com', 'agentpw') + params = { + title: 'a new ticket #3', + group: 'Users', + priority: '2 normal', + state: 'new', + customer: @customer_without_org.email, + article: { + body: 'some test 123', + }, + } + post '/api/v1/tickets', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(201) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + assert_equal(Ticket::State.lookup(name: 'new').id, result['state_id']) + assert_equal('a new ticket #3', result['title']) + assert_equal(@customer_without_org.id, result['customer_id']) + assert_equal(@agent.id, result['updated_by_id']) + assert_equal(@agent.id, result['created_by_id']) + end + + test '01.05 ticket create with agent - wrong owner_id - 0' do credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-agent@example.com', 'agentpw') params = { title: 'a new ticket #4', @@ -147,7 +170,7 @@ class TicketsControllerTest < ActionDispatch::IntegrationTest assert_equal('Invalid value for param \'owner_id\': 0', result['error']) end - test '01.05 ticket create with agent - wrong owner_id - ""' do + test '01.06 ticket create with agent - wrong owner_id - ""' do credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-agent@example.com', 'agentpw') params = { title: 'a new ticket #5', @@ -175,7 +198,7 @@ class TicketsControllerTest < ActionDispatch::IntegrationTest assert_equal(@agent.id, result['created_by_id']) end - test '01.06 ticket create with agent - wrong owner_id - 99999' do + test '01.07 ticket create with agent - wrong owner_id - 99999' do credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-agent@example.com', 'agentpw') params = { title: 'a new ticket #6', @@ -195,7 +218,7 @@ class TicketsControllerTest < ActionDispatch::IntegrationTest assert_equal('Invalid value for param \'owner_id\': 99999', result['error']) end - test '01.07 ticket create with agent - wrong owner_id - nil' do + test '01.08 ticket create with agent - wrong owner_id - nil' do credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-agent@example.com', 'agentpw') params = { title: 'a new ticket #7', @@ -219,7 +242,7 @@ class TicketsControllerTest < ActionDispatch::IntegrationTest assert_equal(@agent.id, result['created_by_id']) end - test '01.08 ticket create with agent - minimal article with guess customer' do + test '01.09 ticket create with agent - minimal article with guess customer' do credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-agent@example.com', 'agentpw') params = { title: 'a new ticket #8', @@ -242,7 +265,7 @@ class TicketsControllerTest < ActionDispatch::IntegrationTest assert_equal(@agent.id, result['created_by_id']) end - test '01.09 ticket create with agent - minimal article with guess customer' do + test '01.10 ticket create with agent - minimal article with guess customer' do credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-agent@example.com', 'agentpw') params = { title: 'a new ticket #9', @@ -263,7 +286,32 @@ class TicketsControllerTest < ActionDispatch::IntegrationTest assert_equal(@agent.id, result['created_by_id']) end - test '01.10 ticket create with agent - minimal article with missing body - with customer' do + test '01.11 ticket create with agent - minimal article with customer hash' do + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-agent@example.com', 'agentpw') + params = { + title: 'a new ticket #9', + group: 'Users', + customer: { + firstname: 'some firstname', + lastname: 'some lastname', + email: 'some_new_customer@example.com', + }, + article: { + body: 'some test 123', + }, + } + post '/api/v1/tickets', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(201) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + assert_equal(Ticket::State.lookup(name: 'new').id, result['state_id']) + assert_equal('a new ticket #9', result['title']) + assert_equal(User.lookup(email: 'some_new_customer@example.com').id, result['customer_id']) + assert_equal(@agent.id, result['updated_by_id']) + assert_equal(@agent.id, result['created_by_id']) + end + + test '01.12 ticket create with agent - minimal article with missing body - with customer.id' do credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-agent@example.com', 'agentpw') params = { title: 'a new ticket #10', @@ -280,7 +328,7 @@ class TicketsControllerTest < ActionDispatch::IntegrationTest assert_equal('Need at least article: { body: "some text" }', result['error']) end - test '01.11 ticket create with agent - minimal article and attachment with customer' do + test '01.13 ticket create with agent - minimal article and attachment with customer' do credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-agent@example.com', 'agentpw') params = { title: 'a new ticket #11', @@ -316,7 +364,7 @@ class TicketsControllerTest < ActionDispatch::IntegrationTest assert_not(file.preferences['Content-ID']) end - test '01.12 ticket create with agent - minimal article and attachment with customer' do + test '01.14 ticket create with agent - minimal article and attachment with customer' do credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-agent@example.com', 'agentpw') params = { title: 'a new ticket #12', @@ -359,7 +407,7 @@ class TicketsControllerTest < ActionDispatch::IntegrationTest assert_not(file.preferences['Content-ID']) end - test '01.13 ticket create with agent - minimal article and attachment missing mine-type with customer' do + test '01.15 ticket create with agent - minimal article and attachment missing mine-type with customer' do credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-agent@example.com', 'agentpw') params = { title: 'a new ticket #13', @@ -382,7 +430,7 @@ class TicketsControllerTest < ActionDispatch::IntegrationTest assert_equal('Invalid base64 for attachment with index \'0\'', result['error']) end - test '01.14 ticket create with agent - minimal article and attachment invalid base64 with customer' do + test '01.16 ticket create with agent - minimal article and attachment invalid base64 with customer' do credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-agent@example.com', 'agentpw') params = { title: 'a new ticket #14', @@ -404,7 +452,7 @@ class TicketsControllerTest < ActionDispatch::IntegrationTest assert_equal('Attachment needs \'mime-type\' param for attachment with index \'0\'', result['error']) end - test '01.15 ticket create with agent - minimal article and inline attachments with customer' do + test '01.17 ticket create with agent - minimal article and inline attachments with customer' do credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-agent@example.com', 'agentpw') params = { title: 'a new ticket #15', @@ -444,7 +492,7 @@ AAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO assert(file.preferences['Content-ID']) end - test '01.16 ticket create with agent - minimal article and inline attachments with customer' do + test '01.18 ticket create with agent - minimal article and inline attachments with customer' do credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-agent@example.com', 'agentpw') params = { title: 'a new ticket #16', @@ -925,7 +973,36 @@ AAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO assert_equal(@customer_without_org.id, result['created_by_id']) end - test '03.03 ticket with wrong ticket id' do + test '03.03 ticket create with customer with wrong customer hash' do + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-customer1@example.com', 'customer1pw') + params = { + title: 'a new ticket #c2', + state: 'new', + priority: '2 normal', + group: 'Users', + customer: { + firstname: @agent.firstname, + lastname: @agent.lastname, + email: @agent.email, + }, + article: { + content_type: 'text/plain', # or text/html + body: 'some body', + sender: 'System', + }, + } + post '/api/v1/tickets', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(201) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + assert_equal(Ticket::State.lookup(name: 'new').id, result['state_id']) + assert_equal('a new ticket #c2', result['title']) + assert_equal(@customer_without_org.id, result['customer_id']) + assert_equal(@customer_without_org.id, result['updated_by_id']) + assert_equal(@customer_without_org.id, result['created_by_id']) + end + + test '03.04 ticket with wrong ticket id' do ticket = Ticket.create!( title: 'ticket with wrong ticket id', group: Group.lookup(name: 'Users'), @@ -958,7 +1035,7 @@ AAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO assert_equal('Not authorized', result['error']) end - test '03.04 ticket with correct ticket id' do + test '03.05 ticket with correct ticket id' do title = "ticket with corret ticket id testme#{rand(999_999_999)}" ticket = Ticket.create!( title: title, @@ -1107,4 +1184,553 @@ AAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO assert_equal('Not authorized (admin permission required)!', result['error']) end + test '04.01 ticket show and response format' do + title = "ticket testagent#{rand(999_999_999)}" + ticket = Ticket.create!( + title: title, + group: Group.lookup(name: 'Users'), + customer_id: @customer_without_org.id, + state: Ticket::State.lookup(name: 'new'), + priority: Ticket::Priority.lookup(name: '2 normal'), + updated_by_id: @agent.id, + created_by_id: @agent.id, + ) + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-agent@example.com', 'agentpw') + get "/api/v1/tickets/#{ticket.id}", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + assert_equal(ticket.id, result['id']) + assert_equal(ticket.title, result['title']) + assert_not(result['group']) + assert_not(result['priority']) + assert_not(result['owner']) + assert_equal(ticket.customer_id, result['customer_id']) + assert_equal(@agent.id, result['updated_by_id']) + assert_equal(@agent.id, result['created_by_id']) + + get "/api/v1/tickets/#{ticket.id}?expand=true", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + assert_equal(ticket.id, result['id']) + assert_equal(ticket.title, result['title']) + assert_equal(ticket.customer_id, result['customer_id']) + assert_equal(ticket.group.name, result['group']) + assert_equal(ticket.priority.name, result['priority']) + assert_equal(ticket.owner.login, result['owner']) + assert_equal(@agent.id, result['updated_by_id']) + assert_equal(@agent.id, result['created_by_id']) + + get "/api/v1/tickets/#{ticket.id}?expand=false", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + assert_equal(ticket.id, result['id']) + assert_equal(ticket.title, result['title']) + assert_not(result['group']) + assert_not(result['priority']) + assert_not(result['owner']) + assert_equal(ticket.customer_id, result['customer_id']) + assert_equal(@agent.id, result['updated_by_id']) + assert_equal(@agent.id, result['created_by_id']) + + get "/api/v1/tickets/#{ticket.id}?full=true", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + + assert_equal(Hash, result.class) + assert_equal(ticket.id, result['id']) + assert(result['assets']) + assert(result['assets']['Ticket']) + assert(result['assets']['Ticket'][ticket.id.to_s]) + assert_equal(ticket.id, result['assets']['Ticket'][ticket.id.to_s]['id']) + assert_equal(ticket.title, result['assets']['Ticket'][ticket.id.to_s]['title']) + assert_equal(ticket.customer_id, result['assets']['Ticket'][ticket.id.to_s]['customer_id']) + + assert(result['assets']['User']) + assert(result['assets']['User'][@agent.id.to_s]) + assert_equal(@agent.id, result['assets']['User'][@agent.id.to_s]['id']) + assert_equal(@agent.firstname, result['assets']['User'][@agent.id.to_s]['firstname']) + assert_equal(@agent.lastname, result['assets']['User'][@agent.id.to_s]['lastname']) + + assert(result['assets']['User']) + assert(result['assets']['User'][@customer_without_org.id.to_s]) + assert_equal(@customer_without_org.id, result['assets']['User'][@customer_without_org.id.to_s]['id']) + assert_equal(@customer_without_org.firstname, result['assets']['User'][@customer_without_org.id.to_s]['firstname']) + assert_equal(@customer_without_org.lastname, result['assets']['User'][@customer_without_org.id.to_s]['lastname']) + + get "/api/v1/tickets/#{ticket.id}?full=false", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + assert_equal(ticket.id, result['id']) + assert_equal(ticket.title, result['title']) + assert_not(result['group']) + assert_not(result['priority']) + assert_not(result['owner']) + assert_equal(ticket.customer_id, result['customer_id']) + assert_equal(@agent.id, result['updated_by_id']) + assert_equal(@agent.id, result['created_by_id']) + end + + test '04.02 ticket index and response format' do + title = "ticket testagent#{rand(999_999_999)}" + ticket = Ticket.create!( + title: title, + group: Group.lookup(name: 'Users'), + customer_id: @customer_without_org.id, + state: Ticket::State.lookup(name: 'new'), + priority: Ticket::Priority.lookup(name: '2 normal'), + updated_by_id: @agent.id, + created_by_id: @agent.id, + ) + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-agent@example.com', 'agentpw') + get '/api/v1/tickets', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + + assert_equal(Array, result.class) + assert_equal(Hash, result[0].class) + assert_equal(1, result[0]['id']) + assert_equal(ticket.id, result[1]['id']) + assert_equal(ticket.title, result[1]['title']) + assert_not(result[1]['group']) + assert_not(result[1]['priority']) + assert_not(result[1]['owner']) + assert_equal(ticket.customer_id, result[1]['customer_id']) + assert_equal(@agent.id, result[1]['updated_by_id']) + assert_equal(@agent.id, result[1]['created_by_id']) + + get '/api/v1/tickets?expand=true', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Array, result.class) + assert_equal(Hash, result[0].class) + assert_equal(1, result[0]['id']) + assert_equal(ticket.id, result[1]['id']) + assert_equal(ticket.title, result[1]['title']) + assert_equal(ticket.customer_id, result[1]['customer_id']) + assert_equal(ticket.group.name, result[1]['group']) + assert_equal(ticket.priority.name, result[1]['priority']) + assert_equal(ticket.owner.login, result[1]['owner']) + assert_equal(@agent.id, result[1]['updated_by_id']) + assert_equal(@agent.id, result[1]['created_by_id']) + + get '/api/v1/tickets?expand=false', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Array, result.class) + assert_equal(Hash, result[0].class) + assert_equal(1, result[0]['id']) + assert_equal(ticket.id, result[1]['id']) + assert_equal(ticket.title, result[1]['title']) + assert_not(result[1]['group']) + assert_not(result[1]['priority']) + assert_not(result[1]['owner']) + assert_equal(ticket.customer_id, result[1]['customer_id']) + assert_equal(@agent.id, result[1]['updated_by_id']) + assert_equal(@agent.id, result[1]['created_by_id']) + + get '/api/v1/tickets?full=true', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + + assert_equal(Hash, result.class) + assert_equal(Array, result['record_ids'].class) + assert_equal(1, result['record_ids'][0]) + assert_equal(ticket.id, result['record_ids'][1]) + assert(result['assets']) + assert(result['assets']['Ticket']) + assert(result['assets']['Ticket'][ticket.id.to_s]) + assert_equal(ticket.id, result['assets']['Ticket'][ticket.id.to_s]['id']) + assert_equal(ticket.title, result['assets']['Ticket'][ticket.id.to_s]['title']) + assert_equal(ticket.customer_id, result['assets']['Ticket'][ticket.id.to_s]['customer_id']) + + assert(result['assets']['User']) + assert(result['assets']['User'][@agent.id.to_s]) + assert_equal(@agent.id, result['assets']['User'][@agent.id.to_s]['id']) + assert_equal(@agent.firstname, result['assets']['User'][@agent.id.to_s]['firstname']) + assert_equal(@agent.lastname, result['assets']['User'][@agent.id.to_s]['lastname']) + + assert(result['assets']['User']) + assert(result['assets']['User'][@customer_without_org.id.to_s]) + assert_equal(@customer_without_org.id, result['assets']['User'][@customer_without_org.id.to_s]['id']) + assert_equal(@customer_without_org.firstname, result['assets']['User'][@customer_without_org.id.to_s]['firstname']) + assert_equal(@customer_without_org.lastname, result['assets']['User'][@customer_without_org.id.to_s]['lastname']) + + get '/api/v1/tickets?full=false', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Array, result.class) + assert_equal(Hash, result[0].class) + assert_equal(1, result[0]['id']) + assert_equal(ticket.id, result[1]['id']) + assert_equal(ticket.title, result[1]['title']) + assert_not(result[1]['group']) + assert_not(result[1]['priority']) + assert_not(result[1]['owner']) + assert_equal(ticket.customer_id, result[1]['customer_id']) + assert_equal(@agent.id, result[1]['updated_by_id']) + assert_equal(@agent.id, result[1]['created_by_id']) + end + + test '04.03 ticket create and response format' do + title = "ticket testagent#{rand(999_999_999)}" + params = { + title: title, + group: 'Users', + customer_id: @customer_without_org.id, + state: 'new', + priority: '2 normal', + article: { + body: 'some test 123', + }, + } + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-agent@example.com', 'agentpw') + + post '/api/v1/tickets', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(201) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + + ticket = Ticket.find(result['id']) + assert_equal(ticket.state_id, result['state_id']) + assert_not(result['state']) + assert_equal(ticket.priority_id, result['priority_id']) + assert_not(result['priority']) + assert_equal(ticket.group_id, result['group_id']) + assert_not(result['group']) + assert_equal(title, result['title']) + assert_equal(@customer_without_org.id, result['customer_id']) + assert_equal(@agent.id, result['updated_by_id']) + assert_equal(@agent.id, result['created_by_id']) + + post '/api/v1/tickets?expand=true', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(201) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + + ticket = Ticket.find(result['id']) + assert_equal(ticket.state_id, result['state_id']) + assert_equal(ticket.state.name, result['state']) + assert_equal(ticket.priority_id, result['priority_id']) + assert_equal(ticket.priority.name, result['priority']) + assert_equal(ticket.group_id, result['group_id']) + assert_equal(ticket.group.name, result['group']) + assert_equal(title, result['title']) + assert_equal(@customer_without_org.id, result['customer_id']) + assert_equal(@agent.id, result['updated_by_id']) + assert_equal(@agent.id, result['created_by_id']) + + post '/api/v1/tickets?full=true', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(201) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + + ticket = Ticket.find(result['id']) + assert(result['assets']) + assert(result['assets']['Ticket']) + assert(result['assets']['Ticket'][ticket.id.to_s]) + assert_equal(ticket.id, result['assets']['Ticket'][ticket.id.to_s]['id']) + assert_equal(title, result['assets']['Ticket'][ticket.id.to_s]['title']) + assert_equal(ticket.customer_id, result['assets']['Ticket'][ticket.id.to_s]['customer_id']) + + assert(result['assets']['User']) + assert(result['assets']['User'][@agent.id.to_s]) + assert_equal(@agent.id, result['assets']['User'][@agent.id.to_s]['id']) + assert_equal(@agent.firstname, result['assets']['User'][@agent.id.to_s]['firstname']) + assert_equal(@agent.lastname, result['assets']['User'][@agent.id.to_s]['lastname']) + + assert(result['assets']['User']) + assert(result['assets']['User'][@customer_without_org.id.to_s]) + assert_equal(@customer_without_org.id, result['assets']['User'][@customer_without_org.id.to_s]['id']) + assert_equal(@customer_without_org.firstname, result['assets']['User'][@customer_without_org.id.to_s]['firstname']) + assert_equal(@customer_without_org.lastname, result['assets']['User'][@customer_without_org.id.to_s]['lastname']) + + end + + test '04.04 ticket update and response formats' do + title = "ticket testagent#{rand(999_999_999)}" + ticket = Ticket.create!( + title: title, + group: Group.lookup(name: 'Users'), + customer_id: @customer_without_org.id, + state: Ticket::State.lookup(name: 'new'), + priority: Ticket::Priority.lookup(name: '2 normal'), + updated_by_id: @agent.id, + created_by_id: @agent.id, + ) + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-agent@example.com', 'agentpw') + + params = { + title: 'a update ticket #1', + } + put "/api/v1/tickets/#{ticket.id}", params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + + ticket = Ticket.find(result['id']) + assert_equal(ticket.state_id, result['state_id']) + assert_not(result['state']) + assert_equal(ticket.priority_id, result['priority_id']) + assert_not(result['priority']) + assert_equal(ticket.group_id, result['group_id']) + assert_not(result['group']) + assert_equal('a update ticket #1', result['title']) + assert_equal(@customer_without_org.id, result['customer_id']) + assert_equal(@agent.id, result['updated_by_id']) + assert_equal(@agent.id, result['created_by_id']) + + params = { + title: 'a update ticket #2', + } + put "/api/v1/tickets/#{ticket.id}?expand=true", params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + + ticket = Ticket.find(result['id']) + assert_equal(ticket.state_id, result['state_id']) + assert_equal(ticket.state.name, result['state']) + assert_equal(ticket.priority_id, result['priority_id']) + assert_equal(ticket.priority.name, result['priority']) + assert_equal(ticket.group_id, result['group_id']) + assert_equal(ticket.group.name, result['group']) + assert_equal('a update ticket #2', result['title']) + assert_equal(@customer_without_org.id, result['customer_id']) + assert_equal(@agent.id, result['updated_by_id']) + assert_equal(@agent.id, result['created_by_id']) + + params = { + title: 'a update ticket #3', + } + put "/api/v1/tickets/#{ticket.id}?full=true", params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + + ticket = Ticket.find(result['id']) + assert(result['assets']) + assert(result['assets']['Ticket']) + assert(result['assets']['Ticket'][ticket.id.to_s]) + assert_equal(ticket.id, result['assets']['Ticket'][ticket.id.to_s]['id']) + assert_equal('a update ticket #3', result['assets']['Ticket'][ticket.id.to_s]['title']) + assert_equal(ticket.customer_id, result['assets']['Ticket'][ticket.id.to_s]['customer_id']) + + assert(result['assets']['User']) + assert(result['assets']['User'][@agent.id.to_s]) + assert_equal(@agent.id, result['assets']['User'][@agent.id.to_s]['id']) + assert_equal(@agent.firstname, result['assets']['User'][@agent.id.to_s]['firstname']) + assert_equal(@agent.lastname, result['assets']['User'][@agent.id.to_s]['lastname']) + + assert(result['assets']['User']) + assert(result['assets']['User'][@customer_without_org.id.to_s]) + assert_equal(@customer_without_org.id, result['assets']['User'][@customer_without_org.id.to_s]['id']) + assert_equal(@customer_without_org.firstname, result['assets']['User'][@customer_without_org.id.to_s]['firstname']) + assert_equal(@customer_without_org.lastname, result['assets']['User'][@customer_without_org.id.to_s]['lastname']) + + end + + test '05.01 ticket split with html - check attachments' do + ticket = Ticket.create!( + title: 'some title', + group: Group.lookup(name: 'Users'), + customer_id: @customer_without_org.id, + state: Ticket::State.lookup(name: 'new'), + priority: Ticket::Priority.lookup(name: '2 normal'), + updated_by_id: @agent.id, + created_by_id: @agent.id, + ) + article = Ticket::Article.create!( + type: Ticket::Article::Type.lookup(name: 'note'), + sender: Ticket::Article::Sender.lookup(name: 'Customer'), + from: 'sender', + subject: 'subject', + body: 'test test ', + content_type: 'text/html', + ticket_id: ticket.id, + updated_by_id: 1, + created_by_id: 1, + ) + Store.add( + object: 'Ticket::Article', + o_id: article.id, + data: 'content_file1_normally_should_be_an_image', + filename: 'some_file1.jpg', + preferences: { + 'Content-Type' => 'image/jpeg', + 'Mime-Type' => 'image/jpeg', + 'Content-ID' => '15.274327094.140938@zammad.example.com', + 'Content-Disposition' => 'inline', + }, + created_by_id: 1, + ) + Store.add( + object: 'Ticket::Article', + o_id: article.id, + data: 'content_file2_normally_should_be_an_image', + filename: 'some_file2.jpg', + preferences: { + 'Content-Type' => 'image/jpeg', + 'Mime-Type' => 'image/jpeg', + 'Content-ID' => '15.274327094.140938.2@zammad.example.com', + 'Content-Disposition' => 'inline', + }, + created_by_id: 1, + ) + Store.add( + object: 'Ticket::Article', + o_id: article.id, + data: 'content_file3_normally_should_be_an_image', + filename: 'some_file3.jpg', + preferences: { + 'Content-Type' => 'image/jpeg', + 'Mime-Type' => 'image/jpeg', + 'Content-ID' => '15.274327094.140938.3@zammad.example.com', + }, + created_by_id: 1, + ) + Store.add( + object: 'Ticket::Article', + o_id: article.id, + data: 'content_file4_normally_should_be_an_image', + filename: 'some_file4.jpg', + preferences: { + 'Content-Type' => 'image/jpeg', + 'Mime-Type' => 'image/jpeg', + 'Content-ID' => '15.274327094.140938.4@zammad.example.com', + }, + created_by_id: 1, + ) + Store.add( + object: 'Ticket::Article', + o_id: article.id, + data: 'content_file1_normally_should_be_an_pdf', + filename: 'Rechnung_RE-2018-200.pdf', + preferences: { + 'Content-Type' => 'application/octet-stream; name="Rechnung_RE-2018-200.pdf"', + 'Mime-Type' => 'application/octet-stream', + 'Content-ID' => '8AB0BEC88984EE4EBEF643C79C8E0346@zammad.example.com', + 'Content-Description' => 'Rechnung_RE-2018-200.pdf', + 'Content-Disposition' => 'attachment', + }, + created_by_id: 1, + ) + + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-agent@example.com', 'agentpw') + + get "/api/v1/ticket_split?ticket_id=#{ticket.id}&article_id=#{article.id}&form_id=new_form_id123", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + assert(result['assets']) + assert(result['assets']['Ticket']) + assert(result['assets']['Ticket'][ticket.id.to_s]) + assert(result['assets']['TicketArticle'][article.id.to_s]) + assert(result['attachments']) + assert_equal(result['attachments'].count, 3) + + get "/api/v1/ticket_split?ticket_id=#{ticket.id}&article_id=#{article.id}&form_id=new_form_id123", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + assert(result['assets']) + assert(result['assets']['Ticket']) + assert(result['assets']['Ticket'][ticket.id.to_s]) + assert(result['assets']['TicketArticle'][article.id.to_s]) + assert(result['attachments']) + assert_equal(result['attachments'].count, 0) + + end + + test '05.02 ticket split with plain - check attachments' do + ticket = Ticket.create!( + title: 'some title', + group: Group.lookup(name: 'Users'), + customer_id: @customer_without_org.id, + state: Ticket::State.lookup(name: 'new'), + priority: Ticket::Priority.lookup(name: '2 normal'), + updated_by_id: @agent.id, + created_by_id: @agent.id, + ) + article = Ticket::Article.create!( + type: Ticket::Article::Type.lookup(name: 'note'), + sender: Ticket::Article::Sender.lookup(name: 'Customer'), + from: 'sender', + subject: 'subject', + body: 'test ', + content_type: 'text/plain', + ticket_id: ticket.id, + updated_by_id: 1, + created_by_id: 1, + ) + Store.add( + object: 'Ticket::Article', + o_id: article.id, + data: 'content_file1_normally_should_be_an_image', + filename: 'some_file1.jpg', + preferences: { + 'Content-Type' => 'image/jpeg', + 'Mime-Type' => 'image/jpeg', + 'Content-ID' => '15.274327094.140938@zammad.example.com', + 'Content-Disposition' => 'inline', + }, + created_by_id: 1, + ) + Store.add( + object: 'Ticket::Article', + o_id: article.id, + data: 'content_file1_normally_should_be_an_image', + filename: 'some_file2.jpg', + preferences: { + 'Content-Type' => 'image/jpeg', + 'Mime-Type' => 'image/jpeg', + 'Content-ID' => '15.274327094.140938.2@zammad.example.com', + 'Content-Disposition' => 'inline', + }, + created_by_id: 1, + ) + Store.add( + object: 'Ticket::Article', + o_id: article.id, + data: 'content_file1_normally_should_be_an_pdf', + filename: 'Rechnung_RE-2018-200.pdf', + preferences: { + 'Content-Type' => 'application/octet-stream; name="Rechnung_RE-2018-200.pdf"', + 'Mime-Type' => 'application/octet-stream', + 'Content-ID' => '8AB0BEC88984EE4EBEF643C79C8E0346@zammad.example.com', + 'Content-Description' => 'Rechnung_RE-2018-200.pdf', + 'Content-Disposition' => 'attachment', + }, + created_by_id: 1, + ) + + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-agent@example.com', 'agentpw') + + get "/api/v1/ticket_split?ticket_id=#{ticket.id}&article_id=#{article.id}&form_id=new_form_id123", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + assert(result['assets']) + assert(result['assets']['Ticket']) + assert(result['assets']['Ticket'][ticket.id.to_s]) + assert(result['assets']['TicketArticle'][article.id.to_s]) + assert(result['attachments']) + assert_equal(result['attachments'].count, 3) + + get "/api/v1/ticket_split?ticket_id=#{ticket.id}&article_id=#{article.id}&form_id=new_form_id123", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + assert(result['assets']) + assert(result['assets']['Ticket']) + assert(result['assets']['Ticket'][ticket.id.to_s]) + assert(result['assets']['TicketArticle'][article.id.to_s]) + assert(result['attachments']) + assert_equal(result['attachments'].count, 0) + + end + end diff --git a/test/controllers/user_controller_test.rb b/test/controllers/user_controller_test.rb new file mode 100644 index 000000000..1ff94a176 --- /dev/null +++ b/test/controllers/user_controller_test.rb @@ -0,0 +1,960 @@ + +require 'test_helper' +require 'rake' + +class UserControllerTest < ActionDispatch::IntegrationTest + setup do + + # set accept header + @headers = { 'ACCEPT' => 'application/json', 'CONTENT_TYPE' => 'application/json' } + + # create agent + roles = Role.where(name: %w[Admin Agent]) + groups = Group.all + + UserInfo.current_user_id = 1 + + @backup_admin = User.create_or_update( + login: 'backup-admin', + firstname: 'Backup', + lastname: 'Agent', + email: 'backup-admin@example.com', + password: 'adminpw', + active: true, + roles: roles, + groups: groups, + ) + + @admin = User.create_or_update( + login: 'rest-admin', + firstname: 'Rest', + lastname: 'Agent', + email: 'rest-admin@example.com', + password: 'adminpw', + active: true, + roles: roles, + groups: groups, + ) + + # create agent + roles = Role.where(name: 'Agent') + @agent = User.create_or_update( + login: 'rest-agent@example.com', + firstname: 'Rest', + lastname: 'Agent', + email: 'rest-agent@example.com', + password: 'agentpw', + active: true, + roles: roles, + groups: groups, + ) + + # create customer without org + roles = Role.where(name: 'Customer') + @customer_without_org = User.create_or_update( + login: 'rest-customer1@example.com', + firstname: 'Rest', + lastname: 'Customer1', + email: 'rest-customer1@example.com', + password: 'customer1pw', + active: true, + roles: roles, + ) + + # create orgs + @organization = Organization.create_or_update( + name: 'Rest Org', + ) + @organization2 = Organization.create_or_update( + name: 'Rest Org #2', + ) + @organization3 = Organization.create_or_update( + name: 'Rest Org #3', + ) + + # create customer with org + @customer_with_org = User.create_or_update( + login: 'rest-customer2@example.com', + firstname: 'Rest', + lastname: 'Customer2', + email: 'rest-customer2@example.com', + password: 'customer2pw', + active: true, + roles: roles, + organization_id: @organization.id, + ) + + # configure es + if ENV['ES_URL'].present? + #fail "ERROR: Need ES_URL - hint ES_URL='http://127.0.0.1:9200'" + Setting.set('es_url', ENV['ES_URL']) + + # Setting.set('es_url', 'http://127.0.0.1:9200') + # Setting.set('es_index', 'estest.local_zammad') + # Setting.set('es_user', 'elasticsearch') + # Setting.set('es_password', 'zammad') + + if ENV['ES_INDEX_RAND'].present? + ENV['ES_INDEX'] = "es_index_#{rand(999_999_999)}" + end + if ENV['ES_INDEX'].blank? + raise "ERROR: Need ES_INDEX - hint ES_INDEX='estest.local_zammad'" + end + Setting.set('es_index', ENV['ES_INDEX']) + + travel 1.minute + + # drop/create indexes + Rake::Task.clear + Zammad::Application.load_tasks + #Rake::Task["searchindex:drop"].execute + #Rake::Task["searchindex:create"].execute + Rake::Task['searchindex:rebuild'].execute + + # execute background jobs + Scheduler.worker(true) + + sleep 6 + end + UserInfo.current_user_id = nil + + end + + test 'user create tests - no user' do + + post '/api/v1/signshow', params: {}, headers: @headers + + # create user with disabled feature + Setting.set('user_create_account', false) + token = @response.headers['CSRF-TOKEN'] + + # token based on form + params = { email: 'some_new_customer@example.com', authenticity_token: token } + post '/api/v1/users', params: params.to_json, headers: @headers + assert_response(422) + result = JSON.parse(@response.body) + assert(result['error']) + assert_equal('Feature not enabled!', result['error']) + + # token based on headers + headers = @headers.merge('X-CSRF-Token' => token) + params = { email: 'some_new_customer@example.com' } + post '/api/v1/users', params: params.to_json, headers: headers + assert_response(422) + result = JSON.parse(@response.body) + assert(result['error']) + assert_equal('Feature not enabled!', result['error']) + + Setting.set('user_create_account', true) + + # no signup param with enabled feature + params = { email: 'some_new_customer@example.com' } + post '/api/v1/users', params: params.to_json, headers: headers + assert_response(422) + result = JSON.parse(@response.body) + assert(result['error']) + assert_equal('Only signup with not authenticate user possible!', result['error']) + + # already existing user with enabled feature + params = { email: 'rest-customer1@example.com', signup: true } + post '/api/v1/users', params: params.to_json, headers: headers + assert_response(422) + result = JSON.parse(@response.body) + assert(result['error']) + assert_equal('Email address is already used for other user.', result['error']) + + # email missing with enabled feature + params = { firstname: 'some firstname', signup: true } + post '/api/v1/users', params: params.to_json, headers: headers + assert_response(422) + result = JSON.parse(@response.body) + assert(result['error']) + assert_equal('Attribute \'email\' required!', result['error']) + + # email missing with enabled feature + params = { firstname: 'some firstname', signup: true } + post '/api/v1/users', params: params.to_json, headers: headers + assert_response(422) + result = JSON.parse(@response.body) + assert(result['error']) + assert_equal('Attribute \'email\' required!', result['error']) + + # create user with enabled feature (take customer role) + params = { firstname: 'Me First', lastname: 'Me Last', email: 'new_here@example.com', signup: true } + post '/api/v1/users', params: params.to_json, headers: headers + assert_response(201) + result = JSON.parse(@response.body) + assert(result) + + assert_equal('Me First', result['firstname']) + assert_equal('Me Last', result['lastname']) + assert_equal('new_here@example.com', result['login']) + assert_equal('new_here@example.com', result['email']) + user = User.find(result['id']) + assert_not(user.role?('Admin')) + assert_not(user.role?('Agent')) + assert(user.role?('Customer')) + + # create user with admin role (not allowed for signup, take customer role) + role = Role.lookup(name: 'Admin') + params = { firstname: 'Admin First', lastname: 'Admin Last', email: 'new_admin@example.com', role_ids: [ role.id ], signup: true } + post '/api/v1/users', params: params.to_json, headers: headers + assert_response(201) + result = JSON.parse(@response.body) + assert(result) + user = User.find(result['id']) + assert_not(user.role?('Admin')) + assert_not(user.role?('Agent')) + assert(user.role?('Customer')) + + # create user with agent role (not allowed for signup, take customer role) + role = Role.lookup(name: 'Agent') + params = { firstname: 'Agent First', lastname: 'Agent Last', email: 'new_agent@example.com', role_ids: [ role.id ], signup: true } + post '/api/v1/users', params: params.to_json, headers: headers + assert_response(201) + result = JSON.parse(@response.body) + assert(result) + user = User.find(result['id']) + assert_not(user.role?('Admin')) + assert_not(user.role?('Agent')) + assert(user.role?('Customer')) + + # no user (because of no session) + get '/api/v1/users', params: {}, headers: headers + assert_response(401) + result = JSON.parse(@response.body) + assert_equal('authentication failed', result['error']) + + # me + get '/api/v1/users/me', params: {}, headers: headers + assert_response(401) + result = JSON.parse(@response.body) + assert_equal('authentication failed', result['error']) + end + + test 'auth tests - not existing user' do + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('not_existing@example.com', 'adminpw') + + # me + get '/api/v1/users/me', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(401) + result = JSON.parse(@response.body) + assert_equal('authentication failed', result['error']) + + get '/api/v1/users', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(401) + result = JSON.parse(@response.body) + assert_equal('authentication failed', result['error']) + end + + test 'auth tests - username auth, wrong pw' do + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('rest-admin', 'not_existing') + + get '/api/v1/users', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(401) + result = JSON.parse(@response.body) + assert_equal('authentication failed', result['error']) + end + + test 'auth tests - email auth, wrong pw' do + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('rest-admin@example.com', 'not_existing') + + get '/api/v1/users', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(401) + result = JSON.parse(@response.body) + assert_equal('authentication failed', result['error']) + end + + test 'auth tests - username auth' do + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('rest-admin', 'adminpw') + + get '/api/v1/users', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert(result) + end + + test 'auth tests - email auth' do + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('rest-admin@example.com', 'adminpw') + + get '/api/v1/users', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert(result) + end + + test 'user index and create with admin' do + + # email auth + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('rest-admin@example.com', 'adminpw') + + # me + get '/api/v1/users/me', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert(result) + assert_equal(result['email'], 'rest-admin@example.com') + + # index + get '/api/v1/users', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert(result) + + # index + get '/api/v1/users', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert(result) + assert_equal(result.class, Array) + assert(result.length >= 3) + + # show/:id + get "/api/v1/users/#{@agent.id}", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert(result) + assert_equal(result.class, Hash) + assert_equal(result['email'], 'rest-agent@example.com') + + get "/api/v1/users/#{@customer_without_org.id}", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert(result) + assert_equal(result.class, Hash) + assert_equal(result['email'], 'rest-customer1@example.com') + + # create user with admin role + role = Role.lookup(name: 'Admin') + params = { firstname: 'Admin First', lastname: 'Admin Last', email: 'new_admin_by_admin@example.com', role_ids: [ role.id ] } + post '/api/v1/users', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(201) + result = JSON.parse(@response.body) + assert(result) + user = User.find(result['id']) + assert(user.role?('Admin')) + assert_not(user.role?('Agent')) + assert_not(user.role?('Customer')) + assert_equal('new_admin_by_admin@example.com', result['login']) + assert_equal('new_admin_by_admin@example.com', result['email']) + + # create user with agent role + role = Role.lookup(name: 'Agent') + params = { firstname: 'Agent First', lastname: 'Agent Last', email: 'new_agent_by_admin1@example.com', role_ids: [ role.id ] } + post '/api/v1/users', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(201) + result = JSON.parse(@response.body) + assert(result) + user = User.find(result['id']) + assert_not(user.role?('Admin')) + assert(user.role?('Agent')) + assert_not(user.role?('Customer')) + assert_equal('new_agent_by_admin1@example.com', result['login']) + assert_equal('new_agent_by_admin1@example.com', result['email']) + + role = Role.lookup(name: 'Agent') + params = { firstname: 'Agent First', email: 'new_agent_by_admin2@example.com', role_ids: [ role.id ] } + post '/api/v1/users', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(201) + result = JSON.parse(@response.body) + assert(result) + user = User.find(result['id']) + assert_not(user.role?('Admin')) + assert(user.role?('Agent')) + assert_not(user.role?('Customer')) + assert_equal('new_agent_by_admin2@example.com', result['login']) + assert_equal('new_agent_by_admin2@example.com', result['email']) + assert_equal('Agent', result['firstname']) + assert_equal('First', result['lastname']) + + role = Role.lookup(name: 'Agent') + params = { firstname: 'Agent First', email: 'new_agent_by_admin2@example.com', role_ids: [ role.id ] } + post '/api/v1/users', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(422) + result = JSON.parse(@response.body) + assert(result) + assert_equal('Email address is already used for other user.', result['error']) + + # missing required attributes + params = { note: 'some note' } + post '/api/v1/users', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(422) + result = JSON.parse(@response.body) + assert(result) + assert_equal('Minimum one identifier (login, firstname, lastname, phone or email) for user is required.', result['error']) + + # invalid email + params = { firstname: 'newfirstname123', email: 'some_what', note: 'some note' } + post '/api/v1/users', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(422) + result = JSON.parse(@response.body) + assert(result) + assert_equal('Invalid email', result['error']) + + # with valid attributes + params = { firstname: 'newfirstname123', note: 'some note' } + post '/api/v1/users', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(201) + result = JSON.parse(@response.body) + assert(result) + user = User.find(result['id']) + assert_not(user.role?('Admin')) + assert_not(user.role?('Agent')) + assert(user.role?('Customer')) + assert(result['login'].start_with?('auto-')) + assert_equal('', result['email']) + assert_equal('newfirstname123', result['firstname']) + assert_equal('', result['lastname']) + end + + test 'user index and create with agent' do + + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('rest-agent@example.com', 'agentpw') + + # me + get '/api/v1/users/me', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert(result) + assert_equal(result['email'], 'rest-agent@example.com') + + # index + get '/api/v1/users', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert(result) + + # index + get '/api/v1/users', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert(result) + assert_equal(result.class, Array) + assert(result.length >= 3) + + get '/api/v1/users?limit=40&page=1&per_page=2', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Array, result.class) + users = User.order(:id).limit(2) + assert_equal(users[0].id, result[0]['id']) + assert_equal(users[1].id, result[1]['id']) + assert_equal(2, result.count) + + get '/api/v1/users?limit=40&page=2&per_page=2', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Array, result.class) + users = User.order(:id).limit(4) + assert_equal(users[2].id, result[0]['id']) + assert_equal(users[3].id, result[1]['id']) + assert_equal(2, result.count) + + # create user with admin role + firstname = "First test#{rand(999_999_999)}" + role = Role.lookup(name: 'Admin') + params = { firstname: "Admin#{firstname}", lastname: 'Admin Last', email: 'new_admin_by_agent@example.com', role_ids: [ role.id ] } + post '/api/v1/users', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(201) + result_user1 = JSON.parse(@response.body) + assert(result_user1) + user = User.find(result_user1['id']) + assert_not(user.role?('Admin')) + assert_not(user.role?('Agent')) + assert(user.role?('Customer')) + assert_equal('new_admin_by_agent@example.com', result_user1['login']) + assert_equal('new_admin_by_agent@example.com', result_user1['email']) + + # create user with agent role + role = Role.lookup(name: 'Agent') + params = { firstname: "Agent#{firstname}", lastname: 'Agent Last', email: 'new_agent_by_agent@example.com', role_ids: [ role.id ] } + post '/api/v1/users', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(201) + result_user1 = JSON.parse(@response.body) + assert(result_user1) + user = User.find(result_user1['id']) + assert_not(user.role?('Admin')) + assert_not(user.role?('Agent')) + assert(user.role?('Customer')) + assert_equal('new_agent_by_agent@example.com', result_user1['login']) + assert_equal('new_agent_by_agent@example.com', result_user1['email']) + + # create user with customer role + role = Role.lookup(name: 'Customer') + params = { firstname: "Customer#{firstname}", lastname: 'Customer Last', email: 'new_customer_by_agent@example.com', role_ids: [ role.id ] } + post '/api/v1/users', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(201) + result_user1 = JSON.parse(@response.body) + assert(result_user1) + user = User.find(result_user1['id']) + assert_not(user.role?('Admin')) + assert_not(user.role?('Agent')) + assert(user.role?('Customer')) + assert_equal('new_customer_by_agent@example.com', result_user1['login']) + assert_equal('new_customer_by_agent@example.com', result_user1['email']) + + # search as agent + Scheduler.worker(true) + sleep 2 # let es time to come ready + get "/api/v1/users/search?query=#{CGI.escape("Customer#{firstname}")}", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Array, result.class) + + assert_equal(result_user1['id'], result[0]['id']) + assert_equal("Customer#{firstname}", result[0]['firstname']) + assert_equal('Customer Last', result[0]['lastname']) + assert(result[0]['role_ids']) + assert_not(result[0]['roles']) + + get "/api/v1/users/search?query=#{CGI.escape("Customer#{firstname}")}&expand=true", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Array, result.class) + assert_equal(result_user1['id'], result[0]['id']) + assert_equal("Customer#{firstname}", result[0]['firstname']) + assert_equal('Customer Last', result[0]['lastname']) + assert(result[0]['role_ids']) + assert(result[0]['roles']) + + get "/api/v1/users/search?query=#{CGI.escape("Customer#{firstname}")}&label=true", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Array, result.class) + assert_equal(result_user1['id'], result[0]['id']) + assert_equal("Customer#{firstname} Customer Last ", result[0]['label']) + assert_equal("Customer#{firstname} Customer Last ", result[0]['value']) + assert_not(result[0]['role_ids']) + assert_not(result[0]['roles']) + + role = Role.find_by(name: 'Agent') + get "/api/v1/users/search?query=#{CGI.escape("Customer#{firstname}")}&role_ids=#{role.id}&label=true", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Array, result.class) + assert_equal(0, result.count) + + role = Role.find_by(name: 'Customer') + get "/api/v1/users/search?query=#{CGI.escape("Customer#{firstname}")}&role_ids=#{role.id}&label=true", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Array, result.class) + assert_equal(result_user1['id'], result[0]['id']) + assert_equal("Customer#{firstname} Customer Last ", result[0]['label']) + assert_equal("Customer#{firstname} Customer Last ", result[0]['value']) + assert_not(result[0]['role_ids']) + assert_not(result[0]['roles']) + + permission = Permission.find_by(name: 'ticket.agent') + get "/api/v1/users/search?query=#{CGI.escape("Customer#{firstname}")}&permissions=#{permission.name}&label=true", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Array, result.class) + assert_equal(0, result.count) + + permission = Permission.find_by(name: 'ticket.customer') + get "/api/v1/users/search?query=#{CGI.escape("Customer#{firstname}")}&permissions=#{permission.name}&label=true", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Array, result.class) + assert_equal(result_user1['id'], result[0]['id']) + assert_equal("Customer#{firstname} Customer Last ", result[0]['label']) + assert_equal("Customer#{firstname} Customer Last ", result[0]['value']) + assert_not(result[0]['role_ids']) + assert_not(result[0]['roles']) + end + + test 'user index and create with customer1' do + + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('rest-customer1@example.com', 'customer1pw') + + # me + get '/api/v1/users/me', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert(result) + assert_equal(result['email'], 'rest-customer1@example.com') + + # index + get '/api/v1/users', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(result.class, Array) + assert_equal(result.length, 1) + + # show/:id + get "/api/v1/users/#{@customer_without_org.id}", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(result.class, Hash) + assert_equal(result['email'], 'rest-customer1@example.com') + + get "/api/v1/users/#{@customer_with_org.id}", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(401) + result = JSON.parse(@response.body) + assert_equal(result.class, Hash) + assert(result['error']) + + # create user with admin role + role = Role.lookup(name: 'Admin') + params = { firstname: 'Admin First', lastname: 'Admin Last', email: 'new_admin_by_customer1@example.com', role_ids: [ role.id ] } + post '/api/v1/users', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(401) + + # create user with agent role + role = Role.lookup(name: 'Agent') + params = { firstname: 'Agent First', lastname: 'Agent Last', email: 'new_agent_by_customer1@example.com', role_ids: [ role.id ] } + post '/api/v1/users', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(401) + + # search + Scheduler.worker(true) + get "/api/v1/users/search?query=#{CGI.escape('First')}", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(401) + end + + test 'user index with customer2' do + + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('rest-customer2@example.com', 'customer2pw') + + # me + get '/api/v1/users/me', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert(result) + assert_equal(result['email'], 'rest-customer2@example.com') + + # index + get '/api/v1/users', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(result.class, Array) + assert_equal(result.length, 1) + + # show/:id + get "/api/v1/users/#{@customer_with_org.id}", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(result.class, Hash) + assert_equal(result['email'], 'rest-customer2@example.com') + + get "/api/v1/users/#{@customer_without_org.id}", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(401) + result = JSON.parse(@response.body) + assert_equal(result.class, Hash) + assert(result['error']) + + # search + Scheduler.worker(true) + get "/api/v1/users/search?query=#{CGI.escape('First')}", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(401) + end + + test '04.01 users show and response format' do + roles = Role.where(name: 'Customer') + organization = Organization.first + user = User.create!( + login: 'rest-customer3@example.com', + firstname: 'Rest', + lastname: 'Customer3', + email: 'rest-customer3@example.com', + password: 'customer3pw', + active: true, + organization: organization, + roles: roles, + updated_by_id: @admin.id, + created_by_id: @admin.id, + ) + + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('rest-admin@example.com', 'adminpw') + get "/api/v1/users/#{user.id}", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + assert_equal(user.id, result['id']) + assert_equal(user.firstname, result['firstname']) + assert_not(result['organization']) + assert_equal(user.organization_id, result['organization_id']) + assert_not(result['password']) + assert_equal(user.role_ids, result['role_ids']) + assert_equal(@admin.id, result['updated_by_id']) + assert_equal(@admin.id, result['created_by_id']) + + get "/api/v1/users/#{user.id}?expand=true", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + assert_equal(user.id, result['id']) + assert_equal(user.firstname, result['firstname']) + assert_equal(user.organization_id, result['organization_id']) + assert_equal(user.organization.name, result['organization']) + assert_equal(user.role_ids, result['role_ids']) + assert_not(result['password']) + assert_equal(@admin.id, result['updated_by_id']) + assert_equal(@admin.id, result['created_by_id']) + + get "/api/v1/users/#{user.id}?expand=false", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + assert_equal(user.id, result['id']) + assert_equal(user.firstname, result['firstname']) + assert_not(result['organization']) + assert_equal(user.organization_id, result['organization_id']) + assert_not(result['password']) + assert_equal(user.role_ids, result['role_ids']) + assert_equal(@admin.id, result['updated_by_id']) + assert_equal(@admin.id, result['created_by_id']) + + get "/api/v1/users/#{user.id}?full=true", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + + assert_equal(Hash, result.class) + assert_equal(user.id, result['id']) + assert(result['assets']) + assert(result['assets']['User']) + assert(result['assets']['User'][user.id.to_s]) + assert_equal(user.id, result['assets']['User'][user.id.to_s]['id']) + assert_equal(user.firstname, result['assets']['User'][user.id.to_s]['firstname']) + assert_equal(user.organization_id, result['assets']['User'][user.id.to_s]['organization_id']) + assert_equal(user.role_ids, result['assets']['User'][user.id.to_s]['role_ids']) + + get "/api/v1/users/#{user.id}?full=false", params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + assert_equal(user.id, result['id']) + assert_equal(user.firstname, result['firstname']) + assert_not(result['organization']) + assert_equal(user.organization_id, result['organization_id']) + assert_not(result['password']) + assert_equal(user.role_ids, result['role_ids']) + assert_equal(@admin.id, result['updated_by_id']) + assert_equal(@admin.id, result['created_by_id']) + end + + test '04.02 user index and response format' do + roles = Role.where(name: 'Customer') + organization = Organization.first + user = User.create!( + login: 'rest-customer3@example.com', + firstname: 'Rest', + lastname: 'Customer3', + email: 'rest-customer3@example.com', + password: 'customer3pw', + active: true, + organization: organization, + roles: roles, + updated_by_id: @admin.id, + created_by_id: @admin.id, + ) + + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('rest-admin@example.com', 'adminpw') + get '/api/v1/users', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Array, result.class) + assert_equal(Hash, result[0].class) + assert_equal(user.id, result.last['id']) + assert_equal(user.lastname, result.last['lastname']) + assert_not(result.last['organization']) + assert_equal(user.role_ids, result.last['role_ids']) + assert_equal(user.organization_id, result.last['organization_id']) + assert_not(result.last['password']) + assert_equal(@admin.id, result.last['updated_by_id']) + assert_equal(@admin.id, result.last['created_by_id']) + + get '/api/v1/users?expand=true', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Array, result.class) + assert_equal(Hash, result[0].class) + assert_equal(user.id, result.last['id']) + assert_equal(user.lastname, result.last['lastname']) + assert_equal(user.organization_id, result.last['organization_id']) + assert_equal(user.organization.name, result.last['organization']) + assert_not(result.last['password']) + assert_equal(@admin.id, result.last['updated_by_id']) + assert_equal(@admin.id, result.last['created_by_id']) + + get '/api/v1/users?expand=false', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Array, result.class) + assert_equal(Hash, result[0].class) + assert_equal(user.id, result.last['id']) + assert_equal(user.lastname, result.last['lastname']) + assert_not(result.last['organization']) + assert_equal(user.role_ids, result.last['role_ids']) + assert_equal(user.organization_id, result.last['organization_id']) + assert_not(result.last['password']) + assert_equal(@admin.id, result.last['updated_by_id']) + assert_equal(@admin.id, result.last['created_by_id']) + + get '/api/v1/users?full=true', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + + assert_equal(Hash, result.class) + assert_equal(Array, result['record_ids'].class) + assert_equal(1, result['record_ids'][0]) + assert_equal(user.id, result['record_ids'].last) + assert(result['assets']) + assert(result['assets']['User']) + assert(result['assets']['User'][user.id.to_s]) + assert_equal(user.id, result['assets']['User'][user.id.to_s]['id']) + assert_equal(user.lastname, result['assets']['User'][user.id.to_s]['lastname']) + assert_equal(user.organization_id, result['assets']['User'][user.id.to_s]['organization_id']) + assert_not(result['assets']['User'][user.id.to_s]['password']) + + get '/api/v1/users?full=false', params: {}, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Array, result.class) + assert_equal(Hash, result[0].class) + assert_equal(user.id, result.last['id']) + assert_equal(user.lastname, result.last['lastname']) + assert_not(result.last['organization']) + assert_equal(user.role_ids, result.last['role_ids']) + assert_equal(user.organization_id, result.last['organization_id']) + assert_not(result.last['password']) + assert_equal(@admin.id, result.last['updated_by_id']) + assert_equal(@admin.id, result.last['created_by_id']) + end + + test '04.03 ticket create and response format' do + organization = Organization.first + params = { + firstname: 'newfirstname123', + note: 'some note', + organization: organization.name, + } + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('rest-admin@example.com', 'adminpw') + + post '/api/v1/users', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(201) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + + user = User.find(result['id']) + assert_equal(user.firstname, result['firstname']) + assert_equal(user.organization_id, result['organization_id']) + assert_not(result['organization']) + assert_not(result['password']) + assert_equal(@admin.id, result['updated_by_id']) + assert_equal(@admin.id, result['created_by_id']) + + post '/api/v1/users?expand=true', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(201) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + + user = User.find(result['id']) + assert_equal(user.firstname, result['firstname']) + assert_equal(user.organization_id, result['organization_id']) + assert_equal(user.organization.name, result['organization']) + assert_not(result['password']) + assert_equal(@admin.id, result['updated_by_id']) + assert_equal(@admin.id, result['created_by_id']) + + post '/api/v1/users?full=true', params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(201) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + + user = User.find(result['id']) + assert(result['assets']) + assert(result['assets']['User']) + assert(result['assets']['User'][user.id.to_s]) + assert_equal(user.id, result['assets']['User'][user.id.to_s]['id']) + assert_equal(user.firstname, result['assets']['User'][user.id.to_s]['firstname']) + assert_equal(user.lastname, result['assets']['User'][user.id.to_s]['lastname']) + assert_not(result['assets']['User'][user.id.to_s]['password']) + + assert(result['assets']['User'][@admin.id.to_s]) + assert_equal(@admin.id, result['assets']['User'][@admin.id.to_s]['id']) + assert_equal(@admin.firstname, result['assets']['User'][@admin.id.to_s]['firstname']) + assert_equal(@admin.lastname, result['assets']['User'][@admin.id.to_s]['lastname']) + assert_not(result['assets']['User'][@admin.id.to_s]['password']) + + end + + test '04.04 ticket update and response formats' do + roles = Role.where(name: 'Customer') + organization = Organization.first + user = User.create!( + login: 'rest-customer3@example.com', + firstname: 'Rest', + lastname: 'Customer3', + email: 'rest-customer3@example.com', + password: 'customer3pw', + active: true, + organization: organization, + roles: roles, + updated_by_id: @admin.id, + created_by_id: @admin.id, + ) + + credentials = ActionController::HttpAuthentication::Basic.encode_credentials('rest-admin@example.com', 'adminpw') + + params = { + firstname: 'a update firstname #1', + } + put "/api/v1/users/#{user.id}", params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + + user = User.find(result['id']) + assert_equal(user.lastname, result['lastname']) + assert_equal(params[:firstname], result['firstname']) + assert_equal(user.organization_id, result['organization_id']) + assert_not(result['organization']) + assert_not(result['password']) + assert_equal(@admin.id, result['updated_by_id']) + assert_equal(@admin.id, result['created_by_id']) + + params = { + firstname: 'a update firstname #2', + } + put "/api/v1/users/#{user.id}?expand=true", params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + + user = User.find(result['id']) + assert_equal(user.lastname, result['lastname']) + assert_equal(params[:firstname], result['firstname']) + assert_equal(user.organization_id, result['organization_id']) + assert_equal(user.organization.name, result['organization']) + assert_not(result['password']) + assert_equal(@admin.id, result['updated_by_id']) + assert_equal(@admin.id, result['created_by_id']) + + params = { + firstname: 'a update firstname #3', + } + put "/api/v1/users/#{user.id}?full=true", params: params.to_json, headers: @headers.merge('Authorization' => credentials) + assert_response(200) + result = JSON.parse(@response.body) + assert_equal(Hash, result.class) + + user = User.find(result['id']) + assert(result['assets']) + assert(result['assets']['User']) + assert(result['assets']['User'][user.id.to_s]) + assert_equal(user.id, result['assets']['User'][user.id.to_s]['id']) + assert_equal(params[:firstname], result['assets']['User'][user.id.to_s]['firstname']) + assert_equal(user.lastname, result['assets']['User'][user.id.to_s]['lastname']) + assert_not(result['assets']['User'][user.id.to_s]['password']) + + assert(result['assets']['User'][@admin.id.to_s]) + assert_equal(@admin.id, result['assets']['User'][@admin.id.to_s]['id']) + assert_equal(@admin.firstname, result['assets']['User'][@admin.id.to_s]['firstname']) + assert_equal(@admin.lastname, result['assets']['User'][@admin.id.to_s]['lastname']) + assert_not(result['assets']['User'][@admin.id.to_s]['password']) + + end + +end diff --git a/test/controllers/user_organization_controller_test.rb b/test/controllers/user_organization_controller_test.rb index 4079eba1f..b484d4faf 100644 --- a/test/controllers/user_organization_controller_test.rb +++ b/test/controllers/user_organization_controller_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' require 'rake' @@ -9,7 +9,7 @@ class UserOrganizationControllerTest < ActionDispatch::IntegrationTest @headers = { 'ACCEPT' => 'application/json', 'CONTENT_TYPE' => 'application/json' } # create agent - roles = Role.where(name: %w(Admin Agent)) + roles = Role.where(name: %w[Admin Agent]) groups = Group.all UserInfo.current_user_id = 1 diff --git a/test/fixtures/mail64.box b/test/fixtures/mail64.box new file mode 100644 index 000000000..73be6d677 --- /dev/null +++ b/test/fixtures/mail64.box @@ -0,0 +1,944 @@ +Return-Path: +X-Original-To: me@example.de +Delivered-To: martin@samba.example.de +Received: from me.home (93-82-123-230.adsl.highway.telekom.at [93.82.123.230]) + by samba.example.de (Postfix) with ESMTPSA id B3F2D500D3D + for ; Mon, 2 Jul 2012 16:14:33 +0100 (BST) +From: Martin Edenhofer +Content-Type: multipart/alternative; boundary="Apple-Mail=_A3A84DDB-B242-4521-AD6F-24FAEC28042F" +Subject: =?utf-8?B?QVc6IE9UUlMgLyBBbmZyYWdlIE9UUlMgRWluZsO8aHJ1bmcvUHLDpHNlbnRh?= + =?utf-8?Q?tion_[Ticket#11545]?= +Date: Mon, 2 Jul 2012 17:14:37 +0200 +Message-Id: <4C4ECFBF-BA12-46D9-A407-8E873F20DEF3@example.de> +To: me@example.de +Mime-Version: 1.0 (Apple Message framework v1278) +X-Mailer: Apple Mail (2.1278) + + +--Apple-Mail=_A3A84DDB-B242-4521-AD6F-24FAEC28042F +Content-Transfer-Encoding: 7bit +Content-Type: text/plain; + charset=us-ascii + +Enjoy! + +-Martin + +-- +Old programmers never die. They just branch to a new address. + + +--Apple-Mail=_A3A84DDB-B242-4521-AD6F-24FAEC28042F +Content-Type: multipart/related; + type="text/html"; + boundary="Apple-Mail=_5FA1E6E6-1C40-4E5D-8231-1F0EF0E45CCF" + + +--Apple-Mail=_5FA1E6E6-1C40-4E5D-8231-1F0EF0E45CCF +Content-Transfer-Encoding: 7bit +Content-Type: text/html; + charset=us-ascii + +Enjoy!

                -Martin

                --
                Old programmers never die. They just branch to a new address.

                +--Apple-Mail=_5FA1E6E6-1C40-4E5D-8231-1F0EF0E45CCF +Content-Type: image/jpg; + name="=?windows-1258?Q?Capture_d=92e=ECcran_2017-12-27_a=CC_12.22.38.jpg?=" +Content-Description: =?windows-1258?Q?Capture_d=92e=ECcran_2017-12-27_a=CC_12.22.38.jpg?= +Content-Disposition: attachment; filename= + "=?windows-1258?Q?Capture_d=92e=ECcran_2017-12-27_a=CC_12.22.38.jpg?="; + size=74975; creation-date="Wed, 27 Dec 2017 11:23:05 GMT"; + modification-date="Wed, 27 Dec 2017 11:23:05 GMT" +Content-Transfer-Encoding: base64 + +/9j/4AAQSkZJRgABAQEASABIAAD/4gxYSUNDX1BST0ZJTEUAAQEAAAxITGlubwIQAABtbnRyUkdC +IFhZWiAHzgACAAkABgAxAABhY3NwTVNGVAAAAABJRUMgc1JHQgAAAAAAAAAAAAAAAAAA9tYAAQAA +AADTLUhQICAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABFj +cHJ0AAABUAAAADNkZXNjAAABhAAAAGx3dHB0AAAB8AAAABRia3B0AAACBAAAABRyWFlaAAACGAAA +ABRnWFlaAAACLAAAABRiWFlaAAACQAAAABRkbW5kAAACVAAAAHBkbWRkAAACxAAAAIh2dWVkAAAD +TAAAAIZ2aWV3AAAD1AAAACRsdW1pAAAD+AAAABRtZWFzAAAEDAAAACR0ZWNoAAAEMAAAAAxyVFJD +AAAEPAAACAxnVFJDAAAEPAAACAxiVFJDAAAEPAAACAx0ZXh0AAAAAENvcHlyaWdodCAoYykgMTk5 +OCBIZXdsZXR0LVBhY2thcmQgQ29tcGFueQAAZGVzYwAAAAAAAAASc1JHQiBJRUM2MTk2Ni0yLjEA +AAAAAAAAAAAAABJzUkdCIElFQzYxOTY2LTIuMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAWFlaIAAAAAAAAPNRAAEAAAABFsxYWVogAAAAAAAAAAAAAAAA +AAAAAFhZWiAAAAAAAABvogAAOPUAAAOQWFlaIAAAAAAAAGKZAAC3hQAAGNpYWVogAAAAAAAAJKAA +AA+EAAC2z2Rlc2MAAAAAAAAAFklFQyBodHRwOi8vd3d3LmllYy5jaAAAAAAAAAAAAAAAFklFQyBo +dHRwOi8vd3d3LmllYy5jaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAABkZXNjAAAAAAAAAC5JRUMgNjE5NjYtMi4xIERlZmF1bHQgUkdCIGNvbG91ciBzcGFjZSAt +IHNSR0IAAAAAAAAAAAAAAC5JRUMgNjE5NjYtMi4xIERlZmF1bHQgUkdCIGNvbG91ciBzcGFjZSAt +IHNSR0IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZGVzYwAAAAAAAAAsUmVmZXJlbmNlIFZpZXdpbmcg +Q29uZGl0aW9uIGluIElFQzYxOTY2LTIuMQAAAAAAAAAAAAAALFJlZmVyZW5jZSBWaWV3aW5nIENv +bmRpdGlvbiBpbiBJRUM2MTk2Ni0yLjEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHZpZXcAAAAA +ABOk/gAUXy4AEM8UAAPtzAAEEwsAA1yeAAAAAVhZWiAAAAAAAEwJVgBQAAAAVx/nbWVhcwAAAAAA +AAABAAAAAAAAAAAAAAAAAAAAAAAAAo8AAAACc2lnIAAAAABDUlQgY3VydgAAAAAAAAQAAAAABQAK +AA8AFAAZAB4AIwAoAC0AMgA3ADsAQABFAEoATwBUAFkAXgBjAGgAbQByAHcAfACBAIYAiwCQAJUA +mgCfAKQAqQCuALIAtwC8AMEAxgDLANAA1QDbAOAA5QDrAPAA9gD7AQEBBwENARMBGQEfASUBKwEy +ATgBPgFFAUwBUgFZAWABZwFuAXUBfAGDAYsBkgGaAaEBqQGxAbkBwQHJAdEB2QHhAekB8gH6AgMC +DAIUAh0CJgIvAjgCQQJLAlQCXQJnAnECegKEAo4CmAKiAqwCtgLBAssC1QLgAusC9QMAAwsDFgMh +Ay0DOANDA08DWgNmA3IDfgOKA5YDogOuA7oDxwPTA+AD7AP5BAYEEwQgBC0EOwRIBFUEYwRxBH4E +jASaBKgEtgTEBNME4QTwBP4FDQUcBSsFOgVJBVgFZwV3BYYFlgWmBbUFxQXVBeUF9gYGBhYGJwY3 +BkgGWQZqBnsGjAadBq8GwAbRBuMG9QcHBxkHKwc9B08HYQd0B4YHmQesB78H0gflB/gICwgfCDII +RghaCG4IggiWCKoIvgjSCOcI+wkQCSUJOglPCWQJeQmPCaQJugnPCeUJ+woRCicKPQpUCmoKgQqY +Cq4KxQrcCvMLCwsiCzkLUQtpC4ALmAuwC8gL4Qv5DBIMKgxDDFwMdQyODKcMwAzZDPMNDQ0mDUAN +Wg10DY4NqQ3DDd4N+A4TDi4OSQ5kDn8Omw62DtIO7g8JDyUPQQ9eD3oPlg+zD88P7BAJECYQQxBh +EH4QmxC5ENcQ9RETETERTxFtEYwRqhHJEegSBxImEkUSZBKEEqMSwxLjEwMTIxNDE2MTgxOkE8UT +5RQGFCcUSRRqFIsUrRTOFPAVEhU0FVYVeBWbFb0V4BYDFiYWSRZsFo8WshbWFvoXHRdBF2UXiReu +F9IX9xgbGEAYZRiKGK8Y1Rj6GSAZRRlrGZEZtxndGgQaKhpRGncanhrFGuwbFBs7G2MbihuyG9oc +AhwqHFIcexyjHMwc9R0eHUcdcB2ZHcMd7B4WHkAeah6UHr4e6R8THz4faR+UH78f6iAVIEEgbCCY +IMQg8CEcIUghdSGhIc4h+yInIlUigiKvIt0jCiM4I2YjlCPCI/AkHyRNJHwkqyTaJQklOCVoJZcl +xyX3JicmVyaHJrcm6CcYJ0kneierJ9woDSg/KHEooijUKQYpOClrKZ0p0CoCKjUqaCqbKs8rAis2 +K2krnSvRLAUsOSxuLKIs1y0MLUEtdi2rLeEuFi5MLoIuty7uLyQvWi+RL8cv/jA1MGwwpDDbMRIx +SjGCMbox8jIqMmMymzLUMw0zRjN/M7gz8TQrNGU0njTYNRM1TTWHNcI1/TY3NnI2rjbpNyQ3YDec +N9c4FDhQOIw4yDkFOUI5fzm8Ofk6Njp0OrI67zstO2s7qjvoPCc8ZTykPOM9Ij1hPaE94D4gPmA+ +oD7gPyE/YT+iP+JAI0BkQKZA50EpQWpBrEHuQjBCckK1QvdDOkN9Q8BEA0RHRIpEzkUSRVVFmkXe +RiJGZ0arRvBHNUd7R8BIBUhLSJFI10kdSWNJqUnwSjdKfUrESwxLU0uaS+JMKkxyTLpNAk1KTZNN +3E4lTm5Ot08AT0lPk0/dUCdQcVC7UQZRUFGbUeZSMVJ8UsdTE1NfU6pT9lRCVI9U21UoVXVVwlYP +VlxWqVb3V0RXklfgWC9YfVjLWRpZaVm4WgdaVlqmWvVbRVuVW+VcNVyGXNZdJ114XcleGl5sXr1f +D19hX7NgBWBXYKpg/GFPYaJh9WJJYpxi8GNDY5dj62RAZJRk6WU9ZZJl52Y9ZpJm6Gc9Z5Nn6Wg/ +aJZo7GlDaZpp8WpIap9q92tPa6dr/2xXbK9tCG1gbbluEm5rbsRvHm94b9FwK3CGcOBxOnGVcfBy +S3KmcwFzXXO4dBR0cHTMdSh1hXXhdj52m3b4d1Z3s3gReG54zHkqeYl553pGeqV7BHtje8J8IXyB +fOF9QX2hfgF+Yn7CfyN/hH/lgEeAqIEKgWuBzYIwgpKC9INXg7qEHYSAhOOFR4Wrhg6GcobXhzuH +n4gEiGmIzokziZmJ/opkisqLMIuWi/yMY4zKjTGNmI3/jmaOzo82j56QBpBukNaRP5GokhGSepLj +k02TtpQglIqU9JVflcmWNJaflwqXdZfgmEyYuJkkmZCZ/JpomtWbQpuvnByciZz3nWSd0p5Anq6f +HZ+Ln/qgaaDYoUehtqImopajBqN2o+akVqTHpTilqaYapoum/adup+CoUqjEqTepqaocqo+rAqt1 +q+msXKzQrUStuK4trqGvFq+LsACwdbDqsWCx1rJLssKzOLOutCW0nLUTtYq2AbZ5tvC3aLfguFm4 +0blKucK6O7q1uy67p7whvJu9Fb2Pvgq+hL7/v3q/9cBwwOzBZ8Hjwl/C28NYw9TEUcTOxUvFyMZG +xsPHQce/yD3IvMk6ybnKOMq3yzbLtsw1zLXNNc21zjbOts83z7jQOdC60TzRvtI/0sHTRNPG1EnU +y9VO1dHWVdbY11zX4Nhk2OjZbNnx2nba+9uA3AXcit0Q3ZbeHN6i3ynfr+A24L3hROHM4lPi2+Nj +4+vkc+T85YTmDeaW5x/nqegy6LzpRunQ6lvq5etw6/vshu0R7ZzuKO6070DvzPBY8OXxcvH/8ozz +GfOn9DT0wvVQ9d72bfb794r4Gfio+Tj5x/pX+uf7d/wH/Jj9Kf26/kv+3P9t////4QMmRXhpZgAA +TU0AKgAAAAgACgEPAAIAAAASAAAAhgEQAAIAAAAKAAAAmAESAAMAAAABAAEAAAEaAAUAAAABAAAA +ogEbAAUAAAABAAAAqgEoAAMAAAABAAIAAAExAAIAAAAeAAAAsgEyAAIAAAAUAAAA0AE8AAIAAAAQ +AAAA5IdpAAQAAAABAAAA9AAAAABOSUtPTiBDT1JQT1JBVElPTgBOSUtPTiBEOTAAAAAASAAAAAEA +AABIAAAAAUFkb2JlIFBob3Rvc2hvcCBDUzQgTWFjaW50b3NoADIwMTI6MDU6MTcgMjE6MjU6MTUA +TWFjIE9TIFggMTAuNi44AAAigpoABQAAAAEAAAKSgp0ABQAAAAEAAAKaiCIAAwAAAAEAAwAAiCcA +AwAAAAEAyAAAkAAABwAAAAQwMjIwkAMAAgAAABQAAAKikAQAAgAAABQAAAK2kQEABwAAAAQAAAAB +kQIABQAAAAEAAALKkgQACgAAAAEAAALSkgUABQAAAAEAAALakgcAAwAAAAEAAgAAkggAAwAAAAEA +AAAAkgkAAwAAAAEAAAAAkgoABQAAAAEAAALikoYABwAAACwAAALqkpAAAgAAAAMwMAAAkpEAAgAA +AAMwMAAAkpIAAgAAAAMwMAAAoAAABwAAAAQwMTAwoAEAAwAAAAEAAQAAoAIABAAAAAEAAAKAoAMA +BAAAAAEAAAGpohcAAwAAAAEAAgAApAEAAwAAAAEAAAAApAIAAwAAAAEAAAAApAMAAwAAAAEAAAAA +pAQABQAAAAEAAAMWpAUAAwAAAAEANAAApAYAAwAAAAEAAAAApAgAAwAAAAEAAAAApAkAAwAAAAEA +AAAApAoAAwAAAAEAAAAApAwAAwAAAAEAAAAAAAAAAAAAAAEAAA+gAAAACQAAAAUyMDEyOjA1OjE3 +IDE4OjEwOjMzADIwMTI6MDU6MTcgMTg6MTA6MzMAAAAABAAAAAEAAAAAAAAAAQAAAAgAAAAFAAAA +IwAAAAFBU0NJSQAAACAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAAAAAEAAAAB +/+EA5Gh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8APHg6eG1wbWV0YSB4bWxuczp4PSJhZG9i +ZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpy +ZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8 +cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIi8+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+ +CgD/2wBDAAICAgICAQICAgICAgIDAwYEAwMDAwcFBQQGCAcICAgHCAgJCg0LCQkMCggICw8LDA0O +Dg4OCQsQEQ8OEQ0ODg7/2wBDAQICAgMDAwYEBAYOCQgJDg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4O +Dg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg7/wAARCAGpAoADASIAAhEBAxEB/8QAHwAAAQUBAQEB +AQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1Fh +ByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZ +WmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXG +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 + +--Apple-Mail=_5FA1E6E6-1C40-4E5D-8231-1F0EF0E45CCF-- + +--Apple-Mail=_A3A84DDB-B242-4521-AD6F-24FAEC28042F-- diff --git a/test/fixtures/mail65.box b/test/fixtures/mail65.box new file mode 100644 index 000000000..96ee62707 --- /dev/null +++ b/test/fixtures/mail65.box @@ -0,0 +1,17 @@ +From: =?iso-8859-1?Q?B=FCrling,=20Andreas?= +Content-Type: text/plain; + charset=iso-8859-1 +Content-Transfer-Encoding: quoted-printable +Subject: =?iso-8859-1?Q?aa=E4=F6=FC=DFad_asd?= +X-Universally-Unique-Identifier: d12c15d2-e6d6-4ccd-86c7-abc2c3d0a2a2 +Date: Fri, 4 May 2012 14:01:03 +0200 +Message-Id: +To: metest@znuny.com +Mime-Version: 1.0 (Apple Message framework v1257) + +=E4=F6=FC=DF ad asd + +-Martin + +-- +Old programmers never die. They just branch to a new address. diff --git a/test/fixtures/seeds.rb b/test/fixtures/seeds.rb index 8ed902c03..8f21fdf54 100644 --- a/test/fixtures/seeds.rb +++ b/test/fixtures/seeds.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + # inital data set as extention to db/seeds.rb Trigger.destroy_all @@ -30,7 +30,7 @@ User.create_or_update( email: 'admin@example.com', password: 'adminpw', active: true, - roles: Role.where(name: %w(Admin)), + roles: Role.where(name: %w[Admin]), updated_by_id: 1, created_by_id: 1, ) diff --git a/test/fixtures/telegram/channel1_message_content1.json b/test/fixtures/telegram/channel1_message_content1.json new file mode 100644 index 000000000..48b7539d7 --- /dev/null +++ b/test/fixtures/telegram/channel1_message_content1.json @@ -0,0 +1,22 @@ +{ + "update_id":10001, + "channel_post":{ + "date":1441645532, + "chat":{ + "last_name":"Test Lastname", + "id":1111111, + "type":"channel", + "username":"Testusername" + }, + "message_id":1365, + "text":"Hello, I need your Help", + "bid":"12345678", + "callback_token":"AbcDefG", + "entities": [ + {"offset": 0, + "length": 6, + "type": "bot_command" + } + ] + } +} diff --git a/test/fixtures/telegram/channel1_message_content2.json b/test/fixtures/telegram/channel1_message_content2.json new file mode 100644 index 000000000..bb1cd4dd2 --- /dev/null +++ b/test/fixtures/telegram/channel1_message_content2.json @@ -0,0 +1,27 @@ +{ + "update_id": 30003, + "channel_post": { + "message_id": 3367, + "chat": { + "title": "Zammad Bot", + "id":1111112, + "type": "channel" + }, + "date": 1486036832, + "document": { + "file_name": "blockposter-162412.pdf", + "mime_type": "application/pdf", + "thumb": { + "file_id": "AAQCABO0I4INAATATQAB5HWPq4XgxQACAg", + "file_size": 8752, + "width": 200, + "height": 200 + }, + "caption": "test", + "file_id": "BQADAgADDgAD7x6ZSC_-1LMkOEmoAg", + "file_size": 3622849, + "bid": "435791794", + "callback_token": "z5N_uxY_Fut81g" + } + } +} diff --git a/test/fixtures/telegram/channel1_message_content3.json b/test/fixtures/telegram/channel1_message_content3.json new file mode 100644 index 000000000..22c5a8965 --- /dev/null +++ b/test/fixtures/telegram/channel1_message_content3.json @@ -0,0 +1,34 @@ +{ + "update_id": 30002, + "channel_post": { + "message_id": 3366, + "chat": { + "title":"Zammad Bot", + "id":1111112, + "type": "channel" + }, + "date": 1486036832, + "photo": [ + { + "file_id": "ABC-123VabcOcv123w0ABBL_aoY-F849YYABC", + "file_size": 1016, + "width": 90, + "height": 82 + }, + { + "file_id": "ABC-123VabcOcv123w0ABPlhIiVSfO9TYoABC", + "file_size": 7378, + "width": 320, + "height": 291 + }, + { + "file_id": "ABC-123VabcOcv123w0ABHywrcPqfrbAYIABC", + "file_size": 16433, + "width": 720, + "height": 654 + } + ], + "bid":"435791794", + "callback_token":"z5N_uxY_Fut81g" + } +} diff --git a/test/fixtures/telegram/channel1_message_content4.json b/test/fixtures/telegram/channel1_message_content4.json new file mode 100644 index 000000000..4b92f9d79 --- /dev/null +++ b/test/fixtures/telegram/channel1_message_content4.json @@ -0,0 +1,20 @@ +{ + "update_id":30005, + "channel_post":{ + "message_id":3368, + "chat":{ + "title": "Zammad Bot", + "id":1111112, + "type": "channel" + }, + "date":1487119496, + "voice":{ + "duration":1, + "mime_type":"audio/ogg", + "file_id":"AwADAgADVQADCEIYSZwyOmSZK9iZAg", + "file_size":6030 + }, + "bid": "435791794", + "callback_token":"z5N_uxY_Fut81g" + } +} diff --git a/test/fixtures/telegram/channel1_message_content5.json b/test/fixtures/telegram/channel1_message_content5.json new file mode 100644 index 000000000..a5d476009 --- /dev/null +++ b/test/fixtures/telegram/channel1_message_content5.json @@ -0,0 +1,30 @@ +{ + "update_id":40000, + "channel_post":{ + "message_id":273, + "chat":{ + "id":3310000, + "type":"channel", + "title":"Zammad Bot" + }, + "date":1487161566, + "sticker":{ + "width":512, + "height":512, + "emoji":"💻", + "set_name": "ChristmasGoose", + "thumb":{ + "file_id":"AAQDABO3-e4qAASs6ZOjJUT7tQ4lAAIC", + "file_size":4584, + "width":128, + "height":128, + "file_path": "thumbnails/file57.jpg" + }, + "file_id":"BQADAwAD0QIAAqbJWAAB8OkQqgtDQe0C", + "file_size":25974, + "file_path": "stickers/file_58.webp" + }, + "callback_token":"z5N_uxY_Fut81g", + "bid":"435791794" + } +} diff --git a/test/fixtures/telegram/channel2_message_content1.json b/test/fixtures/telegram/channel2_message_content1.json new file mode 100644 index 000000000..2a7c8435e --- /dev/null +++ b/test/fixtures/telegram/channel2_message_content1.json @@ -0,0 +1,22 @@ +{ + "update_id":10001, + "edited_channel_post":{ + "date":1441645532, + "chat":{ + "last_name":"Test Lastname", + "id":1111111, + "type":"channel", + "username":"Testusername" + }, + "message_id":1365, + "text":"Hello, I need your Help", + "bid":"12345678", + "callback_token":"AbcDefG", + "entities": [ + {"offset": 0, + "length": 6, + "type": "bot_command" + } + ] + } +} diff --git a/test/integration/aaa_auto_wizard_base_setup_test.rb b/test/integration/aaa_auto_wizard_base_setup_test.rb index 913583238..8f26b5169 100644 --- a/test/integration/aaa_auto_wizard_base_setup_test.rb +++ b/test/integration/aaa_auto_wizard_base_setup_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AaaAutoWizardBaseSetupTest < TestCase diff --git a/test/integration/auto_wizard_browser_test.rb b/test/integration/auto_wizard_browser_test.rb index b07485433..2a71f78a9 100644 --- a/test/integration/auto_wizard_browser_test.rb +++ b/test/integration/auto_wizard_browser_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class AutoWizardBrowserTest < TestCase diff --git a/test/integration/auto_wizard_test.rb b/test/integration/auto_wizard_test.rb index 17ef729b2..026466bc6 100644 --- a/test/integration/auto_wizard_test.rb +++ b/test/integration/auto_wizard_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class AutoWizardTest < ActiveSupport::TestCase @@ -46,7 +46,7 @@ class AutoWizardTest < ActiveSupport::TestCase assert_equal(false, AutoWizard.enabled?) # check first user roles - auto_wizard_data[:Users][0][:roles] = %w(Agent Admin) + auto_wizard_data[:Users][0][:roles] = %w[Agent Admin] auto_wizard_data[:Users].each do |local_user| user = User.find_by(login: local_user[:login]) @@ -203,11 +203,9 @@ class AutoWizardTest < ActiveSupport::TestCase auto_wizard_data[:Groups].each do |local_group| group = Group.find_by(name: local_group[:name]) assert_equal(local_group[:name], group.name) - if local_group[:users] - local_group[:users].each do |local_user_login| - local_user = User.find_by(login: local_user_login) - assert(group.user_ids.include?(local_user.id)) - end + local_group[:users]&.each do |local_user_login| + local_user = User.find_by(login: local_user_login) + assert(group.user_ids.include?(local_user.id)) end if local_group[:signature] signature = group.signature @@ -239,14 +237,14 @@ class AutoWizardTest < ActiveSupport::TestCase end def auto_wizard_file_write(data) - location = "#{Rails.root}/auto_wizard.json" + location = Rails.root.join('auto_wizard.json') file = File.new(location, 'wb') file.write(data.to_json) file.close end def auto_wizard_file_exists? - location = "#{Rails.root}/auto_wizard.json" + location = Rails.root.join('auto_wizard.json') return false if File.exist?(location) true end diff --git a/test/integration/calendar_subscriptions_tickets_test.rb b/test/integration/calendar_subscriptions_tickets_test.rb index 0816aacb8..25a9246c8 100644 --- a/test/integration/calendar_subscriptions_tickets_test.rb +++ b/test/integration/calendar_subscriptions_tickets_test.rb @@ -1,4 +1,4 @@ -## encoding: utf-8 + require 'integration_test_helper' class CalendarSubscriptionsTicketsTest < ActiveSupport::TestCase @@ -272,7 +272,7 @@ class CalendarSubscriptionsTicketsTest < ActiveSupport::TestCase event_data.each do |event| contained = false - if ical =~ /#{event[:summary]}/ + if ical.match?(/#{event[:summary]}/) contained = true end @@ -348,7 +348,7 @@ class CalendarSubscriptionsTicketsTest < ActiveSupport::TestCase event_data.each do |event| contained = false - if ical =~ /#{event[:summary]}/ + if ical.match?(/#{event[:summary]}/) contained = true end @@ -424,7 +424,7 @@ class CalendarSubscriptionsTicketsTest < ActiveSupport::TestCase event_data.each do |event| contained = false - if ical =~ /#{event[:summary]}/ + if ical.match?(/#{event[:summary]}/) contained = true end diff --git a/test/integration/clearbit_test.rb b/test/integration/clearbit_test.rb index 6e01e9ca0..1b4f42c2e 100644 --- a/test/integration/clearbit_test.rb +++ b/test/integration/clearbit_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'integration_test_helper' class ClearbitTest < ActiveSupport::TestCase diff --git a/test/integration/elasticsearch_test.rb b/test/integration/elasticsearch_test.rb index 778c4100d..94d4991bc 100644 --- a/test/integration/elasticsearch_test.rb +++ b/test/integration/elasticsearch_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'integration_test_helper' require 'rake' @@ -114,6 +114,7 @@ class ElasticsearchTest < ActiveSupport::TestCase assert_equal('E', attributes['firstname']) assert_equal('S', attributes['lastname']) assert_equal('es-agent@example.com', attributes['email']) + assert(attributes['preferences']) assert_not(attributes['password']) assert_not(attributes['organization']) @@ -121,6 +122,7 @@ class ElasticsearchTest < ActiveSupport::TestCase assert_equal('E', attributes['firstname']) assert_equal('S', attributes['lastname']) assert_equal('es-agent@example.com', attributes['email']) + assert(attributes['preferences']) assert_not(attributes['password']) assert_not(attributes['organization']) @@ -128,6 +130,7 @@ class ElasticsearchTest < ActiveSupport::TestCase assert_equal('ES', attributes['firstname']) assert_equal('Customer1', attributes['lastname']) assert_equal('es-customer1@example.com', attributes['email']) + assert(attributes['preferences']) assert_not(attributes['password']) assert_equal('Customer Organization Update', attributes['organization']) @@ -168,7 +171,7 @@ class ElasticsearchTest < ActiveSupport::TestCase Store.add( object: 'Ticket::Article', o_id: article1.id, - data: IO.binread("#{Rails.root}/test/fixtures/es-normal.txt"), + data: IO.binread(Rails.root.join('test', 'fixtures', 'es-normal.txt')), filename: 'es-normal.txt', preferences: {}, created_by_id: 1, @@ -194,9 +197,9 @@ class ElasticsearchTest < ActiveSupport::TestCase assert(attributes['article'][0]['attachment'][0]) assert_not(attributes['article'][0]['attachment'][1]) assert_equal('es-normal.txt', attributes['article'][0]['attachment'][0]['_name']) - assert_equal("c29tZSBub3JtYWwgdGV4dDY2Cg==\n", attributes['article'][0]['attachment'][0]['_content']) + assert_equal('c29tZSBub3JtYWwgdGV4dDY2Cg==', attributes['article'][0]['attachment'][0]['_content']) - ticket1.destroy + ticket1.destroy! # execute background jobs Scheduler.worker(true) @@ -229,7 +232,7 @@ class ElasticsearchTest < ActiveSupport::TestCase Store.add( object: 'Ticket::Article', o_id: article1.id, - data: IO.binread("#{Rails.root}/test/fixtures/es-normal.txt"), + data: IO.binread(Rails.root.join('test', 'fixtures', 'es-normal.txt')), filename: 'es-normal.txt', preferences: {}, created_by_id: 1, @@ -240,7 +243,7 @@ class ElasticsearchTest < ActiveSupport::TestCase Store.add( object: 'Ticket::Article', o_id: article1.id, - data: IO.binread("#{Rails.root}/test/fixtures/es-pdf1.pdf"), + data: IO.binread(Rails.root.join('test', 'fixtures', 'es-pdf1.pdf')), filename: 'es-pdf1.pdf', preferences: {}, created_by_id: 1, @@ -251,7 +254,7 @@ class ElasticsearchTest < ActiveSupport::TestCase Store.add( object: 'Ticket::Article', o_id: article1.id, - data: IO.binread("#{Rails.root}/test/fixtures/es-box1.box"), + data: IO.binread(Rails.root.join('test', 'fixtures', 'es-box1.box')), filename: 'mail1.box', preferences: {}, created_by_id: 1, @@ -262,7 +265,7 @@ class ElasticsearchTest < ActiveSupport::TestCase Store.add( object: 'Ticket::Article', o_id: article1.id, - data: IO.binread("#{Rails.root}/test/fixtures/es-too-big.txt"), + data: IO.binread(Rails.root.join('test', 'fixtures', 'es-too-big.txt')), filename: 'es-too-big.txt', preferences: {}, created_by_id: 1, @@ -332,7 +335,7 @@ class ElasticsearchTest < ActiveSupport::TestCase limit: 15, ) - assert(!result.empty?, 'result exists not') + assert(result.present?, 'result exists not') assert(result[0], 'record 1') assert(!result[1], 'record 2') assert_equal(result[0].id, ticket2.id) @@ -344,7 +347,7 @@ class ElasticsearchTest < ActiveSupport::TestCase limit: 15, ) - assert(!result.empty?, 'result exists not') + assert(result.present?, 'result exists not') assert(result[0], 'record 1') assert(!result[1], 'record 2') assert_equal(result[0].id, ticket2.id) @@ -387,7 +390,7 @@ class ElasticsearchTest < ActiveSupport::TestCase query: 'kindergarden', limit: 15, ) - assert(result.empty?, 'result should be empty') + assert(result.blank?, 'result should be empty') assert(!result[0], 'record 1') # search as @customer1 @@ -397,7 +400,7 @@ class ElasticsearchTest < ActiveSupport::TestCase limit: 15, ) - assert(!result.empty?, 'result exists not') + assert(result.present?, 'result exists not') assert(result[0], 'record 1') assert(result[1], 'record 2') assert(!result[2], 'record 3') @@ -411,7 +414,7 @@ class ElasticsearchTest < ActiveSupport::TestCase limit: 15, ) - assert(!result.empty?, 'result exists not') + assert(result.present?, 'result exists not') assert(result[0], 'record 1') assert(result[1], 'record 2') assert(!result[2], 'record 3') @@ -425,7 +428,7 @@ class ElasticsearchTest < ActiveSupport::TestCase limit: 15, ) - assert(!result.empty?, 'result exists not') + assert(result.present?, 'result exists not') assert(result[0], 'record 1') assert(!result[1], 'record 2') assert_equal(result[0].id, ticket3.id) @@ -523,7 +526,7 @@ class ElasticsearchTest < ActiveSupport::TestCase query: 'customer1', limit: 15, ) - assert(!result.empty?, 'result should not be empty') + assert(result.present?, 'result should not be empty') assert(result[0], 'record 1') assert(!result[1], 'record 2') assert_equal(result[0].id, @customer1.id) @@ -534,7 +537,7 @@ class ElasticsearchTest < ActiveSupport::TestCase query: 'customer1', limit: 15, ) - assert(result.empty?, 'result should be empty') + assert(result.blank?, 'result should be empty') assert(!result[0], 'record 1') # cleanup diff --git a/test/integration/email_deliver_test.rb b/test/integration/email_deliver_test.rb index 5b069068d..b7dff2901 100644 --- a/test/integration/email_deliver_test.rb +++ b/test/integration/email_deliver_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class EmailDeliverTest < ActiveSupport::TestCase diff --git a/test/integration/email_helper_test.rb b/test/integration/email_helper_test.rb index 745e6c130..f13802872 100644 --- a/test/integration/email_helper_test.rb +++ b/test/integration/email_helper_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class EmailHelperTest < ActiveSupport::TestCase @@ -374,7 +374,7 @@ class EmailHelperTest < ActiveSupport::TestCase assert_equal('invalid', result[:result]) # if we have to many failed logins, we need to handle another error message - if result[:message_human] && !result[:message_human].empty? + if result[:message_human].present? assert_equal('Authentication failed!', result[:message_human]) else assert_match(/Please log in with your web browser and then try again/, result[:message]) diff --git a/test/integration/email_keep_on_server_test.rb b/test/integration/email_keep_on_server_test.rb index 99d8069b9..e3003aad0 100644 --- a/test/integration/email_keep_on_server_test.rb +++ b/test/integration/email_keep_on_server_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' require 'net/imap' diff --git a/test/integration/facebook_browser_test.rb b/test/integration/facebook_browser_test.rb index c42135d5b..d2e371e6f 100644 --- a/test/integration/facebook_browser_test.rb +++ b/test/integration/facebook_browser_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class FacebookBrowserTest < TestCase diff --git a/test/integration/facebook_test.rb b/test/integration/facebook_test.rb index 769b9a523..a9cdc7808 100644 --- a/test/integration/facebook_test.rb +++ b/test/integration/facebook_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'integration_test_helper' class FacebookTest < ActiveSupport::TestCase diff --git a/test/integration/geo_calendar_test.rb b/test/integration/geo_calendar_test.rb index 9cbbe836e..8ecd6bcaa 100644 --- a/test/integration/geo_calendar_test.rb +++ b/test/integration/geo_calendar_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'integration_test_helper' class GeoIpCalendar < ActiveSupport::TestCase diff --git a/test/integration/geo_ip_test.rb b/test/integration/geo_ip_test.rb index b1eaba5e8..a2537343a 100644 --- a/test/integration/geo_ip_test.rb +++ b/test/integration/geo_ip_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'integration_test_helper' class GeoIpTest < ActiveSupport::TestCase diff --git a/test/integration/geo_location_test.rb b/test/integration/geo_location_test.rb index 88e6d1152..7fb38f17c 100644 --- a/test/integration/geo_location_test.rb +++ b/test/integration/geo_location_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'integration_test_helper' require 'webmock/minitest' diff --git a/test/integration/idoit_controller_test.rb b/test/integration/idoit_controller_test.rb index f7d376066..a970abf31 100644 --- a/test/integration/idoit_controller_test.rb +++ b/test/integration/idoit_controller_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' require 'webmock/minitest' @@ -20,7 +20,7 @@ class IdoitControllerTest < ActionDispatch::IntegrationTest client_id: '', }) groups = Group.where(name: 'Users') - roles = Role.where(name: %w(Agent)) + roles = Role.where(name: %w[Agent]) agent = User.create_or_update( login: 'idoit-agent@example.com', firstname: 'E', @@ -33,7 +33,7 @@ class IdoitControllerTest < ActionDispatch::IntegrationTest updated_by_id: 1, created_by_id: 1, ) - roles = Role.where(name: %w(Agent Admin)) + roles = Role.where(name: %w[Agent Admin]) admin = User.create_or_update( login: 'idoit-admin@example.com', firstname: 'E', diff --git a/test/integration/object_manager_test.rb b/test/integration/object_manager_test.rb index c6125a69f..47d9db91a 100644 --- a/test/integration/object_manager_test.rb +++ b/test/integration/object_manager_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 +# rubocop:disable Lint/BooleanSymbol require 'test_helper' class ObjectManagerTest < ActiveSupport::TestCase @@ -7,10 +7,10 @@ class ObjectManagerTest < ActiveSupport::TestCase test 'a object manager' do list_objects = ObjectManager.list_objects - assert_equal(%w(Ticket TicketArticle User Organization Group), list_objects) + assert_equal(%w[Ticket TicketArticle User Organization Group], list_objects) list_objects = ObjectManager.list_frontend_objects - assert_equal(%w(Ticket User Organization Group), list_objects) + assert_equal(%w[Ticket User Organization Group], list_objects) assert_equal(false, ObjectManager::Attribute.pending_migration?) diff --git a/test/integration/otrs_import_browser_test.rb b/test/integration/otrs_import_browser_test.rb index 505bea0fd..9329089e3 100644 --- a/test/integration/otrs_import_browser_test.rb +++ b/test/integration/otrs_import_browser_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class OtrsImportBrowserTest < TestCase diff --git a/test/integration/otrs_import_test.rb b/test/integration/otrs_import_test.rb index c3a839d5a..87010e203 100644 --- a/test/integration/otrs_import_test.rb +++ b/test/integration/otrs_import_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'integration_test_helper' class OtrsImportTest < ActiveSupport::TestCase @@ -33,12 +33,12 @@ class OtrsImportTest < ActiveSupport::TestCase test 'check dynamic fields' do local_objects = ObjectManager::Attribute.list_full - object_attribute_names = local_objects.reject do |local_object| - local_object[:object] != 'Ticket' + object_attribute_names = local_objects.select do |local_object| + local_object[:object] == 'Ticket' end.collect do |local_object| local_object['name'] end - expected_object_attribute_names = %w(vertriebsweg te_test sugar_crm_remote_no sugar_crm_company_selected_no sugar_crm_company_selection combine itsm_criticality customer_id itsm_impact itsm_review_required itsm_decision_result itsm_repair_start_time itsm_recovery_start_time itsm_decision_date title itsm_due_date topic_no open_exchange_ticket_number hostname ticket_free_key11 type ticket_free_text11 open_exchange_tn topic zarafa_tn group_id scom_hostname checkbox_example scom_uuid scom_state scom_service location owner_id department customer_location state_id pending_time priority_id tags) + expected_object_attribute_names = %w[vertriebsweg te_test sugar_crm_remote_no sugar_crm_company_selected_no sugar_crm_company_selection combine itsm_criticality customer_id itsm_impact itsm_review_required itsm_decision_result itsm_repair_start_time itsm_recovery_start_time itsm_decision_date title itsm_due_date topic_no open_exchange_ticket_number hostname ticket_free_key11 type ticket_free_text11 open_exchange_tn topic zarafa_tn group_id scom_hostname checkbox_example scom_uuid scom_state scom_service location owner_id department customer_location state_id pending_time priority_id tags] assert_equal(expected_object_attribute_names, object_attribute_names, 'dynamic field names') end diff --git a/test/integration/package_test.rb b/test/integration/package_test.rb index 1799e97cc..26bf7f7f2 100644 --- a/test/integration/package_test.rb +++ b/test/integration/package_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class PackageTest < ActiveSupport::TestCase diff --git a/test/integration/report_test.rb b/test/integration/report_test.rb index af1164ae8..1b4a1a57c 100644 --- a/test/integration/report_test.rb +++ b/test/integration/report_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'integration_test_helper' require 'rake' @@ -136,8 +136,8 @@ class ReportTest < ActiveSupport::TestCase state: Ticket::State.lookup(name: 'closed'), priority: Ticket::Priority.lookup(name: '2 normal'), close_at: '2015-10-28 11:30:00 UTC', - created_at: '2015-10-28 10:30:00 UTC', - updated_at: '2015-10-28 10:30:00 UTC', + created_at: '2015-10-28 10:30:01 UTC', + updated_at: '2015-10-28 10:30:01 UTC', updated_by_id: 1, created_by_id: 1, ) @@ -151,8 +151,8 @@ class ReportTest < ActiveSupport::TestCase internal: false, sender: Ticket::Article::Sender.where(name: 'Customer').first, type: Ticket::Article::Type.where(name: 'email').first, - created_at: '2015-10-28 10:30:00 UTC', - updated_at: '2015-10-28 10:30:00 UTC', + created_at: '2015-10-28 10:30:01 UTC', + updated_at: '2015-10-28 10:30:01 UTC', updated_by_id: 1, created_by_id: 1, ) @@ -245,6 +245,34 @@ class ReportTest < ActiveSupport::TestCase created_by_id: 1, ) + @ticket8 = Ticket.create!( + title: 'test 8', + group: group1, + customer_id: 2, + state: Ticket::State.lookup(name: 'merged'), + priority: Ticket::Priority.lookup(name: '2 normal'), + close_at: '2015-11-02 12:30:00 UTC', + created_at: '2015-11-02 12:30:00 UTC', + updated_at: '2015-11-02 12:30:00 UTC', + updated_by_id: 1, + created_by_id: 1, + ) + Ticket::Article.create!( + ticket_id: @ticket8.id, + from: 'some_sender@example.com', + to: 'some_recipient@example.com', + subject: 'some subject', + message_id: 'some@id', + body: 'some message article_outbound', + internal: false, + sender: Ticket::Article::Sender.where(name: 'Agent').first, + type: Ticket::Article::Type.where(name: 'email').first, + created_at: '2015-11-02 12:30:00 UTC', + updated_at: '2015-11-02 12:30:00 UTC', + updated_by_id: 1, + created_by_id: 1, + ) + # execute background jobs Scheduler.worker(true) @@ -276,7 +304,7 @@ class ReportTest < ActiveSupport::TestCase assert_equal(0, result[7]) assert_equal(0, result[8]) assert_equal(2, result[9]) - assert_equal(1, result[10]) + assert_equal(2, result[10]) assert_equal(0, result[11]) assert_nil(result[12]) @@ -289,7 +317,8 @@ class ReportTest < ActiveSupport::TestCase assert_equal(@ticket5.id, result[:ticket_ids][0]) assert_equal(@ticket6.id, result[:ticket_ids][1]) assert_equal(@ticket7.id, result[:ticket_ids][2]) - assert_nil(result[:ticket_ids][3]) + assert_equal(@ticket8.id, result[:ticket_ids][3]) + assert_nil(result[:ticket_ids][4]) # month - with selector #1 result = Report::TicketFirstSolution.aggs( @@ -332,6 +361,47 @@ class ReportTest < ActiveSupport::TestCase assert_equal(@ticket5.id, result[:ticket_ids][0]) assert_nil(result[:ticket_ids][1]) + # month - with merged tickets selector + result = Report::TicketFirstSolution.aggs( + range_start: '2015-01-01T00:00:00Z', + range_end: '2015-12-31T23:59:59Z', + interval: 'month', # year, quarter, month, week, day, hour, minute, second + selector: { + 'ticket_state.name' => { + 'operator' => 'is not', + 'value' => 'merged', + } + }, # ticket selector to get only a collection of tickets + ) + assert(result) + assert_equal(0, result[0]) + assert_equal(0, result[1]) + assert_equal(0, result[2]) + assert_equal(0, result[3]) + assert_equal(0, result[4]) + assert_equal(0, result[5]) + assert_equal(0, result[6]) + assert_equal(0, result[7]) + assert_equal(0, result[8]) + assert_equal(2, result[9]) + assert_equal(1, result[10]) + assert_equal(0, result[11]) + assert_nil(result[12]) + + result = Report::TicketFirstSolution.items( + range_start: '2015-01-01T00:00:00Z', + range_end: '2015-12-31T23:59:59Z', + selector: { + 'ticket_state.name' => { + 'operator' => 'is not', + 'value' => 'merged', + } + }, # ticket selector to get only a collection of tickets + ) + assert(result) + assert_equal(@ticket5.id, result[:ticket_ids][0]) + assert_nil(result[:ticket_ids][3]) + # month - with selector #2 result = Report::TicketFirstSolution.aggs( range_start: '2015-01-01T00:00:00Z', @@ -355,7 +425,7 @@ class ReportTest < ActiveSupport::TestCase assert_equal(0, result[7]) assert_equal(0, result[8]) assert_equal(1, result[9]) - assert_equal(1, result[10]) + assert_equal(2, result[10]) assert_equal(0, result[11]) assert_nil(result[12]) @@ -372,7 +442,8 @@ class ReportTest < ActiveSupport::TestCase assert(result) assert_equal(@ticket6.id, result[:ticket_ids][0]) assert_equal(@ticket7.id, result[:ticket_ids][1]) - assert_nil(result[:ticket_ids][2]) + assert_equal(@ticket8.id, result[:ticket_ids][2]) + assert_nil(result[:ticket_ids][3]) # week result = Report::TicketFirstSolution.aggs( @@ -611,6 +682,94 @@ class ReportTest < ActiveSupport::TestCase assert(result) assert_nil(result[:ticket_ids][0]) + # month - reopened with merge selector + result = Report::TicketReopened.aggs( + range_start: '2015-01-01T00:00:00Z', + range_end: '2015-12-31T23:59:59Z', + interval: 'month', # year, quarter, month, week, day, hour, minute, second + selector: { + 'ticket_state.name' => { + 'operator' => 'is not', + 'value' => 'merged', + } + }, # ticket selector to get only a collection of tickets + ) + assert(result) + assert_equal(0, result[0]) + assert_equal(0, result[1]) + assert_equal(0, result[2]) + assert_equal(0, result[3]) + assert_equal(0, result[4]) + assert_equal(0, result[5]) + assert_equal(0, result[6]) + assert_equal(0, result[7]) + assert_equal(0, result[8]) + assert_equal(1, result[9]) + assert_equal(0, result[10]) + assert_equal(0, result[11]) + assert_nil(result[12]) + + result = Report::TicketReopened.items( + range_start: '2015-01-01T00:00:00Z', + range_end: '2015-12-31T23:59:59Z', + selector: { + 'ticket_state.name' => { + 'operator' => 'is not', + 'value' => 'merged', + } + }, # ticket selector to get only a collection of tickets + ) + assert(result) + assert_equal(@ticket5.id, result[:ticket_ids][0]) + assert_nil(result[:ticket_ids][1]) + + # move in/out without merged status + result = Report::TicketMoved.aggs( + range_start: '2015-01-01T00:00:00Z', + range_end: '2015-12-31T23:59:59Z', + interval: 'month', # year, quarter, month, week, day, hour, minute, second + selector: { + 'ticket_state.name' => { + 'operator' => 'is not', + 'value' => 'merged', + } + }, # ticket selector to get only a collection of tickets + params: { + type: 'in', + }, + ) + assert(result) + assert_equal(0, result[0]) + assert_equal(0, result[1]) + assert_equal(0, result[2]) + assert_equal(0, result[3]) + assert_equal(0, result[4]) + assert_equal(0, result[5]) + assert_equal(0, result[6]) + assert_equal(0, result[7]) + assert_equal(0, result[8]) + assert_equal(0, result[9]) + assert_equal(0, result[10]) + assert_equal(0, result[11]) + assert_nil(result[12]) + + result = Report::TicketMoved.items( + range_start: '2015-01-01T00:00:00Z', + range_end: '2015-12-31T23:59:59Z', + selector: { + 'ticket.group_id' => { + 'operator' => 'is', + 'value' => [Group.lookup(name: 'Users').id], + } + }, # ticket selector to get only a collection of tickets + params: { + type: 'in', + }, + ) + assert(result) + assert_equal(@ticket1.id, result[:ticket_ids][0]) + assert_nil(result[:ticket_ids][1]) + # move in/out result = Report::TicketMoved.aggs( range_start: '2015-01-01T00:00:00Z', @@ -658,6 +817,52 @@ class ReportTest < ActiveSupport::TestCase assert_equal(@ticket1.id, result[:ticket_ids][0]) assert_nil(result[:ticket_ids][1]) + # out without merged tickets + result = Report::TicketMoved.aggs( + range_start: '2015-01-01T00:00:00Z', + range_end: '2015-12-31T23:59:59Z', + interval: 'month', # year, quarter, month, week, day, hour, minute, second + selector: { + 'ticket_state.name' => { + 'operator' => 'is not', + 'value' => 'merged', + } + }, # ticket selector to get only a collection of tickets + params: { + type: 'out', + }, + ) + assert(result) + assert_equal(0, result[0]) + assert_equal(0, result[1]) + assert_equal(0, result[2]) + assert_equal(0, result[3]) + assert_equal(0, result[4]) + assert_equal(0, result[5]) + assert_equal(0, result[6]) + assert_equal(0, result[7]) + assert_equal(0, result[8]) + assert_equal(0, result[9]) + assert_equal(0, result[10]) + assert_equal(0, result[11]) + assert_nil(result[12]) + + result = Report::TicketMoved.items( + range_start: '2015-01-01T00:00:00Z', + range_end: '2015-12-31T23:59:59Z', + selector: { + 'ticket_state.name' => { + 'operator' => 'is not', + 'value' => 'merged', + } + }, # ticket selector to get only a collection of tickets + params: { + type: 'out', + }, + ) + assert(result) + assert_nil(result[:ticket_ids][0]) + # out result = Report::TicketMoved.aggs( range_start: '2015-01-01T00:00:00Z', @@ -724,7 +929,7 @@ class ReportTest < ActiveSupport::TestCase assert_equal(0, result[7]) assert_equal(0, result[8]) assert_equal(6, result[9]) - assert_equal(1, result[10]) + assert_equal(2, result[10]) assert_equal(0, result[11]) assert_nil(result[12]) @@ -735,12 +940,62 @@ class ReportTest < ActiveSupport::TestCase params: { field: 'created_at' }, ) assert(result) + assert_equal(@ticket8.id, result[:ticket_ids][0].to_i) + assert_equal(@ticket7.id, result[:ticket_ids][1].to_i) + assert_equal(@ticket6.id, result[:ticket_ids][2].to_i) + assert_equal(@ticket5.id, result[:ticket_ids][3].to_i) + assert_equal(@ticket4.id, result[:ticket_ids][4].to_i) + assert_equal(@ticket3.id, result[:ticket_ids][5].to_i) + assert_equal(@ticket2.id, result[:ticket_ids][6].to_i) + assert_equal(@ticket1.id, result[:ticket_ids][7].to_i) + assert_nil(result[:ticket_ids][8]) + # create at - selector with merge + result = Report::TicketGenericTime.aggs( + range_start: '2015-01-01T00:00:00Z', + range_end: '2015-12-31T23:59:59Z', + interval: 'month', # year, quarter, month, week, day, hour, minute, second + selector: { + 'state' => { + 'operator' => 'is not', + 'value' => 'merged' + } + }, # ticket selector to get only a collection of tickets + params: { field: 'created_at' }, + ) + assert(result) + assert_equal(0, result[0]) + assert_equal(0, result[1]) + assert_equal(0, result[2]) + assert_equal(0, result[3]) + assert_equal(0, result[4]) + assert_equal(0, result[5]) + assert_equal(0, result[6]) + assert_equal(0, result[7]) + assert_equal(0, result[8]) + assert_equal(6, result[9]) + assert_equal(1, result[10]) + assert_equal(0, result[11]) + assert_nil(result[12]) + + result = Report::TicketGenericTime.items( + range_start: '2015-01-01T00:00:00Z', + range_end: '2015-12-31T23:59:59Z', + selector: { + 'state' => { + 'operator' => 'is not', + 'value' => 'merged' + } + }, # ticket selector to get only a collection of tickets + params: { field: 'created_at' }, + ) + + assert(result) assert_equal(@ticket7.id, result[:ticket_ids][0].to_i) assert_equal(@ticket6.id, result[:ticket_ids][1].to_i) assert_equal(@ticket5.id, result[:ticket_ids][2].to_i) - assert_equal(@ticket3.id, result[:ticket_ids][3].to_i) - assert_equal(@ticket4.id, result[:ticket_ids][4].to_i) + assert_equal(@ticket4.id, result[:ticket_ids][3].to_i) + assert_equal(@ticket3.id, result[:ticket_ids][4].to_i) assert_equal(@ticket2.id, result[:ticket_ids][5].to_i) assert_equal(@ticket1.id, result[:ticket_ids][6].to_i) assert_nil(result[:ticket_ids][7]) diff --git a/test/integration/sipgate_controller_test.rb b/test/integration/sipgate_controller_test.rb index 26eecf6e6..5d252f130 100644 --- a/test/integration/sipgate_controller_test.rb +++ b/test/integration/sipgate_controller_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' require 'rexml/document' @@ -37,7 +37,7 @@ class SipgateControllerTest < ActionDispatch::IntegrationTest },) groups = Group.where(name: 'Users') - roles = Role.where(name: %w(Agent)) + roles = Role.where(name: %w[Agent]) agent = User.create_or_update( login: 'cti-agent@example.com', firstname: 'E', diff --git a/test/integration/slack_test.rb b/test/integration/slack_test.rb index 52847def9..b57d77367 100644 --- a/test/integration/slack_test.rb +++ b/test/integration/slack_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'integration_test_helper' require 'slack' @@ -34,7 +34,7 @@ class SlackTest < ActiveSupport::TestCase items = [ { group_ids: [slack_group.id], - types: %w(create update reminder_reached), + types: %w[create update reminder_reached], webhook: webhook, channel: channel, username: 'zammad bot', @@ -300,7 +300,7 @@ class SlackTest < ActiveSupport::TestCase message_count = 0 channel_history['messages'].each do |message| next if !message['text'] - if message['text'] =~ /#{search_for}/i + if message['text'].match?(/#{search_for}/i) message_count += 1 p "SUCCESS: message with #{search_for} found #{message_count} time(s)!" end diff --git a/test/integration/telegram_controller_test.rb b/test/integration/telegram_controller_test.rb index c31465ca1..1ab2c9370 100644 --- a/test/integration/telegram_controller_test.rb +++ b/test/integration/telegram_controller_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' require 'rexml/document' require 'webmock/minitest' @@ -105,6 +105,28 @@ class TelegramControllerTest < ActionDispatch::IntegrationTest assert_equal('Hello, I need your Help', ticket.articles.first.body) assert_equal('text/plain', ticket.articles.first.content_type) + # send channel message1 + post callback_url, params: read_messaage('channel1_message_content1'), headers: @headers + assert_response(200) + assert_equal(1, Ticket.count) + ticket = Ticket.last + assert_equal('Hello, I need your Help', ticket.title) + assert_equal('new', ticket.state.name) + assert_equal(1, ticket.articles.count) + assert_equal('Hello, I need your Help', ticket.articles.first.body) + assert_equal('text/plain', ticket.articles.first.content_type) + + # edit channel message1 + post callback_url, params: read_messaage('channel2_message_content1'), headers: @headers + assert_response(200) + assert_equal(1, Ticket.count) + ticket = Ticket.last + assert_equal('Hello, I need your Help', ticket.title) + assert_equal('new', ticket.state.name) + assert_equal(1, ticket.articles.count) + assert_equal('Hello, I need your Help', ticket.articles.first.body) + assert_equal('text/plain', ticket.articles.first.content_type) + # send same message again, ignore it post callback_url, params: read_messaage('personal1_message_content1'), headers: @headers assert_response(200) @@ -193,6 +215,17 @@ class TelegramControllerTest < ActionDispatch::IntegrationTest assert_match(/ 'AAQCABO0I4INAATATQAB5HWPq4XgxQACAg' }) @@ -214,6 +247,18 @@ class TelegramControllerTest < ActionDispatch::IntegrationTest assert_equal('text/html', ticket.articles.last.content_type) assert_equal(1, ticket.articles.last.attachments.count) + # isend channel message 2 + post callback_url, params: read_messaage('channel1_message_content2'), headers: @headers + assert_response(200) + assert_equal(3, Ticket.count) + ticket = Ticket.last + assert_equal('Can you help me with my feature?', ticket.title) + assert_equal('new', ticket.state.name) + assert_equal(3, ticket.articles.count) + assert_match(/ 'AAQDABO3-e4qAASs6ZOjJUT7tQ4lAAIC' }) @@ -267,6 +323,22 @@ class TelegramControllerTest < ActionDispatch::IntegrationTest assert_equal('text/html', ticket.articles.last.content_type) assert_equal(1, ticket.articles.last.attachments.count) + # send channel message #5 with sticker + post callback_url, params: read_messaage('channel1_message_content5'), headers: @headers + assert_response(200) + assert_equal(4, Ticket.count) + ticket = Ticket.last + if Rails.application.config.db_4bytes_utf8 + assert_equal('💻', ticket.title) + else + assert_equal('', ticket.title) + end + assert_equal('new', ticket.state.name) + assert_equal(1, ticket.articles.count) + assert_match(/ 'AgADAgADwacxGxk5MUmim45lijOwsKk1Sw0ABNQoaI8BwR_z_2MFAAEC' }) diff --git a/test/integration/twitter_browser_test.rb b/test/integration/twitter_browser_test.rb index dab4ae94e..c0ea4d20b 100644 --- a/test/integration/twitter_browser_test.rb +++ b/test/integration/twitter_browser_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class TwitterBrowserTest < TestCase diff --git a/test/integration/twitter_test.rb b/test/integration/twitter_test.rb index c1d984f16..25c9f0d7f 100644 --- a/test/integration/twitter_test.rb +++ b/test/integration/twitter_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'integration_test_helper' class TwitterTest < ActiveSupport::TestCase diff --git a/test/integration/user_agent_test.rb b/test/integration/user_agent_test.rb index 57923906c..d3f7b19a6 100644 --- a/test/integration/user_agent_test.rb +++ b/test/integration/user_agent_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'integration_test_helper' class UserAgentTest < ActiveSupport::TestCase diff --git a/test/integration/user_device_controller_test.rb b/test/integration/user_device_controller_test.rb index a5788f44d..d3697b407 100644 --- a/test/integration/user_device_controller_test.rb +++ b/test/integration/user_device_controller_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class UserDeviceControllerTest < ActionDispatch::IntegrationTest @@ -11,7 +11,7 @@ class UserDeviceControllerTest < ActionDispatch::IntegrationTest @headers = { 'ACCEPT' => 'application/json', 'CONTENT_TYPE' => 'application/json' } # create agent - roles = Role.where(name: %w(Admin Agent)) + roles = Role.where(name: %w[Admin Agent]) groups = Group.all UserInfo.current_user_id = 1 diff --git a/test/integration/zendesk_import_browser_test.rb b/test/integration/zendesk_import_browser_test.rb index 60876e0bf..da26c7f6d 100644 --- a/test/integration/zendesk_import_browser_test.rb +++ b/test/integration/zendesk_import_browser_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'browser_test_helper' class ZendeskImportBrowserTest < TestCase @@ -79,32 +79,27 @@ class ZendeskImportBrowserTest < TestCase click(css: '.js-migration-start') watch_for( - css: '.js-group .js-done', + css: '.js-groups .js-done', value: '2', timeout: 120, ) watch_for( - css: '.js-organization .js-done', + css: '.js-organizations .js-done', value: '1', timeout: 120, ) watch_for( - css: '.js-user .js-done', + css: '.js-users .js-done', value: '141', timeout: 120, ) - watch_for( - css: '.js-ticket .js-done', - value: '143', - timeout: 800, - ) - watch_for( css: 'body', value: 'login', + timeout: 800, ) end end diff --git a/test/integration/zendesk_import_test.rb b/test/integration/zendesk_import_test.rb index 8d125fa7a..1b781a9a1 100644 --- a/test/integration/zendesk_import_test.rb +++ b/test/integration/zendesk_import_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'integration_test_helper' class ZendeskImportTest < ActiveSupport::TestCase @@ -20,29 +20,58 @@ class ZendeskImportTest < ActiveSupport::TestCase Setting.set('import_zendesk_endpoint_username', ENV['IMPORT_ZENDESK_ENDPOINT_USERNAME']) Setting.set('import_mode', true) Setting.set('system_init_done', false) - Import::Zendesk.start + + job = ImportJob.create(name: 'Import::Zendesk') + job.start # check statistic count test 'check statistic' do - remote_statistic = Import::Zendesk.statistic - # retrive statistic compare_statistic = { - 'Tickets' => 143, - 'TicketFields' => 13, - 'UserFields' => 2, - 'OrganizationFields' => 2, - 'Groups' => 2, - 'Organizations' => 1, - 'Users' => 141, - 'GroupMemberships' => 3, - 'Macros' => 5, - 'Views' => 19, - 'Automations' => 5 + Groups: { + skipped: 0, + created: 2, + updated: 0, + unchanged: 0, + failed: 0, + deactivated: 0, + sum: 2, + total: 2 + }, + Users: { + skipped: 0, + created: 141, + updated: 0, + unchanged: 0, + failed: 0, + deactivated: 0, + sum: 141, + total: 141 + }, + Organizations: { + skipped: 0, + created: 1, + updated: 0, + unchanged: 0, + failed: 0, + deactivated: 0, + sum: 1, + total: 1 + }, + Tickets: { + skipped: 0, + created: 142, + updated: 1, + unchanged: 0, + failed: 0, + deactivated: 0, + sum: 143, + total: 143 + } } - assert_equal(compare_statistic, remote_statistic, 'statistic') + assert_equal(compare_statistic.with_indifferent_access, job.result, 'statistic') end # check count of imported items @@ -155,7 +184,7 @@ class ZendeskImportTest < ActiveSupport::TestCase # check user fields test 'check user fields' do local_fields = User.column_names - copmare_fields = %w( + copmare_fields = %w[ id organization_id login @@ -193,7 +222,7 @@ class ZendeskImportTest < ActiveSupport::TestCase updated_at lieblingstier custom_dropdown - ) + ] assert_equal(copmare_fields, local_fields, 'user fields') end @@ -275,7 +304,7 @@ class ZendeskImportTest < ActiveSupport::TestCase # check organization fields test 'check organization fields' do local_fields = Organization.column_names - copmare_fields = %w( + copmare_fields = %w[ id name shared @@ -289,7 +318,7 @@ class ZendeskImportTest < ActiveSupport::TestCase updated_at api_key custom_dropdown - ) + ] assert_equal(copmare_fields, local_fields, 'organization fields') end @@ -456,7 +485,7 @@ If you\'re reading this message in your email, click the ticket number link that # check ticket fields test 'check ticket fields' do local_fields = Ticket.column_names - copmare_fields = %w( + copmare_fields = %w[ id group_id priority_id @@ -500,7 +529,7 @@ If you\'re reading this message in your email, click the ticket number link that custom_integer custom_regex custom_drop_down - ) + ] assert_equal(copmare_fields, local_fields, 'ticket fields') end diff --git a/test/integration_test_helper.rb b/test/integration_test_helper.rb index 841df1ccc..ca23a6622 100644 --- a/test/integration_test_helper.rb +++ b/test/integration_test_helper.rb @@ -15,8 +15,8 @@ class ActiveSupport::TestCase Cache.clear # load seeds - load "#{Rails.root}/db/seeds.rb" - load "#{Rails.root}/test/fixtures/seeds.rb" + load Rails.root.join('db', 'seeds.rb') + load Rails.root.join('test', 'fixtures', 'seeds.rb') setup do diff --git a/test/test_helper.rb b/test/test_helper.rb index d1064274c..51bb095e5 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -28,8 +28,8 @@ class ActiveSupport::TestCase Cache.clear # load seeds - load "#{Rails.root}/db/seeds.rb" - load "#{Rails.root}/test/fixtures/seeds.rb" + load Rails.root.join('db', 'seeds.rb') + load Rails.root.join('test', 'fixtures', 'seeds.rb') # set system mode to done / to activate Setting.set('system_init_done', true) @@ -67,14 +67,14 @@ class ActiveSupport::TestCase def email_notification_count(type, recipient) # read config file and count type & recipients - file = "#{Rails.root}/log/#{Rails.env}.log" + file = Rails.root.join('log', "#{Rails.env}.log") lines = [] IO.foreach(file) do |line| lines.push line end count = 0 lines.reverse.each do |line| - break if line =~ /\+\+\+\+NEW\+\+\+\+TEST\+\+\+\+/ + break if line.match?(/\+\+\+\+NEW\+\+\+\+TEST\+\+\+\+/) next if line !~ /Send notification \(#{type}\)/ next if line !~ /to:\s#{recipient}/ count += 1 @@ -85,14 +85,14 @@ class ActiveSupport::TestCase def email_count(recipient) # read config file and count & recipients - file = "#{Rails.root}/log/#{Rails.env}.log" + file = Rails.root.join('log', "#{Rails.env}.log") lines = [] IO.foreach(file) do |line| lines.push line end count = 0 lines.reverse.each do |line| - break if line =~ /\+\+\+\+NEW\+\+\+\+TEST\+\+\+\+/ + break if line.match?(/\+\+\+\+NEW\+\+\+\+TEST\+\+\+\+/) next if line !~ /Send email to:/ next if line !~ /to:\s'#{recipient}'/ count += 1 diff --git a/test/unit/aaa_string_test.rb b/test/unit/aaa_string_test.rb index e1c0458f1..f7b61ab6e 100644 --- a/test/unit/aaa_string_test.rb +++ b/test/unit/aaa_string_test.rb @@ -1,4 +1,3 @@ -# encoding: utf-8 # rubocop:disable all require 'test_helper' @@ -645,7 +644,11 @@ Men-----------------------' assert_equal(result, html.html2html_strict) html = 'http://what-different.example.com' - result = "http://example.com (http://what-different.example.com)" + result = "http://what-different.example.com" + assert_equal(result, html.html2html_strict) + + html = 'http://what-different.example.com' + result = "http://what-different.example.com" assert_equal(result, html.html2html_strict) html = 'http://EXAMPLE.com' @@ -677,7 +680,7 @@ Men-----------------------' assert_equal(result, html.html2html_strict) html = "" - result = 'http://example.com/?abc=123&123=abc' + result = '' assert_equal(result, html.html2html_strict) html = '

                https://wiki.lab.example.com/doku.php?id=xxxx:start&#ldap

                ' @@ -722,7 +725,7 @@ Men-----------------------' assert_equal(result, html.html2html_strict) html = "Damit Sie keinen Tag versäumen, empfehlen wir Ihnen den Link des Adventkalenders in
                      Ihrer Lesezeichen-Symbolleiste zu ergänzen.

                 " - result = "Damit Sie keinen Tag versäumen, empfehlen wir Ihnen den Link des Adventkalenders (http://newsletters.cylex.de/) in
                Ihrer Lesezeichen-Symbolleiste zu ergänzen.
                " + result = "Damit Sie keinen Tag versäumen, empfehlen wir Ihnen den Link des Adventkalenders in
                Ihrer Lesezeichen-Symbolleiste zu ergänzen.
                " assert_equal(result, html.html2html_strict) html = 'Hello Mr Smith,' @@ -956,18 +959,15 @@ html.html2html_strict assert_equal(result, html.html2html_strict) html = '

                ' - #result = '

                http://www.example.com/

                ' - result = '

                http://www.example.com/

                ' + result = '

                ' assert_equal(result, html.html2html_strict) html = '

                ' - #result = '

                http://www.example.com/?wm=mail

                ' - result = '

                http://www.example.com/?wm=mail

                ' + result = '

                ' assert_equal(result, html.html2html_strict) html = '

                ' - #result = '

                http://www.example.com/?wm=mail

                ' - result = '

                http://www.example.com/?wm=mail

                ' + result = '

                ' assert_equal(result, html.html2html_strict) html = '
                Wir brauchen also die Instanz example.zammad.com, kann die aber nicht mehr nutzen.

                Bitte um Freischaltung.

             

            20-29
            200
            -1
            201
            country
            Target (gross)
            Remaining Recruits
            Total Recruits

            -http://newsletters.cylex.de/ref/www.cylex.de/sid-105/uid-4134001/lid-2/http://web2.cylex.de/advent2012?b2b

            Lieber CYLEX Eintragsinhaber,

            das Jahr neigt sich dem Ende und die besinnliche Zeit beginnt laut Kalender mit dem
            1. Advent. Und wie immer wird es in der vorweihnachtlichen Zeit meist beruflich und privat
            so richtig schön hektisch.

            Um Ihre Weihnachtsstimmung in Schwung zu bringen kommen wir nun mit unserem Adventskalender ins Spiel. Denn 24 Tage werden Sie unsere netten Geschichten, Rezepte und Gewinnspiele sowie ausgesuchte Geschenktipps und Einkaufsgutscheine online begleiten. Damit lässt sich Ihre Freude auf das Fest garantiert mit jedem Tag steigern.

            +

            Lieber CYLEX Eintragsinhaber,

            das Jahr neigt sich dem Ende und die besinnliche Zeit beginnt laut Kalender mit dem
            1. Advent. Und wie immer wird es in der vorweihnachtlichen Zeit meist beruflich und privat
            so richtig schön hektisch.

            Um Ihre Weihnachtsstimmung in Schwung zu bringen kommen wir nun mit unserem Adventskalender ins Spiel. Denn 24 Tage werden Sie unsere netten Geschichten, Rezepte und Gewinnspiele sowie ausgesuchte Geschenktipps und Einkaufsgutscheine online begleiten. Damit lässt sich Ihre Freude auf das Fest garantiert mit jedem Tag steigern.

            Einen gemütlichen Start in die Adventszeit wünscht Ihnen -http://newsletters.cylex.de/ref/www.cylex.de/sid-105/uid-4134001/lid-1/http://web2.cylex.de/advent2012?b2b +

            Ihr CYLEX Team

            -P.S. Damit Sie keinen Tag versäumen, empfehlen wir Ihnen den Link des Adventkalenders (http://newsletters.cylex.de/ref/www.cylex.de/sid-105/uid-4134001/lid-3/http://web2.cylex.de/advent2012?b2b) in
            Ihrer Lesezeichen-Symbolleiste zu ergänzen.

             
            +
            serviceteam@cylex.de
            +Homepage
            +Newsletter abbestellen +
            Impressum
            S.C. CYLEX INTERNATIONAL S.N.C.
            Sat. Palota 119/A RO 417516 Palota Romania
            Tel.: +49 208/62957-0 |
            Geschäftsführer: Francisc Osvald
            Handelsregister: J05/1591/2009
            USt.IdNr.: RO26332771
            -
            serviceteam@cylex.de
            Homepage (http://newsletters.cylex.de/ref/www.cylex.de/sid-105/uid-4134001/lid-98/http://web2.cylex.de/Homepage/Home.asp)
            Newsletter abbestellen (http://newsletters.cylex.de/ref/www.cylex.de/sid-105/uid-4134001/lid-99/http://newsletters.cylex.de/unsubscribe.aspx?uid=4134001&d=www.cylex.de&e=enjoy@znuny.com&sc=3009&l=d)
            ", @@ -507,7 +509,7 @@ Managing Director: Martin Edenhofer }, { data: IO.binread('test/fixtures/mail20.box'), - body_md5: '7cdfb67ce7bf914fa0a5b85f0a365fdc', + body_md5: '56ad8d02f4c7641fd2bb8ebf484d36d7', params: { from: 'Health and Care-Mall ', from_email: 'drugs-cheapest8@sicor.com', @@ -521,7 +523,7 @@ Managing Director: Martin Edenhofer
            		óû5aHw5³½IΨµÁxG⌊o8KHCmς9-Ö½23QgñV6UAD¿ùAX←t¨Lf7⊕®Ir²r½TLA5pYJhjV gPnãM36V®E89RUDΤÅ©ÈI9æsàCΘYEϒAfg∗bT¡1∫rIoiš¦O5oUIN±IsæSعPp Ÿÿq1FΧ⇑eGOz⌈F³R98y§ 74”lTr8r§HÐæuØEÛPËq VmkfB∫SKNElst4S∃Á8üTðG°í lY9åPu×8>RÒ¬⊕ΜIÙzÙCC4³ÌQEΡºSè!XgŒs.
            çγ⇓BcwspC L I C K H E R Eëe3¸ ! (http://pxmzcgy.storeprescription.ru?zz=fkxffti)Calm dylan for school today.
            Closing the nursery with you down. Here and made the mess. Maybe the oï from under his mother. Song of course beth touched his pants.
            When someone who gave up from here. Feel of god knows what.            		çγ⇓BcwspC L I C K H E R Eëe3¸ !Calm dylan for school today.
            Closing the nursery with you down. Here and made the mess. Maybe the oï from under his mother. Song of course beth touched his pants.
            When someone who gave up from here. Feel of god knows what.
            TBϖ∃M5T5ΕEf2û–N¶ÁvΖ'®⇓∝5SÐçË5 Χ0jΔHbAgþE—2i6A2lD⇑LGjÓnTOy»¦Hëτ9’:Their mother and tugged it seemed like
            - +
            -
            http://business-catalogs.example.com/ODtpbGs5MWIzbjUyYzExLTA4Yy06Mmg7N3AvL3R0bmFvY3B0LXlhbW9sc2Nhb3NnYy5lL3RpbXJlZi9lbS9ycnJuaWFpZXMsdGxnaWVpLGUzZHx4bnxlZWY=
            Geben Sie diese Information an den Direktor oder den für Marketing und Umsatzsteigerung verantwortlichen Mitarbeiter Ihrer Firma weiter! -

            Hallo,

            -
            Unsubscribe from newsletter: Click here (http://business-catalogs.example.com/c2JudXVlcmNic2I4MWk7MTgxOTMyNS1jMmMtNzA=)", +
            Unsubscribe from newsletter: Click here", }, }, { diff --git a/test/unit/email_postmaster_test.rb b/test/unit/email_postmaster_test.rb index 3893ddab3..877c8b0b3 100644 --- a/test/unit/email_postmaster_test.rb +++ b/test/unit/email_postmaster_test.rb @@ -1,4 +1,3 @@ -# encoding: utf-8 # rubocop:disable all require 'test_helper' diff --git a/test/unit/email_process_auto_response_test.rb b/test/unit/email_process_auto_response_test.rb index 1d81118f6..d37c1f1d7 100644 --- a/test/unit/email_process_auto_response_test.rb +++ b/test/unit/email_process_auto_response_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 +# rubocop:disable Lint/InterpolationCheck require 'test_helper' class EmailProcessAutoResponseTest < ActiveSupport::TestCase diff --git a/test/unit/email_process_bounce_delivery_permanent_failed_test.rb b/test/unit/email_process_bounce_delivery_permanent_failed_test.rb index f62210e55..75d5b62ce 100644 --- a/test/unit/email_process_bounce_delivery_permanent_failed_test.rb +++ b/test/unit/email_process_bounce_delivery_permanent_failed_test.rb @@ -1,10 +1,10 @@ -# encoding: utf-8 +# rubocop:disable Lint/InterpolationCheck require 'test_helper' class EmailProcessBounceDeliveryPermanentFailedTest < ActiveSupport::TestCase test 'process with bounce trigger email loop check - article based blocker' do - roles = Role.where(name: %w(Customer)) + roles = Role.where(name: %w[Customer]) customer1 = User.create_or_update( login: 'ticket-bounce-trigger1@example.com', firstname: 'Notification', @@ -111,7 +111,7 @@ class EmailProcessBounceDeliveryPermanentFailedTest < ActiveSupport::TestCase end test 'process with bounce trigger email loop check - bounce based blocker' do - roles = Role.where(name: %w(Customer)) + roles = Role.where(name: %w[Customer]) customer2 = User.create_or_update( login: 'ticket-bounce-trigger2@example.com', firstname: 'Notification', diff --git a/test/unit/email_process_bounce_follow_test.rb b/test/unit/email_process_bounce_follow_test.rb index 242c95845..0deed2d91 100644 --- a/test/unit/email_process_bounce_follow_test.rb +++ b/test/unit/email_process_bounce_follow_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 +# rubocop:disable Lint/InterpolationCheck require 'test_helper' class EmailProcessBounceFollowUpTest < ActiveSupport::TestCase @@ -38,7 +38,7 @@ class EmailProcessBounceFollowUpTest < ActiveSupport::TestCase end test 'process with bounce trigger email loop check - article based blocker' do - roles = Role.where(name: %w(Customer)) + roles = Role.where(name: %w[Customer]) customer1 = User.create_or_update( login: 'ticket-bounce-trigger1@example.com', firstname: 'Notification', @@ -145,7 +145,7 @@ class EmailProcessBounceFollowUpTest < ActiveSupport::TestCase end test 'process with bounce trigger email loop check - bounce based blocker' do - roles = Role.where(name: %w(Customer)) + roles = Role.where(name: %w[Customer]) customer2 = User.create_or_update( login: 'ticket-bounce-trigger2@example.com', firstname: 'Notification', diff --git a/test/unit/email_process_customer_selection_based_on_sender_recipient_test.rb b/test/unit/email_process_customer_selection_based_on_sender_recipient_test.rb new file mode 100644 index 000000000..81fcfa24d --- /dev/null +++ b/test/unit/email_process_customer_selection_based_on_sender_recipient_test.rb @@ -0,0 +1,79 @@ + +require 'test_helper' + +class EmailProcessCustomerSelectionBasedOnSenderRecipient < ActiveSupport::TestCase + + setup do + groups = Group.all + roles = Role.where(name: 'Agent') + @agent1 = User.create_or_update( + login: 'user-customer-selection-agent1@example.com', + firstname: 'UserOutOfOffice', + lastname: 'Agent1', + email: 'user-customer-selection-agent1@example.com', + password: 'agentpw', + active: true, + roles: roles, + groups: groups, + updated_by_id: 1, + created_by_id: 1, + ) + roles = Role.where(name: 'Customer') + @customer1 = User.create_or_update( + login: 'user-customer-selection-customer1@example.com', + firstname: 'UserOutOfOffice', + lastname: 'customer1', + email: 'user-customer-selection-customer1@example.com', + password: 'customerpw', + active: true, + roles: roles, + updated_by_id: 1, + created_by_id: 1, + ) + end + + test 'customer need to be customer' do + + email_raw_string = "From: #{@agent1.email} +To: #{@customer1.email} +Subject: test + +Some Text" + + 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('test', ticket.title) + assert_equal('new', ticket.state.name) + assert_equal('Agent', ticket.create_article_sender.name) + assert_equal('Agent', article.sender.name) + assert_equal(@customer1.email, ticket.customer.email) + assert_equal(@customer1.firstname, ticket.customer.firstname) + assert_equal(@customer1.lastname, ticket.customer.lastname) + + end + + test 'agent need to be customer' do + + Setting.set('postmaster_sender_is_agent_search_for_customer', false) + + email_raw_string = "From: #{@agent1.email} +To: #{@customer1.email} +Subject: test + +Some Text" + + 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('test', ticket.title) + assert_equal('new', ticket.state.name) + assert_equal('Agent', ticket.create_article_sender.name) + assert_equal('Agent', article.sender.name) + assert_equal(@agent1.email, ticket.customer.email) + assert_equal(@agent1.firstname, ticket.customer.firstname) + assert_equal(@agent1.lastname, ticket.customer.lastname) + + end + +end diff --git a/test/unit/email_process_follow_up_possible_test.rb b/test/unit/email_process_follow_up_possible_test.rb index 32529ceaf..46a81cf8f 100644 --- a/test/unit/email_process_follow_up_possible_test.rb +++ b/test/unit/email_process_follow_up_possible_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class EmailProcessFollowUpPossibleTest < ActiveSupport::TestCase diff --git a/test/unit/email_process_follow_up_test.rb b/test/unit/email_process_follow_up_test.rb index ccbc5c291..59c1d0e08 100644 --- a/test/unit/email_process_follow_up_test.rb +++ b/test/unit/email_process_follow_up_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class EmailProcessFollowUpTest < ActiveSupport::TestCase @@ -88,7 +88,7 @@ References: <20150830145601.30. no reference " setting_orig = Setting.get('postmaster_follow_up_search_in') - Setting.set('postmaster_follow_up_search_in', %w(body attachment references)) + Setting.set('postmaster_follow_up_search_in', %w[body attachment references]) travel 1.second ticket_p, article_p, user_p = Channel::EmailParser.new.process({}, email_raw_string_subject) @@ -251,7 +251,7 @@ Some Text" test 'process with follow up check with two external reference headers' do setting_orig = Setting.get('postmaster_follow_up_search_in') - Setting.set('postmaster_follow_up_search_in', %w(body attachment references)) + Setting.set('postmaster_follow_up_search_in', %w[body attachment references]) data1 = "From: me@example.com To: z@example.com diff --git a/test/unit/email_process_identify_sender_max_test.rb b/test/unit/email_process_identify_sender_max_test.rb index 81d0d316b..0a0efecc3 100644 --- a/test/unit/email_process_identify_sender_max_test.rb +++ b/test/unit/email_process_identify_sender_max_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class EmailProcessIdentifySenderMax < ActiveSupport::TestCase diff --git a/test/unit/email_process_out_of_office_test.rb b/test/unit/email_process_out_of_office_test.rb index 10f529e0c..2025a12c1 100644 --- a/test/unit/email_process_out_of_office_test.rb +++ b/test/unit/email_process_out_of_office_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class EmailProcessOutOfOfficeTest < ActiveSupport::TestCase diff --git a/test/unit/email_process_reply_to_test.rb b/test/unit/email_process_reply_to_test.rb index dbef68207..b4f698604 100644 --- a/test/unit/email_process_reply_to_test.rb +++ b/test/unit/email_process_reply_to_test.rb @@ -1,11 +1,9 @@ -# encoding: utf-8 + require 'test_helper' class EmailProcessReplyToTest < ActiveSupport::TestCase test 'normal processing' do - - setting_orig = Setting.get('postmaster_sender_based_on_reply_to') Setting.set('postmaster_sender_based_on_reply_to', '') email = "From: Bob Smith @@ -16,19 +14,16 @@ Reply-To: replay_to_customer_process1@example.com Some Text" 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('Bob Smith ', article_p.from) assert_equal('replay_to_customer_process1@example.com', article_p.reply_to) assert_equal('marketing_tool@example.com', ticket_p.customer.email) assert_equal('Bob', ticket_p.customer.firstname) assert_equal('Smith', ticket_p.customer.lastname) - - Setting.set('postmaster_sender_based_on_reply_to', setting_orig) - end test 'normal processing - take reply to as customer' do - - setting_orig = Setting.get('postmaster_sender_based_on_reply_to') Setting.set('postmaster_sender_based_on_reply_to', 'as_sender_of_email') email = "From: Bob Smith @@ -53,19 +48,16 @@ Reply-To: Some Name Some Text" 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) assert_equal('Some Name ', article_p.reply_to) assert_equal('replay_to_customer_process2-1@example.com', ticket_p.customer.email) assert_equal('Some', ticket_p.customer.firstname) assert_equal('Name', ticket_p.customer.lastname) - - Setting.set('postmaster_sender_based_on_reply_to', setting_orig) - end test 'normal processing - take reply to as customer and use from as realname' do - - setting_orig = Setting.get('postmaster_sender_based_on_reply_to') Setting.set('postmaster_sender_based_on_reply_to', 'as_sender_of_email_use_from_realname') email = "From: Bob Smith @@ -90,13 +82,42 @@ Reply-To: Some Name Some Text" 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) assert_equal('Some Name ', article_p.reply_to) assert_equal('replay_to_customer_process3-1@example.com', ticket_p.customer.email) assert_equal('Bob', ticket_p.customer.firstname) assert_equal('Smith', ticket_p.customer.lastname) + end - Setting.set('postmaster_sender_based_on_reply_to', setting_orig) + test 'normal processing - take reply to as customer and sender is system address' do + + Setting.set('postmaster_sender_based_on_reply_to', 'as_sender_of_email') + + EmailAddress.create!( + realname: 'address #1', + email: 'marketing_tool@example.com', + active: true, + updated_by_id: 1, + created_by_id: 1, + ) + + email = "From: Marketing Tool +To: zammad@example.com +Subject: some new subject +Reply-To: replay_to_customer_process2@example.com + +Some Text" + + 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('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) + assert_equal('', ticket_p.customer.firstname) + assert_equal('', ticket_p.customer.lastname) end 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 bd0b7093b..d1e7265c8 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 @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class EmailProcessSenderIsSystemAddressOrAgent < ActiveSupport::TestCase diff --git a/test/unit/email_process_sender_name_update_if_needed.rb b/test/unit/email_process_sender_name_update_if_needed.rb index 553adf421..6c979f315 100644 --- a/test/unit/email_process_sender_name_update_if_needed.rb +++ b/test/unit/email_process_sender_name_update_if_needed.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class EmailProcessSenderNameUpdateIfNeeded < ActiveSupport::TestCase diff --git a/test/unit/email_process_state_open_set.rb b/test/unit/email_process_state_open_set.rb index 6ae4bf578..0347e14ca 100644 --- a/test/unit/email_process_state_open_set.rb +++ b/test/unit/email_process_state_open_set.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class EmailProcessStateOpenSet < ActiveSupport::TestCase diff --git a/test/unit/email_process_test.rb b/test/unit/email_process_test.rb index 3df6d1844..8c2a0a227 100644 --- a/test/unit/email_process_test.rb +++ b/test/unit/email_process_test.rb @@ -1,4 +1,3 @@ -# encoding: utf-8 # rubocop:disable all require 'test_helper' @@ -204,6 +203,74 @@ Some Text", ], }, }, + { + data: "From: sender@example.com +To: some_new_customer423@example.com +Cc: some recipient , max +Subject: abc some subject2 + +Some Text", + success: true, + result: { + 0 => { + priority: '2 normal', + title: 'abc some subject2', + }, + 1 => { + body: 'Some Text', + sender: 'Customer', + type: 'email', + internal: false, + }, + }, + verify: { + users: [ + { + firstname: 'max', + lastname: '', + fullname: 'max', + email: 'somebody_else@example.com', + }, + { + firstname: '', + lastname: '', + fullname: 'some_new_customer423@example.com', + email: 'some_new_customer423@example.com', + }, + ], + }, + }, + { + data: "From: sender@example.com +To: some_new_customer424@example.com +Subject: abc some subject3 +Reply-To: some user + +Some Text", + success: true, + result: { + 0 => { + priority: '2 normal', + title: 'abc some subject3', + }, + 1 => { + body: 'Some Text', + sender: 'Customer', + type: 'email', + internal: false, + }, + }, + verify: { + users: [ + { + firstname: '', + lastname: '', + fullname: 'some_new_customer424@example.com', + email: 'some_new_customer424@example.com', + }, + ], + }, + }, { data: "From: me@example.com To: Alexander Ha , @@ -355,7 +422,7 @@ Some Text",             		9õhH3ÿoIÚõ´GÿiH±6u-û◊NQ4ùäU¹awAq¹JLZμÒIicgT1ζ2Y7⊆t 63‘Mñ36EßÝ→DAå†I048CvJ9A↑3iTc4ÉIΥvXO50ñNÁFJSð­r 154F1HPOÀ£CRxZp tLîT9öXH1b3Es±W mNàBg3õEbPŒSúfτTóY4 sUÖPÒζΔRFkcIÕ1™CÓZ3EΛRq!Cass is good to ask what that
            86ËÏuÕC L I C K H E R E28M (http://piufup.medicatingsafemart.ru)Luke had been thinking about that.
            Shannon said nothing in fact they. Matt placed the sofa with amy smiled. Since the past him with more. Maybe he checked the phone. Neither did her name only. Ryan then went inside matt.
            Maybe we can have anything you sure.            		86ËÏuÕC L I C K H E R E28MLuke had been thinking about that.
            Shannon said nothing in fact they. Matt placed the sofa with amy smiled. Since the past him with more. Maybe he checked the phone. Neither did her name only. Ryan then went inside matt.
            Maybe we can have anything you sure.
            á•XMYÍÅEE£ÓN°kP'dÄÅS4⌉d √p¨HΣ>jE4y4ACüûLì“vT∧4tHXÆX: @@ -431,10 +498,10 @@ Some Text",
            -http://www.avast.com/ + -

            ?????? ?????????????????? ???????????????? ???? ?????????????? ?? ???????????????????????? ???? ?????????????????? avast! Antivirus (http://www.avast.com/) ???????????? ??????????????.

            +

            ?????? ?????????????????? ???????????????? ???? ?????????????? ?? ???????????????????????? ???? ?????????????????? avast! Antivirus ???????????? ??????????????.

            ", @@ -2602,6 +2669,113 @@ Some Text', ], }, }, + { + data: IO.binread('test/fixtures/mail64.box'), + success: true, + result: { + 0 => { + priority: '2 normal', + title: 'AW: OTRS / Anfrage OTRS Einführung/Präsentation [Ticket#11545]', + }, + 1 => { + from: 'Martin Edenhofer ', + sender: 'Customer', + type: 'email', + body: 'Enjoy!
            +
            -Martin

            --
            Old programmers never die. They just branch to a new address.
            +
            +
            +
            ', + }, + }, + verify: { + users: [ + { + firstname: 'Martin', + lastname: 'Edenhofer', + fullname: 'Martin Edenhofer', + email: 'martin@example.de', + }, + ], + }, + }, + { + data: 'From: =?iso-8859-1?Q?B=FCrling,=20Andreas?= +Content-Type: text/plain; + charset=iso-8859-1 +Content-Transfer-Encoding: quoted-printable +Subject: =?iso-8859-1?Q?aa=E4=F6=FC=DFad_asd?= +X-Universally-Unique-Identifier: d12c15d2-e6d6-4ccd-86c7-abc2c3d0a2a2 +Date: Fri, 4 May 2012 14:01:03 +0200 +Message-Id: +To: metest@znuny.com +Mime-Version: 1.0 (Apple Message framework v1257) + +=E4=F6=FC=DF ad asd + +-Martin + +-- +Old programmers never die. They just branch to a new address.', + success: true, + result: { + 0 => { + priority: '2 normal', + title: 'aaäöüßad asd', + }, + 1 => { + from: '=?iso-8859-1?Q?B=FCrling, =20Andreas?= ', + sender: 'Customer', + type: 'email', + body: 'äöüß ad asd + +-Martin + +-- +Old programmers never die. They just branch to a new address.', + }, + }, + verify: { + users: [ + { + firstname: '=20Andreas?=', + lastname: '', + fullname: '=20Andreas?=', + email: 'smith@example.com', + }, + ], + }, + }, + { + data: 'From: =?windows-1258?B?VmFuZHJvbW1lLCBGculk6XJpYw==?= +To: Example +Subject: some subject 3 + +Some Text', + success: true, + result: { + 0 => { + priority: '2 normal', + title: 'some subject 3', + }, + 1 => { + from: '=?windows-1258?B?VmFuZHJvbW1lLCBGculk6XJpYw==?= ', + sender: 'Customer', + type: 'email', + body: 'Some Text', + }, + }, + verify: { + users: [ + { + firstname: 'Frédéric', + lastname: 'Vandromme', + fullname: 'Frédéric Vandromme', + email: 'fvandromme@example.com', + }, + ], + }, + }, ] assert_process(files) end @@ -2813,9 +2987,9 @@ Some Text', # verify if users are created if file[:verify][:users] file[:verify][:users].each { |user_result| - user = User.where(email: user_result[:email]).first + user = User.where(email: user_result[:email].downcase).first if !user - assert(false, "No user '#{user_result[:email]}' found!") + assert(false, "No user '#{user_result[:email].downcase}' found!") return end user_result.each { |key, value| diff --git a/test/unit/email_regex_test.rb b/test/unit/email_regex_test.rb index 0052fa06f..88832ef76 100644 --- a/test/unit/email_regex_test.rb +++ b/test/unit/email_regex_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class EmailRegexTest < ActiveSupport::TestCase diff --git a/test/unit/email_signatur_detection_test.rb b/test/unit/email_signatur_detection_test.rb index 8ad183d1d..37510921a 100644 --- a/test/unit/email_signatur_detection_test.rb +++ b/test/unit/email_signatur_detection_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class EmailSignaturDetectionTest < ActiveSupport::TestCase @@ -14,7 +14,7 @@ class EmailSignaturDetectionTest < ActiveSupport::TestCase fixture_messages = [] fixture_files.each do |filepath, value| - value[:content] = File.new("#{Rails.root}/test/fixtures/#{filepath}", 'r').read + value[:content] = File.new( Rails.root.join('test', 'fixtures', filepath), 'r').read fixture_messages.push value end @@ -22,7 +22,7 @@ class EmailSignaturDetectionTest < ActiveSupport::TestCase expected_signature = "\nMit freundlichen Grüßen\n\nBob Smith\nBerechtigungen und dez. Department\n________________________________\n\nMusik AG\nBerechtigungen und dez. Department (ITPBM)\nKastanien 2" assert_equal(expected_signature, signature) - fixture_files.each do |_filepath, value| + fixture_files.each_value do |value| assert_equal(value[:line], SignatureDetection.find_signature_line(signature, value[:content], value[:content_type])) end end @@ -37,7 +37,7 @@ class EmailSignaturDetectionTest < ActiveSupport::TestCase fixture_messages = [] fixture_files.each do |filepath, value| - value[:content] = File.new("#{Rails.root}/test/fixtures/#{filepath}", 'r').read + value[:content] = File.new( Rails.root.join('test', 'fixtures', filepath), 'r').read fixture_messages.push value end @@ -45,14 +45,14 @@ class EmailSignaturDetectionTest < ActiveSupport::TestCase expected_signature = "\nFreundliche Grüße\n\nGünter Lässig\nLokale Daten\n\nMusic GmbH\nBaustraße 123, 12345 Max City\nTelefon 0123 5432114\nTelefax 0123 5432139" assert_equal(expected_signature, signature) - fixture_files.each do |_filepath, value| + fixture_files.each_value do |value| assert_equal(value[:line], SignatureDetection.find_signature_line(signature, value[:content], value[:content_type])) end end test 'test case 3 - just tests' do signature = "~~~~~~~~~~~~~~~~~~~~~~~~~~~~\nBob Smith\nABC Organisation\n\nEXAMPLE IT-Service GmbH\nDorten 5 F&E\n12345 Da / Germany\nPhone: +49 (0) 1234 567 890 / +49 (0) 1234 567 891\nFax:     +49 (0) 1234 567 892" - message = File.new("#{Rails.root}/test/fixtures/email_signature_detection/example1.html", 'r').read + message = File.new(Rails.root.join('test', 'fixtures', 'email_signature_detection', 'example1.html'), 'r').read signature_line = SignatureDetection.find_signature_line(signature, message, 'text/html') assert_equal(11, signature_line) end @@ -67,7 +67,7 @@ class EmailSignaturDetectionTest < ActiveSupport::TestCase fixture_messages = [] fixture_files.each do |filepath, value| - value[:content] = File.new("#{Rails.root}/test/fixtures/#{filepath}", 'r').read + value[:content] = File.new( Rails.root.join('test', 'fixtures', filepath), 'r').read fixture_messages.push value end @@ -84,7 +84,7 @@ class EmailSignaturDetectionTest < ActiveSupport::TestCase raw_email_header = "From: Bob.Smith@music.com\nTo: test@zammad.org\nSubject: test\n\n" # process email I - file = File.open("#{Rails.root}/test/fixtures/email_signature_detection/client_a_1.txt", 'rb') + file = File.open(Rails.root.join('test', 'fixtures', 'email_signature_detection', 'client_a_1.txt'), 'rb') raw_email = raw_email_header + file.read ticket1, article1, user1, mail = Channel::EmailParser.new.process({}, raw_email) assert(ticket1) @@ -92,7 +92,7 @@ class EmailSignaturDetectionTest < ActiveSupport::TestCase Scheduler.worker(true) # process email II - file = File.open("#{Rails.root}/test/fixtures/email_signature_detection/client_a_2.txt", 'rb') + file = File.open(Rails.root.join('test', 'fixtures', 'email_signature_detection', 'client_a_2.txt'), 'rb') raw_email = raw_email_header + file.read ticket2, article2, user2, mail = Channel::EmailParser.new.process({}, raw_email) assert(ticket2) @@ -104,7 +104,7 @@ class EmailSignaturDetectionTest < ActiveSupport::TestCase assert(user2.preferences[:signature_detection]) # process email III - file = File.open("#{Rails.root}/test/fixtures/email_signature_detection/client_a_3.txt", 'rb') + file = File.open(Rails.root.join('test', 'fixtures', 'email_signature_detection', 'client_a_3.txt'), 'rb') raw_email = raw_email_header + file.read ticket3, article3, user3, mail = Channel::EmailParser.new.process({}, raw_email) assert(ticket3) diff --git a/test/unit/history_test.rb b/test/unit/history_test.rb index afb276786..51c06e078 100644 --- a/test/unit/history_test.rb +++ b/test/unit/history_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class HistoryTest < ActiveSupport::TestCase diff --git a/test/unit/html_sanitizer_test.rb b/test/unit/html_sanitizer_test.rb index e29b71c8e..a9e9e629b 100644 --- a/test/unit/html_sanitizer_test.rb +++ b/test/unit/html_sanitizer_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class HtmlSanitizerTest < ActiveSupport::TestCase @@ -46,19 +46,19 @@ class HtmlSanitizerTest < ActiveSupport::TestCase assert_equal(HtmlSanitizer.strict(''), '') assert_equal(HtmlSanitizer.strict('
            '), '
            ') assert_equal(HtmlSanitizer.strict('
            '), '
            ') - assert_equal(HtmlSanitizer.strict('test'), 'test (/some/path)') - assert_equal(HtmlSanitizer.strict('test'), 'test (https://some/path)') - assert_equal(HtmlSanitizer.strict('test', true), 'test (https://some/path)') + assert_equal(HtmlSanitizer.strict('test'), 'test') + assert_equal(HtmlSanitizer.strict('test'), 'test') + assert_equal(HtmlSanitizer.strict('test', true), 'test') assert_equal(HtmlSanitizer.strict(''), '') assert_equal(HtmlSanitizer.strict(''), '') assert_equal(HtmlSanitizer.strict(' +ADw-SCRIPT+AD4-alert(\'XSS\');+ADw-/SCRIPT+AD4-'), ' +ADw-SCRIPT+AD4-alert(\'XSS\');+ADw-/SCRIPT+AD4-') assert_equal(HtmlSanitizer.strict(''), '') assert_equal(HtmlSanitizer.strict('XSS'), 'XSS (http://66.000146.0x7.147/)') +tt p://6 6.000146.0x7.147/">XSS'), 'XSS') assert_equal(HtmlSanitizer.strict('XSS', true), 'XSS (http://66.000146.0x7.147/)') - assert_equal(HtmlSanitizer.strict('XSS'), 'XSS (//www.google.com/)') - assert_equal(HtmlSanitizer.strict('XSS', true), 'XSS (//www.google.com/)') +tt p://6 6.000146.0x7.147/">XSS', true), 'XSS') + assert_equal(HtmlSanitizer.strict('XSS'), 'XSS') + assert_equal(HtmlSanitizer.strict('XSS', true), 'XSS') assert_equal(HtmlSanitizer.strict('
            '), 'X') assert_equal(HtmlSanitizer.strict('CLICKME'), 'CLICKME') assert_equal(HtmlSanitizer.strict('CLICKME'), 'CLICKME') @@ -73,8 +73,47 @@ tt p://6 6.000146.0x7.147/">XSS', true), 'XSS (XXX'), 'XXX') assert_equal(HtmlSanitizer.strict('XXX', true), 'XXX') assert_equal(HtmlSanitizer.strict(''), 'alert(1)') - assert_equal(HtmlSanitizer.strict(''), 'http://example.com') - assert_equal(HtmlSanitizer.strict('', true), 'http://example.com') + assert_equal(HtmlSanitizer.strict(''), '') + assert_equal(HtmlSanitizer.strict('', true), '') + assert_equal(HtmlSanitizer.strict('
            + +test 123 +
            '), '
            + +test 123 +
            +
            ') + assert_equal(HtmlSanitizer.strict('
            123
            '), '
            123
            ') + assert_equal(HtmlSanitizer.strict('
            123
            '), '
            123
            ') + assert_equal(HtmlSanitizer.strict('
            123
            '), '
            123
            ') + assert_equal(HtmlSanitizer.strict('
            123
            '), '
            123
            ') + assert_equal(HtmlSanitizer.strict('
            123
            '), '
            123
            ') + assert_equal(HtmlSanitizer.strict('
            123
            '), '
            123
            ') + assert_equal(HtmlSanitizer.strict('
            123
            '), '
            123
            ') + assert_equal(HtmlSanitizer.strict('
            123
            '), '
            123
            ') + end end diff --git a/test/unit/integration_icinga_test.rb b/test/unit/integration_icinga_test.rb index 2106bd6c4..4bf1ce357 100644 --- a/test/unit/integration_icinga_test.rb +++ b/test/unit/integration_icinga_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class IntegrationIcingaTest < ActiveSupport::TestCase diff --git a/test/unit/integration_monit_test.rb b/test/unit/integration_monit_test.rb index fafe72109..a481cc77d 100644 --- a/test/unit/integration_monit_test.rb +++ b/test/unit/integration_monit_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class IntegrationMonitTest < ActiveSupport::TestCase diff --git a/test/unit/integration_nagios_test.rb b/test/unit/integration_nagios_test.rb index 4e33aa405..9248be00e 100644 --- a/test/unit/integration_nagios_test.rb +++ b/test/unit/integration_nagios_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class IntegrationNagiosTest < ActiveSupport::TestCase diff --git a/test/unit/job_assets_test.rb b/test/unit/job_assets_test.rb new file mode 100644 index 000000000..aff315032 --- /dev/null +++ b/test/unit/job_assets_test.rb @@ -0,0 +1,80 @@ + +require 'test_helper' + +class JobAssetsTest < ActiveSupport::TestCase + test 'assets' do + + UserInfo.current_user_id = 1 + roles = Role.where(name: %w[Customer]) + + user1 = User.create_or_update( + login: 'assets_job1@example.org', + firstname: 'assets_job1', + lastname: 'assets_job1', + email: 'assets_job1@example.org', + password: 'some_pass', + active: true, + roles: roles, + ) + user2 = User.create_or_update( + login: 'assets_job2@example.org', + firstname: 'assets_job2', + lastname: 'assets_job2', + email: 'assets_job2@example.org', + password: 'some_pass', + active: true, + roles: roles, + ) + user3 = User.create_or_update( + login: 'assets_job3@example.org', + firstname: 'assets_job3', + lastname: 'assets_job3', + email: 'assets_job3@example.org', + password: 'some_pass', + active: true, + roles: roles, + ) + + ticket_state1 = Ticket::State.find_by(name: 'new') + ticket_state2 = Ticket::State.find_by(name: 'open') + ticket_priority2 = Ticket::Priority.find_by(name: '2 normal') + job = Job.create_or_update( + name: 'my job', + timeplan: { + mon: true, + }, + condition: { + 'ticket.state_id' => { + operator: 'is', + value: [ ticket_state1.id, ticket_state2.id ], + }, + 'ticket.owner_id' => { + operator: 'is', + pre_condition: 'specific', + value: user1.id, + value_completion: 'John Smith ' + }, + }, + perform: { + 'ticket.priority_id' => { + value: ticket_priority2.id, + }, + 'ticket.owner_id' => { + pre_condition: 'specific', + value: user2.id, + value_completion: 'metest123@znuny.com ' + }, + }, + disable_notification: true, + ) + assets = job.assets({}) + assert(assets[:User][user1.id]) + assert(assets[:User][user2.id]) + assert_not(assets[:User][user3.id]) + assert(assets[:TicketState][ticket_state1.id]) + assert(assets[:TicketState][ticket_state2.id]) + assert(assets[:TicketPriority][ticket_priority2.id]) + + end + +end diff --git a/test/unit/job_test.rb b/test/unit/job_test.rb index 7e41e925d..9000e312e 100644 --- a/test/unit/job_test.rb +++ b/test/unit/job_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class JobTest < ActiveSupport::TestCase @@ -11,7 +11,7 @@ class JobTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - ticket1 = Ticket.create( + ticket1 = Ticket.create!( title: 'job test 1', group: group1, customer_id: 2, @@ -22,7 +22,7 @@ class JobTest < ActiveSupport::TestCase created_by_id: 1, updated_by_id: 1, ) - ticket2 = Ticket.create( + ticket2 = Ticket.create!( title: 'job test 2', group: group1, customer_id: 2, @@ -33,7 +33,7 @@ class JobTest < ActiveSupport::TestCase updated_at: Time.zone.now - 1.day, updated_by_id: 1, ) - ticket3 = Ticket.create( + ticket3 = Ticket.create!( title: 'job test 3', group: group2, customer_id: 2, @@ -44,7 +44,7 @@ class JobTest < ActiveSupport::TestCase updated_at: Time.zone.now - 1.day, updated_by_id: 1, ) - ticket4 = Ticket.create( + ticket4 = Ticket.create!( title: 'job test 4', group: group2, customer_id: 2, @@ -55,7 +55,7 @@ class JobTest < ActiveSupport::TestCase updated_at: Time.zone.now - 3.days, updated_by_id: 1, ) - ticket5 = Ticket.create( + ticket5 = Ticket.create!( title: 'job test 5', group: group2, customer_id: 2, @@ -249,7 +249,7 @@ class JobTest < ActiveSupport::TestCase end - test 'case 2' do + test 'with invalid state_id' do # create ticket group1 = Group.lookup(name: 'Users') @@ -258,7 +258,7 @@ class JobTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - ticket1 = Ticket.create( + ticket1 = Ticket.create!( title: 'job test 1', group: group1, customer_id: 2, @@ -269,7 +269,7 @@ class JobTest < ActiveSupport::TestCase created_by_id: 1, updated_by_id: 1, ) - ticket2 = Ticket.create( + ticket2 = Ticket.create!( title: 'job test 2', group: group1, customer_id: 2, @@ -575,9 +575,8 @@ class JobTest < ActiveSupport::TestCase end - test 'case 5' do + test 'check next_run_at' do - # create jobs job1 = Job.create_or_update( name: 'Test Job1', timeplan: { @@ -644,6 +643,290 @@ class JobTest < ActiveSupport::TestCase time_now = Time.zone.parse('2016-03-17 23:51:23 UTC') next_run_at = job1.next_run_at_calculate(time_now) assert_equal('2016-03-21 00:00:00 UTC', next_run_at.to_s) + end + + test 'update next run at' do + + travel_to Time.zone.local(2017, 11, 10, 22, 0o4, 44) + + job1 = Job.create_or_update( + name: 'Test Job1', + timeplan: { + days: { + Mon: false, + Tue: false, + Wed: false, + Thu: false, + Fri: false, + Sat: true, + Sun: false, + }, + hours: { + '0' => false, + '1' => false, + '2' => false, + '3' => false, + '4' => false, + '5' => false, + '6' => false, + '7' => false, + '8' => false, + '9' => false, + '10' => false, + '11' => false, + '12' => false, + '13' => false, + '14' => false, + '15' => false, + '16' => false, + '17' => false, + '18' => false, + '19' => false, + '20' => false, + '21' => false, + '22' => false, + '23' => true, + }, + minutes: { + '0' => true, + '10' => false, + '20' => false, + '30' => false, + '40' => false, + '50' => false, + }, + }, + condition: { + 'ticket.state_id' => { 'operator' => 'is', 'value' => [Ticket::State.lookup(name: 'new').id.to_s, Ticket::State.lookup(name: 'open').id.to_s] }, + }, + perform: { + 'ticket.action' => { 'value' => 'delete' }, + }, + disable_notification: true, + last_run_at: nil, + active: true, + created_by_id: 1, + created_at: Time.zone.now, + updated_by_id: 1, + updated_at: Time.zone.now, + ) + + assert_equal('2017-11-11 23:00:00 UTC', job1.next_run_at.to_s) + assert_not(job1.last_run_at) + + travel_to Time.zone.local(2017, 11, 16, 22, 0o4, 44) + + Job.run + + job1.reload + + assert_equal('2017-11-18 23:00:00 UTC', job1.next_run_at.to_s) + assert_not(job1.last_run_at) + + travel_back + + end + + test 'execute on certain time' do + + travel_to Time.zone.local(2017, 11, 16, 22, 0o4, 44) + + group1 = Group.lookup(name: 'Users') + ticket1 = Ticket.create!( + title: 'job test 1', + group: group1, + customer_id: 2, + state: Ticket::State.lookup(name: 'new'), + priority: Ticket::Priority.lookup(name: '2 normal'), + created_by_id: 1, + updated_by_id: 1, + ) + ticket2 = Ticket.create!( + title: 'job test 2', + group: group1, + customer_id: 2, + state: Ticket::State.lookup(name: 'new'), + priority: Ticket::Priority.lookup(name: '2 normal'), + created_by_id: 1, + updated_by_id: 1, + ) + + job1 = Job.create_or_update( + name: 'Test Job1', + timeplan: { + days: { + Mon: false, + Tue: false, + Wed: false, + Thu: true, + Fri: false, + Sat: false, + Sun: false, + }, + hours: { + '0' => false, + '1' => false, + '2' => false, + '3' => false, + '4' => false, + '5' => false, + '6' => false, + '7' => false, + '8' => false, + '9' => false, + '10' => false, + '11' => false, + '12' => false, + '13' => false, + '14' => false, + '15' => false, + '16' => false, + '17' => false, + '18' => false, + '19' => false, + '20' => false, + '21' => false, + '22' => false, + '23' => true, + }, + minutes: { + '0' => true, + '10' => false, + '20' => false, + '30' => false, + '40' => false, + '50' => false, + }, + }, + condition: { + 'ticket.state_id' => { 'operator' => 'is', 'value' => [Ticket::State.lookup(name: 'new').id.to_s, Ticket::State.lookup(name: 'open').id.to_s] }, + }, + perform: { + 'ticket.action' => { 'value' => 'delete' }, + }, + disable_notification: true, + last_run_at: nil, + active: true, + created_by_id: 1, + created_at: Time.zone.now, + updated_by_id: 1, + updated_at: Time.zone.now, + ) + Job.run + + assert(Ticket.find_by(id: ticket1.id)) + assert(Ticket.find_by(id: ticket2.id)) + + travel_to Time.zone.local(2017, 11, 16, 23, 0o4, 44) + + Job.run + + assert_not(Ticket.find_by(id: ticket1.id)) + assert_not(Ticket.find_by(id: ticket2.id)) + + travel_back + end + + test 'delete based on tag' do + + # create ticket + group1 = Group.lookup(name: 'Users') + group2 = Group.create_or_update( + name: 'JobTest2', + updated_by_id: 1, + created_by_id: 1, + ) + ticket1 = Ticket.create!( + title: 'job test 1', + group: group1, + customer_id: 2, + state: Ticket::State.lookup(name: 'new'), + priority: Ticket::Priority.lookup(name: '2 normal'), + created_at: Time.zone.now - 3.days, + updated_at: Time.zone.now - 3.days, + created_by_id: 1, + updated_by_id: 1, + ) + ticket1.tag_add('spam', 1) + ticket1.tag_add('test1 ', 1) + ticket2 = Ticket.create!( + title: 'job test 2', + group: group1, + customer_id: 2, + state: Ticket::State.lookup(name: 'new'), + priority: Ticket::Priority.lookup(name: '2 normal'), + created_at: Time.zone.now - 1.day, + created_by_id: 1, + updated_at: Time.zone.now - 1.day, + updated_by_id: 1, + ) + + job1 = Job.create_or_update( + name: 'Test Job1', + timeplan: { + days: { + Mon: true, + Tue: true, + Wed: true, + Thu: true, + Fri: true, + Sat: true, + Sun: true, + }, + hours: { + 0 => true, + 1 => true, + 2 => true, + 3 => true, + 4 => true, + 5 => true, + 6 => true, + 7 => true, + 8 => true, + 9 => true, + 10 => true, + 11 => true, + 12 => true, + 13 => true, + 14 => true, + 15 => true, + 16 => true, + 17 => true, + 18 => true, + 19 => true, + 20 => true, + 21 => true, + 22 => true, + 23 => true, + }, + minutes: { + 0 => true, + 10 => true, + 20 => true, + 30 => true, + 40 => true, + 50 => true, + }, + }, + condition: { + 'ticket.tags' => { 'operator' => 'contains one', 'value' => 'spam' }, + }, + perform: { + 'ticket.action' => { 'value' => 'delete' }, + }, + disable_notification: true, + last_run_at: nil, + updated_at: Time.zone.now - 15.minutes, + active: true, + updated_by_id: 1, + created_by_id: 1, + ) + assert(job1.executable?) + assert(job1.in_timeplan?) + Job.run + + assert_not(Ticket.find_by(id: ticket1.id)) + assert(Ticket.find_by(id: ticket2.id)) end diff --git a/test/unit/karma_test.rb b/test/unit/karma_test.rb index c53bd09ed..b2659a206 100644 --- a/test/unit/karma_test.rb +++ b/test/unit/karma_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class KarmaTest < ActiveSupport::TestCase diff --git a/test/unit/migration_ror_42_to50_store_test.rb b/test/unit/migration_ror_42_to50_store_test.rb index 56778693b..09e1c273b 100644 --- a/test/unit/migration_ror_42_to50_store_test.rb +++ b/test/unit/migration_ror_42_to50_store_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + # Rails 5.0 has changed to only store and read ActiveSupport::HashWithIndifferentAccess from stores # we extended lib/core_ext/active_record/store/indifferent_coder.rb to read also ActionController::Parameters # and convert them to ActiveSupport::HashWithIndifferentAccess for migration in db/migrate/20170910000001_fixed_store_upgrade_45.rb. diff --git a/test/unit/model_test.rb b/test/unit/model_test.rb index b7c0d7777..b8483213d 100644 --- a/test/unit/model_test.rb +++ b/test/unit/model_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class ModelTest < ActiveSupport::TestCase @@ -65,7 +65,7 @@ class ModelTest < ActiveSupport::TestCase # create base groups = Group.where(name: 'Users') - roles = Role.where(name: %w(Agent Admin)) + roles = Role.where(name: %w[Agent Admin]) agent1 = User.create_or_update( login: 'model-agent1@example.com', firstname: 'Model', @@ -179,7 +179,7 @@ class ModelTest < ActiveSupport::TestCase assert(!references1['Organization']) assert(!references1['Group']) assert(!references1['UserGroup']) - assert(references1.empty?) + assert(references1.blank?) references_total1 = Models.references_total('User', agent1.id) assert_equal(references_total1, 0) @@ -211,7 +211,7 @@ class ModelTest < ActiveSupport::TestCase # verify agent2 references2 = Models.references('Organization', organization2.id) - assert(references2.empty?) + assert(references2.blank?) references_total2 = Models.references_total('Organization', organization2.id) assert_equal(references_total2, 0) @@ -221,7 +221,7 @@ class ModelTest < ActiveSupport::TestCase # verify agent1 references1 = Models.references('Organization', organization1.id) - assert(references1.empty?) + assert(references1.blank?) references_total1 = Models.references_total('Organization', organization1.id) assert_equal(references_total1, 0) @@ -243,8 +243,98 @@ class ModelTest < ActiveSupport::TestCase assert(searchable.include?(Ticket)) assert(searchable.include?(User)) assert(searchable.include?(Organization)) - assert_equal(3, searchable.count) + assert(searchable.include?(Chat::Session)) + assert_equal(4, searchable.count) + end + test 'param_cleanup test' do + params = { + id: 123, + abc: true, + firstname: '123', + created_by_id: 1, + created_at: Time.zone.now, + updated_by_id: 1, + updated_at: Time.zone.now, + action: 'some action', + controller: 'some controller', + } + result = User.param_cleanup(params, true) + assert_not(result.key?(:id)) + assert_not(result.key?(:abc)) + assert_equal('123', result[:firstname]) + assert_not(result.key?(:created_by_id)) + assert_not(result.key?(:created_at)) + assert_not(result.key?(:updated_by_id)) + assert_not(result.key?(:updated_at)) + assert_not(result.key?(:action)) + assert_not(result.key?(:controller)) + + params = { + id: 123, + abc: true, + firstname: '123', + created_by_id: 1, + created_at: Time.zone.now, + updated_by_id: 1, + updated_at: Time.zone.now, + action: 'some action', + controller: 'some controller', + } + result = User.param_cleanup(params) + assert_equal(123, result[:id]) + assert_not(result.key?(:abc)) + assert_equal('123', result[:firstname]) + assert_not(result.key?(:created_by_id)) + assert_not(result.key?(:created_at)) + assert_not(result.key?(:updated_by_id)) + assert_not(result.key?(:updated_at)) + assert_not(result.key?(:action)) + assert_not(result.key?(:controller)) + + Setting.set('import_mode', true) + + params = { + id: 123, + abc: true, + firstname: '123', + created_by_id: 1, + created_at: Time.zone.now, + updated_by_id: 1, + updated_at: Time.zone.now, + action: 'some action', + controller: 'some controller', + } + result = User.param_cleanup(params, true) + assert_not(result.key?(:abc)) + assert_equal('123', result[:firstname]) + assert_equal(1, result[:created_by_id]) + assert(result[:created_at]) + assert_equal(1, result[:updated_by_id]) + assert(result[:updated_at]) + assert_not(result.key?(:action)) + assert_not(result.key?(:controller)) + + params = { + id: 123, + abc: true, + firstname: '123', + created_by_id: 1, + created_at: Time.zone.now, + updated_by_id: 1, + updated_at: Time.zone.now, + action: 'some action', + controller: 'some controller', + } + result = User.param_cleanup(params) + assert_equal(123, result[:id]) + assert_equal('123', result[:firstname]) + assert_equal(1, result[:created_by_id]) + assert(result[:created_at]) + assert_equal(1, result[:updated_by_id]) + assert(result[:updated_at]) + assert_not(result.key?(:action)) + assert_not(result.key?(:controller)) end end diff --git a/test/unit/notification_factory_mailer_template_test.rb b/test/unit/notification_factory_mailer_template_test.rb index 7889b6057..2a3e4b36b 100644 --- a/test/unit/notification_factory_mailer_template_test.rb +++ b/test/unit/notification_factory_mailer_template_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class NotificationFactoryMailerTemplateTest < ActiveSupport::TestCase @@ -158,8 +158,8 @@ class NotificationFactoryMailerTemplateTest < ActiveSupport::TestCase created_by_id: 1, ) changes = { - state: %w(aaa bbb), - group: %w(xxx yyy), + state: %w[aaa bbb], + group: %w[xxx yyy], } result = NotificationFactory::Mailer.template( template: 'ticket_update', @@ -201,6 +201,66 @@ class NotificationFactoryMailerTemplateTest < ActiveSupport::TestCase assert_no_match('longname', result[:body]) assert_match('Current User', result[:body]) + Setting.set('locale_default', 'de-de') + result = NotificationFactory::Mailer.template( + template: 'ticket_update', + objects: { + ticket: ticket, + article: article, + recipient: agent1, + current_user: agent_current_user, + changes: changes, + }, + ) + assert_match('Ticket aktualisiert', result[:subject]) + assert_match('Notification<b>xxx</b>', result[:body]) + assert_match('wurde von', result[:body]) + assert_match('test123', result[:body]) + assert_match('Benachrichtigungseinstellungen Verwalten', result[:body]) + assert_no_match('Your', result[:body]) + assert_no_match('longname', result[:body]) + assert_match('Current User', result[:body]) + + Setting.set('locale_default', 'not_existing') + result = NotificationFactory::Mailer.template( + template: 'ticket_update', + objects: { + ticket: ticket, + article: article, + recipient: agent1, + current_user: agent_current_user, + changes: changes, + }, + ) + assert_match('Updated Ticket', result[:subject]) + assert_match('Notification<b>xxx</b>', result[:body]) + assert_match('has been updated by', result[:body]) + assert_match('test123', result[:body]) + assert_match('Manage your notifications settings', result[:body]) + assert_no_match('Dein', result[:body]) + assert_no_match('longname', result[:body]) + assert_match('Current User', result[:body]) + + Setting.set('locale_default', 'pt-br') + result = NotificationFactory::Mailer.template( + template: 'ticket_update', + objects: { + ticket: ticket, + article: article, + recipient: agent1, + current_user: agent_current_user, + changes: changes, + }, + ) + assert_match('Chamado atualizado', result[:subject]) + assert_match('Notification<b>xxx</b>', result[:body]) + assert_match('foi atualizado por', result[:body]) + assert_match('test123', result[:body]) + assert_match('Manage your notifications settings', result[:body]) + assert_no_match('Dein', result[:body]) + assert_no_match('longname', result[:body]) + assert_match('Current User', result[:body]) + end end diff --git a/test/unit/notification_factory_mailer_test.rb b/test/unit/notification_factory_mailer_test.rb index 22a0d3e7c..770911693 100644 --- a/test/unit/notification_factory_mailer_test.rb +++ b/test/unit/notification_factory_mailer_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class NotificationFactoryMailerTest < ActiveSupport::TestCase diff --git a/test/unit/notification_factory_renderer_test.rb b/test/unit/notification_factory_renderer_test.rb index d3bcffed1..74e33362c 100644 --- a/test/unit/notification_factory_renderer_test.rb +++ b/test/unit/notification_factory_renderer_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 +# rubocop:disable Lint/InterpolationCheck require 'test_helper' class NotificationFactoryRendererTest < ActiveSupport::TestCase diff --git a/test/unit/notification_factory_slack_template_test.rb b/test/unit/notification_factory_slack_template_test.rb index cb3b349f0..319198492 100644 --- a/test/unit/notification_factory_slack_template_test.rb +++ b/test/unit/notification_factory_slack_template_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class NotificationFactorySlackTemplateTest < ActiveSupport::TestCase @@ -98,8 +98,8 @@ class NotificationFactorySlackTemplateTest < ActiveSupport::TestCase created_by_id: 1, ) changes = { - state: %w(aaa bbb), - group: %w(xxx yyy), + state: %w[aaa bbb], + group: %w[xxx yyy], } result = NotificationFactory::Slack.template( template: 'ticket_update', diff --git a/test/unit/notification_factory_template_test.rb b/test/unit/notification_factory_template_test.rb index baee7c7ea..604ed0e62 100644 --- a/test/unit/notification_factory_template_test.rb +++ b/test/unit/notification_factory_template_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 +# rubocop:disable Lint/InterpolationCheck require 'test_helper' class NotificationFactoryTemplateTest < ActiveSupport::TestCase diff --git a/test/unit/object_cache_test.rb b/test/unit/object_cache_test.rb index 4ab4ee840..086210c9a 100644 --- a/test/unit/object_cache_test.rb +++ b/test/unit/object_cache_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class ObjectCacheTest < ActiveSupport::TestCase @@ -9,7 +9,7 @@ class ObjectCacheTest < ActiveSupport::TestCase created_by_id: 1, ) - roles = Role.where( name: %w(Agent Admin) ) + roles = Role.where( name: %w[Agent Admin] ) groups = Group.all user1 = User.create_or_update( login: 'object_cache1@example.org', @@ -36,7 +36,7 @@ class ObjectCacheTest < ActiveSupport::TestCase end test 'user cache' do - roles = Role.where(name: %w(Agent Admin)) + roles = Role.where(name: %w[Agent Admin]) groups = Group.all.order(:id) # be sure that minimum one admin is available 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 f79557371..db2b02d04 100644 --- a/test/unit/object_create_update_with_ref_name_test.rb +++ b/test/unit/object_create_update_with_ref_name_test.rb @@ -1,9 +1,9 @@ -# encoding: utf-8 + require 'test_helper' class ObjectCreateUpdateWithRefNameTest < ActiveSupport::TestCase test 'organization' do - roles = Role.where(name: %w(Agent Admin)) + roles = Role.where(name: %w[Agent Admin]) groups = Group.all user1 = User.create_or_update( login: 'object_ref_name1@example.org', @@ -90,7 +90,7 @@ class ObjectCreateUpdateWithRefNameTest < ActiveSupport::TestCase organization: 'some org update_with_ref user', updated_by_id: 1, created_by_id: 1, - roles: %w(Agent Admin), + roles: %w[Agent Admin], groups: ['Users'], ) user2 = User.create_or_update_with_ref( @@ -137,7 +137,7 @@ class ObjectCreateUpdateWithRefNameTest < ActiveSupport::TestCase organization_id: nil, updated_by_id: 1, created_by_id: 1, - roles: %w(Agent Admin), + roles: %w[Agent Admin], groups: [], ) user2 = User.create_or_update_with_ref( diff --git a/test/unit/object_type_lookup_test.rb b/test/unit/object_type_lookup_test.rb index d4643d471..f37a9c24a 100644 --- a/test/unit/object_type_lookup_test.rb +++ b/test/unit/object_type_lookup_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class ObjectTypeLookupTest < ActiveSupport::TestCase diff --git a/test/unit/online_notifiaction_test.rb b/test/unit/online_notifiaction_test.rb index a50354f11..07e669f9d 100644 --- a/test/unit/online_notifiaction_test.rb +++ b/test/unit/online_notifiaction_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class OnlineNotificationTest < ActiveSupport::TestCase @@ -347,11 +347,11 @@ class OnlineNotificationTest < ActiveSupport::TestCase Scheduler.worker(true) notifications = OnlineNotification.list_by_object('Ticket', tickets[0].id) - assert(!notifications.empty?, 'should have notifications') + assert(notifications.present?, 'should have notifications') assert(OnlineNotification.all_seen?('Ticket', tickets[0].id), 'still not seen notifications for merged ticket available') notifications = OnlineNotification.list_by_object('Ticket', tickets[1].id) - assert(!notifications.empty?, 'should have notifications') + assert(notifications.present?, 'should have notifications') assert(!OnlineNotification.all_seen?('Ticket', tickets[1].id), 'no notifications for master ticket available') # delete tickets @@ -364,7 +364,7 @@ class OnlineNotificationTest < ActiveSupport::TestCase # check if notifications for ticket still exist Scheduler.worker(true) notifications = OnlineNotification.list_by_object('Ticket', ticket_id) - assert(notifications.empty?, 'still notifications for destroyed ticket available') + assert(notifications.blank?, 'still notifications for destroyed ticket available') end end diff --git a/test/unit/organization_assets_test.rb b/test/unit/organization_assets_test.rb new file mode 100644 index 000000000..48c89a735 --- /dev/null +++ b/test/unit/organization_assets_test.rb @@ -0,0 +1,157 @@ + +require 'test_helper' + +class OrganizationAssetsTest < ActiveSupport::TestCase + test 'assets' do + + roles = Role.where( name: %w[Agent Admin] ) + admin1 = User.create_or_update( + login: 'admin1@example.org', + firstname: 'admin1', + lastname: 'admin1', + email: 'admin1@example.org', + password: 'some_pass', + active: true, + updated_by_id: 1, + created_by_id: 1, + roles: roles, + ) + + roles = Role.where( name: %w[Customer] ) + org = Organization.create_or_update( + name: 'some customer org', + updated_by_id: admin1.id, + created_by_id: 1, + ) + + user1 = User.create_or_update( + login: 'assets1@example.org', + firstname: 'assets1', + lastname: 'assets1', + email: 'assets1@example.org', + password: 'some_pass', + active: true, + updated_by_id: 1, + created_by_id: 1, + organization_id: org.id, + roles: roles, + ) + + user2 = User.create_or_update( + login: 'assets2@example.org', + firstname: 'assets2', + lastname: 'assets2', + email: 'assets2@example.org', + password: 'some_pass', + active: true, + updated_by_id: 1, + created_by_id: 1, + organization_id: org.id, + roles: roles, + ) + + user3 = User.create_or_update( + login: 'assets3@example.org', + firstname: 'assets3', + lastname: 'assets3', + email: 'assets3@example.org', + password: 'some_pass', + active: true, + updated_by_id: user1.id, + created_by_id: user2.id, + roles: roles, + ) + + org = Organization.find(org.id) + assets = org.assets({}) + attributes = org.attributes_with_association_ids + attributes.delete('user_ids') + assert( diff(attributes, assets[:Organization][org.id]), 'check assets' ) + + admin1 = User.find(admin1.id) + attributes = admin1.attributes_with_association_ids + attributes['accounts'] = {} + attributes.delete('password') + attributes.delete('token_ids') + attributes.delete('authorization_ids') + assert( diff(attributes, assets[:User][admin1.id]), 'check assets' ) + + user1 = User.find(user1.id) + attributes = user1.attributes_with_association_ids + attributes['accounts'] = {} + attributes.delete('password') + attributes.delete('token_ids') + attributes.delete('authorization_ids') + assert( diff(attributes, assets[:User][user1.id]), 'check assets' ) + + user2 = User.find(user2.id) + attributes = user2.attributes_with_association_ids + attributes['accounts'] = {} + attributes.delete('password') + attributes.delete('token_ids') + attributes.delete('authorization_ids') + assert( diff(attributes, assets[:User][user2.id]), 'check assets' ) + + user3 = User.find(user3.id) + attributes = user3.attributes_with_association_ids + attributes['accounts'] = {} + attributes.delete('password') + attributes.delete('token_ids') + attributes.delete('authorization_ids') + assert_nil( assets[:User][user3.id], 'check assets' ) + + # touch user 2, check if org has changed + travel 2.seconds + user_new_2 = User.find(user2.id) + user_new_2.lastname = 'assets2' + user_new_2.save! + + org_new = Organization.find(org.id) + attributes = org_new.attributes_with_association_ids + attributes.delete('user_ids') + assert( !diff(attributes, assets[:Organization][org_new.id]), 'check assets' ) + + attributes = user_new_2.attributes_with_association_ids + attributes['accounts'] = {} + attributes.delete('password') + attributes.delete('token_ids') + attributes.delete('authorization_ids') + assert( diff(attributes, assets[:User][user_new_2.id]), 'check assets' ) + + # check new assets lookup + assets = org_new.assets({}) + attributes = org_new.attributes_with_association_ids + attributes.delete('user_ids') + assert( diff(attributes, assets[:Organization][org_new.id]), 'check assets' ) + + attributes = user_new_2.attributes_with_association_ids + attributes['accounts'] = {} + attributes.delete('password') + attributes.delete('token_ids') + attributes.delete('authorization_ids') + assert( diff(attributes, assets[:User][user_new_2.id]), 'check assets' ) + travel_back + + user3.destroy! + user2.destroy! + user1.destroy! + org.destroy! + assert_not(Organization.find_by(id: org_new.id)) + end + + def diff(o1, o2) + return true if o1 == o2 + %w[updated_at created_at].each do |item| + if o1[item] + o1[item] = o1[item].to_s + end + if o2[item] + o2[item] = o2[item].to_s + end + end + return true if (o1.to_a - o2.to_a).blank? + #puts "ERROR: difference \n1: #{o1.inspect}\n2: #{o2.inspect}\ndiff: #{(o1.to_a - o2.to_a).inspect}" + false + end + +end diff --git a/test/unit/organization_domain_based_assignment_test.rb b/test/unit/organization_domain_based_assignment_test.rb index bfc2cff9a..4b2e04523 100644 --- a/test/unit/organization_domain_based_assignment_test.rb +++ b/test/unit/organization_domain_based_assignment_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class OrganizationDomainBasedAssignmentTest < ActiveSupport::TestCase diff --git a/test/unit/organization_ref_object_touch_test.rb b/test/unit/organization_ref_object_touch_test.rb index f6095fd98..f327bee06 100644 --- a/test/unit/organization_ref_object_touch_test.rb +++ b/test/unit/organization_ref_object_touch_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class OrganizationRefObjectTouchTest < ActiveSupport::TestCase diff --git a/test/unit/overview_assets_test.rb b/test/unit/overview_assets_test.rb new file mode 100644 index 000000000..5c25cc428 --- /dev/null +++ b/test/unit/overview_assets_test.rb @@ -0,0 +1,136 @@ + +require 'test_helper' + +class OverviewAssetsTest < ActiveSupport::TestCase + test 'assets' do + + UserInfo.current_user_id = 1 + roles = Role.where(name: %w[Customer]) + + user1 = User.create_or_update( + login: 'assets_overview1@example.org', + firstname: 'assets_overview1', + lastname: 'assets_overview1', + email: 'assets_overview1@example.org', + password: 'some_pass', + active: true, + roles: roles, + ) + user2 = User.create_or_update( + login: 'assets_overview2@example.org', + firstname: 'assets_overview2', + lastname: 'assets_overview2', + email: 'assets_overview2@example.org', + password: 'some_pass', + active: true, + roles: roles, + ) + user3 = User.create_or_update( + login: 'assets_overview3@example.org', + firstname: 'assets_overview3', + lastname: 'assets_overview3', + email: 'assets_overview3@example.org', + password: 'some_pass', + active: true, + roles: roles, + ) + user4 = User.create_or_update( + login: 'assets_overview4@example.org', + firstname: 'assets_overview4', + lastname: 'assets_overview4', + email: 'assets_overview4@example.org', + password: 'some_pass', + active: true, + roles: roles, + ) + user5 = User.create_or_update( + login: 'assets_overview5@example.org', + firstname: 'assets_overview5', + lastname: 'assets_overview5', + email: 'assets_overview5@example.org', + password: 'some_pass', + active: true, + roles: roles, + ) + + ticket_state1 = Ticket::State.find_by(name: 'new') + ticket_state2 = Ticket::State.find_by(name: 'open') + overview_role = Role.find_by(name: 'Agent') + overview = Overview.create_or_update( + name: 'my asset test', + link: 'my_asset_test', + prio: 1000, + role_ids: [overview_role.id], + user_ids: [user4.id, user5.id], + condition: { + 'ticket.state_id' => { + operator: 'is', + value: [ ticket_state1.id, ticket_state2.id ], + }, + 'ticket.owner_id' => { + operator: 'is', + pre_condition: 'specific', + value: user1.id, + value_completion: 'John Smith ' + }, + }, + order: { + by: 'created_at', + direction: 'ASC', + }, + view: { + d: %w[title customer group created_at], + s: %w[title customer group created_at], + m: %w[number title customer group created_at], + view_mode_default: 's', + }, + ) + assets = overview.assets({}) + assert(assets[:User][user1.id]) + assert_not(assets[:User][user2.id]) + assert_not(assets[:User][user3.id]) + assert(assets[:User][user4.id]) + assert(assets[:User][user5.id]) + assert(assets[:TicketState][ticket_state1.id]) + assert(assets[:TicketState][ticket_state2.id]) + + overview = Overview.create_or_update( + name: 'my asset test', + link: 'my_asset_test', + prio: 1000, + role_ids: [overview_role.id], + user_ids: [user4.id], + condition: { + 'ticket.state_id' => { + operator: 'is', + value: ticket_state1.id, + }, + 'ticket.owner_id' => { + operator: 'is', + pre_condition: 'specific', + value: [user1.id, user2.id], + }, + }, + order: { + by: 'created_at', + direction: 'ASC', + }, + view: { + d: %w[title customer group created_at], + s: %w[title customer group created_at], + m: %w[number title customer group created_at], + view_mode_default: 's', + }, + ) + assets = overview.assets({}) + assert(assets[:User][user1.id]) + assert(assets[:User][user2.id]) + assert_not(assets[:User][user3.id]) + assert(assets[:User][user4.id]) + assert_not(assets[:User][user5.id]) + assert(assets[:TicketState][ticket_state1.id]) + assert_not(assets[:TicketState][ticket_state2.id]) + overview.destroy! + end + +end diff --git a/test/unit/overview_test.rb b/test/unit/overview_test.rb index 145b64951..384576ca7 100644 --- a/test/unit/overview_test.rb +++ b/test/unit/overview_test.rb @@ -1,12 +1,15 @@ -# encoding: utf-8 + require 'test_helper' class OverviewTest < ActiveSupport::TestCase test 'overview link' do UserInfo.current_user_id = 1 + roles = Role.where(name: 'Agent') + overview = Overview.create!( name: 'Not Shown Admin 2', + roles: roles, condition: { 'ticket.state_id' => { operator: 'is', @@ -18,9 +21,9 @@ class OverviewTest < ActiveSupport::TestCase direction: 'DESC', }, view: { - d: %w(title customer state created_at), - s: %w(number title customer state created_at), - m: %w(number title customer state created_at), + d: %w[title customer state created_at], + s: %w[number title customer state created_at], + m: %w[number title customer state created_at], view_mode_default: 's', }, ) @@ -28,7 +31,8 @@ class OverviewTest < ActiveSupport::TestCase overview.destroy! overview = Overview.create!( - name: 'My assigned Tickets', + name: 'My assigned Tickets 2', + roles: roles, condition: { 'ticket.state_id' => { operator: 'is', @@ -40,17 +44,18 @@ class OverviewTest < ActiveSupport::TestCase direction: 'DESC', }, view: { - d: %w(title customer state created_at), - s: %w(number title customer state created_at), - m: %w(number title customer state created_at), + d: %w[title customer state created_at], + s: %w[number title customer state created_at], + m: %w[number title customer state created_at], view_mode_default: 's', }, ) - assert_equal(overview.link, 'my_assigned_tickets') + assert_equal(overview.link, 'my_assigned_tickets_2') overview.destroy! overview = Overview.create!( name: 'Übersicht', + roles: roles, condition: { 'ticket.state_id' => { operator: 'is', @@ -62,9 +67,9 @@ class OverviewTest < ActiveSupport::TestCase direction: 'DESC', }, view: { - d: %w(title customer state created_at), - s: %w(number title customer state created_at), - m: %w(number title customer state created_at), + d: %w[title customer state created_at], + s: %w[number title customer state created_at], + m: %w[number title customer state created_at], view_mode_default: 's', }, ) @@ -73,6 +78,7 @@ class OverviewTest < ActiveSupport::TestCase overview = Overview.create!( name: " Übersicht \n", + roles: roles, condition: { 'ticket.state_id' => { operator: 'is', @@ -84,9 +90,9 @@ class OverviewTest < ActiveSupport::TestCase direction: 'DESC', }, view: { - d: %w(title customer state created_at), - s: %w(number title customer state created_at), - m: %w(number title customer state created_at), + d: %w[title customer state created_at], + s: %w[number title customer state created_at], + m: %w[number title customer state created_at], view_mode_default: 's', }, ) @@ -95,6 +101,7 @@ class OverviewTest < ActiveSupport::TestCase overview1 = Overview.create!( name: 'Meine Übersicht', + roles: roles, condition: { 'ticket.state_id' => { operator: 'is', @@ -106,15 +113,16 @@ class OverviewTest < ActiveSupport::TestCase direction: 'DESC', }, view: { - d: %w(title customer state created_at), - s: %w(number title customer state created_at), - m: %w(number title customer state created_at), + d: %w[title customer state created_at], + s: %w[number title customer state created_at], + m: %w[number title customer state created_at], view_mode_default: 's', }, ) assert_equal(overview1.link, 'meine_ubersicht') overview2 = Overview.create!( name: 'Meine Übersicht', + roles: roles, condition: { 'ticket.state_id' => { operator: 'is', @@ -126,9 +134,9 @@ class OverviewTest < ActiveSupport::TestCase direction: 'DESC', }, view: { - d: %w(title customer state created_at), - s: %w(number title customer state created_at), - m: %w(number title customer state created_at), + d: %w[title customer state created_at], + s: %w[number title customer state created_at], + m: %w[number title customer state created_at], view_mode_default: 's', }, ) @@ -139,6 +147,7 @@ class OverviewTest < ActiveSupport::TestCase overview = Overview.create!( name: 'Д дФ ф', + roles: roles, condition: { 'ticket.state_id' => { operator: 'is', @@ -150,9 +159,9 @@ class OverviewTest < ActiveSupport::TestCase direction: 'DESC', }, view: { - d: %w(title customer state created_at), - s: %w(number title customer state created_at), - m: %w(number title customer state created_at), + d: %w[title customer state created_at], + s: %w[number title customer state created_at], + m: %w[number title customer state created_at], view_mode_default: 's', }, ) @@ -161,6 +170,7 @@ class OverviewTest < ActiveSupport::TestCase overview = Overview.create!( name: ' Д дФ ф abc ', + roles: roles, condition: { 'ticket.state_id' => { operator: 'is', @@ -172,9 +182,9 @@ class OverviewTest < ActiveSupport::TestCase direction: 'DESC', }, view: { - d: %w(title customer state created_at), - s: %w(number title customer state created_at), - m: %w(number title customer state created_at), + d: %w[title customer state created_at], + s: %w[number title customer state created_at], + m: %w[number title customer state created_at], view_mode_default: 's', }, ) @@ -184,6 +194,7 @@ class OverviewTest < ActiveSupport::TestCase overview = Overview.create!( name: 'Übersicht', link: 'my_overview', + roles: roles, condition: { 'ticket.state_id' => { operator: 'is', @@ -195,9 +206,9 @@ class OverviewTest < ActiveSupport::TestCase direction: 'DESC', }, view: { - d: %w(title customer state created_at), - s: %w(number title customer state created_at), - m: %w(number title customer state created_at), + d: %w[title customer state created_at], + s: %w[number title customer state created_at], + m: %w[number title customer state created_at], view_mode_default: 's', }, ) @@ -210,6 +221,168 @@ class OverviewTest < ActiveSupport::TestCase assert_equal(overview.link, 'my_overview2') overview.destroy! + end + test 'same url' do + UserInfo.current_user_id = 1 + + roles = Role.where(name: 'Agent') + + overview1 = Overview.create!( + name: 'My own assigned Tickets', + roles: roles, + condition: { + 'ticket.state_id' => { + operator: 'is', + value: [1, 2, 3], + }, + }, + order: { + by: 'created_at', + direction: 'DESC', + }, + view: { + d: %w[title customer state created_at], + s: %w[number title customer state created_at], + m: %w[number title customer state created_at], + view_mode_default: 's', + }, + ) + assert_equal(overview1.link, 'my_own_assigned_tickets') + + overview2 = Overview.create!( + name: 'My own assigned Tickets', + roles: roles, + condition: { + 'ticket.state_id' => { + operator: 'is', + value: [1, 2, 3], + }, + }, + order: { + by: 'created_at', + direction: 'DESC', + }, + view: { + d: %w[title customer state created_at], + s: %w[number title customer state created_at], + m: %w[number title customer state created_at], + view_mode_default: 's', + }, + ) + assert_equal(overview2.link, 'my_own_assigned_tickets_1') + + overview3 = Overview.create!( + name: 'My own assigned Tickets', + roles: roles, + condition: { + 'ticket.state_id' => { + operator: 'is', + value: [1, 2, 3], + }, + }, + order: { + by: 'created_at', + direction: 'DESC', + }, + view: { + d: %w[title customer state created_at], + s: %w[number title customer state created_at], + m: %w[number title customer state created_at], + view_mode_default: 's', + }, + ) + assert_equal(overview3.link, 'my_own_assigned_tickets_2') + + overview1.destroy! + overview2.destroy! + overview3.destroy! + end + + test 'priority rearrangement' do + UserInfo.current_user_id = 1 + + roles = Role.where(name: 'Agent') + + overview1 = Overview.create!( + name: 'Overview1', + link: 'my_overview', + roles: roles, + condition: { + 'ticket.state_id' => { + operator: 'is', + value: [1, 2, 3], + }, + }, + order: { + by: 'created_at', + direction: 'DESC', + }, + view: { + d: %w[title customer state created_at], + s: %w[number title customer state created_at], + m: %w[number title customer state created_at], + view_mode_default: 's', + }, + prio: 1, + ) + + overview2 = Overview.create!( + name: 'Overview2', + link: 'my_overview', + roles: roles, + condition: { + 'ticket.state_id' => { + operator: 'is', + value: [1, 2, 3], + }, + }, + order: { + by: 'created_at', + direction: 'DESC', + }, + view: { + d: %w[title customer state created_at], + s: %w[number title customer state created_at], + m: %w[number title customer state created_at], + view_mode_default: 's', + }, + prio: 2, + ) + + overview3 = Overview.create!( + name: 'Overview3', + link: 'my_overview', + roles: roles, + condition: { + 'ticket.state_id' => { + operator: 'is', + value: [1, 2, 3], + }, + }, + order: { + by: 'created_at', + direction: 'DESC', + }, + view: { + d: %w[title customer state created_at], + s: %w[number title customer state created_at], + m: %w[number title customer state created_at], + view_mode_default: 's', + }, + prio: 3, + ) + + overview2.prio = 3 + overview2.save! + + overviews = Overview.all.order(prio: :asc).pluck(:id) + assert_equal(overview1.id, overviews[0]) + assert_equal(overview3.id, overviews[1]) + assert_equal(overview2.id, overviews[2]) + + overview1.destroy! + overview2.destroy! + overview3.destroy! end end diff --git a/test/unit/permission_test.rb b/test/unit/permission_test.rb index 10d30cf77..b8ccc0268 100644 --- a/test/unit/permission_test.rb +++ b/test/unit/permission_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class PermissionTest < ActiveSupport::TestCase diff --git a/test/unit/recent_view_test.rb b/test/unit/recent_view_test.rb index 6604b87ce..aabd1fe5f 100644 --- a/test/unit/recent_view_test.rb +++ b/test/unit/recent_view_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class RecentViewTest < ActiveSupport::TestCase diff --git a/test/unit/role_test.rb b/test/unit/role_test.rb index 81bb767ef..72dac85ab 100644 --- a/test/unit/role_test.rb +++ b/test/unit/role_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class RoleTest < ActiveSupport::TestCase @@ -138,4 +138,87 @@ class RoleTest < ActiveSupport::TestCase assert(role.with_permission?(['test-with-permission2', 'some_other_permission'])) end + test 'default_at_signup' do + + agent_role = Role.find_by(name: 'Agent') + assert_raises(Exceptions::UnprocessableEntity) do + agent_role.default_at_signup = true + agent_role.save! + end + + admin_role = Role.find_by(name: 'Admin') + assert_raises(Exceptions::UnprocessableEntity) do + admin_role.default_at_signup = true + admin_role.save! + end + + assert_raises(Exceptions::UnprocessableEntity) do + Role.create!( + name: 'Test1', + note: 'Test1 Role.', + default_at_signup: true, + permissions: [Permission.find_by(name: 'admin')], + updated_by_id: 1, + created_by_id: 1 + ) + end + + role = Role.create!( + name: 'Test1', + note: 'Test1 Role.', + default_at_signup: false, + permissions: [Permission.find_by(name: 'admin')], + updated_by_id: 1, + created_by_id: 1 + ) + assert(role) + + permissions = Permission.where('name LIKE ? OR name = ?', 'admin%', 'ticket.agent').pluck(:name) # get all administrative permissions + permissions.each do |type| + + assert_raises(Exceptions::UnprocessableEntity) do + Role.create!( + name: "Test1_#{type}", + note: 'Test1 Role.', + default_at_signup: true, + permissions: [Permission.find_by(name: type)], + updated_by_id: 1, + created_by_id: 1 + ) + end + + role = Role.create!( + name: "Test1_#{type}", + note: 'Test1 Role.', + default_at_signup: false, + permissions: [Permission.find_by(name: type)], + updated_by_id: 1, + created_by_id: 1 + ) + assert(role) + end + + assert_raises(Exceptions::UnprocessableEntity) do + Role.create!( + name: 'Test2', + note: 'Test2 Role.', + default_at_signup: true, + permissions: [Permission.find_by(name: 'ticket.agent')], + updated_by_id: 1, + created_by_id: 1 + ) + end + + role = Role.create!( + name: 'Test2', + note: 'Test2 Role.', + default_at_signup: false, + permissions: [Permission.find_by(name: 'ticket.agent')], + updated_by_id: 1, + created_by_id: 1 + ) + assert(role) + + end + end diff --git a/test/unit/role_validate_agent_limit_test.rb b/test/unit/role_validate_agent_limit_test.rb index 5395d0c5e..4292e596b 100644 --- a/test/unit/role_validate_agent_limit_test.rb +++ b/test/unit/role_validate_agent_limit_test.rb @@ -1,8 +1,8 @@ -# encoding: utf-8 + require 'test_helper' class RoleValidateAgentLimit < ActiveSupport::TestCase - test 'role_validate_agent_limit' do + test 'role validate agent limit' do agent_max = User.with_permissions('ticket.agent').count UserInfo.current_user_id = 1 @@ -70,4 +70,73 @@ class RoleValidateAgentLimit < ActiveSupport::TestCase role_agent_limit_fail.destroy! Setting.set('system_agent_limit', nil) end + + test 'role validate agent limit - 1 user 2 ticket.agent roles' do + + current_agent_max = User.with_permissions('ticket.agent').count + 1 + UserInfo.current_user_id = 1 + Setting.set('system_agent_limit', current_agent_max) + + permission_ticket_agent = Permission.find_by(name: 'ticket.agent') + + role_agent_limit1 = Role.create!( + name: 'agent-limit-test1', + note: 'agent-limit-test1 Role.', + permissions: [permission_ticket_agent], + active: true, + ) + role_agent_limit2 = Role.create!( + name: 'agent-limit-test2', + note: 'agent-limit-test2 Role.', + permissions: [permission_ticket_agent], + active: true, + ) + + user1 = User.create!( + firstname: 'Firstname', + lastname: 'Lastname', + email: 'some-agentlimit-role@example.com', + login: 'some-agentlimit-role@example.com', + roles: [role_agent_limit1, role_agent_limit2], + active: true, + ) + + user1.roles = Role.where(name: %w[Admin Agent]) + + user1.role_ids = [Role.find_by(name: 'Agent').id] + + user1.role_ids = [Role.find_by(name: 'Agent').id, role_agent_limit1.id] + + 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!( + firstname: 'Firstname2', + lastname: 'Lastname2', + email: 'some-agentlimit-role-2@example.com', + login: 'some-agentlimit-role-2@example.com', + roles: [role_agent_limit1], + active: true, + ) + end + + assert_equal(current_agent_max, User.with_permissions('ticket.agent').count) + + current_agent_max = User.with_permissions('ticket.agent').count + 1 + Setting.set('system_agent_limit', current_agent_max) + + user3 = User.create!( + firstname: 'Firstname', + lastname: 'Lastname', + email: 'some-agentlimit-role-3@example.com', + login: 'some-agentlimit-role-3@example.com', + role_ids: [Role.find_by(name: 'Agent').id], + active: true, + ) + + role_agent_limit1.destroy! + role_agent_limit2.destroy! + Setting.set('system_agent_limit', nil) + end + end diff --git a/test/unit/session_basic_test.rb b/test/unit/session_basic_test.rb index b3a029774..072cf492d 100644 --- a/test/unit/session_basic_test.rb +++ b/test/unit/session_basic_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class SessionBasicTest < ActiveSupport::TestCase @@ -50,7 +50,7 @@ class SessionBasicTest < ActiveSupport::TestCase test 'c session create / update' do # create users - roles = Role.where(name: %w(Agent)) + roles = Role.where(name: %w[Agent]) groups = Group.all agent1 = User.create_or_update( @@ -124,10 +124,10 @@ class SessionBasicTest < ActiveSupport::TestCase # get whole collections result1 = collection_client1.push - assert(!result1.empty?, 'check collections') + assert(result1.present?, 'check collections') sleep 0.6 result2 = collection_client2.push - assert(!result2.empty?, 'check collections') + assert(result2.present?, 'check collections') assert_equal(result1, result2, 'check collections') # next check should be empty @@ -145,10 +145,10 @@ class SessionBasicTest < ActiveSupport::TestCase # get whole collections result1 = collection_client1.push - assert(!result1.empty?, 'check collections - after touch') + assert(result1.present?, 'check collections - after touch') result2 = collection_client2.push - assert(!result2.empty?, 'check collections - after touch') + assert(result2.present?, 'check collections - after touch') assert_equal(result1, result2, 'check collections') # check again after touch @@ -168,9 +168,9 @@ class SessionBasicTest < ActiveSupport::TestCase # get whole collections result1 = collection_client1.push - assert(!result1.empty?, 'check collections - after create') + assert(result1.present?, 'check collections - after create') result2 = collection_client2.push - assert(!result2.empty?, 'check collections - after create') + assert(result2.present?, 'check collections - after create') assert_equal(result1, result2, 'check collections') # check again after create @@ -186,9 +186,9 @@ class SessionBasicTest < ActiveSupport::TestCase # get whole collections result1 = collection_client1.push - assert(!result1.empty?, 'check collections - after destroy') + assert(result1.present?, 'check collections - after destroy') result2 = collection_client2.push - assert(!result2.empty?, 'check collections - after destroy') + assert(result2.present?, 'check collections - after destroy') assert_equal(result1, result2, 'check collections') # check again after destroy @@ -203,7 +203,7 @@ class SessionBasicTest < ActiveSupport::TestCase test 'c activity stream' do # create users - roles = Role.where(name: %w(Agent Admin)) + roles = Role.where(name: %w[Agent Admin]) groups = Group.all agent1 = User.create_or_update( @@ -265,7 +265,7 @@ class SessionBasicTest < ActiveSupport::TestCase test 'c ticket_create' do # create users - roles = Role.where(name: %w(Agent Admin)) + roles = Role.where(name: %w[Agent Admin]) groups = Group.all agent1 = User.create_or_update( diff --git a/test/unit/session_basic_ticket_test.rb b/test/unit/session_basic_ticket_test.rb index 2defadf8e..20706036e 100644 --- a/test/unit/session_basic_ticket_test.rb +++ b/test/unit/session_basic_ticket_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class SessionBasicTicketTest < ActiveSupport::TestCase @@ -30,7 +30,7 @@ class SessionBasicTicketTest < ActiveSupport::TestCase groups: groups, ) Overview.destroy_all - load "#{Rails.root}/db/seeds/overviews.rb" + load Rails.root.join('db', 'seeds', 'overviews.rb') end test 'asset needed' do diff --git a/test/unit/session_collections_test.rb b/test/unit/session_collections_test.rb index 0af97e5d1..d58b01918 100644 --- a/test/unit/session_collections_test.rb +++ b/test/unit/session_collections_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class SessionCollectionsTest < ActiveSupport::TestCase @@ -8,7 +8,7 @@ class SessionCollectionsTest < ActiveSupport::TestCase UserInfo.current_user_id = 1 # create users - roles = Role.where(name: %w(Agent Admin)) + roles = Role.where(name: %w[Agent Admin]) groups = Group.all agent1 = User.create_or_update( @@ -94,12 +94,12 @@ class SessionCollectionsTest < ActiveSupport::TestCase # next check should be empty result1 = collection_client1.push - assert(result1.empty?, 'check collections - recall') + assert(result1.blank?, 'check collections - recall') travel 0.4.seconds result2 = collection_client2.push - assert(result2.empty?, 'check collections - recall') + assert(result2.blank?, 'check collections - recall') result3 = collection_client3.push - assert(result3.empty?, 'check collections - recall') + assert(result3.blank?, 'check collections - recall') # change collection group = Group.first @@ -123,11 +123,11 @@ class SessionCollectionsTest < ActiveSupport::TestCase # next check should be empty travel 0.5.seconds result1 = collection_client1.push - assert(result1.empty?, 'check collections - recall') + assert(result1.blank?, 'check collections - recall') result2 = collection_client2.push - assert(result2.empty?, 'check collections - recall') + assert(result2.blank?, 'check collections - recall') result3 = collection_client3.push - assert(result3.empty?, 'check collections - recall') + assert(result3.blank?, 'check collections - recall') travel 10.seconds Sessions.destroy_idle_sessions(3) @@ -171,7 +171,7 @@ class SessionCollectionsTest < ActiveSupport::TestCase end test 'b assets' do - roles = Role.where(name: %w(Agent Admin)) + roles = Role.where(name: %w[Agent Admin]) groups = Group.all.order(id: :asc) UserInfo.current_user_id = 2 diff --git a/test/unit/session_enhanced_test.rb b/test/unit/session_enhanced_test.rb index 680933deb..2443adeba 100644 --- a/test/unit/session_enhanced_test.rb +++ b/test/unit/session_enhanced_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class SessionEnhancedTest < ActiveSupport::TestCase @@ -331,13 +331,13 @@ class SessionEnhancedTest < ActiveSupport::TestCase #puts "rc: " next if !message['data'] - message['data'].each do |key, _value| + message['data'].each_key do |key| #puts "rc: #{key}" collections_result[key] = true end end #puts "c: #{collections_result.inspect}" - collections_orig.each do |key, _value| + collections_orig.each_key do |key| if collections_orig[key].nil? assert_nil(collections_result[key], "collection message for #{key} #{type}-check (client_id #{client_id})") else diff --git a/test/unit/sla_assets_test.rb b/test/unit/sla_assets_test.rb new file mode 100644 index 000000000..7616cb851 --- /dev/null +++ b/test/unit/sla_assets_test.rb @@ -0,0 +1,71 @@ + +require 'test_helper' + +class SlaAssetsTest < ActiveSupport::TestCase + test 'assets' do + + UserInfo.current_user_id = 1 + roles = Role.where(name: %w[Customer]) + + user1 = User.create_or_update( + login: 'assets_sla1@example.org', + firstname: 'assets_sla1', + lastname: 'assets_sla1', + email: 'assets_sla1@example.org', + password: 'some_pass', + active: true, + roles: roles, + ) + user2 = User.create_or_update( + login: 'assets_sla2@example.org', + firstname: 'assets_sla2', + lastname: 'assets_sla2', + email: 'assets_sla2@example.org', + password: 'some_pass', + active: true, + roles: roles, + ) + + calendar1 = Calendar.create_or_update( + name: 'US 1', + timezone: 'America/Los_Angeles', + business_hours: { + mon: { '09:00' => '17:00' }, + tue: { '09:00' => '17:00' }, + wed: { '09:00' => '17:00' }, + thu: { '09:00' => '17:00' }, + fri: { '09:00' => '17:00' } + }, + default: true, + ical_url: nil, + updated_by_id: 1, + created_by_id: 1, + ) + ticket_state1 = Ticket::State.find_by(name: 'new') + ticket_state2 = Ticket::State.find_by(name: 'open') + sla = Sla.create_or_update( + name: 'my asset test', + calendar_id: calendar1.id, + condition: { + 'ticket.state_id' => { + operator: 'is', + value: [ ticket_state1.id, ticket_state2.id ], + }, + 'ticket.owner_id' => { + operator: 'is', + pre_condition: 'specific', + value: user1.id, + value_completion: 'John Smith ' + }, + }, + ) + assets = sla.assets({}) + assert(assets[:User][user1.id], 'check assets') + assert_not(assets[:User][user2.id], 'check assets') + assert(assets[:TicketState][ticket_state1.id], 'check assets') + assert(assets[:TicketState][ticket_state2.id], 'check assets') + assert(assets[:Calendar][calendar1.id], 'check assets') + + end + +end diff --git a/test/unit/stats_ticket_waiting_time_test.rb b/test/unit/stats_ticket_waiting_time_test.rb index bd4229d0c..a1842090c 100644 --- a/test/unit/stats_ticket_waiting_time_test.rb +++ b/test/unit/stats_ticket_waiting_time_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' require 'stats/ticket_waiting_time' diff --git a/test/unit/store_test.rb b/test/unit/store_test.rb index 1213768f2..bd1732fce 100644 --- a/test/unit/store_test.rb +++ b/test/unit/store_test.rb @@ -1,11 +1,11 @@ -# encoding: utf-8 + require 'test_helper' class StoreTest < ActiveSupport::TestCase test 'store fs - get_location' do sha = 'ed7002b439e9ac845f22357d822bac1444730fbdb6016d3ec9432297b9ec9f73' location = Store::Provider::File.get_location(sha) - assert_equal("#{Rails.root}/storage/fs/ed70/02b4/39e9a/c845f/22357d8/22bac14/44730fbdb6016d3ec9432297b9ec9f73", location) + assert_equal(Rails.root.join('storage', 'fs', 'ed70', '02b4', '39e9a', 'c845f', '22357d8', '22bac14', '44730fbdb6016d3ec9432297b9ec9f73').to_s, location) end test 'store fs - empty dir remove' do @@ -19,17 +19,17 @@ class StoreTest < ActiveSupport::TestCase result = Store::Provider::File.delete(sha) exists = File.exist?(location) assert(!exists) - exists = File.exist?("#{Rails.root}/storage/fs/ed70/02b4") + exists = File.exist?(Rails.root.join('storage', 'fs', 'ed70', '02b4')) assert(!exists) - exists = File.exist?("#{Rails.root}/storage/fs/ed70/") + exists = File.exist?(Rails.root.join('storage', 'fs', 'ed70')) assert(!exists) - exists = File.exist?("#{Rails.root}/storage/fs/") + exists = File.exist?(Rails.root.join('storage', 'fs')) assert(exists) - exists = File.exist?("#{Rails.root}/storage/") + exists = File.exist?(Rails.root.join('storage')) assert(exists) end - test 'store attachment' do + test 'store attachment and move it between backends' do files = [ { data: 'hello world', @@ -54,7 +54,7 @@ class StoreTest < ActiveSupport::TestCase ] files.each do |file| - sha = Digest::SHA256.hexdigest( file[:data] ) + sha = Digest::SHA256.hexdigest(file[:data]) # add attachments store = Store.add( @@ -75,23 +75,23 @@ class StoreTest < ActiveSupport::TestCase assert attachments # sha check - sha_new = Digest::SHA256.hexdigest( attachments[0].content ) - assert_equal( sha, sha_new, "check file #{file[:filename]}") + sha_new = Digest::SHA256.hexdigest(attachments[0].content) + assert_equal(sha, sha_new, "check file #{file[:filename]}") # filename check - assert_equal( file[:filename], attachments[0].filename ) + assert_equal(file[:filename], attachments[0].filename) # provider check - assert_equal( 'DB', attachments[0].provider ) + assert_equal('DB', attachments[0].provider) end success = Store::File.verify assert success, 'verify ok' - Store::File.move( 'DB', 'File' ) + Store::File.move('DB', 'File') files.each do |file| - sha = Digest::SHA256.hexdigest( file[:data] ) + sha = Digest::SHA256.hexdigest(file[:data]) # get list of attachments attachments = Store.list( @@ -101,54 +101,55 @@ class StoreTest < ActiveSupport::TestCase assert attachments # sha check - sha_new = Digest::SHA256.hexdigest( attachments[0].content ) - assert_equal( sha, sha_new, "check file #{file[:filename]}") + sha_new = Digest::SHA256.hexdigest(attachments[0].content) + assert_equal(sha, sha_new, "check file #{file[:filename]}") # filename check - assert_equal( file[:filename], attachments[0].filename ) + assert_equal(file[:filename], attachments[0].filename) # provider check - assert_equal( 'File', attachments[0].provider ) + assert_equal('File', attachments[0].provider) end success = Store::File.verify assert success, 'verify ok' - Store::File.move( 'File', 'DB' ) + Store::File.move('File', 'DB') files.each do |file| - sha = Digest::SHA256.hexdigest( file[:data] ) + sha = Digest::SHA256.hexdigest(file[:data]) # get list of attachments attachments = Store.list( object: 'Test', o_id: file[:o_id], ) - assert attachments + assert(attachments) + assert_equal(attachments.count, 1) # sha check - sha_new = Digest::SHA256.hexdigest( attachments[0].content ) - assert_equal( sha, sha_new, "check file #{file[:filename]}") + sha_new = Digest::SHA256.hexdigest(attachments[0].content) + assert_equal(sha, sha_new, "check file #{file[:filename]}") # filename check - assert_equal( file[:filename], attachments[0].filename ) + assert_equal(file[:filename], attachments[0].filename) # provider check - assert_equal( 'DB', attachments[0].provider ) + assert_equal('DB', attachments[0].provider) # delete attachments success = Store.remove( object: 'Test', o_id: file[:o_id], ) - assert success + assert(success) # check attachments again attachments = Store.list( object: 'Test', o_id: file[:o_id], ) - assert !attachments[0] + assert_not(attachments[0]) end end end diff --git a/test/unit/tag_test.rb b/test/unit/tag_test.rb index c54ce4416..a1d1809d3 100644 --- a/test/unit/tag_test.rb +++ b/test/unit/tag_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class TagTest < ActiveSupport::TestCase diff --git a/test/unit/ticket_article_communicate_test.rb b/test/unit/ticket_article_communicate_test.rb index 533cbe657..a4d0618f0 100644 --- a/test/unit/ticket_article_communicate_test.rb +++ b/test/unit/ticket_article_communicate_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class TicketArticleCommunicateTest < ActiveSupport::TestCase diff --git a/test/unit/ticket_article_dos_test.rb b/test/unit/ticket_article_dos_test.rb index 1891bcb5b..f22ba38ec 100644 --- a/test/unit/ticket_article_dos_test.rb +++ b/test/unit/ticket_article_dos_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class TicketArticleDos < ActiveSupport::TestCase diff --git a/test/unit/ticket_article_store_empty.rb b/test/unit/ticket_article_store_empty.rb new file mode 100644 index 000000000..913ef2798 --- /dev/null +++ b/test/unit/ticket_article_store_empty.rb @@ -0,0 +1,75 @@ + +require 'test_helper' + +class TicketArticleStoreEmpty < ActiveSupport::TestCase + + test 'check if attachments are deleted after ticket is deleted' do + + current_count = Store.count + current_file_count = Store::File.count + current_backend_count = Store::Provider::DB.count + + email_raw_string = IO.binread('test/fixtures/mail1.box') + ticket, article, user, mail = Channel::EmailParser.new.process({}, email_raw_string) + + next_count = Store.count + next_file_count = Store::File.count + next_backend_count = Store::Provider::DB.count + + assert_equal(current_count, next_count - 2) + assert_equal(current_file_count, next_file_count - 2) + assert_equal(current_backend_count, next_backend_count - 2) + + ticket.destroy! + + after_count = Store.count + after_file_count = Store::File.count + after_backend_count = Store::Provider::DB.count + + assert_equal(current_count, after_count) + assert_equal(current_file_count, after_file_count) + assert_equal(current_backend_count, after_backend_count) + + end + + test 'check if attachments are deleted after ticket same ticket 2 times is deleted' do + + current_count = Store.count + current_file_count = Store::File.count + current_backend_count = Store::Provider::DB.count + + email_raw_string = IO.binread('test/fixtures/mail1.box') + ticket1, article1, user1, mail1 = Channel::EmailParser.new.process({}, email_raw_string) + ticket2, article2, user2, mail2 = Channel::EmailParser.new.process({}, email_raw_string) + + next_count = Store.count + next_file_count = Store::File.count + next_backend_count = Store::Provider::DB.count + + assert_equal(current_count, next_count - 4) + assert_equal(current_file_count, next_file_count - 2) + assert_equal(current_backend_count, next_backend_count - 2) + + ticket1.destroy! + + next_count = Store.count + next_file_count = Store::File.count + next_backend_count = Store::Provider::DB.count + + assert_equal(current_count, next_count - 2) + assert_equal(current_file_count, next_file_count - 2) + assert_equal(current_backend_count, next_backend_count - 2) + + ticket2.destroy! + + after_count = Store.count + after_file_count = Store::File.count + after_backend_count = Store::Provider::DB.count + + assert_equal(current_count, after_count) + assert_equal(current_file_count, after_file_count) + assert_equal(current_backend_count, after_backend_count) + + end + +end diff --git a/test/unit/ticket_article_time_accouting_test.rb b/test/unit/ticket_article_time_accouting_test.rb index 4bb650c7c..54adc448c 100644 --- a/test/unit/ticket_article_time_accouting_test.rb +++ b/test/unit/ticket_article_time_accouting_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class TicketArticleTimeAccoutingTest < ActiveSupport::TestCase diff --git a/test/unit/ticket_article_twitter_test.rb b/test/unit/ticket_article_twitter_test.rb index a4f743a11..d76f9bf11 100644 --- a/test/unit/ticket_article_twitter_test.rb +++ b/test/unit/ticket_article_twitter_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class TicketArticleTwitter < ActiveSupport::TestCase diff --git a/test/unit/ticket_customer_organization_update_test.rb b/test/unit/ticket_customer_organization_update_test.rb index 8327048e9..7d7914d60 100644 --- a/test/unit/ticket_customer_organization_update_test.rb +++ b/test/unit/ticket_customer_organization_update_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class TicketCustomerOrganizationUpdateTest < ActiveSupport::TestCase diff --git a/test/unit/ticket_escalation_test.rb b/test/unit/ticket_escalation_test.rb index a79be51ca..a963874f0 100644 --- a/test/unit/ticket_escalation_test.rb +++ b/test/unit/ticket_escalation_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class TicketEscalationTest < ActiveSupport::TestCase diff --git a/test/unit/ticket_last_owner_update_test.rb b/test/unit/ticket_last_owner_update_test.rb index 80ec7478d..e4dc85bb6 100644 --- a/test/unit/ticket_last_owner_update_test.rb +++ b/test/unit/ticket_last_owner_update_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class TicketLastOwnerUpdateTest < ActiveSupport::TestCase diff --git a/test/unit/ticket_notification_test.rb b/test/unit/ticket_notification_test.rb index 0288f41dd..dee8ec856 100644 --- a/test/unit/ticket_notification_test.rb +++ b/test/unit/ticket_notification_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class TicketNotificationTest < ActiveSupport::TestCase @@ -25,6 +25,7 @@ class TicketNotificationTest < ActiveSupport::TestCase }, perform: { 'notification.email' => { + # rubocop:disable Lint/InterpolationCheck 'body' => '

            Your request (Ticket##{ticket.number}) has been received and will be reviewed by our support staff.


            To provide additional information, please reply to this email or click on the following link: @@ -34,6 +35,7 @@ class TicketNotificationTest < ActiveSupport::TestCase

            Zammad, your customer support system

            ', 'recipient' => 'ticket_customer', 'subject' => 'Thanks for your inquiry (#{ticket.title})', + # rubocop:enable Lint/InterpolationCheck }, }, disable_notification: true, diff --git a/test/unit/ticket_null_byte_test.rb b/test/unit/ticket_null_byte_test.rb index aa3fdbd6a..0579112bf 100644 --- a/test/unit/ticket_null_byte_test.rb +++ b/test/unit/ticket_null_byte_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class TicketNullByteTest < ActiveSupport::TestCase diff --git a/test/unit/ticket_number_test.rb b/test/unit/ticket_number_test.rb new file mode 100644 index 000000000..d708aee70 --- /dev/null +++ b/test/unit/ticket_number_test.rb @@ -0,0 +1,162 @@ + +require 'test_helper' + +class TicketNumberTest < ActiveSupport::TestCase + test 'number' do + Setting.set('ticket_number_increment', { checksum: false, min_size: 5 }) + Setting.set('system_id', 1) + + number = Ticket::Number.generate + assert_equal(number.to_s.length, 5) + + Setting.set('ticket_number_increment', { checksum: false, min_size: 10 }) + Setting.set('system_id', 1) + + number = Ticket::Number.generate + assert_equal(number.to_s.length, 10) + + Setting.set('ticket_number_increment', { checksum: true, min_size: 5 }) + Setting.set('system_id', 1) + + number = Ticket::Number.generate + assert_equal(number.to_s.length, 5) + + Setting.set('ticket_number_increment', { checksum: true, min_size: 10 }) + Setting.set('system_id', 1) + + number = Ticket::Number.generate + assert_equal(number.to_s.length, 10) + + Setting.set('ticket_number_increment', { checksum: false, min_size: 5 }) + Setting.set('system_id', 88) + + number = Ticket::Number.generate + assert_equal(number.to_s.length, 5) + + Setting.set('ticket_number_increment', { checksum: false, min_size: 10 }) + Setting.set('system_id', 88) + + number = Ticket::Number.generate + assert_equal(number.to_s.length, 10) + + Setting.set('ticket_number_increment', { checksum: true, min_size: 5 }) + Setting.set('system_id', 88) + + number = Ticket::Number.generate + assert_equal(number.to_s.length, 5) + + Setting.set('ticket_number_increment', { checksum: true, min_size: 10 }) + Setting.set('system_id', 88) + + number = Ticket::Number.generate + assert_equal(number.to_s.length, 10) + + 150.times do + number = Ticket::Number.generate + assert_equal(number.to_s.length, 10) + end + + end + + test 'number check' do + Setting.set('ticket_number_increment', { checksum: false, min_size: 5 }) + ticket = Ticket.create!( + title: 'test 1', + group: Group.lookup(name: 'Users'), + customer_id: 2, + state: Ticket::State.lookup(name: 'new'), + priority: Ticket::Priority.lookup(name: '2 normal'), + updated_by_id: 1, + created_by_id: 1, + ) + subject = ticket.subject_build(ticket.title) + + ticket_check = Ticket::Number.check(subject) + assert_equal(ticket.id, ticket_check.id) + + Setting.set('system_id', 999) + + ticket_check = Ticket::Number.check(subject) + assert_not(ticket_check) + + Setting.set('ticket_number_ignore_system_id', true) + + ticket_check = Ticket::Number.check(subject) + assert_equal(ticket.id, ticket_check.id) + end + + test 'date' do + Setting.set('ticket_number', 'Ticket::Number::Date') + Setting.set('ticket_number_date', { checksum: false }) + Setting.set('system_id', 1) + system_id = Setting.get('system_id') + number_prefix = "#{Time.zone.now.strftime('%Y%m%d')}#{system_id}" + + number = Ticket::Number.generate + assert_equal(number.to_s.length, 13) + assert_match(/#{number_prefix}/, number.to_s) + + Setting.set('ticket_number_date', { checksum: false }) + Setting.set('system_id', 88) + + number = Ticket::Number.generate + system_id = Setting.get('system_id') + number_prefix = "#{Time.zone.now.strftime('%Y%m%d')}#{system_id}" + assert_equal(number.to_s.length, 14) + assert_match(/#{number_prefix}/, number.to_s) + + Setting.set('ticket_number_date', { checksum: true }) + Setting.set('system_id', 1) + + number = Ticket::Number.generate + system_id = Setting.get('system_id') + number_prefix = "#{Time.zone.now.strftime('%Y%m%d')}#{system_id}" + assert_equal(number.to_s.length, 14) + assert_match(/#{number_prefix}/, number.to_s) + + Setting.set('ticket_number_date', { checksum: true }) + Setting.set('system_id', 88) + + number = Ticket::Number.generate + system_id = Setting.get('system_id') + number_prefix = "#{Time.zone.now.strftime('%Y%m%d')}#{system_id}" + assert_equal(number.to_s.length, 15) + assert_match(/#{number_prefix}/, number.to_s) + + 150.times do + number = Ticket::Number.generate + assert_equal(number.to_s.length, 15) + end + + end + + test 'date check' do + Setting.set('ticket_number', 'Ticket::Number::Date') + Setting.set('ticket_number_date', { checksum: false }) + + ticket = Ticket.create!( + title: 'test 1', + group: Group.lookup(name: 'Users'), + customer_id: 2, + state: Ticket::State.lookup(name: 'new'), + priority: Ticket::Priority.lookup(name: '2 normal'), + updated_by_id: 1, + created_by_id: 1, + ) + subject = ticket.subject_build(ticket.title) + + ticket_check = Ticket::Number.check(subject) + assert_equal(ticket.id, ticket_check.id) + + Setting.set('system_id', 999) + + ticket_check = Ticket::Number.check(subject) + assert_not(ticket_check) + + Setting.set('ticket_number_ignore_system_id', true) + + ticket_check = Ticket::Number.check(subject) + assert_equal(ticket.id, ticket_check.id) + end + +end diff --git a/test/unit/ticket_overview_out_of_office_test.rb b/test/unit/ticket_overview_out_of_office_test.rb index f1901f628..9445f944c 100644 --- a/test/unit/ticket_overview_out_of_office_test.rb +++ b/test/unit/ticket_overview_out_of_office_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class TicketOverviewOutOfOfficeTest < ActiveSupport::TestCase @@ -85,9 +85,9 @@ class TicketOverviewOutOfOfficeTest < ActiveSupport::TestCase direction: 'ASC', }, view: { - d: %w(title customer group created_at), - s: %w(title customer group created_at), - m: %w(number title customer group created_at), + d: %w[title customer group created_at], + s: %w[title customer group created_at], + m: %w[number title customer group created_at], view_mode_default: 's', }, ) @@ -111,9 +111,9 @@ class TicketOverviewOutOfOfficeTest < ActiveSupport::TestCase direction: 'ASC', }, view: { - d: %w(title customer group created_at), - s: %w(title customer group created_at), - m: %w(number title customer group created_at), + d: %w[title customer group created_at], + s: %w[title customer group created_at], + m: %w[number title customer group created_at], view_mode_default: 's', }, ) @@ -140,9 +140,9 @@ class TicketOverviewOutOfOfficeTest < ActiveSupport::TestCase direction: 'DESC', }, view: { - d: %w(title customer state created_at), - s: %w(number title state created_at), - m: %w(number title state created_at), + d: %w[title customer state created_at], + s: %w[number title state created_at], + m: %w[number title state created_at], view_mode_default: 's', }, ) diff --git a/test/unit/ticket_overview_test.rb b/test/unit/ticket_overview_test.rb index 284787ee4..1c98e6911 100644 --- a/test/unit/ticket_overview_test.rb +++ b/test/unit/ticket_overview_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class TicketOverviewTest < ActiveSupport::TestCase @@ -106,9 +106,9 @@ class TicketOverviewTest < ActiveSupport::TestCase direction: 'ASC', }, view: { - d: %w(title customer group created_at), - s: %w(title customer group created_at), - m: %w(number title customer group created_at), + d: %w[title customer group created_at], + s: %w[title customer group created_at], + m: %w[number title customer group created_at], view_mode_default: 's', }, ) @@ -133,9 +133,9 @@ class TicketOverviewTest < ActiveSupport::TestCase direction: 'ASC', }, view: { - d: %w(title customer group created_at), - s: %w(title customer group created_at), - m: %w(number title customer group created_at), + d: %w[title customer group created_at], + s: %w[title customer group created_at], + m: %w[number title customer group created_at], view_mode_default: 's', }, ) @@ -160,9 +160,9 @@ class TicketOverviewTest < ActiveSupport::TestCase direction: 'ASC', }, view: { - d: %w(title customer group created_at), - s: %w(title customer group created_at), - m: %w(number title customer group created_at), + d: %w[title customer group created_at], + s: %w[title customer group created_at], + m: %w[number title customer group created_at], view_mode_default: 's', }, ) @@ -187,9 +187,9 @@ class TicketOverviewTest < ActiveSupport::TestCase direction: 'ASC', }, view: { - d: %w(title customer group created_at), - s: %w(title customer group created_at), - m: %w(number title customer group created_at), + d: %w[title customer group created_at], + s: %w[title customer group created_at], + m: %w[number title customer group created_at], view_mode_default: 's', }, ) @@ -215,9 +215,9 @@ class TicketOverviewTest < ActiveSupport::TestCase direction: 'DESC', }, view: { - d: %w(title customer state created_at), - s: %w(number title state created_at), - m: %w(number title state created_at), + d: %w[title customer state created_at], + s: %w[number title state created_at], + m: %w[number title state created_at], view_mode_default: 's', }, ) @@ -242,9 +242,9 @@ class TicketOverviewTest < ActiveSupport::TestCase direction: 'DESC', }, view: { - d: %w(title customer state created_at), - s: %w(number title customer state created_at), - m: %w(number title customer state created_at), + d: %w[title customer state created_at], + s: %w[number title customer state created_at], + m: %w[number title customer state created_at], view_mode_default: 's', }, ) @@ -270,9 +270,9 @@ class TicketOverviewTest < ActiveSupport::TestCase direction: 'DESC', }, view: { - d: %w(title customer state created_at), - s: %w(number title customer state created_at), - m: %w(number title customer state created_at), + d: %w[title customer state created_at], + s: %w[number title customer state created_at], + m: %w[number title customer state created_at], view_mode_default: 's', }, ) @@ -294,19 +294,20 @@ class TicketOverviewTest < ActiveSupport::TestCase direction: 'DESC', }, view: { - d: %w(title customer state created_at), - s: %w(number title customer state created_at), - m: %w(number title customer state created_at), + d: %w[title customer state created_at], + s: %w[number title customer state created_at], + m: %w[number title customer state created_at], view_mode_default: 's', }, ) end - test 'bbb overview index' do + test 'overview index' do result = Ticket::Overviews.all( current_user: @agent1, ) + assert_equal(3, result.count) assert_equal('My assigned Tickets', result[0].name) assert_equal('Unassigned & Open', result[1].name) @@ -343,7 +344,42 @@ class TicketOverviewTest < ActiveSupport::TestCase end - test 'ccc overview content' do + test 'missing role' do + Ticket.destroy_all + + assert_raises(Exception) do + Overview.create!( + name: 'new overview', + link: 'new_overview', + prio: 1200, + user_ids: [@customer2.id], + organization_shared: true, + condition: { + 'ticket.state_id' => { + operator: 'is', + value: [1, 2, 3], + }, + 'ticket.organization_id' => { + operator: 'is', + pre_condition: 'current_user.organization_id', + }, + }, + order: { + by: 'created_at', + direction: 'DESC', + }, + view: { + d: %w[title customer state created_at], + s: %w[number title customer state created_at], + m: %w[number title customer state created_at], + view_mode_default: 's', + }, + ) + end + + end + + test 'overview content' do Ticket.destroy_all diff --git a/test/unit/ticket_priority_test.rb b/test/unit/ticket_priority_test.rb index c6cbe4dee..92ff51064 100644 --- a/test/unit/ticket_priority_test.rb +++ b/test/unit/ticket_priority_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class TicketPriorityTest < ActiveSupport::TestCase diff --git a/test/unit/ticket_ref_object_touch_test.rb b/test/unit/ticket_ref_object_touch_test.rb index 77bb2ed6c..d2957c7a5 100644 --- a/test/unit/ticket_ref_object_touch_test.rb +++ b/test/unit/ticket_ref_object_touch_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class TicketRefObjectTouchTest < ActiveSupport::TestCase diff --git a/test/unit/ticket_screen_options_test.rb b/test/unit/ticket_screen_options_test.rb new file mode 100644 index 000000000..c678f8d9b --- /dev/null +++ b/test/unit/ticket_screen_options_test.rb @@ -0,0 +1,626 @@ + +require 'test_helper' + +class TicketScreenOptionsTest < ActiveSupport::TestCase + + test 'base' do + + group1 = Group.create!( + name: 'Group 1', + active: true, + email_address: EmailAddress.first, + created_by_id: 1, + updated_by_id: 1, + ) + group2 = Group.create!( + name: 'Group 2', + active: true, + created_by_id: 1, + updated_by_id: 1, + ) + group3 = Group.create!( + name: 'Group 3', + active: true, + created_by_id: 1, + updated_by_id: 1, + ) + + agent1 = User.create!( + login: 'agent1@example.com', + firstname: 'Role', + lastname: 'Agent1', + email: 'agent1@example.com', + password: 'agentpw', + active: true, + roles: Role.where(name: %w[Admin Agent]), + updated_by_id: 1, + created_by_id: 1, + ) + agent1.group_names_access_map = { + group1.name => 'full', + group2.name => %w[read change], + group3.name => 'full', + } + + agent2 = User.create!( + login: 'agent2@example.com', + firstname: 'Role', + lastname: 'Agent2', + email: 'agent2@example.com', + password: 'agentpw', + active: true, + roles: Role.where(name: %w[Admin Agent]), + updated_by_id: 1, + created_by_id: 1, + ) + agent2.group_names_access_map = { + group1.name => 'full', + group2.name => %w[read change], + group3.name => ['create'], + } + + agent3 = User.create!( + login: 'agent3@example.com', + firstname: 'Role', + lastname: 'Agent3', + email: 'agent3@example.com', + password: 'agentpw', + active: true, + roles: Role.where(name: %w[Admin Agent]), + updated_by_id: 1, + created_by_id: 1, + ) + agent3.group_names_access_map = { + group1.name => 'full', + group2.name => ['full'], + } + + agent4 = User.create!( + login: 'agent4@example.com', + firstname: 'Role', + lastname: 'Agent4', + email: 'agent4@example.com', + password: 'agentpw', + active: true, + roles: Role.where(name: %w[Admin Agent]), + updated_by_id: 1, + created_by_id: 1, + ) + agent4.group_names_access_map = { + group1.name => 'full', + group2.name => %w[read overview change], + } + + agent5 = User.create!( + login: 'agent5@example.com', + firstname: 'Role', + lastname: 'Agent5', + email: 'agent5@example.com', + password: 'agentpw', + active: true, + roles: Role.where(name: %w[Admin Agent]), + updated_by_id: 1, + created_by_id: 1, + ) + agent5.group_names_access_map = { + group3.name => 'full', + } + + agent6 = User.create!( + login: 'agent6@example.com', + firstname: 'Role', + lastname: 'Agent6', + email: 'agent6@example.com', + password: 'agentpw', + active: true, + roles: Role.where(name: %w[Admin Agent]), + updated_by_id: 1, + created_by_id: 1, + ) + + result = Ticket::ScreenOptions.attributes_to_change( + current_user: agent1, + ) + + assert(result[:form_meta]) + assert(result[:form_meta][:filter]) + assert(result[:form_meta][:filter][:state_id]) + assert_equal([ + Ticket::State.lookup(name: 'open').id, + Ticket::State.lookup(name: 'pending reminder').id, + Ticket::State.lookup(name: 'closed').id, + Ticket::State.lookup(name: 'pending close').id, + ], result[:form_meta][:filter][:state_id].sort) + assert(result[:form_meta][:filter][:priority_id]) + assert_equal([ + Ticket::Priority.lookup(name: '1 low').id, + Ticket::Priority.lookup(name: '2 normal').id, + Ticket::Priority.lookup(name: '3 high').id, + ], result[:form_meta][:filter][:priority_id].sort) + assert(result[:form_meta][:filter][:type_id]) + assert_equal([], result[:form_meta][:filter][:type_id].sort) + assert(result[:form_meta][:filter][:group_id]) + assert_equal([group1.id, group3.id], result[:form_meta][:filter][:group_id].sort) + assert(result[:form_meta][:dependencies]) + assert(result[:form_meta][:dependencies][:group_id]) + assert_equal(3, result[:form_meta][:dependencies][:group_id].count) + assert(result[:form_meta][:dependencies][:group_id]['']) + assert(result[:form_meta][:dependencies][:group_id][''][:owner_id]) + assert_equal([], result[:form_meta][:dependencies][:group_id][''][:owner_id]) + assert(result[:form_meta][:dependencies][:group_id][group1.id]) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id]) + assert_equal(4, result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].count) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent1.id)) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent2.id)) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent3.id)) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent4.id)) + assert(result[:form_meta][:dependencies][:group_id][group3.id]) + assert(result[:form_meta][:dependencies][:group_id][group3.id][:owner_id]) + assert_equal(2, result[:form_meta][:dependencies][:group_id][group3.id][:owner_id].count) + assert(result[:form_meta][:dependencies][:group_id][group3.id][:owner_id].include?(agent1.id)) + assert(result[:form_meta][:dependencies][:group_id][group3.id][:owner_id].include?(agent5.id)) + + result = Ticket::ScreenOptions.attributes_to_change( + current_user: agent2, + ) + + assert(result[:form_meta]) + assert(result[:form_meta][:filter]) + assert(result[:form_meta][:filter][:state_id]) + assert_equal([ + Ticket::State.lookup(name: 'open').id, + Ticket::State.lookup(name: 'pending reminder').id, + Ticket::State.lookup(name: 'closed').id, + Ticket::State.lookup(name: 'pending close').id, + ], result[:form_meta][:filter][:state_id].sort) + assert(result[:form_meta][:filter][:priority_id]) + assert_equal([ + Ticket::Priority.lookup(name: '1 low').id, + Ticket::Priority.lookup(name: '2 normal').id, + Ticket::Priority.lookup(name: '3 high').id, + ], result[:form_meta][:filter][:priority_id].sort) + assert(result[:form_meta][:filter][:type_id]) + assert_equal([], result[:form_meta][:filter][:type_id].sort) + assert(result[:form_meta][:filter][:group_id]) + assert_equal([group1.id, group3.id], result[:form_meta][:filter][:group_id].sort) + assert(result[:form_meta][:dependencies]) + assert(result[:form_meta][:dependencies][:group_id]) + assert_equal(3, result[:form_meta][:dependencies][:group_id].count) + assert(result[:form_meta][:dependencies][:group_id]['']) + assert(result[:form_meta][:dependencies][:group_id][''][:owner_id]) + assert_equal([], result[:form_meta][:dependencies][:group_id][''][:owner_id]) + assert(result[:form_meta][:dependencies][:group_id][group1.id]) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id]) + assert_equal(4, result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].count) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent1.id)) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent2.id)) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent3.id)) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent4.id)) + assert_equal(2, result[:form_meta][:dependencies][:group_id][group3.id][:owner_id].count) + assert(result[:form_meta][:dependencies][:group_id][group3.id][:owner_id].include?(agent1.id)) + assert(result[:form_meta][:dependencies][:group_id][group3.id][:owner_id].include?(agent5.id)) + + result = Ticket::ScreenOptions.attributes_to_change( + current_user: agent3, + ) + + assert(result[:form_meta]) + assert(result[:form_meta][:filter]) + assert(result[:form_meta][:filter][:state_id]) + assert_equal([ + Ticket::State.lookup(name: 'open').id, + Ticket::State.lookup(name: 'pending reminder').id, + Ticket::State.lookup(name: 'closed').id, + Ticket::State.lookup(name: 'pending close').id, + ], result[:form_meta][:filter][:state_id].sort) + assert(result[:form_meta][:filter][:priority_id]) + assert_equal([ + Ticket::Priority.lookup(name: '1 low').id, + Ticket::Priority.lookup(name: '2 normal').id, + Ticket::Priority.lookup(name: '3 high').id, + ], result[:form_meta][:filter][:priority_id].sort) + assert(result[:form_meta][:filter][:type_id]) + assert_equal([], result[:form_meta][:filter][:type_id].sort) + assert(result[:form_meta][:filter][:group_id]) + assert_equal([group1.id, group2.id], result[:form_meta][:filter][:group_id].sort) + assert(result[:form_meta][:dependencies]) + assert(result[:form_meta][:dependencies][:group_id]) + assert_equal(3, result[:form_meta][:dependencies][:group_id].count) + assert(result[:form_meta][:dependencies][:group_id]['']) + assert(result[:form_meta][:dependencies][:group_id][''][:owner_id]) + assert_equal([], result[:form_meta][:dependencies][:group_id][''][:owner_id]) + assert(result[:form_meta][:dependencies][:group_id][group1.id]) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id]) + assert_equal(4, result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].count) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent1.id)) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent2.id)) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent3.id)) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent4.id)) + assert_equal(1, result[:form_meta][:dependencies][:group_id][group2.id][:owner_id].count) + assert(result[:form_meta][:dependencies][:group_id][group2.id][:owner_id].include?(agent3.id)) + + ticket1 = Ticket.create!( + title: 'some title 1', + group: group1, + customer_id: 2, + state: Ticket::State.lookup(name: 'new'), + priority: Ticket::Priority.lookup(name: '2 normal'), + updated_by_id: 1, + created_by_id: 1, + ) + article1 = Ticket::Article.create!( + ticket_id: ticket1.id, + from: 'some_sender@example.com', + to: 'some_recipient@example.com', + subject: 'some subject', + message_id: 'some@id', + body: 'some message', + internal: false, + sender: Ticket::Article::Sender.find_by(name: 'Customer'), + type: Ticket::Article::Type.find_by(name: 'email'), + updated_by_id: 1, + created_by_id: 1, + ) + + ticket2 = Ticket.create!( + title: 'some title 2', + group: group2, + customer_id: 2, + state: Ticket::State.lookup(name: 'new'), + priority: Ticket::Priority.lookup(name: '2 normal'), + updated_by_id: 1, + created_by_id: 1, + ) + article2 = Ticket::Article.create!( + ticket_id: ticket2.id, + from: 'some_sender@example.com', + to: 'some_recipient@example.com', + subject: 'some subject', + message_id: 'some@id', + body: 'some message', + internal: false, + sender: Ticket::Article::Sender.find_by(name: 'Customer'), + type: Ticket::Article::Type.find_by(name: 'email'), + updated_by_id: 1, + created_by_id: 1, + ) + + result = Ticket::ScreenOptions.attributes_to_change( + ticket_id: ticket1.id, + current_user: agent1, + ) + + assert(result[:form_meta]) + assert(result[:form_meta][:filter]) + assert(result[:form_meta][:filter][:state_id]) + assert_equal([ + Ticket::State.lookup(name: 'new').id, + Ticket::State.lookup(name: 'open').id, + Ticket::State.lookup(name: 'pending reminder').id, + Ticket::State.lookup(name: 'closed').id, + Ticket::State.lookup(name: 'pending close').id, + ], result[:form_meta][:filter][:state_id].sort) + assert(result[:form_meta][:filter][:priority_id]) + assert_equal([ + Ticket::Priority.lookup(name: '1 low').id, + Ticket::Priority.lookup(name: '2 normal').id, + Ticket::Priority.lookup(name: '3 high').id, + ], result[:form_meta][:filter][:priority_id].sort) + assert(result[:form_meta][:filter][:type_id]) + assert_equal([ + Ticket::Article::Type.lookup(name: 'email').id, + Ticket::Article::Type.lookup(name: 'phone').id, + Ticket::Article::Type.lookup(name: 'note').id, + ], result[:form_meta][:filter][:type_id].sort) + assert(result[:form_meta][:filter][:group_id]) + assert_equal([group1.id, group2.id, group3.id], result[:form_meta][:filter][:group_id].sort) + assert(result[:form_meta][:dependencies]) + assert(result[:form_meta][:dependencies][:group_id]) + assert_equal(4, result[:form_meta][:dependencies][:group_id].count) + assert(result[:form_meta][:dependencies][:group_id]['']) + assert(result[:form_meta][:dependencies][:group_id][''][:owner_id]) + assert_equal([], result[:form_meta][:dependencies][:group_id][''][:owner_id]) + assert(result[:form_meta][:dependencies][:group_id][group1.id]) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id]) + assert_equal(4, result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].count) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent1.id)) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent2.id)) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent3.id)) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent4.id)) + assert(result[:form_meta][:dependencies][:group_id][group2.id]) + assert(result[:form_meta][:dependencies][:group_id][group2.id][:owner_id]) + assert_equal(1, result[:form_meta][:dependencies][:group_id][group2.id][:owner_id].count) + assert(result[:form_meta][:dependencies][:group_id][group2.id][:owner_id].include?(agent3.id)) + assert(result[:form_meta][:dependencies][:group_id][group3.id]) + assert(result[:form_meta][:dependencies][:group_id][group3.id][:owner_id]) + assert_equal(2, result[:form_meta][:dependencies][:group_id][group3.id][:owner_id].count) + assert(result[:form_meta][:dependencies][:group_id][group3.id][:owner_id].include?(agent1.id)) + assert(result[:form_meta][:dependencies][:group_id][group3.id][:owner_id].include?(agent5.id)) + + result = Ticket::ScreenOptions.attributes_to_change( + ticket_id: ticket2.id, + current_user: agent1, + ) + + assert(result[:form_meta]) + assert(result[:form_meta][:filter]) + assert(result[:form_meta][:filter][:state_id]) + assert_equal([ + Ticket::State.lookup(name: 'new').id, + Ticket::State.lookup(name: 'open').id, + Ticket::State.lookup(name: 'pending reminder').id, + Ticket::State.lookup(name: 'closed').id, + Ticket::State.lookup(name: 'pending close').id, + ], result[:form_meta][:filter][:state_id].sort) + assert(result[:form_meta][:filter][:priority_id]) + assert_equal([ + Ticket::Priority.lookup(name: '1 low').id, + Ticket::Priority.lookup(name: '2 normal').id, + Ticket::Priority.lookup(name: '3 high').id, + ], result[:form_meta][:filter][:priority_id].sort) + assert(result[:form_meta][:filter][:type_id]) + assert_equal([ + Ticket::Article::Type.lookup(name: 'phone').id, + Ticket::Article::Type.lookup(name: 'note').id, + ], result[:form_meta][:filter][:type_id].sort) + assert(result[:form_meta][:filter][:group_id]) + assert_equal([group1.id, group2.id, group3.id], result[:form_meta][:filter][:group_id].sort) + assert(result[:form_meta][:dependencies]) + assert(result[:form_meta][:dependencies][:group_id]) + assert_equal(4, result[:form_meta][:dependencies][:group_id].count) + assert(result[:form_meta][:dependencies][:group_id]['']) + assert(result[:form_meta][:dependencies][:group_id][''][:owner_id]) + assert_equal([], result[:form_meta][:dependencies][:group_id][''][:owner_id]) + assert(result[:form_meta][:dependencies][:group_id][group1.id]) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id]) + assert_equal(4, result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].count) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent1.id)) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent2.id)) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent3.id)) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent4.id)) + assert(result[:form_meta][:dependencies][:group_id][group2.id]) + assert(result[:form_meta][:dependencies][:group_id][group2.id][:owner_id]) + assert_equal(1, result[:form_meta][:dependencies][:group_id][group2.id][:owner_id].count) + assert(result[:form_meta][:dependencies][:group_id][group2.id][:owner_id].include?(agent3.id)) + assert(result[:form_meta][:dependencies][:group_id][group3.id]) + assert(result[:form_meta][:dependencies][:group_id][group3.id][:owner_id]) + assert_equal(2, result[:form_meta][:dependencies][:group_id][group3.id][:owner_id].count) + assert(result[:form_meta][:dependencies][:group_id][group3.id][:owner_id].include?(agent1.id)) + assert(result[:form_meta][:dependencies][:group_id][group3.id][:owner_id].include?(agent5.id)) + + result = Ticket::ScreenOptions.attributes_to_change( + ticket_id: ticket2.id, + current_user: agent1, + ) + + assert(result[:form_meta]) + assert(result[:form_meta][:filter]) + assert(result[:form_meta][:filter][:state_id]) + assert_equal([ + Ticket::State.lookup(name: 'new').id, + Ticket::State.lookup(name: 'open').id, + Ticket::State.lookup(name: 'pending reminder').id, + Ticket::State.lookup(name: 'closed').id, + Ticket::State.lookup(name: 'pending close').id, + ], result[:form_meta][:filter][:state_id].sort) + assert(result[:form_meta][:filter][:priority_id]) + assert_equal([ + Ticket::Priority.lookup(name: '1 low').id, + Ticket::Priority.lookup(name: '2 normal').id, + Ticket::Priority.lookup(name: '3 high').id, + ], result[:form_meta][:filter][:priority_id].sort) + assert(result[:form_meta][:filter][:type_id]) + assert_equal([ + Ticket::Article::Type.lookup(name: 'phone').id, + Ticket::Article::Type.lookup(name: 'note').id, + ], result[:form_meta][:filter][:type_id].sort) + assert(result[:form_meta][:filter][:group_id]) + assert_equal([group1.id, group2.id, group3.id], result[:form_meta][:filter][:group_id].sort) + assert(result[:form_meta][:dependencies]) + assert(result[:form_meta][:dependencies][:group_id]) + assert_equal(4, result[:form_meta][:dependencies][:group_id].count) + assert(result[:form_meta][:dependencies][:group_id]['']) + assert(result[:form_meta][:dependencies][:group_id][''][:owner_id]) + assert_equal([], result[:form_meta][:dependencies][:group_id][''][:owner_id]) + assert(result[:form_meta][:dependencies][:group_id][group1.id]) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id]) + assert_equal(4, result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].count) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent1.id)) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent2.id)) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent3.id)) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent4.id)) + assert(result[:form_meta][:dependencies][:group_id][group2.id]) + assert(result[:form_meta][:dependencies][:group_id][group2.id][:owner_id]) + assert_equal(1, result[:form_meta][:dependencies][:group_id][group2.id][:owner_id].count) + assert(result[:form_meta][:dependencies][:group_id][group2.id][:owner_id].include?(agent3.id)) + assert(result[:form_meta][:dependencies][:group_id][group3.id]) + assert(result[:form_meta][:dependencies][:group_id][group3.id][:owner_id]) + assert_equal(2, result[:form_meta][:dependencies][:group_id][group3.id][:owner_id].count) + assert(result[:form_meta][:dependencies][:group_id][group3.id][:owner_id].include?(agent1.id)) + assert(result[:form_meta][:dependencies][:group_id][group3.id][:owner_id].include?(agent5.id)) + + result = Ticket::ScreenOptions.attributes_to_change( + ticket_id: ticket1.id, + current_user: agent2, + ) + + assert(result[:form_meta]) + assert(result[:form_meta][:filter]) + assert(result[:form_meta][:filter][:state_id]) + assert_equal([ + Ticket::State.lookup(name: 'new').id, + Ticket::State.lookup(name: 'open').id, + Ticket::State.lookup(name: 'pending reminder').id, + Ticket::State.lookup(name: 'closed').id, + Ticket::State.lookup(name: 'pending close').id, + ], result[:form_meta][:filter][:state_id].sort) + assert(result[:form_meta][:filter][:priority_id]) + assert_equal([ + Ticket::Priority.lookup(name: '1 low').id, + Ticket::Priority.lookup(name: '2 normal').id, + Ticket::Priority.lookup(name: '3 high').id, + ], result[:form_meta][:filter][:priority_id].sort) + assert(result[:form_meta][:filter][:type_id]) + assert_equal([ + Ticket::Article::Type.lookup(name: 'email').id, + Ticket::Article::Type.lookup(name: 'phone').id, + Ticket::Article::Type.lookup(name: 'note').id, + ], result[:form_meta][:filter][:type_id].sort) + assert(result[:form_meta][:filter][:group_id]) + assert_equal([group1.id, group2.id], result[:form_meta][:filter][:group_id].sort) + assert(result[:form_meta][:dependencies]) + assert(result[:form_meta][:dependencies][:group_id]) + assert_equal(3, result[:form_meta][:dependencies][:group_id].count) + assert(result[:form_meta][:dependencies][:group_id]['']) + assert(result[:form_meta][:dependencies][:group_id][''][:owner_id]) + assert_equal([], result[:form_meta][:dependencies][:group_id][''][:owner_id]) + assert(result[:form_meta][:dependencies][:group_id][group1.id]) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id]) + assert_equal(4, result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].count) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent1.id)) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent2.id)) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent3.id)) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent4.id)) + assert(result[:form_meta][:dependencies][:group_id][group2.id]) + assert(result[:form_meta][:dependencies][:group_id][group2.id][:owner_id]) + assert_equal(1, result[:form_meta][:dependencies][:group_id][group2.id][:owner_id].count) + assert(result[:form_meta][:dependencies][:group_id][group2.id][:owner_id].include?(agent3.id)) + + result = Ticket::ScreenOptions.attributes_to_change( + ticket_id: ticket2.id, + current_user: agent2, + ) + + assert(result[:form_meta]) + assert(result[:form_meta][:filter]) + assert(result[:form_meta][:filter][:state_id]) + assert_equal([ + Ticket::State.lookup(name: 'new').id, + Ticket::State.lookup(name: 'open').id, + Ticket::State.lookup(name: 'pending reminder').id, + Ticket::State.lookup(name: 'closed').id, + Ticket::State.lookup(name: 'pending close').id, + ], result[:form_meta][:filter][:state_id].sort) + assert(result[:form_meta][:filter][:priority_id]) + assert_equal([ + Ticket::Priority.lookup(name: '1 low').id, + Ticket::Priority.lookup(name: '2 normal').id, + Ticket::Priority.lookup(name: '3 high').id, + ], result[:form_meta][:filter][:priority_id].sort) + assert(result[:form_meta][:filter][:type_id]) + assert_equal([ + Ticket::Article::Type.lookup(name: 'phone').id, + Ticket::Article::Type.lookup(name: 'note').id, + ], result[:form_meta][:filter][:type_id].sort) + assert(result[:form_meta][:filter][:group_id]) + assert_equal([group1.id, group2.id], result[:form_meta][:filter][:group_id].sort) + assert(result[:form_meta][:dependencies]) + assert(result[:form_meta][:dependencies][:group_id]) + assert_equal(3, result[:form_meta][:dependencies][:group_id].count) + assert(result[:form_meta][:dependencies][:group_id]['']) + assert(result[:form_meta][:dependencies][:group_id][''][:owner_id]) + assert_equal([], result[:form_meta][:dependencies][:group_id][''][:owner_id]) + assert(result[:form_meta][:dependencies][:group_id][group1.id]) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id]) + assert_equal(4, result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].count) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent1.id)) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent2.id)) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent3.id)) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent4.id)) + assert(result[:form_meta][:dependencies][:group_id][group2.id]) + assert(result[:form_meta][:dependencies][:group_id][group2.id][:owner_id]) + assert_equal(1, result[:form_meta][:dependencies][:group_id][group2.id][:owner_id].count) + assert(result[:form_meta][:dependencies][:group_id][group2.id][:owner_id].include?(agent3.id)) + + result = Ticket::ScreenOptions.attributes_to_change( + ticket_id: ticket1.id, + current_user: agent3, + ) + + assert(result[:form_meta]) + assert(result[:form_meta][:filter]) + assert(result[:form_meta][:filter][:state_id]) + assert_equal([ + Ticket::State.lookup(name: 'new').id, + Ticket::State.lookup(name: 'open').id, + Ticket::State.lookup(name: 'pending reminder').id, + Ticket::State.lookup(name: 'closed').id, + Ticket::State.lookup(name: 'pending close').id, + ], result[:form_meta][:filter][:state_id].sort) + assert(result[:form_meta][:filter][:priority_id]) + assert_equal([ + Ticket::Priority.lookup(name: '1 low').id, + Ticket::Priority.lookup(name: '2 normal').id, + Ticket::Priority.lookup(name: '3 high').id, + ], result[:form_meta][:filter][:priority_id].sort) + assert(result[:form_meta][:filter][:type_id]) + assert_equal([ + Ticket::Article::Type.lookup(name: 'email').id, + Ticket::Article::Type.lookup(name: 'phone').id, + Ticket::Article::Type.lookup(name: 'note').id, + ], result[:form_meta][:filter][:type_id].sort) + assert(result[:form_meta][:filter][:group_id]) + assert_equal([group1.id, group2.id], result[:form_meta][:filter][:group_id].sort) + assert(result[:form_meta][:dependencies]) + assert(result[:form_meta][:dependencies][:group_id]) + assert_equal(3, result[:form_meta][:dependencies][:group_id].count) + assert(result[:form_meta][:dependencies][:group_id]['']) + assert(result[:form_meta][:dependencies][:group_id][''][:owner_id]) + assert_equal([], result[:form_meta][:dependencies][:group_id][''][:owner_id]) + assert(result[:form_meta][:dependencies][:group_id][group1.id]) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id]) + assert_equal(4, result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].count) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent1.id)) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent2.id)) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent3.id)) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent4.id)) + assert_equal(1, result[:form_meta][:dependencies][:group_id][group2.id][:owner_id].count) + assert(result[:form_meta][:dependencies][:group_id][group2.id][:owner_id].include?(agent3.id)) + + result = Ticket::ScreenOptions.attributes_to_change( + ticket_id: ticket2.id, + current_user: agent3, + ) + + assert(result[:form_meta]) + assert(result[:form_meta][:filter]) + assert(result[:form_meta][:filter][:state_id]) + assert_equal([ + Ticket::State.lookup(name: 'new').id, + Ticket::State.lookup(name: 'open').id, + Ticket::State.lookup(name: 'pending reminder').id, + Ticket::State.lookup(name: 'closed').id, + Ticket::State.lookup(name: 'pending close').id, + ], result[:form_meta][:filter][:state_id].sort) + assert(result[:form_meta][:filter][:priority_id]) + assert_equal([ + Ticket::Priority.lookup(name: '1 low').id, + Ticket::Priority.lookup(name: '2 normal').id, + Ticket::Priority.lookup(name: '3 high').id, + ], result[:form_meta][:filter][:priority_id].sort) + assert(result[:form_meta][:filter][:type_id]) + assert_equal([ + Ticket::Article::Type.lookup(name: 'phone').id, + Ticket::Article::Type.lookup(name: 'note').id, + ], result[:form_meta][:filter][:type_id].sort) + assert(result[:form_meta][:filter][:group_id]) + assert_equal([group1.id, group2.id], result[:form_meta][:filter][:group_id].sort) + assert(result[:form_meta][:dependencies]) + assert(result[:form_meta][:dependencies][:group_id]) + assert_equal(3, result[:form_meta][:dependencies][:group_id].count) + assert(result[:form_meta][:dependencies][:group_id]['']) + assert(result[:form_meta][:dependencies][:group_id][''][:owner_id]) + assert_equal([], result[:form_meta][:dependencies][:group_id][''][:owner_id]) + assert(result[:form_meta][:dependencies][:group_id][group1.id]) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id]) + assert_equal(4, result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].count) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent1.id)) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent2.id)) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent3.id)) + assert(result[:form_meta][:dependencies][:group_id][group1.id][:owner_id].include?(agent4.id)) + assert_equal(1, result[:form_meta][:dependencies][:group_id][group2.id][:owner_id].count) + assert(result[:form_meta][:dependencies][:group_id][group2.id][:owner_id].include?(agent3.id)) + + end + +end diff --git a/test/unit/ticket_selector_test.rb b/test/unit/ticket_selector_test.rb index 374172b09..6ba4e33e7 100644 --- a/test/unit/ticket_selector_test.rb +++ b/test/unit/ticket_selector_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class TicketSelectorTest < ActiveSupport::TestCase diff --git a/test/unit/ticket_sla_test.rb b/test/unit/ticket_sla_test.rb index fa17d4eb9..83f15a403 100644 --- a/test/unit/ticket_sla_test.rb +++ b/test/unit/ticket_sla_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class TicketSlaTest < ActiveSupport::TestCase @@ -141,7 +141,7 @@ class TicketSlaTest < ActiveSupport::TestCase condition: { 'ticket.priority_id' => { operator: 'is', - value: %w(1 2 3), + value: %w[1 2 3], }, }, calendar_id: calendar2.id, @@ -551,7 +551,7 @@ class TicketSlaTest < ActiveSupport::TestCase condition: { 'ticket.priority_id' => { operator: 'is', - value: %w(2), + value: %w[2], }, }, first_response_time: 60, @@ -676,7 +676,7 @@ class TicketSlaTest < ActiveSupport::TestCase condition: { 'ticket.priority_id' => { operator: 'is not', - value: %w(1 2 3), + value: %w[1 2 3], }, }, calendar_id: calendar.id, @@ -1640,7 +1640,7 @@ class TicketSlaTest < ActiveSupport::TestCase condition: { 'ticket.priority_id' => { operator: 'is', - value: %w(1 2 3), + value: %w[1 2 3], }, 'article.subject' => { operator: 'contains', @@ -1670,7 +1670,7 @@ class TicketSlaTest < ActiveSupport::TestCase condition: { 'ticket.priority_id' => { operator: 'is', - value: %w(1 2 3), + value: %w[1 2 3], }, 'ticket.title' => { operator: 'contains', @@ -1700,7 +1700,7 @@ class TicketSlaTest < ActiveSupport::TestCase condition: { 'ticket.priority_id' => { operator: 'is', - value: %w(1 2 3), + value: %w[1 2 3], }, 'ticket.title' => { operator: 'contains', diff --git a/test/unit/ticket_state_test.rb b/test/unit/ticket_state_test.rb index b4f9996e7..3e3cbf7a2 100644 --- a/test/unit/ticket_state_test.rb +++ b/test/unit/ticket_state_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class TicketStateTest < ActiveSupport::TestCase diff --git a/test/unit/ticket_test.rb b/test/unit/ticket_test.rb index 549d7130e..90dae91ea 100644 --- a/test/unit/ticket_test.rb +++ b/test/unit/ticket_test.rb @@ -1,9 +1,9 @@ -# encoding: utf-8 + require 'test_helper' class TicketTest < ActiveSupport::TestCase test 'ticket create' do - ticket = Ticket.create( + ticket = Ticket.create!( title: "some title\n äöüß", group: Group.lookup(name: 'Users'), customer_id: 2, @@ -19,7 +19,7 @@ class TicketTest < ActiveSupport::TestCase assert_equal(ticket.state.name, 'new', 'ticket.state verify') # create inbound article #1 - article_inbound1 = Ticket::Article.create( + article_inbound1 = Ticket::Article.create!( ticket_id: ticket.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -44,7 +44,7 @@ class TicketTest < ActiveSupport::TestCase # create inbound article #2 travel 2.seconds - article_inbound2 = Ticket::Article.create( + article_inbound2 = Ticket::Article.create!( ticket_id: ticket.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -68,7 +68,7 @@ class TicketTest < ActiveSupport::TestCase assert_nil(ticket.close_at, 'ticket.close_at verify - inbound') # create note article - article_note = Ticket::Article.create( + article_note = Ticket::Article.create!( ticket_id: ticket.id, from: 'some person', subject: "some\nnote", @@ -92,7 +92,7 @@ class TicketTest < ActiveSupport::TestCase # create outbound article travel 2.seconds - article_outbound = Ticket::Article.create( + article_outbound = Ticket::Article.create!( ticket_id: ticket.id, from: 'some_recipient@example.com', to: 'some_sender@example.com', @@ -115,7 +115,7 @@ class TicketTest < ActiveSupport::TestCase assert_nil(ticket.close_at, 'ticket.close_at verify - outbound') # create inbound article #3 - article_inbound3 = Ticket::Article.create( + article_inbound3 = Ticket::Article.create!( ticket_id: ticket.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -140,7 +140,7 @@ class TicketTest < ActiveSupport::TestCase # create inbound article #4 travel 2.seconds - article_inbound4 = Ticket::Article.create( + article_inbound4 = Ticket::Article.create!( ticket_id: ticket.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -192,7 +192,7 @@ class TicketTest < ActiveSupport::TestCase assert_nil(ticket.pending_time) # delete article - article_note = Ticket::Article.create( + article_note = Ticket::Article.create!( ticket_id: ticket.id, from: 'some person', subject: 'some note', @@ -218,7 +218,7 @@ class TicketTest < ActiveSupport::TestCase end test 'ticket latest change' do - ticket1 = Ticket.create( + ticket1 = Ticket.create!( title: 'latest change 1', group: Group.lookup(name: 'Users'), customer_id: 2, @@ -231,7 +231,7 @@ class TicketTest < ActiveSupport::TestCase travel 1.minute - ticket2 = Ticket.create( + ticket2 = Ticket.create!( title: 'latest change 2', group: Group.lookup(name: 'Users'), customer_id: 2, @@ -267,7 +267,7 @@ class TicketTest < ActiveSupport::TestCase ticket.save! end - ticket = Ticket.create( + ticket = Ticket.create!( title: 'pending close test', group: Group.lookup(name: 'Users'), customer_id: 2, @@ -289,7 +289,7 @@ class TicketTest < ActiveSupport::TestCase test 'ticket subject' do - ticket = Ticket.create( + ticket = Ticket.create!( title: 'subject test 1', group: Group.lookup(name: 'Users'), customer_id: 2, @@ -307,7 +307,7 @@ class TicketTest < ActiveSupport::TestCase Setting.set('ticket_hook_position', 'left') - ticket = Ticket.create( + ticket = Ticket.create!( title: 'subject test 1', group: Group.lookup(name: 'Users'), customer_id: 2, @@ -325,7 +325,7 @@ class TicketTest < ActiveSupport::TestCase Setting.set('ticket_hook_position', 'none') - ticket = Ticket.create( + ticket = Ticket.create!( title: 'subject test 1', group: Group.lookup(name: 'Users'), customer_id: 2, @@ -348,7 +348,7 @@ class TicketTest < ActiveSupport::TestCase origin_backend = Setting.get('ticket_number') Setting.set('ticket_number', 'Ticket::Number::Increment') - ticket1 = Ticket.create( + ticket1 = Ticket.create!( title: 'subject test 1234-1', group: Group.lookup(name: 'Users'), customer_id: 2, @@ -362,7 +362,7 @@ class TicketTest < ActiveSupport::TestCase assert_equal(ticket1.id, Ticket::Number.check("Re: Help [Ticket##{ticket1.number}]").id) Setting.set('ticket_number', 'Ticket::Number::Date') - ticket1 = Ticket.create( + ticket1 = Ticket.create!( title: 'subject test 1234-2', group: Group.lookup(name: 'Users'), customer_id: 2, @@ -380,7 +380,7 @@ class TicketTest < ActiveSupport::TestCase test 'article attachment helper 1' do - ticket1 = Ticket.create( + ticket1 = Ticket.create!( title: 'some article helper test1', group: Group.lookup(name: 'Users'), customer_id: 2, @@ -392,7 +392,7 @@ class TicketTest < ActiveSupport::TestCase assert(ticket1, 'ticket created') # create inbound article #1 - article1 = Ticket::Article.create( + article1 = Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -466,7 +466,7 @@ class TicketTest < ActiveSupport::TestCase test 'article attachment helper 2' do - ticket1 = Ticket.create( + ticket1 = Ticket.create!( title: 'some article helper test2', group: Group.lookup(name: 'Users'), customer_id: 2, @@ -478,7 +478,7 @@ class TicketTest < ActiveSupport::TestCase assert(ticket1, 'ticket created') # create inbound article #1 - article1 = Ticket::Article.create( + article1 = Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', diff --git a/test/unit/ticket_trigger_test.rb b/test/unit/ticket_trigger_test.rb index 686827c6c..e04c0b7f9 100644 --- a/test/unit/ticket_trigger_test.rb +++ b/test/unit/ticket_trigger_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 +# rubocop:disable Lint/InterpolationCheck require 'test_helper' class TicketTriggerTest < ActiveSupport::TestCase @@ -151,15 +151,14 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, ) - ticket1 = Ticket.create( + ticket1 = Ticket.create!( title: "some title\n äöüß", group: Group.lookup(name: 'Users'), customer: User.lookup(email: 'nicole.braun@zammad.org'), updated_by_id: 1, created_by_id: 1, ) - assert(ticket1, 'ticket1 created') - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -189,7 +188,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal('new', ticket1.state.name, 'ticket1.state verify') assert_equal('3 high', ticket1.priority.name, 'ticket1.priority verify') assert_equal(2, ticket1.articles.count, 'ticket1.articles verify') - assert_equal(%w(aa kk abc), ticket1.tag_list) + assert_equal(%w[aa kk abc], ticket1.tag_list) article1 = ticket1.articles.last assert_match('Zammad ', article1.from) assert_match('nicole.braun@zammad.org', article1.to) @@ -208,7 +207,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal('new', ticket1.state.name, 'ticket1.state verify') assert_equal('2 normal', ticket1.priority.name, 'ticket1.priority verify') assert_equal(2, ticket1.articles.count, 'ticket1.articles verify') - assert_equal(%w(aa kk abc), ticket1.tag_list) + assert_equal(%w[aa kk abc], ticket1.tag_list) ticket1.state = Ticket::State.lookup(name: 'open') ticket1.save! @@ -221,7 +220,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal('open', ticket1.state.name, 'ticket1.state verify') assert_equal('2 normal', ticket1.priority.name, 'ticket1.priority verify') assert_equal(2, ticket1.articles.count, 'ticket1.articles verify') - assert_equal(%w(aa kk abc), ticket1.tag_list) + assert_equal(%w[aa kk abc], ticket1.tag_list) ticket1.state = Ticket::State.lookup(name: 'new') ticket1.save! @@ -234,9 +233,9 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal('new', ticket1.state.name, 'ticket1.state verify') assert_equal('3 high', ticket1.priority.name, 'ticket1.priority verify') assert_equal(2, ticket1.articles.count, 'ticket1.articles verify') - assert_equal(%w(aa abc), ticket1.tag_list) + assert_equal(%w[aa abc], ticket1.tag_list) - ticket2 = Ticket.create( + ticket2 = Ticket.create!( title: "some title\n äöüß", group: Group.lookup(name: 'Users'), customer: User.lookup(email: 'nicole.braun@zammad.org'), @@ -245,7 +244,6 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - assert(ticket2, 'ticket2 created') assert_equal('some title äöüß', ticket2.title, 'ticket2.title verify') assert_equal('Users', ticket2.group.name, 'ticket2.group verify') @@ -264,7 +262,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal(0, ticket2.articles.count, 'ticket2.articles verify') assert_equal([], ticket2.tag_list) - ticket3 = Ticket.create( + ticket3 = Ticket.create!( title: "some title\n äöüß3", group: Group.lookup(name: 'Users'), customer: User.lookup(email: 'nicole.braun@zammad.org'), @@ -273,7 +271,7 @@ class TicketTriggerTest < ActiveSupport::TestCase ) assert(ticket3, 'ticket3 created') - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket3.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -303,7 +301,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal('new', ticket3.state.name, 'ticket3.state verify') assert_equal('3 high', ticket3.priority.name, 'ticket3.priority verify') assert_equal(3, ticket3.articles.count, 'ticket3.articles verify') - assert_equal(%w(aa kk abc article_create_trigger), ticket3.tag_list) + assert_equal(%w[aa kk abc article_create_trigger], ticket3.tag_list) article3 = ticket3.articles[1] assert_match('Zammad ', article3.from) assert_match('nicole.braun@zammad.org', article3.to) @@ -318,7 +316,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_match('Thanks for your inquiry - 1234 check (some title äöüß3)!', article3.subject) assert_equal('text/html', article3.content_type) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket3.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -341,9 +339,9 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal('new', ticket3.state.name, 'ticket3.state verify') assert_equal('3 high', ticket3.priority.name, 'ticket3.priority verify') assert_equal(4, ticket3.articles.count, 'ticket3.articles verify') - assert_equal(%w(aa abc article_create_trigger), ticket3.tag_list) + assert_equal(%w[aa abc article_create_trigger], ticket3.tag_list) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket3.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -366,9 +364,9 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal('new', ticket3.state.name, 'ticket3.state verify') assert_equal('3 high', ticket3.priority.name, 'ticket3.priority verify') assert_equal(5, ticket3.articles.count, 'ticket3.articles verify') - assert_equal(%w(aa abc article_create_trigger), ticket3.tag_list) + assert_equal(%w[aa abc article_create_trigger], ticket3.tag_list) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket3.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -391,7 +389,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal('new', ticket3.state.name, 'ticket3.state verify') assert_equal('3 high', ticket3.priority.name, 'ticket3.priority verify') assert_equal(7, ticket3.articles.count, 'ticket3.articles verify') - assert_equal(%w(aa abc article_create_trigger), ticket3.tag_list) + assert_equal(%w[aa abc article_create_trigger], ticket3.tag_list) end test '2 actions - create' do @@ -423,14 +421,13 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, ) - ticket1 = Ticket.create( + ticket1 = Ticket.create!( title: "some title\n äöüß", group: Group.lookup(name: 'Users'), customer: User.lookup(email: 'nicole.braun@zammad.org'), updated_by_id: 1, created_by_id: 1, ) - assert(ticket1, 'ticket1 created') assert_equal('some title äöüß', ticket1.title, 'ticket1.title verify') assert_equal('Users', ticket1.group.name, 'ticket1.group verify') @@ -517,14 +514,13 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, ) - ticket1 = Ticket.create( + ticket1 = Ticket.create!( title: "some title\n äöüß", group: Group.lookup(name: 'Users'), customer: User.lookup(email: 'nicole.braun@zammad.org'), updated_by_id: 1, created_by_id: 1, ) - assert(ticket1, 'ticket1 created') assert_equal('some title äöüß', ticket1.title, 'ticket1.title verify') assert_equal('Users', ticket1.group.name, 'ticket1.group verify') @@ -732,7 +728,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( + article_p = Ticket::Article.create!( ticket_id: ticket_p.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -752,7 +748,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( + article_p = Ticket::Article.create!( ticket_id: ticket_p.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -772,7 +768,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( + article_p = Ticket::Article.create!( ticket_id: ticket_p.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -803,7 +799,7 @@ class TicketTriggerTest < ActiveSupport::TestCase ticket_p.state = Ticket::State.lookup(name: 'open') ticket_p.save! - article_p = Ticket::Article.create( + article_p = Ticket::Article.create!( ticket_id: ticket_p.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -1207,7 +1203,7 @@ class TicketTriggerTest < ActiveSupport::TestCase created_by_id: 1, ) - ticket1 = Ticket.create( + ticket1 = Ticket.create!( title: 'test 123', owner: agent, group: Group.lookup(name: 'Users'), @@ -1215,7 +1211,7 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -1240,7 +1236,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal(1, ticket1.articles.count) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -1283,7 +1279,7 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, ) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -1342,7 +1338,7 @@ class TicketTriggerTest < ActiveSupport::TestCase created_by_id: 1, ) - ticket1 = Ticket.create( + ticket1 = Ticket.create!( title: 'test 123', #owner: agent, group: Group.lookup(name: 'Users'), @@ -1350,7 +1346,7 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -1374,7 +1370,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal([], ticket1.tag_list) UserInfo.current_user_id = agent.id - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -1467,14 +1463,14 @@ class TicketTriggerTest < ActiveSupport::TestCase created_by_id: 1, ) - ticket1 = Ticket.create( + ticket1 = Ticket.create!( title: 'test 123', group: Group.lookup(name: 'Users'), customer: customer, updated_by_id: 1, created_by_id: 1, ) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -1500,7 +1496,7 @@ class TicketTriggerTest < ActiveSupport::TestCase ticket1.update!(customer: User.lookup(email: 'nicole.braun@zammad.org') ) UserInfo.current_user_id = agent.id - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -1578,14 +1574,14 @@ class TicketTriggerTest < ActiveSupport::TestCase created_by_id: 1, ) - ticket1 = Ticket.create( + ticket1 = Ticket.create!( title: 'test 123', group: Group.lookup(name: 'Users'), customer: User.lookup(email: 'nicole.braun@zammad.org'), updated_by_id: 1, created_by_id: 1, ) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -1611,7 +1607,7 @@ class TicketTriggerTest < ActiveSupport::TestCase ticket1.update!(customer: customer ) UserInfo.current_user_id = agent.id - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -1691,7 +1687,7 @@ class TicketTriggerTest < ActiveSupport::TestCase created_by_id: 1, ) - ticket1 = Ticket.create( + ticket1 = Ticket.create!( title: 'test 123', #owner: agent, group: Group.lookup(name: 'Users'), @@ -1699,7 +1695,7 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -1723,7 +1719,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal([], ticket1.tag_list) UserInfo.current_user_id = agent1.id - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -1762,7 +1758,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal([], ticket1.tag_list) UserInfo.current_user_id = agent1.id - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -1801,7 +1797,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal([], ticket1.tag_list) UserInfo.current_user_id = agent1.id - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -1872,7 +1868,7 @@ class TicketTriggerTest < ActiveSupport::TestCase created_by_id: 1, ) - ticket1 = Ticket.create( + ticket1 = Ticket.create!( title: 'test 123', #owner: agent, group: Group.lookup(name: 'Users'), @@ -1880,7 +1876,7 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -1904,7 +1900,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal([], ticket1.tag_list) UserInfo.current_user_id = agent.id - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -2019,7 +2015,7 @@ class TicketTriggerTest < ActiveSupport::TestCase created_by_id: 1, ) - ticket1 = Ticket.create( + ticket1 = Ticket.create!( title: 'test 123', owner: agent, customer: customer, @@ -2027,7 +2023,7 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -2065,7 +2061,7 @@ class TicketTriggerTest < ActiveSupport::TestCase customer.vip = false customer.save! - ticket2 = Ticket.create( + ticket2 = Ticket.create!( title: 'test 123', owner: agent, customer: customer, @@ -2073,7 +2069,7 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket2.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -2157,14 +2153,14 @@ class TicketTriggerTest < ActiveSupport::TestCase created_by_id: 1, ) - ticket1 = Ticket.create( + ticket1 = Ticket.create!( title: 'test 123', group: Group.lookup(name: 'Users'), customer: User.lookup(email: 'nicole.braun@zammad.org'), updated_by_id: 1, created_by_id: 1, ) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -2291,7 +2287,7 @@ class TicketTriggerTest < ActiveSupport::TestCase created_by_id: 1, ) - ticket1 = Ticket.create( + ticket1 = Ticket.create!( title: 'test 123', owner: agent, customer: customer, @@ -2299,7 +2295,7 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -2325,7 +2321,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal(2, ticket1.articles.count, 'ticket1.articles verify') assert_equal([], ticket1.tag_list) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -2350,7 +2346,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal(3, ticket1.articles.count, 'ticket1.articles verify') assert_equal([], ticket1.tag_list) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -2377,7 +2373,7 @@ class TicketTriggerTest < ActiveSupport::TestCase ticket1.priority = Ticket::Priority.find_by(name: '3 high') ticket1.save! - article = Ticket::Article.create( + article = Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -2416,7 +2412,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal(6, ticket1.articles.count, 'ticket1.articles verify') assert_equal([], ticket1.tag_list) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -2574,7 +2570,7 @@ class TicketTriggerTest < ActiveSupport::TestCase created_by_id: 1, ) - ticket1 = Ticket.create( + ticket1 = Ticket.create!( title: 'test 123', #owner: agent, customer: customer, @@ -2582,7 +2578,7 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -2624,7 +2620,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal(3, ticket1.articles.count, 'ticket1.articles verify') assert_equal([], ticket1.tag_list) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -2718,14 +2714,14 @@ class TicketTriggerTest < ActiveSupport::TestCase created_by_id: 1, updated_by_id: 1, ) - ticket1 = Ticket.create( + ticket1 = Ticket.create!( title: "some title\n äöüß", group: Group.lookup(name: 'Users'), customer: User.lookup(email: 'nicole.braun@zammad.org'), updated_by_id: 1, created_by_id: 1, ) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient+from@example.com', @@ -2775,14 +2771,14 @@ class TicketTriggerTest < ActiveSupport::TestCase created_by_id: 1, updated_by_id: 1, ) - ticket1 = Ticket.create( + ticket1 = Ticket.create!( title: "some title\n äöüß", group: Group.lookup(name: 'Users'), customer: User.lookup(email: 'nicole.braun@zammad.org'), updated_by_id: 1, created_by_id: 1, ) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender+from@example.com', to: 'some_recipient@example.com', @@ -2844,14 +2840,14 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - ticket1 = Ticket.create( + ticket1 = Ticket.create!( title: "some title\n äöüß", group: Group.lookup(name: 'Users'), customer: User.lookup(email: 'nicole.braun@zammad.org'), updated_by_id: 1, created_by_id: 1, ) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, to: 'some_recipient@example.com', subject: 'some subject', @@ -2913,14 +2909,14 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - ticket1 = Ticket.create( + ticket1 = Ticket.create!( title: "some title\n äöüß", group: Group.lookup(name: 'Users'), customer: User.lookup(email: 'nicole.braun@zammad.org'), updated_by_id: 1, created_by_id: 1, ) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, to: 'some_recipient@example.com', subject: 'some subject', @@ -2959,7 +2955,7 @@ class TicketTriggerTest < ActiveSupport::TestCase perform: { 'notification.email' => { 'body' => 'some text
            #{ticket.customer.lastname}
            #{ticket.title}
            #{article.body}', - 'recipient' => %w(ticket_owner article_last_sender), + 'recipient' => %w[ticket_owner article_last_sender], 'subject' => 'Thanks for your inquiry (#{ticket.title})!', }, }, @@ -2975,11 +2971,11 @@ class TicketTriggerTest < ActiveSupport::TestCase email: 'admin+owner_recipient@example.com', password: 'adminpw', active: true, - roles: Role.where(name: %w(Admin Agent)), + roles: Role.where(name: %w[Admin Agent]), updated_by_id: 1, created_by_id: 1, ) - ticket1 = Ticket.create( + ticket1 = Ticket.create!( title: "some title\n äöüß", group: Group.lookup(name: 'Users'), customer: User.lookup(email: 'nicole.braun@zammad.org'), @@ -2987,7 +2983,7 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, created_by_id: 1, ) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient+from@example.com', @@ -3038,14 +3034,14 @@ class TicketTriggerTest < ActiveSupport::TestCase created_by_id: 1, updated_by_id: 1, ) - ticket1 = Ticket.create( + ticket1 = Ticket.create!( title: "some title\n äöüß", group: Group.lookup(name: 'Users'), customer: User.lookup(email: 'nicole.braun@zammad.org'), updated_by_id: 1, created_by_id: 1, ) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient+from@example.com', @@ -3101,15 +3097,14 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, ) - ticket1 = Ticket.create( + ticket1 = Ticket.create!( title: 'loop try 1', group: Group.lookup(name: 'Users'), customer: User.lookup(email: 'nicole.braun@zammad.org'), updated_by_id: 1, created_by_id: 1, ) - assert(ticket1, 'ticket1 created') - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_loop_sender@example.com', to: 'some_loop_recipient@example.com', @@ -3136,7 +3131,7 @@ class TicketTriggerTest < ActiveSupport::TestCase ticket1.reload assert_equal(2, ticket1.articles.count) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_loop_sender@example.com', to: 'some_loop_recipient@example.com', @@ -3157,7 +3152,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal('some_loop_sender@example.com', ticket1.articles[2].from) assert_equal('nicole.braun@zammad.org', ticket1.articles[3].to) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_loop_sender@example.com', to: 'some_loop_recipient@example.com', @@ -3178,7 +3173,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal('some_loop_sender@example.com', ticket1.articles[4].from) assert_equal('nicole.braun@zammad.org', ticket1.articles[5].to) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_loop_sender@example.com', to: 'some_loop_recipient@example.com', @@ -3199,7 +3194,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal('some_loop_sender@example.com', ticket1.articles[6].from) assert_equal('nicole.braun@zammad.org', ticket1.articles[7].to) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_loop_sender@example.com', to: 'some_loop_recipient@example.com', @@ -3220,7 +3215,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal('some_loop_sender@example.com', ticket1.articles[8].from) assert_equal('nicole.braun@zammad.org', ticket1.articles[9].to) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_loop_sender@example.com', to: 'some_loop_recipient@example.com', @@ -3241,7 +3236,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal('some_loop_sender@example.com', ticket1.articles[10].from) assert_equal('nicole.braun@zammad.org', ticket1.articles[11].to) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_loop_sender@example.com', to: 'some_loop_recipient@example.com', @@ -3262,7 +3257,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal('some_loop_sender@example.com', ticket1.articles[12].from) assert_equal('nicole.braun@zammad.org', ticket1.articles[13].to) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_loop_sender@example.com', to: 'some_loop_recipient@example.com', @@ -3283,7 +3278,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal('some_loop_sender@example.com', ticket1.articles[14].from) assert_equal('nicole.braun@zammad.org', ticket1.articles[15].to) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_loop_sender@example.com', to: 'some_loop_recipient@example.com', @@ -3304,7 +3299,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal('some_loop_sender@example.com', ticket1.articles[16].from) assert_equal('nicole.braun@zammad.org', ticket1.articles[17].to) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_loop_sender@example.com', to: 'some_loop_recipient@example.com', @@ -3325,7 +3320,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal('some_loop_sender@example.com', ticket1.articles[18].from) assert_equal('nicole.braun@zammad.org', ticket1.articles[19].to) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_loop_sender@example.com', to: 'some_loop_recipient@example.com', @@ -3345,7 +3340,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal(21, ticket1.articles.count) assert_equal('some_loop_sender@example.com', ticket1.articles[20].from) - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_loop_sender@example.com', to: 'some_loop_recipient@example.com', @@ -3431,15 +3426,14 @@ class TicketTriggerTest < ActiveSupport::TestCase updated_by_id: 1, ) - ticket1 = Ticket.create( + ticket1 = Ticket.create!( title: "some title\n äöüß", group: Group.lookup(name: 'Users'), customer: User.lookup(email: 'nicole.braun@zammad.org'), updated_by_id: 1, created_by_id: 1, ) - assert(ticket1, 'ticket1 created') - Ticket::Article.create( + Ticket::Article.create!( ticket_id: ticket1.id, from: 'some_sender@example.com', to: 'some_recipient@example.com', @@ -3469,7 +3463,7 @@ class TicketTriggerTest < ActiveSupport::TestCase assert_equal('new', ticket1.state.name, 'ticket1.state verify') assert_equal('3 high', ticket1.priority.name, 'ticket1.priority verify') assert_equal(2, ticket1.articles.count, 'ticket1.articles verify') - assert_equal(%w(aa kk), ticket1.tag_list) + assert_equal(%w[aa kk], ticket1.tag_list) article1 = ticket1.articles.last assert_match('Zammad ', article1.from) assert_match('nicole.braun@zammad.org', article1.to) @@ -3480,4 +3474,747 @@ class TicketTriggerTest < ActiveSupport::TestCase end + test '4 tag based auto response' do + trigger1 = Trigger.create_or_update( + name: '100 add tag if sender 1', + condition: { + 'ticket.action' => { + 'operator' => 'is', + 'value' => 'create', + }, + 'article.from' => { + 'operator' => 'contains', + 'value' => 'sender1', + }, + }, + perform: { + 'ticket.tags' => { + 'operator' => 'add', + 'value' => 'sender1', + }, + }, + disable_notification: true, + active: true, + created_by_id: 1, + updated_by_id: 1, + ) + + trigger2 = Trigger.create_or_update( + name: '200 add tag if sender 2', + condition: { + 'ticket.action' => { + 'operator' => 'is', + 'value' => 'create', + }, + 'article.from' => { + 'operator' => 'contains', + 'value' => 'sender2', + }, + }, + perform: { + 'ticket.tags' => { + 'operator' => 'add', + 'value' => 'sender2', + }, + }, + disable_notification: true, + active: true, + created_by_id: 1, + updated_by_id: 1, + ) + + trigger3 = Trigger.create_or_update( + name: '300 auto reply', + condition: { + 'ticket.action' => { + 'operator' => 'is', + 'value' => 'create', + }, + 'ticket.state_id' => { + 'operator' => 'is', + 'value' => Ticket::State.lookup(name: 'new').id.to_s, + }, + 'ticket.tags' => { + #'operator' => 'contains one not', + 'operator' => 'contains all not', + 'value' => 'sender1, sender2', + }, + }, + perform: { + 'notification.email' => { + 'body' => 'some text
            #{ticket.customer.lastname}
            #{ticket.title}
            #{article.body}', + 'recipient' => 'ticket_customer', + 'subject' => 'Thanks for your inquiry (#{ticket.title})!', + }, + }, + disable_notification: true, + active: true, + created_by_id: 1, + updated_by_id: 1, + ) + + ticket1 = Ticket.create!( + title: 'test 1', + group: Group.lookup(name: 'Users'), + customer: User.lookup(email: 'nicole.braun@zammad.org'), + updated_by_id: 1, + created_by_id: 1, + ) + Ticket::Article.create!( + ticket_id: ticket1.id, + from: 'sender1@example.com', + to: 'some_recipient@example.com', + subject: 'some subject', + message_id: 'some@id', + body: "some message note\nnew line", + internal: false, + sender: Ticket::Article::Sender.find_by(name: 'Customer'), + type: Ticket::Article::Type.find_by(name: 'email'), + updated_by_id: 1, + created_by_id: 1, + ) + + ticket1.reload + assert_equal('test 1', ticket1.title, 'ticket1.title verify') + assert_equal('Users', ticket1.group.name, 'ticket1.group verify') + assert_equal('new', ticket1.state.name, 'ticket1.state verify') + assert_equal('2 normal', ticket1.priority.name, 'ticket1.priority verify') + assert_equal(1, ticket1.articles.count, 'ticket1.articles verify') + assert_equal([], ticket1.tag_list) + Observer::Transaction.commit + ticket1.reload + assert_equal('test 1', ticket1.title, 'ticket1.title verify') + assert_equal('Users', ticket1.group.name, 'ticket1.group verify') + assert_equal('new', ticket1.state.name, 'ticket1.state verify') + assert_equal('2 normal', ticket1.priority.name, 'ticket1.priority verify') + assert_equal(1, ticket1.articles.count, 'ticket1.articles verify') + assert_equal(%w[sender1], ticket1.tag_list) + + ticket2 = Ticket.create!( + title: 'test 2', + group: Group.lookup(name: 'Users'), + customer: User.lookup(email: 'nicole.braun@zammad.org'), + updated_by_id: 1, + created_by_id: 1, + ) + Ticket::Article.create!( + ticket_id: ticket2.id, + from: 'sender2@example.com', + to: 'some_recipient@example.com', + subject: 'some subject', + message_id: 'some@id', + body: "some message note\nnew line", + internal: false, + sender: Ticket::Article::Sender.find_by(name: 'Customer'), + type: Ticket::Article::Type.find_by(name: 'email'), + updated_by_id: 1, + created_by_id: 1, + ) + + ticket2.reload + assert_equal('test 2', ticket2.title, 'ticket2.title verify') + assert_equal('Users', ticket2.group.name, 'ticket2.group verify') + assert_equal('new', ticket2.state.name, 'ticket2.state verify') + assert_equal('2 normal', ticket2.priority.name, 'ticket2.priority verify') + assert_equal(1, ticket2.articles.count, 'ticket2.articles verify') + assert_equal([], ticket2.tag_list) + + Observer::Transaction.commit + + ticket2.reload + assert_equal('test 2', ticket2.title, 'ticket2.title verify') + assert_equal('Users', ticket2.group.name, 'ticket2.group verify') + assert_equal('new', ticket2.state.name, 'ticket2.state verify') + assert_equal('2 normal', ticket2.priority.name, 'ticket2.priority verify') + assert_equal(1, ticket2.articles.count, 'ticket2.articles verify') + assert_equal(%w[sender2], ticket2.tag_list) + + ticket3 = Ticket.create!( + title: 'test 3', + group: Group.lookup(name: 'Users'), + customer: User.lookup(email: 'nicole.braun@zammad.org'), + updated_by_id: 1, + created_by_id: 1, + ) + assert(ticket3, 'ticket3 created') + Ticket::Article.create!( + ticket_id: ticket3.id, + from: 'sender0@example.com', + to: 'some_recipient@example.com', + subject: 'some subject', + message_id: 'some@id', + body: "some message note\nnew line", + internal: false, + sender: Ticket::Article::Sender.find_by(name: 'Customer'), + type: Ticket::Article::Type.find_by(name: 'email'), + updated_by_id: 1, + created_by_id: 1, + ) + + ticket3.reload + assert_equal('test 3', ticket3.title, 'ticket3.title verify') + assert_equal('Users', ticket3.group.name, 'ticket3.group verify') + assert_equal('new', ticket3.state.name, 'ticket3.state verify') + assert_equal('2 normal', ticket3.priority.name, 'ticket3.priority verify') + assert_equal(1, ticket3.articles.count, 'ticket3.articles verify') + assert_equal([], ticket3.tag_list) + Observer::Transaction.commit + ticket3.reload + assert_equal('test 3', ticket3.title, 'ticket3.title verify') + assert_equal('Users', ticket3.group.name, 'ticket3.group verify') + assert_equal('new', ticket3.state.name, 'ticket3.state verify') + 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 + + end + + test 'article.body' do + trigger1 = Trigger.create_or_update( + name: 'auto reply', + condition: { + 'ticket.action' => { + 'operator' => 'is', + 'value' => 'create', + }, + 'ticket.state_id' => { + 'operator' => 'is', + 'value' => Ticket::State.lookup(name: 'new').id.to_s, + }, + 'article.body' => { + 'operator' => 'contains', + 'value' => 'hello', + }, + }, + perform: { + 'notification.email' => { + 'body' => 'some text
            #{ticket.customer.lastname}
            #{ticket.title}
            #{article.body}', + 'recipient' => 'ticket_customer', + 'subject' => 'Thanks for your inquiry (#{ticket.title})!', + }, + 'ticket.tags' => { + 'operator' => 'add', + 'value' => 'aa, kk', + }, + }, + disable_notification: true, + active: true, + created_by_id: 1, + updated_by_id: 1, + ) + + ticket1 = Ticket.create!( + title: 'test 1', + group: Group.lookup(name: 'Users'), + customer: User.lookup(email: 'nicole.braun@zammad.org'), + updated_by_id: 1, + created_by_id: 1, + ) + Ticket::Article.create!( + ticket_id: ticket1.id, + from: 'some_sender@example.com', + to: 'some_recipient@example.com', + subject: 'some subject', + message_id: 'some@id', + body: 'some message note hello ', + internal: false, + sender: Ticket::Article::Sender.find_by(name: 'Agent'), + type: Ticket::Article::Type.find_by(name: 'note'), + updated_by_id: 1, + created_by_id: 1, + ) + + ticket1.reload + assert_equal('test 1', ticket1.title, 'ticket1.title verify') + assert_equal('Users', ticket1.group.name, 'ticket1.group verify') + assert_equal('new', ticket1.state.name, 'ticket1.state verify') + assert_equal('2 normal', ticket1.priority.name, 'ticket1.priority verify') + assert_equal(1, ticket1.articles.count, 'ticket1.articles verify') + assert_equal([], ticket1.tag_list) + + Observer::Transaction.commit + + ticket1.reload + assert_equal('test 1', ticket1.title, 'ticket1.title verify') + assert_equal('Users', ticket1.group.name, 'ticket1.group verify') + assert_equal('new', ticket1.state.name, 'ticket1.state verify') + assert_equal(2, ticket1.articles.count, 'ticket1.articles verify') + assert_equal(%w[aa kk], ticket1.tag_list) + article1 = ticket1.articles.last + assert_match('Zammad ', article1.from) + assert_match('nicole.braun@zammad.org', article1.to) + assert_match('Thanks for your inquiry (test 1)!', article1.subject) + assert_match('some message', article1.body) + assert_match('> some message <b>note</b> hello', article1.body) + assert_equal('text/html', article1.content_type) + + ticket2 = Ticket.create!( + title: 'test 1', + group: Group.lookup(name: 'Users'), + customer: User.lookup(email: 'nicole.braun@zammad.org'), + updated_by_id: 1, + created_by_id: 1, + ) + Ticket::Article.create!( + ticket_id: ticket2.id, + from: 'some_sender@example.com', + to: 'some_recipient@example.com', + subject: 'some subject', + message_id: 'some@id', + body: 'some message note', + internal: false, + sender: Ticket::Article::Sender.find_by(name: 'Agent'), + type: Ticket::Article::Type.find_by(name: 'note'), + updated_by_id: 1, + created_by_id: 1, + ) + + ticket2.reload + assert_equal('test 1', ticket2.title, 'ticket2.title verify') + assert_equal('Users', ticket2.group.name, 'ticket2.group verify') + assert_equal('new', ticket2.state.name, 'ticket2.state verify') + assert_equal('2 normal', ticket2.priority.name, 'ticket2.priority verify') + assert_equal(1, ticket2.articles.count, 'ticket2.articles verify') + assert_equal([], ticket2.tag_list) + + Observer::Transaction.commit + + ticket2.reload + assert_equal('test 1', ticket2.title, 'ticket2.title verify') + assert_equal('Users', ticket2.group.name, 'ticket2.group verify') + assert_equal('new', ticket2.state.name, 'ticket2.state verify') + assert_equal(1, ticket2.articles.count, 'ticket2.articles verify') + assert_equal(%w[], ticket2.tag_list) + + trigger1 = Trigger.create_or_update( + name: 'auto reply', + condition: { + 'ticket.action' => { + 'operator' => 'is', + 'value' => 'create', + }, + 'ticket.state_id' => { + 'operator' => 'is', + 'value' => Ticket::State.lookup(name: 'new').id.to_s, + }, + 'article.body' => { + 'operator' => 'contains not', + 'value' => 'hello', + }, + }, + perform: { + 'notification.email' => { + 'body' => 'some text
            #{ticket.customer.lastname}
            #{ticket.title}
            #{article.body}', + 'recipient' => 'ticket_customer', + 'subject' => 'Thanks for your inquiry (#{ticket.title})!', + }, + 'ticket.tags' => { + 'operator' => 'add', + 'value' => 'aa, kk', + }, + }, + disable_notification: true, + active: true, + created_by_id: 1, + updated_by_id: 1, + ) + + ticket3 = Ticket.create!( + title: 'test 1', + group: Group.lookup(name: 'Users'), + customer: User.lookup(email: 'nicole.braun@zammad.org'), + updated_by_id: 1, + created_by_id: 1, + ) + Ticket::Article.create!( + ticket_id: ticket3.id, + from: 'some_sender@example.com', + to: 'some_recipient@example.com', + subject: 'some subject', + message_id: 'some@id', + body: 'some message note hello ', + internal: false, + sender: Ticket::Article::Sender.find_by(name: 'Agent'), + type: Ticket::Article::Type.find_by(name: 'note'), + updated_by_id: 1, + created_by_id: 1, + ) + + ticket3.reload + assert_equal('test 1', ticket3.title, 'ticket3.title verify') + assert_equal('Users', ticket3.group.name, 'ticket3.group verify') + assert_equal('new', ticket3.state.name, 'ticket3.state verify') + assert_equal('2 normal', ticket3.priority.name, 'ticket3.priority verify') + assert_equal(1, ticket3.articles.count, 'ticket3.articles verify') + assert_equal([], ticket3.tag_list) + + Observer::Transaction.commit + + ticket3.reload + assert_equal('test 1', ticket3.title, 'ticket3.title verify') + assert_equal('Users', ticket3.group.name, 'ticket3.group verify') + assert_equal('new', ticket3.state.name, 'ticket3.state verify') + assert_equal(1, ticket3.articles.count, 'ticket3.articles verify') + assert_equal(%w[], ticket3.tag_list) + + ticket4 = Ticket.create!( + title: 'test 1', + group: Group.lookup(name: 'Users'), + customer: User.lookup(email: 'nicole.braun@zammad.org'), + updated_by_id: 1, + created_by_id: 1, + ) + Ticket::Article.create!( + ticket_id: ticket4.id, + from: 'some_sender@example.com', + to: 'some_recipient@example.com', + subject: 'some subject', + message_id: 'some@id', + body: 'some message note 2', + internal: false, + sender: Ticket::Article::Sender.find_by(name: 'Agent'), + type: Ticket::Article::Type.find_by(name: 'note'), + updated_by_id: 1, + created_by_id: 1, + ) + + ticket4.reload + assert_equal('test 1', ticket4.title, 'ticket4.title verify') + assert_equal('Users', ticket4.group.name, 'ticket4.group verify') + assert_equal('new', ticket4.state.name, 'ticket4.state verify') + assert_equal('2 normal', ticket4.priority.name, 'ticket4.priority verify') + assert_equal(1, ticket4.articles.count, 'ticket4.articles verify') + assert_equal([], ticket4.tag_list) + + Observer::Transaction.commit + + ticket4.reload + assert_equal('test 1', ticket4.title, 'ticket4.title verify') + assert_equal('Users', ticket4.group.name, 'ticket4.group verify') + assert_equal('new', ticket4.state.name, 'ticket4.state verify') + assert_equal(2, ticket4.articles.count, 'ticket4.articles verify') + assert_equal(%w[aa kk], ticket4.tag_list) + article4 = ticket4.articles.last + assert_match('Zammad ', article4.from) + assert_match('nicole.braun@zammad.org', article4.to) + assert_match('Thanks for your inquiry (test 1)!', article4.subject) + assert_match('some message', article4.body) + assert_match('> some message <b>note</b> 2', article4.body) + assert_equal('text/html', article4.content_type) + + end + + test 'change owner' do + roles = Role.where(name: 'Agent') + agent1 = User.create_or_update( + login: 'agent-has-changed@example.com', + firstname: 'Has Changed', + lastname: 'Agent1', + email: 'agent-has-changed@example.com', + password: 'agentpw', + active: true, + roles: roles, + updated_at: '2015-02-05 16:37:00', + updated_by_id: 1, + created_by_id: 1, + ) + + agent2 = User.create_or_update( + login: 'agent-has-changed2@example.com', + firstname: 'Has Changed', + lastname: 'Agent2', + email: 'agent-has-changed2@example.com', + password: 'agentpw', + active: true, + roles: roles, + updated_at: '2015-02-05 16:37:00', + updated_by_id: 1, + created_by_id: 1, + ) + + # multi tag trigger with changed owner + trigger1 = Trigger.create_or_update( + name: 'change owner', + condition: { + 'ticket.owner_id' => { + 'operator' => 'has changed', + }, + 'ticket.tags' => { + 'operator' => 'contains one not', + 'value' => 'nosendmail test123' + } + }, + perform: { + 'ticket.tags' => { + 'operator' => 'add', + 'value' => '123' + }, + 'notification.email' => { + 'body' => 'some lala', + 'recipient' => 'ticket_customer', + 'subject' => 'Thanks for your inquiry - 1234 check (#{ticket.title})!', + }, + }, + disable_notification: true, + active: true, + created_by_id: 1, + updated_by_id: 1, + ) + + # single tag trigger with changed owner + trigger2 = Trigger.create_or_update( + name: 'change owner', + condition: { + 'ticket.owner_id' => { + 'operator' => 'has changed', + }, + 'ticket.tags' => { + 'operator' => 'contains one not', + 'value' => 'nosendmail2', + } + }, + perform: { + 'ticket.tags' => { + 'operator' => 'add', + 'value' => '123' + }, + 'notification.email' => { + 'body' => 'some lala', + 'recipient' => 'ticket_customer', + 'subject' => 'Thanks for your inquiry - 1234 check (#{ticket.title})!', + }, + }, + disable_notification: true, + active: true, + created_by_id: 1, + updated_by_id: 1, + ) + + ticket1 = Ticket.create!( + title: "some title\n äöüß", + group: Group.lookup(name: 'Users'), + customer: User.lookup(email: 'nicole.braun@zammad.org'), + updated_by_id: 1, + created_by_id: 1, + ) + + assert_equal('some title äöüß', ticket1.title, 'ticket1.title verify') + assert_equal('Users', ticket1.group.name, 'ticket1.group verify') + assert_equal('new', ticket1.state.name, 'ticket1.state verify') + assert_equal('2 normal', ticket1.priority.name, 'ticket1.priority verify') + assert_equal(0, ticket1.articles.count, 'ticket1.articles verify') + assert_equal('agent-has-changed@example.com', agent1.login, 'verify agent') + assert_equal([], ticket1.tag_list, 'ticket1.tag_list') + + ticket2 = Ticket.create!( + title: "some title\n äöüß", + group: Group.lookup(name: 'Users'), + customer: User.lookup(email: 'nicole.braun@zammad.org'), + updated_by_id: 1, + created_by_id: 1, + ) + + assert_equal('some title äöüß', ticket2.title, 'ticket1.title verify') + assert_equal('Users', ticket2.group.name, 'ticket2.group verify') + assert_equal('new', ticket2.state.name, 'ticket2.state verify') + assert_equal('2 normal', ticket2.priority.name, 'ticket2.priority verify') + assert_equal(0, ticket2.articles.count, 'ticket2.articles verify') + assert_equal('agent-has-changed@example.com', agent1.login, 'verify agent') + assert_equal([], ticket1.tag_list, 'ticket2.tag_list') + + # control test - should pass + # create common object tag + tag_object = Tag::Object.create_or_update(name: 'Ticket') + + # add tag + ticket1.tag_add('thisisthebestjob', agent1.id) + + # change owner + ticket1.owner_id = agent1.id + ticket1.save! + + Observer::Transaction.commit + + # this will add a tag by trigger + ticket1.reload + assert_equal('some title äöüß', ticket1.title, 'ticket2.title verify') + assert_equal('Users', ticket1.group.name, 'ticket2.group verify') + assert_equal('new', ticket1.state.name, 'ticket2.state verify') + assert_equal('2 normal', ticket1.priority.name, 'ticket2.priority verify') + assert_equal(1, ticket1.articles.count, 'ticket2.articles verify') # articles.count must be 1 if the tag is added + assert_equal('agent-has-changed@example.com', agent1.login, 'verify agent') + assert_equal(%w[thisisthebestjob 123], ticket1.tag_list, 'ticket2.tag_list') + + # add tag nosendmail (to test the bug) + ticket1.tag_add('nosendmail', agent2.id) + + # change owner + ticket1.owner_id = agent2.id + ticket1.save! + + Observer::Transaction.commit + + ticket1.reload + assert_equal('some title äöüß', ticket1.title, 'ticket1.title verify') + assert_equal('Users', ticket1.group.name, 'ticket1.group verify') + assert_equal('new', ticket1.state.name, 'ticket1.state verify') + assert_equal('2 normal', ticket1.priority.name, 'ticket1.priority verify') + assert_equal(2, ticket1.articles.count, 'ticket1.articles verify') # articles.count must be 0 if adding tag is skipped + assert_equal('agent-has-changed2@example.com', agent2.login, 'verify agent') + assert_equal(%w[thisisthebestjob 123 nosendmail], ticket1.tag_list, 'ticket1.tag_list') + + # add tag (to test the bug) + ticket1.tag_add('test123', agent2.id) + + # change owner + ticket1.owner_id = agent1.id + ticket1.save! + + Observer::Transaction.commit + + ticket1.reload + assert_equal('some title äöüß', ticket1.title, 'ticket1.title verify') + assert_equal('Users', ticket1.group.name, 'ticket1.group verify') + assert_equal('new', ticket1.state.name, 'ticket1.state verify') + assert_equal('2 normal', ticket1.priority.name, 'ticket1.priority verify') + assert_equal(3, ticket1.articles.count, 'ticket1.articles verify') # articles.count must be 0 if adding tag is skipped + assert_equal('agent-has-changed@example.com', agent1.login, 'verify agent') + assert_equal(%w[thisisthebestjob 123 nosendmail test123], ticket1.tag_list, 'ticket1.tag_list') + + # add tag single tag 'nosendmail2' (to test the bug) + ticket2.tag_add('nosendmail2', agent1.id) + + # change owner + ticket2.owner_id = agent1.id + ticket2.save! + + Observer::Transaction.commit + + ticket2.reload + assert_equal('some title äöüß', ticket2.title, 'ticket2.title verify') + assert_equal('Users', ticket2.group.name, 'ticket2.group verify') + assert_equal('new', ticket2.state.name, 'ticket2.state verify') + assert_equal('2 normal', ticket2.priority.name, 'ticket2.priority verify') + assert_equal(0, ticket2.articles.count, 'ticket2.articles verify') # articles.count must be 0 if adding tag is skipped + assert_equal('agent-has-changed@example.com', agent1.login, 'verify agent') + assert_equal(['nosendmail2'], ticket2.tag_list, 'ticket2.tag_list') + + end + + test 'trigger auto reply with umlaut in form' do + trigger1 = Trigger.create_or_update( + name: 'auto reply', + condition: { + 'ticket.action' => { + 'operator' => 'is', + 'value' => 'create', + }, + 'ticket.state_id' => { + 'operator' => 'is', + 'value' => Ticket::State.lookup(name: 'new').id.to_s, + }, + }, + perform: { + 'notification.email' => { + 'body' => 'some text
            #{ticket.customer.lastname}
            #{ticket.title}
            #{article.body}', + 'recipient' => 'article_last_sender', + 'subject' => 'Thanks for your inquiry (#{ticket.title})!', + }, + }, + disable_notification: true, + active: true, + created_by_id: 1, + updated_by_id: 1, + ) + + ticket1 = Ticket.create!( + title: 'test 1', + group: Group.lookup(name: 'Users'), + customer: User.lookup(email: 'nicole.braun@zammad.org'), + updated_by_id: 1, + created_by_id: 1, + ) + + Ticket::Article.create!( + ticket_id: ticket1.id, + from: 'Sabine Schütz ', + to: 'some_recipient@example.com', + subject: 'some subject', + message_id: 'some@id', + body: 'some message note hello ', + internal: false, + sender: Ticket::Article::Sender.find_by(name: 'Customer'), + type: Ticket::Article::Type.find_by(name: 'email'), + updated_by_id: 1, + created_by_id: 1, + ) + + ticket1.reload + assert_equal('test 1', ticket1.title, 'ticket1.title verify') + assert_equal('Users', ticket1.group.name, 'ticket1.group verify') + assert_equal('new', ticket1.state.name, 'ticket1.state verify') + assert_equal('2 normal', ticket1.priority.name, 'ticket1.priority verify') + assert_equal(1, ticket1.articles.count, 'ticket1.articles verify') + assert_equal('Sabine Schütz ', ticket1.articles.first.from, 'ticket1.articles.first.from verify') + assert_equal([], ticket1.tag_list) + + Observer::Transaction.commit + + ticket1.reload + assert_equal('test 1', ticket1.title, 'ticket1.title verify') + assert_equal('Users', ticket1.group.name, 'ticket1.group verify') + assert_equal('new', ticket1.state.name, 'ticket1.state verify') + assert_equal(2, ticket1.articles.count, 'ticket1.articles verify') + article1 = ticket1.articles.last + assert_match('Zammad ', article1.from) + assert_match('some_sender@example.com', article1.to) + assert_match('Thanks for your inquiry (test 1)!', article1.subject) + assert_match('some message', article1.body) + assert_match('> some message <b>note</b> hello', article1.body) + assert_equal('text/html', article1.content_type) + + end + + test 'trigger auto reply with 2 sender addresses in form' do + trigger1 = Trigger.create_or_update( + name: 'auto reply', + condition: { + 'ticket.action' => { + 'operator' => 'is', + 'value' => 'create', + }, + 'ticket.state_id' => { + 'operator' => 'is', + 'value' => Ticket::State.lookup(name: 'new').id.to_s, + }, + }, + perform: { + 'notification.email' => { + 'body' => 'some text
            #{ticket.customer.lastname}
            #{ticket.title}
            #{article.body}', + 'recipient' => 'article_last_sender', + 'subject' => 'Thanks for your inquiry (#{ticket.title})!', + }, + }, + disable_notification: true, + active: true, + created_by_id: 1, + updated_by_id: 1, + ) + + ticket1, article1, user, mail = Channel::EmailParser.new.process({}, IO.binread('test/fixtures/mail65.box')) + + assert_equal('aaäöüßad asd', ticket1.title, 'ticket1.title verify') + assert_equal('Users', ticket1.group.name, 'ticket1.group verify') + assert_equal('new', ticket1.state.name, 'ticket1.state verify') + assert_equal(2, ticket1.articles.count, 'ticket1.articles verify') + article1 = ticket1.articles.last + assert_match('Zammad ', article1.from) + assert_match('smith@example.com', article1.to) + assert_match('Thanks for your inquiry (aaäöüßad asd)!', article1.subject) + assert_match('some text

            aaäöüßad asd', article1.body) + assert_equal('text/html', article1.content_type) + + end + end diff --git a/test/unit/ticket_xss_test.rb b/test/unit/ticket_xss_test.rb index 7ebd33b13..9d0b8f6d6 100644 --- a/test/unit/ticket_xss_test.rb +++ b/test/unit/ticket_xss_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class TicketXssTest < ActiveSupport::TestCase @@ -66,7 +66,7 @@ class TicketXssTest < ActiveSupport::TestCase ) assert_equal("please tell me this doesn't work: ada
            -LINKaa (http://lalal.de)ABC
            ", article3.body, 'article3.body verify - inbound') +LINKaaABC
            ", article3.body, 'article3.body verify - inbound') article4 = Ticket::Article.create( ticket_id: ticket.id, @@ -150,7 +150,7 @@ LINKaa (#) 123 (https://example.com)123', article8.body, 'article8.body verify - inbound') + assert_equal('some message article helper test1 abc 123123', article8.body, 'article8.body verify - inbound') end diff --git a/test/unit/token_test.rb b/test/unit/token_test.rb index f2c1d990f..ec1a2bf5b 100644 --- a/test/unit/token_test.rb +++ b/test/unit/token_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class TokenTest < ActiveSupport::TestCase diff --git a/test/unit/trigger_assets_test.rb b/test/unit/trigger_assets_test.rb new file mode 100644 index 000000000..69def14fb --- /dev/null +++ b/test/unit/trigger_assets_test.rb @@ -0,0 +1,77 @@ + +require 'test_helper' + +class TriggerAssetsTest < ActiveSupport::TestCase + test 'assets' do + + UserInfo.current_user_id = 1 + roles = Role.where(name: %w[Customer]) + + user1 = User.create_or_update( + login: 'assets_trigger1@example.org', + firstname: 'assets_trigger1', + lastname: 'assets_trigger1', + email: 'assets_trigger1@example.org', + password: 'some_pass', + active: true, + roles: roles, + ) + user2 = User.create_or_update( + login: 'assets_trigger2@example.org', + firstname: 'assets_trigger2', + lastname: 'assets_trigger2', + email: 'assets_trigger2@example.org', + password: 'some_pass', + active: true, + roles: roles, + ) + user3 = User.create_or_update( + login: 'assets_trigger3@example.org', + firstname: 'assets_trigger3', + lastname: 'assets_trigger3', + email: 'assets_trigger3@example.org', + password: 'some_pass', + active: true, + roles: roles, + ) + group1 = Group.create_or_update( + name: 'group1_trigger', + active: true, + ) + + ticket_state1 = Ticket::State.find_by(name: 'new') + ticket_state2 = Ticket::State.find_by(name: 'open') + ticket_priority2 = Ticket::Priority.find_by(name: '2 normal') + trigger = Trigger.create_or_update( + name: 'my trigger', + condition: { + 'ticket.state_id' => { + operator: 'is', + value: [ ticket_state1.id ], + }, + 'ticket.owner_id' => { + operator: 'is', + pre_condition: 'specific', + value: user1.id, + value_completion: 'John Smith ' + }, + }, + perform: { + 'ticket.group_id' => { + value: group1.id.to_s, + }, + }, + disable_notification: true, + ) + assets = trigger.assets({}) + assert(assets[:User][user1.id]) + assert_not(assets[:User][user2.id]) + assert_not(assets[:User][user3.id]) + assert(assets[:TicketState][ticket_state1.id]) + assert_not(assets[:TicketState][ticket_state2.id]) + assert_not(assets[:TicketPriority]) + assert(assets[:Group][group1.id]) + + end + +end diff --git a/test/unit/user_assets_test.rb b/test/unit/user_assets_test.rb new file mode 100644 index 000000000..432cdee94 --- /dev/null +++ b/test/unit/user_assets_test.rb @@ -0,0 +1,157 @@ + +require 'test_helper' + +class UserAssetsTest < ActiveSupport::TestCase + test 'assets' do + + roles = Role.where(name: %w[Agent Admin]) + groups = Group.all + org1 = Organization.create_or_update( + name: 'some user org', + updated_by_id: 1, + created_by_id: 1, + ) + + user1 = User.create_or_update( + login: 'assets1@example.org', + firstname: 'assets1', + lastname: 'assets1', + email: 'assets1@example.org', + password: 'some_pass', + active: true, + updated_by_id: 1, + created_by_id: 1, + organization_id: org1.id, + roles: roles, + groups: groups, + ) + + user2 = User.create_or_update( + login: 'assets2@example.org', + firstname: 'assets2', + lastname: 'assets2', + email: 'assets2@example.org', + password: 'some_pass', + active: true, + updated_by_id: 1, + created_by_id: 1, + roles: roles, + groups: groups, + ) + + user3 = User.create_or_update( + login: 'assets3@example.org', + firstname: 'assets3', + lastname: 'assets3', + email: 'assets3@example.org', + password: 'some_pass', + active: true, + updated_by_id: user1.id, + created_by_id: user2.id, + roles: roles, + groups: groups, + ) + user3 = User.find(user3.id) + assets = user3.assets({}) + + org1 = Organization.find(org1.id) + attributes = org1.attributes_with_association_ids + attributes.delete('user_ids') + assert(diff(attributes, assets[:Organization][org1.id]), 'check assets') + + user1 = User.find(user1.id) + attributes = user1.attributes_with_association_ids + attributes['accounts'] = {} + attributes.delete('password') + attributes.delete('token_ids') + attributes.delete('authorization_ids') + assert(diff(attributes, assets[:User][user1.id]), 'check assets') + + user2 = User.find(user2.id) + attributes = user2.attributes_with_association_ids + attributes['accounts'] = {} + attributes.delete('password') + attributes.delete('token_ids') + attributes.delete('authorization_ids') + assert(diff(attributes, assets[:User][user2.id]), 'check assets') + + user3 = User.find(user3.id) + attributes = user3.attributes_with_association_ids + attributes['accounts'] = {} + attributes.delete('password') + attributes.delete('token_ids') + attributes.delete('authorization_ids') + assert(diff(attributes, assets[:User][user3.id]), 'check assets') + + # touch org, check if user1 has changed + travel 2.seconds + org2 = Organization.find(org1.id) + org2.note = "some note...#{rand(9_999_999_999_999)}" + org2.save! + + attributes = org2.attributes_with_association_ids + attributes.delete('user_ids') + assert_not(diff(attributes, assets[:Organization][org2.id]), 'check assets') + + user1_new = User.find(user1.id) + attributes = user1_new.attributes_with_association_ids + attributes['accounts'] = {} + attributes.delete('password') + attributes.delete('token_ids') + attributes.delete('authorization_ids') + assert_not(diff(attributes, assets[:User][user1_new.id]), 'check assets') + + # check new assets lookup + assets = user3.assets({}) + attributes = org2.attributes_with_association_ids + attributes.delete('user_ids') + assert(diff(attributes, assets[:Organization][org1.id]), 'check assets') + + user1 = User.find(user1.id) + attributes = user1.attributes_with_association_ids + attributes['accounts'] = {} + attributes.delete('password') + attributes.delete('token_ids') + attributes.delete('authorization_ids') + assert(diff(attributes, assets[:User][user1.id]), 'check assets') + + user2 = User.find(user2.id) + attributes = user2.attributes_with_association_ids + attributes['accounts'] = {} + attributes.delete('password') + attributes.delete('token_ids') + attributes.delete('authorization_ids') + assert(diff(attributes, assets[:User][user2.id]), 'check assets') + + user3 = User.find(user3.id) + attributes = user3.attributes_with_association_ids + attributes['accounts'] = {} + attributes.delete('password') + attributes.delete('token_ids') + attributes.delete('authorization_ids') + assert(diff(attributes, assets[:User][user3.id]), 'check assets') + travel_back + + user3.destroy! + user2.destroy! + user1.destroy! + org1.destroy! + assert_not(Organization.find_by(id: org2.id)) + end + + def diff(o1, o2) + return true if o1 == o2 + %w[updated_at created_at].each do |item| + if o1[item] + o1[item] = o1[item].to_s + end + if o2[item] + o2[item] = o2[item].to_s + end + end + return true if (o1.to_a - o2.to_a).blank? + #puts "ERROR: difference \n1: #{o1.inspect}\n2: #{o2.inspect}\ndiff: #{(o1.to_a - o2.to_a).inspect}" + false + end + +end diff --git a/test/unit/user_mail_delivery_failed_test.rb b/test/unit/user_mail_delivery_failed_test.rb new file mode 100644 index 000000000..2ff9e0b9f --- /dev/null +++ b/test/unit/user_mail_delivery_failed_test.rb @@ -0,0 +1,40 @@ +require 'test_helper' + +class UserMailDeliveryFailedTest < ActiveSupport::TestCase + setup do + + UserInfo.current_user_id = 1 + + roles = Role.where(name: 'Customer') + @customer1 = User.create_or_update( + login: 'user-mail-delivery-failed-customer1@example.com', + firstname: 'UserOutOfOffice', + lastname: 'Customer1', + email: 'user-mail-delivery-failed-customer1@example.com', + password: 'agentpw', + active: true, + roles: roles, + ) + + end + + test 'check reset of mail_delivery_failed' do + + @customer1.preferences[:mail_delivery_failed] = true + @customer1.preferences[:mail_delivery_failed_data] = Time.zone.now + @customer1.save! + @customer1.reload + + assert_equal(@customer1.preferences[:mail_delivery_failed], true) + assert(@customer1.preferences[:mail_delivery_failed_data]) + + @customer1.email = 'new-user-mail-delivery-failed-customer1@example.com' + @customer1.save! + @customer1.reload + + assert_not(@customer1.preferences[:mail_delivery_failed], true) + assert(@customer1.preferences[:mail_delivery_failed_data]) + + end + +end diff --git a/test/unit/user_ref_object_touch_test.rb b/test/unit/user_ref_object_touch_test.rb index 3060cb474..c30f284b2 100644 --- a/test/unit/user_ref_object_touch_test.rb +++ b/test/unit/user_ref_object_touch_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class UserRefObjectTouchTest < ActiveSupport::TestCase diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb index e04984cf8..a6842b556 100644 --- a/test/unit/user_test.rb +++ b/test/unit/user_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class UserTest < ActiveSupport::TestCase @@ -264,9 +264,7 @@ class UserTest < ActiveSupport::TestCase # check if user exists user = User.find_by(login: test[:create][:login]) - if user - user.destroy! - end + user&.destroy! user = User.create!(test[:create]) @@ -320,7 +318,7 @@ class UserTest < ActiveSupport::TestCase email: " #{email} ", password: 'customerpw', active: true, - roles: Role.where(name: %w(Customer)), + roles: Role.where(name: %w[Customer]), updated_by_id: 1, created_by_id: 1, ) @@ -336,7 +334,7 @@ class UserTest < ActiveSupport::TestCase email: "\u{00a0}#{email}\u{00a0}", password: 'customerpw', active: true, - roles: Role.where(name: %w(Customer)), + roles: Role.where(name: %w[Customer]), updated_by_id: 1, created_by_id: 1, ) @@ -354,7 +352,7 @@ class UserTest < ActiveSupport::TestCase email: "\u{200B}#{email}\u{200B}", password: 'customerpw', active: true, - roles: Role.where(name: %w(Customer)), + roles: Role.where(name: %w[Customer]), updated_by_id: 1, created_by_id: 1, ) @@ -372,7 +370,7 @@ class UserTest < ActiveSupport::TestCase email: "\u{200B}#{email}\u{200B}", password: 'customerpw', active: true, - roles: Role.where(name: %w(Customer)), + roles: Role.where(name: %w[Customer]), updated_by_id: 1, created_by_id: 1, ) @@ -390,7 +388,7 @@ class UserTest < ActiveSupport::TestCase email: "\u{200B}#{email}\u{200B}\u{2007}\u{2008}", password: 'customerpw', active: true, - roles: Role.where(name: %w(Customer)), + roles: Role.where(name: %w[Customer]), updated_by_id: 1, created_by_id: 1, ) @@ -413,7 +411,7 @@ class UserTest < ActiveSupport::TestCase #email: "", password: 'adminpw', active: true, - roles: Role.where(name: %w(Admin Agent)), + roles: Role.where(name: %w[Admin Agent]), updated_by_id: 1, created_by_id: 1, ) @@ -451,7 +449,7 @@ class UserTest < ActiveSupport::TestCase #email: "", password: 'adminpw', active: true, - roles: Role.where(name: %w(Admin Agent)), + roles: Role.where(name: %w[Admin Agent]), updated_by_id: 1, created_by_id: 1, ) @@ -487,7 +485,7 @@ class UserTest < ActiveSupport::TestCase email: email1, password: 'adminpw', active: true, - roles: Role.where(name: %w(Admin Agent)), + roles: Role.where(name: %w[Admin Agent]), updated_by_id: 1, created_by_id: 1, ) @@ -503,7 +501,7 @@ class UserTest < ActiveSupport::TestCase email: email1, password: 'adminpw', active: true, - roles: Role.where(name: %w(Admin Agent)), + roles: Role.where(name: %w[Admin Agent]), updated_by_id: 1, created_by_id: 1, ) @@ -516,7 +514,7 @@ class UserTest < ActiveSupport::TestCase email: email2, password: 'adminpw', active: true, - roles: Role.where(name: %w(Admin Agent)), + roles: Role.where(name: %w[Admin Agent]), updated_by_id: 1, created_by_id: 1, ) @@ -545,7 +543,7 @@ class UserTest < ActiveSupport::TestCase email: email1, password: 'adminpw', active: true, - roles: Role.where(name: %w(Admin Agent)), + roles: Role.where(name: %w[Admin Agent]), updated_by_id: 1, created_by_id: 1, ) @@ -560,7 +558,7 @@ class UserTest < ActiveSupport::TestCase email: email1, password: 'adminpw', active: true, - roles: Role.where(name: %w(Admin Agent)), + roles: Role.where(name: %w[Admin Agent]), updated_by_id: 1, created_by_id: 1, ) @@ -580,7 +578,7 @@ class UserTest < ActiveSupport::TestCase email: "admin-role#{name}@example.com", password: 'adminpw', active: true, - roles: Role.where(name: %w(Admin Agent)), + roles: Role.where(name: %w[Admin Agent]), updated_by_id: 1, created_by_id: 1, ) @@ -654,12 +652,12 @@ class UserTest < ActiveSupport::TestCase ) assert_raises(RuntimeError) do - customer3.roles = Role.where(name: %w(Customer Admin)) + customer3.roles = Role.where(name: %w[Customer Admin]) end assert_raises(RuntimeError) do - customer3.roles = Role.where(name: %w(Customer Agent)) + customer3.roles = Role.where(name: %w[Customer Agent]) end - customer3.roles = Role.where(name: %w(Admin Agent)) + customer3.roles = Role.where(name: %w[Admin Agent]) customer3.roles.each do |role| assert_not_equal(role.name, 'Customer') end @@ -760,7 +758,7 @@ class UserTest < ActiveSupport::TestCase name: 'Test3', note: 'People who create Tickets ask for help.', preferences: { - not: %w(Test1 Test2), + not: %w[Test1 Test2], }, updated_by_id: 1, created_by_id: 1 @@ -872,7 +870,7 @@ class UserTest < ActiveSupport::TestCase email: "admin-role#{name}@example.com", password: 'adminpw', active: true, - roles: Role.where(name: %w(Admin Agent)), + roles: Role.where(name: %w[Admin Agent]), updated_by_id: 1, created_by_id: 1, ) @@ -901,7 +899,7 @@ class UserTest < ActiveSupport::TestCase created_by_id: 1, ) users = User.with_permissions('not_existing') - assert(users.empty?) + assert(users.blank?) users = User.with_permissions('admin') assert_equal(admin_count + 1, users.count) @@ -949,7 +947,7 @@ class UserTest < ActiveSupport::TestCase email: "admin-role#{random}@example.com", password: 'adminpw', active: true, - roles: Role.where(name: %w(Admin Agent)), + roles: Role.where(name: %w[Admin Agent]), updated_by_id: 1, created_by_id: 1, ) @@ -962,7 +960,7 @@ class UserTest < ActiveSupport::TestCase email: "admin-role#{random}@example.com", password: 'adminpw', active: true, - roles: Role.where(name: %w(Admin Agent)), + roles: Role.where(name: %w[Admin Agent]), updated_by_id: 1, created_by_id: 1, ) @@ -975,7 +973,7 @@ class UserTest < ActiveSupport::TestCase email: "admin-role#{random}@example.com", password: 'adminpw', active: true, - roles: Role.where(name: %w(Admin Agent)), + roles: Role.where(name: %w[Admin Agent]), updated_by_id: 1, created_by_id: 1, ) @@ -983,18 +981,18 @@ class UserTest < ActiveSupport::TestCase admin_count_inital = User.with_permissions('admin').count assert_equal(3, admin_count_inital) - admin1.update!(roles: Role.where(name: %w(Agent))) + admin1.update!(roles: Role.where(name: %w[Agent])) admin_count_inital = User.with_permissions('admin').count assert_equal(2, admin_count_inital) - admin2.update!(roles: Role.where(name: %w(Agent))) + admin2.update!(roles: Role.where(name: %w[Agent])) admin_count_inital = User.with_permissions('admin').count assert_equal(1, admin_count_inital) assert_raises(Exceptions::UnprocessableEntity) do - admin3.update!(roles: Role.where(name: %w(Agent))) + admin3.update!(roles: Role.where(name: %w[Agent])) end admin_count_inital = User.with_permissions('admin').count diff --git a/test/unit/user_validate_agent_limit_test.rb b/test/unit/user_validate_agent_limit_test.rb index 2fbfa936c..34dd758a4 100644 --- a/test/unit/user_validate_agent_limit_test.rb +++ b/test/unit/user_validate_agent_limit_test.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 + require 'test_helper' class UserValidateAgentLimit < ActiveSupport::TestCase