From 5ff570b7e1417c7f9744d4637aecdd213f08caf3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Apr 2021 05:05:34 +0000
Subject: [PATCH 1/2] Bump jquery-ui-rails from 5.0.5 to 6.0.1

Bumps [jquery-ui-rails](https://github.com/joliss/jquery-ui-rails) from 5.0.5 to 6.0.1.
- [Release notes](https://github.com/joliss/jquery-ui-rails/releases)
- [Changelog](https://github.com/jquery-ui-rails/jquery-ui-rails/blob/master/History.md)
- [Commits](https://github.com/joliss/jquery-ui-rails/compare/v5.0.5...v6.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 565a14126..ffacb5796 100644
--- a/Gemfile
+++ b/Gemfile
@@ -69,7 +69,7 @@ gem 'daemons-rails', '1.2.1'
 gem 'que-web'
 gem 'sidekiq'
 gem 'pdfkit'
-gem 'jquery-ui-rails', '5.0.5'
+gem 'jquery-ui-rails', '6.0.1'
 gem 'airbrake'
 
 gem 'company_register', github: 'internetee/company_register',
diff --git a/Gemfile.lock b/Gemfile.lock
index b1f02ee25..9c5bbc67f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -254,7 +254,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (5.0.5)
+    jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
     json (2.5.1)
     json-jwt (1.13.0)
@@ -275,7 +275,7 @@ GEM
     kaminari-core (1.2.1)
     libxml-ruby (3.2.1)
     logger (1.4.3)
-    loofah (2.9.0)
+    loofah (2.9.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -535,7 +535,7 @@ DEPENDENCIES
   isikukood
   iso8601 (= 0.12.1)
   jquery-rails
-  jquery-ui-rails (= 5.0.5)
+  jquery-ui-rails (= 6.0.1)
   kaminari
   lhv!
   mime-types-data

From 67f6e2ca84be7659a284b4f9eb9a64f57ddaa821 Mon Sep 17 00:00:00 2001
From: Alex Sherman <yul.golem@gmail.com>
Date: Mon, 19 Apr 2021 13:34:00 +0500
Subject: [PATCH 2/2] Fix jquery datapicker requirement

---
 app/assets/javascripts/admin-manifest.coffee      | 2 +-
 app/assets/javascripts/registrant-manifest.coffee | 2 +-
 app/assets/javascripts/registrar-manifest.coffee  | 2 +-
 test/models/csync_record_test.rb                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/admin-manifest.coffee b/app/assets/javascripts/admin-manifest.coffee
index 883070a7a..5c645f8ea 100644
--- a/app/assets/javascripts/admin-manifest.coffee
+++ b/app/assets/javascripts/admin-manifest.coffee
@@ -5,7 +5,7 @@
 #= require admin/autocomplete
 #= require jquery.nested_attributes
 #= require selectize
-#= require jquery-ui/datepicker
+#= require jquery-ui/widgets/datepicker
 #= require select2
 #= require jquery.doubleScroll
 
diff --git a/app/assets/javascripts/registrant-manifest.coffee b/app/assets/javascripts/registrant-manifest.coffee
index febc82e2b..5eb135c24 100644
--- a/app/assets/javascripts/registrant-manifest.coffee
+++ b/app/assets/javascripts/registrant-manifest.coffee
@@ -1,7 +1,7 @@
 #= require jquery
 #= require jquery_ujs
 #= require bootstrap-sprockets
-#= require jquery-ui/datepicker
+#= require jquery-ui/widgets/datepicker
 #= require select2
 #= require datepicker
 
diff --git a/app/assets/javascripts/registrar-manifest.coffee b/app/assets/javascripts/registrar-manifest.coffee
index fd0ec3ca0..17d4ab4de 100644
--- a/app/assets/javascripts/registrar-manifest.coffee
+++ b/app/assets/javascripts/registrar-manifest.coffee
@@ -3,7 +3,7 @@
 #= require bootstrap-sprockets
 #= require typeahead.bundle.min
 #= require jquery.nested_attributes
-#= require jquery-ui/datepicker
+#= require jquery-ui/widgets/datepicker
 #= require select2
 #= require datepicker
 
diff --git a/test/models/csync_record_test.rb b/test/models/csync_record_test.rb
index 9c044e63d..fd23606ce 100644
--- a/test/models/csync_record_test.rb
+++ b/test/models/csync_record_test.rb
@@ -188,7 +188,7 @@ class CsyncRecordTest < ActiveSupport::TestCase
     assert @domain.dnskeys.empty?
 
     mail = ActionMailer::Base.deliveries.last
-    assert_equal (@domain.contacts.map(&:email) << @domain.registrant.email).uniq, mail.to
+    assert_equal (@domain.contacts.map(&:email) << @domain.registrant.email).uniq.sort, mail.to.sort
     assert_equal mail.subject, "Teie domeeni #{@domain.name} DNSSEC andmed on eemaldatud / DNSSEC data for #{@domain.name} has been removed"
   end