merge commerical updates

.codeclimate.yml

@@ -2,5 +2,19 @@ version: "2"
 plugins:
   rubocop:
     enabled: true
-    channel: rubocop-1-48-1
-
+    channel: rubocop-1-56-3
+exclude_patterns:
+- "bin/"
+- "config/"
+- "db/"
+- "dist/"
+- "features/"
+- "**/node_modules/"
+- "script/"
+- "**/spec/"
+- "**/test/"
+- "**/tests/"
+- "Tests/"
+- "**/vendor/"
+- "**/*_test.go"
+- "**/*.d.ts"

.haml-lint_todo.yml

@@ -46,11 +46,13 @@ linters:
       - "app/views/admin/events/index.html.haml"
       - "app/views/admin/tracks/index.html.haml"
       - "app/views/admin/tracks/show.html.haml"
+      - "app/views/admin/registrations/index.html.haml"
       - "app/views/admin/versions/_object_desc_and_link.html.haml"
       - "app/views/conference_registrations/show.html.haml"
       - "app/views/layouts/_admin_sidebar.html.haml"
       - "app/views/proposals/index.html.haml"
       - "app/views/proposals/show.html.haml"
+      - "app/views/proposals/_form.html.haml"
 
   # Offense count: 28
   IdNames:

.rubocop.yml

@@ -3,6 +3,7 @@ require:
   - rubocop-rails
   - rubocop-capybara
   - rubocop-performance
+  - rubocop-factory_bot
 
 inherit_from: .rubocop_todo.yml
 

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-02-13 04:01:02 UTC using RuboCop version 1.60.2.
+# on 2024-03-12 05:45:42 UTC using RuboCop version 1.61.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -14,19 +14,66 @@ Bundler/OrderedGems:
   Exclude:
     - 'Gemfile'
 
-# Offense count: 1
+# Offense count: 180
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: link_or_button, strict
+Capybara/ClickLinkOrButtonStyle:
+  Enabled: false
+
+# Offense count: 77
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: have_no, not_to
 Capybara/NegationMatcher:
   Exclude:
-    - 'spec/features/versions_spec.rb'
+    - 'spec/features/cfp_ability_spec.rb'
+    - 'spec/features/code_of_conduct_spec.rb'
+    - 'spec/features/info_desk_ability_spec.rb'
+    - 'spec/features/organizer_ability_spec.rb'
+    - 'spec/features/proposals_spec.rb'
+    - 'spec/features/splashpage_spec.rb'
+    - 'spec/features/sponsor_spec.rb'
+    - 'spec/features/track_organizer_ability_spec.rb'
+
+# Offense count: 10
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: DefaultSelector.
+Capybara/RSpec/HaveSelector:
+  Exclude:
+    - 'spec/features/cfp_ability_spec.rb'
+    - 'spec/features/info_desk_ability_spec.rb'
+    - 'spec/features/organization_admin_ability_spec.rb'
+    - 'spec/features/organizer_ability_spec.rb'
+    - 'spec/features/proposals_spec.rb'
+    - 'spec/features/sponsor_spec.rb'
+    - 'spec/features/track_organizer_ability_spec.rb'
+    - 'spec/features/voting_spec.rb'
 
-# Offense count: 98
+# Offense count: 101
 # This cop supports safe autocorrection (--autocorrect).
 Capybara/SpecificFinders:
   Enabled: false
 
+# Offense count: 8
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle, NonImplicitAssociationMethodNames.
+# SupportedStyles: explicit, implicit
+FactoryBot/AssociationStyle:
+  Exclude:
+    - 'spec/factories/comments.rb'
+    - 'spec/factories/commercials.rb'
+    - 'spec/factories/conferences.rb'
+    - 'spec/factories/surveys.rb'
+    - 'spec/factories/tracks.rb'
+
+# Offense count: 4
+# Configuration parameters: Include.
+# Include: **/*_spec.rb, **/spec/**/*, **/test/**/*, **/features/support/factories/**/*.rb
+FactoryBot/FactoryAssociationWithStrategy:
+  Exclude:
+    - 'spec/factories/booths.rb'
+    - 'spec/factories/users.rb'
+
 # Offense count: 13
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowedMethods, AllowedPatterns.
@@ -40,7 +87,7 @@ Lint/AmbiguousBlockAssociation:
     - 'spec/controllers/schedules_controller_spec.rb'
     - 'spec/models/user_spec.rb'
 
-# Offense count: 5
+# Offense count: 3
 # Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
 Lint/DuplicateBranch:
   Exclude:
@@ -53,38 +100,38 @@ Lint/IneffectiveAccessModifier:
     - 'app/models/commercial.rb'
     - 'app/models/conference.rb'
 
-# Offense count: 111
+# Offense count: 110
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 72
 
-# Offense count: 19
+# Offense count: 14
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 227
+  Max: 99
 
 # Offense count: 13
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
   Max: 270
 
-# Offense count: 26
+# Offense count: 28
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 15
 
