From c268045d543dc6a5de8b2e7a96c9df8cee7779ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=BCseyin=20Tekinaslan?= Date: Tue, 27 Aug 2019 18:40:40 +0300 Subject: [PATCH 1/5] Manually add the up to date sassc gem to Gemfile --- Gemfile | 4 ++++ Gemfile.lock | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 2b1cf95c4..80c1562d4 100644 --- a/Gemfile +++ b/Gemfile @@ -39,7 +39,11 @@ gem 'net-ldap' # assets: core asset dependencies # TODO: Edge versions require coffee-rails https://github.com/rails/rails/issues/28965 gem 'coffee-rails', '~> 5.0' + +# TODO: This line should be removed when sassc-rails has the latest version of sassc. +gem 'sassc', '~> 2.2.0' gem 'sassc-rails' + gem 'uglifier', '>= 1.3.0' gem 'webpacker' diff --git a/Gemfile.lock b/Gemfile.lock index 41fdaa440..5b2d1fcb1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -321,7 +321,7 @@ GEM ruby_dep (1.5.0) rubyzip (1.2.3) safe_yaml (1.0.5) - sassc (2.1.0) + sassc (2.2.0) ffi (~> 1.9) sassc-rails (2.1.2) railties (>= 4.0.0) @@ -462,6 +462,7 @@ DEPENDENCIES rubocop-rails ruby-progressbar ruby-vips (~> 2.0.14) + sassc (~> 2.2.0) sassc-rails sidekiq simple_form From 6bb446f482fb471e97e357404b058cc0817870ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=BCseyin=20Tekinaslan?= Date: Tue, 27 Aug 2019 18:41:08 +0300 Subject: [PATCH 2/5] Fix bug in academic_staff task --- lib/tasks/fetch/academic_staff.rake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/tasks/fetch/academic_staff.rake b/lib/tasks/fetch/academic_staff.rake index 0ea6f0a79..6bb9934f1 100644 --- a/lib/tasks/fetch/academic_staff.rake +++ b/lib/tasks/fetch/academic_staff.rake @@ -51,10 +51,10 @@ namespace :fetch do password_confirmation: password ) - next unless user.save - progress_bar&.increment + next unless user.save + title = Title.find_by(name: staff[:title].capitalize_turkish) unit = Unit.find_by(yoksis_id: staff[:unit_id]) From f99f5c5fc2019fff37bdd130d004c165d063b3a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=BCseyin=20Tekinaslan?= Date: Tue, 27 Aug 2019 18:43:05 +0300 Subject: [PATCH 3/5] Fix rubocop offenses --- plugins/support/lib/nokul/support/codification/codes.rb | 1 - plugins/support/lib/nokul/support/collection.rb | 4 ++-- .../support/lib/nokul/support/minitest/validation_helper.rb | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/support/lib/nokul/support/codification/codes.rb b/plugins/support/lib/nokul/support/codification/codes.rb index 39ae51e0e..d3be95d29 100644 --- a/plugins/support/lib/nokul/support/codification/codes.rb +++ b/plugins/support/lib/nokul/support/codification/codes.rb @@ -21,7 +21,6 @@ module Codification codifications.each do |codification| name = codification.to_s.demodulize.underscore - plural_method = name.pluralize singular_method = name.singularize diff --git a/plugins/support/lib/nokul/support/collection.rb b/plugins/support/lib/nokul/support/collection.rb index ba69fa4f7..723b527df 100644 --- a/plugins/support/lib/nokul/support/collection.rb +++ b/plugins/support/lib/nokul/support/collection.rb @@ -55,8 +55,8 @@ def self.to_yaml_pretty(instance) def self.write_to_yaml_file(file, instance, **options) comment = options[:comment] - yaml = comment ? comment.gsub(/^/m, '# ') : '' - yaml += to_yaml_pretty(instance) + yaml = comment ? comment.gsub(/^/m, '# ') : '' + yaml += to_yaml_pretty(instance) Support.with_status_and_notification(file, **options) { File.write file, yaml } end diff --git a/plugins/support/lib/nokul/support/minitest/validation_helper.rb b/plugins/support/lib/nokul/support/minitest/validation_helper.rb index a67e74422..67bbaed4c 100644 --- a/plugins/support/lib/nokul/support/minitest/validation_helper.rb +++ b/plugins/support/lib/nokul/support/minitest/validation_helper.rb @@ -45,6 +45,7 @@ def validates_length_of(attribute, **option) minimum: { value: -1, error_key: :too_short }, maximum: { value: 1, error_key: :too_long } } + key = option.keys.first value = option[key].to_i + controls.dig(key, :value).to_i error_key = controls.dig(key, :error_key) From 7a40646387f83d60035fec8a47cd429046691be9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=BCseyin=20Tekinaslan?= Date: Tue, 27 Aug 2019 18:43:20 +0300 Subject: [PATCH 4/5] Update Xokul token for omu tenant --- plugins/tenant/omu/test/dummy/config/credentials.yml.enc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/tenant/omu/test/dummy/config/credentials.yml.enc b/plugins/tenant/omu/test/dummy/config/credentials.yml.enc index 1c9fd4e5b..bb4ad57b9 100644 --- a/plugins/tenant/omu/test/dummy/config/credentials.yml.enc +++ b/plugins/tenant/omu/test/dummy/config/credentials.yml.enc @@ -1 +1 @@ -F9GaVOZYaO29atDYJhVRd7uXR6E91a9OsvFZPVDZpEr0CDe113C6AyK5Q2r7ND/bKW7+2U7vXgA6/RT5Wx2OutuzCG+ag24x4yVmW5CNswY+IOccS13Wn21Rl3M5hctVDLkGTg4uqxCe9D16fMXjgzte8n03qv+I8YHItjHNkPVWQMZAsvdeYQ4GkzwwlJeUz2f2rdILzTYgiFAD3fOmhdkMN9YaVk1mygftFiKlii1hX8sixgOLmWp9jLrEZW11hzbbCt0YXrrH5krzW2f212jyX/7wUyAHKlCg3whjtcIJADh7NfoBKUFSBPk9oTOIUZqk6FDTPvEP/hpZjzinKbDuzLWrKLnTYscBAMpqYdxAmRWtnNZwJXCCBuowreo/bbjmzO5zJ8kEv0HBCjjcEsZVw4N9JUzHgc8MW+4RBzwzOpLz5UQRYVk/MulaOTZCmSGROEjRF/MSiW+hrexbMWMoPyeGnUfQ31MO2XBxgBSO3dS4QoV9QWEj1HWiFxGNnVWrZkY2j/asRCW/tA3gS48z/WO4wwc7McbZICK+MmUbuK1Gm7feWBJsIPKUNizrkbcqIPqhhMBPqTOcOpoZqFyyEaZsjTbQzyBZabVrREVO+hdJBK4vNMNfyk0bWlKtl6+8iDaCNb5QyPIEThLxeG2GTKL0jRJsaTV7AKhqm4493pw7ct3RM1LjC6EZk1oYG5rFS826rzvSSqRhX0ajk96Hjp+mZFYo1ZPq0HuyFhXPawcYJ1sieFnZwYMWuy03yeekjdHfj1wWA/1NVV9tJqrjRNEoTx875VkdUxf8GjDSk5BTZM9b7rKHVJ84UFYgeejfZcYyn1H29nHnnPHkoOd3gVmjncDUvJ5IPtMHhv7kvLbnrMqltnTQ0oQbvgk9O6uwWo+mOqe3ceZO87/mbf/KP/7pZDih2R6KpS1b44GHHIzIYK6DKP9ynQsIKdrLSYLQfznbjuGCyY+SMPN/eibp8hZFNK95KmhXltnrKKIVwLX5tC0UPvkoWW9udBLazwLNQBE8pXdK+11/O3Ol7jyf4QTX9BcuN5QVXhq7OPL7NGCOz2b+gkQGVpIJAlE=--WP1KJ6CvuIZ5szdy--L8NsdpbQnQWBUCE4f5DRCQ== \ No newline at end of file +rOEbk4oF+8RYUuXco0RMCJLLIz01OXOk7R07Z8icTy93ayLAjT6gAOJIPStcnIyoeAxgcfjkCc7npcf25CTR//AnKkTb0xuiFn0drI/vPOz/4yB2gHL/fElDvWJnSrr65+RhMe0QJFnwuE/sD9E0zNzoxs5wHGa+2kueDOy0PHlFh4CatbUiCr2XNn/tZFjqimk62Ko9F4wdjB+On6Adm4aZ9PAtEUsp04273Ft29GxOMH0osSmRkwk50rOUe2k934iahjJ4ea8R5cEjks5SFBEnf747d+jH4rFDfgTLA2DFo9ia2Dwul1FZqq4nw6O2crftknnAEqVQQKarQuYxvvivMCuRscMirROb2AIWU2ONaMt3UJ68IVVPQMYiOeIrAxuilLgKdgqcomB4hwJQqfKtowAIhcqua3MUSaRJipp7tfy8MZwW2WWDCIFiBmGyfyZhgpxLjl3f+Ava+60dR/ONpMJ6QJBJtxZULyFMgyI2xQZB8+hbcwGKuii0OQ9BbIzVRkLXIGF9m2Napmncv2clSjFD5UI9m0bl5QImYrWxgnQfExC8Vpy9Y3CWdeqiBQPhpQmpMEVSTklEcuvl0NVxzRoPm3S6k5CLOhNL4QL7i7kXVAG2WL8PNyjHrhL+pdMlxFeWgVNaBS2NBqvpceYhTya9lkxebYyT/q8KQaQPr9/1b5fUr3Eli9wVoewvCchTNyBsqYZhFwJ31vceDOQD5wU5AqkrE+aCv1Bc3v4OD40zsevzdM5grpQ0V7pWFJvLLHcdWspiQJIvLkmgI5j1H4v1BPVjS2OaFfm6CmLPs1Cf/m01mKX2nZi9wyJg75pvgDaM5ltr8s2jst0dBS/JK+7Odz6j+rDZa+9Fx5RETMzhK/XfPJyKTO9NRrtCSi4Zqcr0t0ApWnbqbQEm/8ooy4PBH44MKRfiZ662uuB2W6dpUxnE/EzgnKHFYcMJlNTTwYYHQ1ZoXchRzcDx34PUoLwqsxQ0mJgVuQo3QL2/lq4viyiVDkWd0ImWQ+Gp6Pmofsdfg0gxgcRq4Jbzp3BPrwP6as0OycsVRJP7cSfaXWjVPVYGzYGuj/SEHPI=--RdtbSSOgzTQu0+CR--xXYJPEYW+1Xhqdr2IdZtyA== \ No newline at end of file From bf0ea292210844f9fa1731727a84c3a171ce3880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=BCseyin=20Tekinaslan?= Date: Tue, 27 Aug 2019 19:05:16 +0300 Subject: [PATCH 5/5] Remove deprecated config from test environment --- Gemfile | 2 +- config/environments/test.rb | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 80c1562d4..3c7731e74 100644 --- a/Gemfile +++ b/Gemfile @@ -40,7 +40,7 @@ gem 'net-ldap' # TODO: Edge versions require coffee-rails https://github.com/rails/rails/issues/28965 gem 'coffee-rails', '~> 5.0' -# TODO: This line should be removed when sassc-rails has the latest version of sassc. +# TODO: The following line should be removed when sassc-rails has the latest version of sassc. gem 'sassc', '~> 2.2.0' gem 'sassc-rails' diff --git a/config/environments/test.rb b/config/environments/test.rb index 339cb7597..ed36c8e27 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -49,7 +49,4 @@ # Raises error for missing translations config.action_view.raise_on_missing_translations = true - - # Prevent expensive template finalization at end of test suite runs. - config.action_view.finalize_compiled_template_methods = false end