-# Offense count: 127
+# Offense count: 126
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 55
 
 # Offense count: 4
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
-  Max: 168
+  Max: 158
 
-# Offense count: 25
+# Offense count: 27
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
   Max: 17
@@ -191,7 +238,7 @@ RSpec/Capybara/FeatureMethods:
     - 'spec/features/user_spec.rb'
     - 'spec/features/voting_spec.rb'
 
-# Offense count: 338
+# Offense count: 339
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
@@ -204,7 +251,7 @@ RSpec/ContextWording:
 RSpec/DescribedClass:
   Enabled: false
 
-# Offense count: 248
+# Offense count: 251
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 222
@@ -259,7 +306,7 @@ RSpec/IdenticalEqualityAssertion:
     - 'spec/controllers/admin/conferences_controller_spec.rb'
 
 # Offense count: 53
-# Configuration parameters: Max.
+# Configuration parameters: Max, AllowedIdentifiers, AllowedPatterns.
 RSpec/IndexedLet:
   Exclude:
     - 'spec/controllers/admin/reports_controller_spec.rb'
@@ -319,11 +366,11 @@ RSpec/MultipleDescribes:
   Exclude:
     - 'spec/models/conference_spec.rb'
 
-# Offense count: 298
+# Offense count: 300
 RSpec/MultipleExpectations:
   Max: 97
 
-# Offense count: 272
+# Offense count: 274
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
   Max: 32
@@ -396,6 +443,12 @@ RSpec/Rails/InferredSpecType:
     - 'spec/helpers/users_helper_spec.rb'
     - 'spec/routing/routing_spec.rb'
 
+# Offense count: 12
+# This cop supports safe autocorrection (--autocorrect).
+RSpec/ReceiveMessages:
+  Exclude:
+    - 'spec/models/track_spec.rb'
+
 # Offense count: 4
 RSpec/RepeatedDescription:
   Exclude:
@@ -466,12 +519,12 @@ Style/CaseLikeIf:
   Exclude:
     - 'app/views/admin/events/events.xlsx.axlsx'
 
-# Offense count: 103
+# Offense count: 107
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
   Enabled: false
 
-# Offense count: 40
+# Offense count: 43
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
@@ -510,7 +563,7 @@ Style/IdenticalConditionalBranches:
     - 'app/controllers/admin/booths_controller.rb'
     - 'app/controllers/admin/events_controller.rb'
 
-# Offense count: 32
+# Offense count: 34
 # This cop supports safe autocorrection (--autocorrect).
 Style/IfUnlessModifier:
   Enabled: false
@@ -587,7 +640,7 @@ Style/OptionalBooleanParameter:
     - 'app/models/event.rb'
 
 # Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
+# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedCompactTypes.
 # SupportedStyles: compact, exploded
 Style/RaiseArgs:
@@ -640,7 +693,7 @@ Style/WordArray:
   EnforcedStyle: percent
   MinSize: 5
 
-# Offense count: 260
+# Offense count: 269
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https

Gemfile

@@ -8,9 +8,6 @@ source 'https://rubygems.org'
 
 ruby ENV.fetch('OSEM_RUBY_VERSION', '3.2.2')
 
-# rails-assets requires >= 1.8.4
-abort 'Bundler version >= 1.8.4 is required' if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.8.4')
-
 # as web framework
 if next?
   gem 'rails', '~> 7'
@@ -89,40 +86,11 @@ gem 'cocoon'
 # as the JavaScript library
 # TODO: Consolidate with the rails-assets below or move to webpack...
 gem 'jquery-rails'
-gem 'jquery-ui-rails', '~> 6.0.1'
+gem 'jquery-ui-rails', '~> 7.0.0'
 
 # for languages validation
 gem 'iso-639'
 
-# frontend javascripts
-source 'https://rails-assets.org' do
-  # transient dependencies, included here to reduce warnings.
-  gem 'rails-assets-bootstrap'
-  gem 'rails-assets-jquery'
-  # for placeholder images
-  gem 'rails-assets-holderjs'
-  # for formating dates
-  gem 'rails-assets-date.format'
-  # for or parsing, validating, manipulating, and formatting dates
-  gem 'rails-assets-momentjs'
-  # for smooth scrolling
-  gem 'rails-assets-jquery-smooth-scroll'
-  # as color picker
-  gem 'rails-assets-spectrum'
-  # for color manipulation
-  gem 'rails-assets-tinycolor'
-  # for drawing triangle backgrounds
-  gem 'rails-assets-trianglify'
-  # for scroll way points
-  gem 'rails-assets-waypoints'
-  # for markdown editors
-  gem 'rails-assets-bootstrap-markdown'
-  # for select with icon
-  gem 'rails-assets-bootstrap-select'
-  gem 'rails-assets-markdown'
-  gem 'rails-assets-to-markdown', '~> 3'
-end
-
 # as date picker
 gem 'bootstrap3-datetimepicker-rails', '~> 4.17.47'