diff --git a/.github/workflows/assets-precompile.yml b/.github/workflows/assets-precompile.yml index fbe439c8..d277fbc2 100644 --- a/.github/workflows/assets-precompile.yml +++ b/.github/workflows/assets-precompile.yml @@ -8,6 +8,7 @@ jobs: assets: env: RAILS_ENV: test + BUNDLE_WITHOUT: development name: Assets Precompile runs-on: ubuntu-latest diff --git a/.github/workflows/brakeman-analysis.yml b/.github/workflows/brakeman-analysis.yml index d842b0f1..b03f900c 100644 --- a/.github/workflows/brakeman-analysis.yml +++ b/.github/workflows/brakeman-analysis.yml @@ -11,6 +11,9 @@ jobs: name: Brakeman Scan runs-on: ubuntu-latest + env: + BUNDLE_WITHOUT: development + steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 1084ed10..929fb295 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -9,6 +9,8 @@ on: jobs: lint: runs-on: ubuntu-latest + env: + BUNDLE_WITHOUT: development steps: - uses: actions/checkout@v4 - name: Set up Ruby 3.2.2 diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index 0628ecd9..3c240b8a 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -29,6 +29,16 @@ jobs: --health-interval 10s --health-timeout 5s --health-retries 5 + redis: + image: redis + ports: + - 6379:6379 + + env: + BUNDLE_WITHOUT: development + RAILS_ENV: test + DATABASE_URL: "postgresql://postgres:postgres@localhost/IKT_test" + REDIS_URL: "redis://localhost:6379/0" steps: - uses: actions/checkout@v4 @@ -43,14 +53,9 @@ jobs: run: | bundle exec rails db:create bundle exec rails db:schema:load - env: - RAILS_ENV: test - DATABASE_URL: "postgresql://postgres:postgres@localhost/IKT_test" - name: Run RSpec tests (UI group) run: bundle exec rspec --tag ui env: - RAILS_ENV: test SMTP_FROM: test@ikt.capybara - DATABASE_URL: "postgresql://postgres:postgres@localhost/IKT_test" UI_TEST_ENGINE: ${{ matrix.ui_test_engine }} diff --git a/Gemfile b/Gemfile index bcd9ca78..d798687f 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,7 @@ gem 'jquery-rails' gem 'pg', '~> 1.5' gem 'puma', '~> 6.4' gem 'pundit' -gem 'rails', '~> 7.0.8' +gem 'rails', '~> 7.2.1' gem 'rails_admin', '~> 3.1' gem 'redis', '~> 4.8', require: %w[redis redis/connection/hiredis] gem 'redis-namespace' diff --git a/Gemfile.lock b/Gemfile.lock index f315d0c0..106fa89b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,75 +1,80 @@ GEM remote: https://rubygems.org/ specs: - actioncable (7.0.8.4) - actionpack (= 7.0.8.4) - activesupport (= 7.0.8.4) + actioncable (7.2.1) + actionpack (= 7.2.1) + activesupport (= 7.2.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8.4) - actionpack (= 7.0.8.4) - activejob (= 7.0.8.4) - activerecord (= 7.0.8.4) - activestorage (= 7.0.8.4) - activesupport (= 7.0.8.4) - mail (>= 2.7.1) - net-imap - net-pop - net-smtp - actionmailer (7.0.8.4) - actionpack (= 7.0.8.4) - actionview (= 7.0.8.4) - activejob (= 7.0.8.4) - activesupport (= 7.0.8.4) - mail (~> 2.5, >= 2.5.4) - net-imap - net-pop - net-smtp - rails-dom-testing (~> 2.0) - actionpack (7.0.8.4) - actionview (= 7.0.8.4) - activesupport (= 7.0.8.4) - rack (~> 2.0, >= 2.2.4) + zeitwerk (~> 2.6) + actionmailbox (7.2.1) + actionpack (= 7.2.1) + activejob (= 7.2.1) + activerecord (= 7.2.1) + activestorage (= 7.2.1) + activesupport (= 7.2.1) + mail (>= 2.8.0) + actionmailer (7.2.1) + actionpack (= 7.2.1) + actionview (= 7.2.1) + activejob (= 7.2.1) + activesupport (= 7.2.1) + mail (>= 2.8.0) + rails-dom-testing (~> 2.2) + actionpack (7.2.1) + actionview (= 7.2.1) + activesupport (= 7.2.1) + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4, < 3.2) + rack-session (>= 1.0.1) rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8.4) - actionpack (= 7.0.8.4) - activerecord (= 7.0.8.4) - activestorage (= 7.0.8.4) - activesupport (= 7.0.8.4) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + useragent (~> 0.16) + actiontext (7.2.1) + actionpack (= 7.2.1) + activerecord (= 7.2.1) + activestorage (= 7.2.1) + activesupport (= 7.2.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8.4) - activesupport (= 7.0.8.4) + actionview (7.2.1) + activesupport (= 7.2.1) builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.8.4) - activesupport (= 7.0.8.4) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activejob (7.2.1) + activesupport (= 7.2.1) globalid (>= 0.3.6) - activemodel (7.0.8.4) - activesupport (= 7.0.8.4) + activemodel (7.2.1) + activesupport (= 7.2.1) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (7.0.8.4) - activemodel (= 7.0.8.4) - activesupport (= 7.0.8.4) - activestorage (7.0.8.4) - actionpack (= 7.0.8.4) - activejob (= 7.0.8.4) - activerecord (= 7.0.8.4) - activesupport (= 7.0.8.4) + activerecord (7.2.1) + activemodel (= 7.2.1) + activesupport (= 7.2.1) + timeout (>= 0.4.0) + activestorage (7.2.1) + actionpack (= 7.2.1) + activejob (= 7.2.1) + activerecord (= 7.2.1) + activesupport (= 7.2.1) marcel (~> 1.0) - mini_mime (>= 1.1.0) - activesupport (7.0.8.4) - concurrent-ruby (~> 1.0, >= 1.0.2) + activesupport (7.2.1) + base64 + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - tzinfo (~> 2.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) airbrussh (1.5.0) @@ -78,12 +83,13 @@ GEM base64 (0.2.0) bcrypt (3.1.20) bcrypt_pbkdf (1.1.0) + bigdecimal (3.1.8) bootsnap (1.18.3) msgpack (~> 1.2) brakeman (6.1.2) racc builder (3.3.0) - bullet (7.1.6) + bullet (7.2.0) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) capistrano (3.18.0) @@ -116,7 +122,7 @@ GEM concurrent-ruby (1.3.4) connection_pool (2.4.1) crass (1.0.6) - database_cleaner-active_record (2.1.0) + database_cleaner-active_record (2.2.0) activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) @@ -133,6 +139,7 @@ GEM activesupport (>= 5.0) request_store (>= 1.0) ruby2_keywords + drb (2.2.1) ed25519 (1.3.0) erubi (1.13.0) execjs (2.9.1) @@ -151,6 +158,10 @@ GEM image_processing (1.12.2) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) + io-console (0.7.2) + irb (1.14.0) + rdoc (>= 4.0.0) + reline (>= 0.4.2) jbuilder (2.11.5) actionview (>= 5.0.0) activesupport (>= 5.0.0) @@ -180,6 +191,7 @@ GEM listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + logger (1.6.0) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) @@ -190,7 +202,6 @@ GEM net-smtp marcel (1.0.4) matrix (0.4.2) - method_source (1.1.0) mini_magick (4.12.0) mini_mime (1.1.5) mini_portile2 (2.8.7) @@ -209,7 +220,7 @@ GEM net-smtp (0.5.0) net-protocol net-ssh (7.2.0) - nio4r (2.7.0) + nio4r (2.7.3) nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) @@ -222,31 +233,38 @@ GEM ast (~> 2.4.1) racc pg (1.5.6) + psych (5.1.2) + stringio public_suffix (5.0.5) puma (6.4.2) nio4r (~> 2.0) pundit (2.3.1) activesupport (>= 3.0.0) racc (1.8.1) - rack (2.2.9) + rack (3.1.7) rack-mini-profiler (3.3.1) rack (>= 1.2.0) + rack-session (2.0.0) + rack (>= 3.0.0) rack-test (2.1.0) rack (>= 1.3) - rails (7.0.8.4) - actioncable (= 7.0.8.4) - actionmailbox (= 7.0.8.4) - actionmailer (= 7.0.8.4) - actionpack (= 7.0.8.4) - actiontext (= 7.0.8.4) - actionview (= 7.0.8.4) - activejob (= 7.0.8.4) - activemodel (= 7.0.8.4) - activerecord (= 7.0.8.4) - activestorage (= 7.0.8.4) - activesupport (= 7.0.8.4) + rackup (2.1.0) + rack (>= 3) + webrick (~> 1.8) + rails (7.2.1) + actioncable (= 7.2.1) + actionmailbox (= 7.2.1) + actionmailer (= 7.2.1) + actionpack (= 7.2.1) + actiontext (= 7.2.1) + actionview (= 7.2.1) + activejob (= 7.2.1) + activemodel (= 7.2.1) + activerecord (= 7.2.1) + activestorage (= 7.2.1) + activesupport (= 7.2.1) bundler (>= 1.15.0) - railties (= 7.0.8.4) + railties (= 7.2.1) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -260,22 +278,27 @@ GEM nested_form (~> 0.3) rails (>= 6.0, < 8) turbo-rails (~> 1.0) - railties (7.0.8.4) - actionpack (= 7.0.8.4) - activesupport (= 7.0.8.4) - method_source + railties (7.2.1) + actionpack (= 7.2.1) + activesupport (= 7.2.1) + irb (~> 1.13) + rackup (>= 1.0.0) rake (>= 12.2) - thor (~> 1.0) - zeitwerk (~> 2.5) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) rainbow (3.1.1) rake (13.2.1) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) + rdoc (6.7.0) + psych (>= 4.0.0) redis (4.8.1) redis-namespace (1.11.0) redis (>= 4) regexp_parser (2.9.2) + reline (0.5.9) + io-console (~> 0.5) request_store (1.5.1) rack (>= 1.4) rexml (3.3.6) @@ -340,6 +363,7 @@ GEM sprockets (> 3.0) sprockets-rails tilt + securerandom (0.3.1) selenium-webdriver (4.19.0) base64 (~> 0.2) rexml (~> 3.2, >= 3.2.5) @@ -356,6 +380,7 @@ GEM sshkit (1.21.5) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) + stringio (3.1.1) strscan (3.1.0) terser (1.2.3) execjs (>= 0.3.0, < 3) @@ -370,6 +395,8 @@ GEM concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) uniform_notifier (1.16.0) + useragent (0.16.10) + webrick (1.8.1) websocket (1.2.10) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) @@ -413,7 +440,7 @@ DEPENDENCIES puma (~> 6.4) pundit rack-mini-profiler (~> 3.3) - rails (~> 7.0.8) + rails (~> 7.2.1) rails_admin (~> 3.1) redis (~> 4.8) redis-namespace diff --git a/bin/brakeman b/bin/brakeman new file mode 100755 index 00000000..ace1c9ba --- /dev/null +++ b/bin/brakeman @@ -0,0 +1,7 @@ +#!/usr/bin/env ruby +require "rubygems" +require "bundler/setup" + +ARGV.unshift("--ensure-latest") + +load Gem.bin_path("brakeman", "brakeman") diff --git a/bin/rubocop b/bin/rubocop new file mode 100755 index 00000000..40330c0f --- /dev/null +++ b/bin/rubocop @@ -0,0 +1,8 @@ +#!/usr/bin/env ruby +require "rubygems" +require "bundler/setup" + +# explicit rubocop config increases performance slightly while avoiding config confusion. +ARGV.unshift("--config", File.expand_path("../.rubocop.yml", __dir__)) + +load Gem.bin_path("rubocop", "rubocop") diff --git a/bin/setup b/bin/setup index 57923026..bf843435 100755 --- a/bin/setup +++ b/bin/setup @@ -3,9 +3,10 @@ require "fileutils" # path to your application root. APP_ROOT = File.expand_path('..', __dir__) +APP_NAME = "ikt" def system!(*args) - system(*args) || abort("\n== Command #{args} failed ==") + system(*args, exception: true) end FileUtils.chdir APP_ROOT do @@ -30,4 +31,8 @@ FileUtils.chdir APP_ROOT do puts "\n== Restarting application server ==" system! 'bin/rails restart' + + # puts "\n== Configuring puma-dev ==" + # system "ln -nfs #{APP_ROOT} ~/.puma-dev/#{APP_NAME}" + # system "curl -Is https://#{APP_NAME}.test/up | head -n 1" end diff --git a/config/application.rb b/config/application.rb index 6b1dabc2..c0bfd742 100644 --- a/config/application.rb +++ b/config/application.rb @@ -22,7 +22,12 @@ module IKT class Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. - config.load_defaults 7.0 + config.load_defaults 7.2 + + # Please, add to the `ignore` list any other `lib` subdirectories that do + # not contain `.rb` files, or that should not be reloaded or eager loaded. + # Common ones are `templates`, `generators`, or `middleware`, for example. + config.autoload_lib ignore: %w[assets tasks capistrano redis] # Configuration for the application, engines, and railties goes here. # diff --git a/config/environments/development.rb b/config/environments/development.rb index f675ec43..2fbd17b2 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -6,7 +6,7 @@ # In the development environment your application's code is reloaded any time # it changes. This slows down response time but is perfect for development # since you don't have to restart the web server when you make code changes. - config.cache_classes = false + config.enable_reloading = true # Do not eager load code on boot. config.eager_load = false @@ -14,7 +14,7 @@ # Show full error reports. config.consider_all_requests_local = true - # Enable server timing + # Enable server timing. config.server_timing = true # Enable/disable caching. By default caching is disabled. @@ -24,9 +24,7 @@ config.action_controller.enable_fragment_cache_logging = true config.cache_store = :memory_store - config.public_file_server.headers = { - 'Cache-Control' => "public, max-age=#{2.days.to_i}", - } + config.public_file_server.headers = { 'Cache-Control' => "public, max-age=#{2.days.to_i}" } else config.action_controller.perform_caching = false @@ -39,6 +37,8 @@ # Don't care if the mailer can't send. config.action_mailer.raise_delivery_errors = false + # Disable caching for Action Mailer templates even if Action Controller + # caching is enabled. config.action_mailer.perform_caching = false # Print deprecation notices to the Rails logger. @@ -56,6 +56,9 @@ # Highlight code that triggered database queries in logs. config.active_record.verbose_query_logs = true + # Highlight code that enqueued background job in logs. + config.active_job.verbose_enqueue_logs = true + # Suppress logger output for asset requests. config.assets.quiet = true @@ -63,8 +66,14 @@ # config.i18n.raise_on_missing_translations = true # Annotate rendered view with file names. - # config.action_view.annotate_rendered_view_with_filenames = true + config.action_view.annotate_rendered_view_with_filenames = true # Uncomment if you wish to allow Action Cable access from any origin. # config.action_cable.disable_request_forgery_protection = true + + # Raise error when a before_action's only/except options reference missing actions. + # config.action_controller.raise_on_missing_callback_actions = true + + # Apply autocorrection by RuboCop to files generated by `bin/rails generate`. + config.generators.apply_rubocop_autocorrect_after_generate! end diff --git a/config/environments/production.rb b/config/environments/production.rb index 7aceefff..06b856c0 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -4,7 +4,7 @@ # Settings specified here will take precedence over those in config/application.rb. # Code is not reloaded between requests. - config.cache_classes = true + config.enable_reloading = false # Eager load code on boot. This eager loads most of Rails and # your application in memory, allowing both threaded web servers @@ -13,22 +13,23 @@ config.eager_load = true # Full error reports are disabled and caching is turned on. - config.consider_all_requests_local = false + config.consider_all_requests_local = false config.action_controller.perform_caching = true - # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] - # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # Ensures that a master key has been made available in ENV["RAILS_MASTER_KEY"], config/master.key, or an environment + # key such as config/credentials/production.key. This key is used to decrypt credentials (and other encrypted files). config.require_master_key = true - # Disable serving static files from the `/public` folder by default since - # Apache or NGINX already handles this. + # Disable serving static files from `public/`, relying on NGINX/Apache to do so instead. config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? # Compress CSS using a preprocessor. - # config.assets.css_compressor = :sass + config.assets.css_compressor = :sass + + # Compress JS using a preprocessor. config.assets.js_compressor = :terser - # Do not fallback to assets pipeline if a precompiled asset is missed. + # Do not fall back to assets pipeline if a precompiled asset is missed. config.assets.compile = false # Enable serving of images, stylesheets, and JavaScripts from an asset server. @@ -46,9 +47,16 @@ # config.action_cable.url = 'wss://example.com/cable' # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + # Assume all access to the app is happening through a SSL-terminating reverse proxy. + # Can be used together with config.force_ssl for Strict-Transport-Security and secure cookies. + # config.assume_ssl = true + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. # config.force_ssl = true + # Skip http-to-https redirect for the default health check endpoint. + # config.ssl_options = { redirect: { exclude: ->(request) { request.path == "/up" } } } + # Include generic and useful information about system operation, but avoid logging too much # information to avoid inadvertent exposure of personally identifiable information (PII). config.log_level = :debug @@ -60,9 +68,11 @@ # config.cache_store = :mem_cache_store # Use a real queuing backend for Active Job (and separate queues per environment). - # config.active_job.queue_adapter = :resque - # config.active_job.queue_name_prefix = "IKT_production" + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "ikt_production" + # Disable caching for Action Mailer templates even if Action Controller + # caching is enabled. config.action_mailer.perform_caching = false # Ignore bad email addresses and do not raise email delivery errors. @@ -73,49 +83,20 @@ # the I18n.default_locale when a translation cannot be found). config.i18n.fallbacks = true - # Send deprecation notices to registered listeners. - config.active_support.deprecation = :notify - - # Log disallowed deprecations. - config.active_support.disallowed_deprecation = :log - - # Tell Active Support which deprecation messages to disallow. - config.active_support.disallowed_deprecation_warnings = [] + # Don't log any deprecations. + config.active_support.report_deprecations = false # Use default logging formatter so that PID and timestamp are not suppressed. config.log_formatter = Logger::Formatter.new - # Use a different logger for distributed setups. - # require "syslog/logger" - # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') - - if ENV['RAILS_LOG_TO_STDOUT'].present? - logger = ActiveSupport::Logger.new $stdout - logger.formatter = config.log_formatter - config.logger = ActiveSupport::TaggedLogging.new logger - end - # Do not dump schema after migrations. config.active_record.dump_schema_after_migration = false - # Inserts middleware to perform automatic connection switching. - # The `database_selector` hash is used to pass options to the DatabaseSelector - # middleware. The `delay` is used to determine how long to wait after a write - # to send a subsequent read to the primary. - # - # The `database_resolver` class is used by the middleware to determine which - # database is appropriate to use based on the time delay. - # - # The `database_resolver_context` class is used by the middleware to set - # timestamps for the last write to the primary. The resolver uses the context - # class timestamps to determine how long to wait before reading from the - # replica. - # - # By default Rails will store a last write timestamp in the session. The - # DatabaseSelector middleware is designed as such you can define your own - # strategy for connection switching and pass that into the middleware through - # these configuration options. - # config.active_record.database_selector = { delay: 2.seconds } - # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver - # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session + # Enable DNS rebinding protection and other `Host` header attacks. + # config.hosts = [ + # "example.com", # Allow requests from example.com + # /.*\.example\.com/ # Allow requests from subdomains like `www.example.com` + # ] + # Skip DNS rebinding protection for the default health check endpoint. + # config.host_authorization = { exclude: ->(request) { request.path == "/up" } } end diff --git a/config/environments/test.rb b/config/environments/test.rb index eace8401..b8374fa6 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -8,27 +8,26 @@ Rails.application.configure do # Settings specified here will take precedence over those in config/application.rb. - config.cache_classes = false - config.action_view.cache_template_loading = true + # While tests run files are not watched, reloading is not necessary. + # Spring reloads, and therefore needs the application to have reloading enabled. + config.enable_reloading = defined?(Spring) - # Do not eager load code on boot. This avoids loading your whole application - # just for the purpose of running a single test. If you are using a tool that - # preloads Rails for running tests, you may have to set it to true. - config.eager_load = false + # Eager loading loads your entire application. When running a single test locally, + # this is usually not necessary, and can slow down your test suite. However, it's + # recommended that you enable it in continuous integration systems to ensure eager + # loading is working properly before deploying your code. + config.eager_load = ENV['CI'].present? # Configure public file server for tests with Cache-Control for performance. - config.public_file_server.enabled = true - config.public_file_server.headers = { - 'Cache-Control' => "public, max-age=#{1.hour.to_i}", - } + config.public_file_server.headers = { 'Cache-Control' => "public, max-age=#{1.hour.to_i}" } # Show full error reports and disable caching. - config.consider_all_requests_local = true + config.consider_all_requests_local = true config.action_controller.perform_caching = false config.cache_store = :null_store # Raise exceptions instead of rendering exception templates. - config.action_dispatch.show_exceptions = false + config.action_dispatch.show_exceptions = :none # Disable request forgery protection in test environment. config.action_controller.allow_forgery_protection = false @@ -36,6 +35,8 @@ # Store uploaded files on the local file system in a temporary directory. config.active_storage.service = :test + # Disable caching for Action Mailer templates even if Action Controller + # caching is enabled. config.action_mailer.perform_caching = false # Tell Action Mailer not to deliver emails to the real world. @@ -57,4 +58,9 @@ # Annotate rendered view with file names. # config.action_view.annotate_rendered_view_with_filenames = true + + # Raise error when a before_action's only/except options reference missing actions. + # config.action_controller.raise_on_missing_callback_actions = true + + config.active_job.queue_adapter = :test end diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb index 54f47cf1..b3076b38 100644 --- a/config/initializers/content_security_policy.rb +++ b/config/initializers/content_security_policy.rb @@ -16,9 +16,9 @@ # # policy.report_uri "/csp-violation-report-endpoint" # end # -# # Generate session nonces for permitted importmap and inline scripts +# # Generate session nonces for permitted importmap, inline scripts, and inline styles. # config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s } -# config.content_security_policy_nonce_directives = %w(script-src) +# config.content_security_policy_nonce_directives = %w(script-src style-src) # # # Report violations without enforcing the policy. # # config.content_security_policy_report_only = true diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb index 9e001ac0..e058dbb3 100644 --- a/config/initializers/filter_parameter_logging.rb +++ b/config/initializers/filter_parameter_logging.rb @@ -1,6 +1,6 @@ # Be sure to restart your server when you modify this file. -# Configure parameters to be filtered from the log file. Use this to limit dissemination of -# sensitive information. See the ActiveSupport::ParameterFilter documentation for supported -# notations and behaviors. +# Configure parameters to be partially matched (e.g. passw matches password) and filtered from the log file. +# Use this to limit dissemination of sensitive information. +# See the ActiveSupport::ParameterFilter documentation for supported notations and behaviors. Rails.application.config.filter_parameters = [] diff --git a/config/initializers/permissions_policy.rb b/config/initializers/permissions_policy.rb index 00f64d71..7db3b957 100644 --- a/config/initializers/permissions_policy.rb +++ b/config/initializers/permissions_policy.rb @@ -1,11 +1,13 @@ +# Be sure to restart your server when you modify this file. + # Define an application-wide HTTP permissions policy. For further -# information see https://developers.google.com/web/updates/2018/06/feature-policy -# -# Rails.application.config.permissions_policy do |f| -# f.camera :none -# f.gyroscope :none -# f.microphone :none -# f.usb :none -# f.fullscreen :self -# f.payment :self, "https://secure.example.com" +# information see: https://developers.google.com/web/updates/2018/06/feature-policy + +# Rails.application.config.permissions_policy do |policy| +# policy.camera :none +# policy.gyroscope :none +# policy.microphone :none +# policy.usb :none +# policy.fullscreen :self +# policy.payment :self, "https://secure.example.com" # end diff --git a/db/structure.sql b/db/structure.sql index 9574f139..71798480 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -890,44 +890,43 @@ ALTER TABLE ONLY public.solutions SET search_path TO "$user", public; INSERT INTO "schema_migrations" (version) VALUES -('20211009102503'), -('20211009102612'), -('20211009104015'), -('20211009105135'), -('20211009105457'), -('20211009111010'), -('20211009111745'), -('20211009162515'), -('20211009212035'), -('20211017194323'), -('20211017195715'), -('20220115120555'), -('20220115123114'), -('20220115134157'), -('20220129140422'), -('20220129165359'), -('20220129173742'), -('20220202205558'), -('20220205113405'), -('20220205114432'), -('20220206140046'), -('20220206140244'), -('20220209182545'), -('20220217094714'), -('20220622205515'), -('20220622205527'), -('20221017055914'), -('20221017111524'), -('20221019173456'), -('20230121191926'), -('20230630170753'), -('20230630172057'), -('20230902145307'), -('20230902145308'), -('20230902145309'), -('20230930203405'), -('20231110173126'), +('20240211194031'), ('20240203172343'), -('20240211194031'); - +('20231110173126'), +('20230930203405'), +('20230902145309'), +('20230902145308'), +('20230902145307'), +('20230630172057'), +('20230630170753'), +('20230121191926'), +('20221019173456'), +('20221017111524'), +('20221017055914'), +('20220622205527'), +('20220622205515'), +('20220217094714'), +('20220209182545'), +('20220206140244'), +('20220206140046'), +('20220205114432'), +('20220205113405'), +('20220202205558'), +('20220129173742'), +('20220129165359'), +('20220129140422'), +('20220115134157'), +('20220115123114'), +('20220115120555'), +('20211017195715'), +('20211017194323'), +('20211009212035'), +('20211009162515'), +('20211009111745'), +('20211009111010'), +('20211009105457'), +('20211009105135'), +('20211009104015'), +('20211009102612'), +('20211009102503'); diff --git a/public/406-unsupported-browser.html b/public/406-unsupported-browser.html new file mode 100644 index 00000000..7cf1e168 --- /dev/null +++ b/public/406-unsupported-browser.html @@ -0,0 +1,66 @@ + + + + Your browser is not supported (406) + + + + + + +
+
+

Your browser is not supported.

+

Please upgrade your browser to continue.

+
+
+ + diff --git a/public/icon.png b/public/icon.png new file mode 100644 index 00000000..f3b5abcb Binary files /dev/null and b/public/icon.png differ diff --git a/public/icon.svg b/public/icon.svg new file mode 100644 index 00000000..78307ccd --- /dev/null +++ b/public/icon.svg @@ -0,0 +1,3 @@ + + + diff --git a/spec/features/registration_spec.rb b/spec/features/registration_spec.rb index 5c073625..526c01a3 100644 --- a/spec/features/registration_spec.rb +++ b/spec/features/registration_spec.rb @@ -20,7 +20,11 @@ before { click_button 'commit' } it { expect(page).to have_content 'Ви успішно зареєстровані.' } - it('delivers email') { expect(ActionMailer::Base.deliveries).to include(registration_email) } + + it 'delivers email' do + perform_enqueued_jobs + expect(ActionMailer::Base.deliveries).to include(registration_email) + end end context 'with duplicated name' do @@ -32,7 +36,11 @@ end it { expect(page).to have_content "Учасник на ім'я #{params[:name]} вже зареєстрований" } - it('does not deliver email') { expect(ActionMailer::Base.deliveries).to_not include(registration_email) } + + it 'does not deliver email' do + perform_enqueued_jobs + expect(ActionMailer::Base.deliveries).to_not include(registration_email) + end end context 'with invalid registration secret' do @@ -41,7 +49,11 @@ before { click_button 'commit' } it { expect(page).to have_content 'Код доступу помилковий' } - it('does not deliver email') { expect(ActionMailer::Base.deliveries).to_not include(registration_email) } + + it 'does not deliver email' do + perform_enqueued_jobs + expect(ActionMailer::Base.deliveries).to_not include(registration_email) + end end context 'without contest site' do @@ -49,8 +61,12 @@ before { click_button 'commit' } - it { expect(page).to have_content 'Заклад, у якому ви пишете олімпіаду не може бути порожнім' } - it('does not deliver email') { expect(ActionMailer::Base.deliveries).to_not include(registration_email) } + it { expect(find_by_id('user_contest_site').native.attribute('validationMessage')).to be_present } + + it 'does not deliver email' do + perform_enqueued_jobs + expect(ActionMailer::Base.deliveries).to_not include(registration_email) + end end context 'without grade' do @@ -58,8 +74,12 @@ before { click_button 'commit' } - it { expect(page).to have_content 'Клас не може бути порожнім' } - it('does not deliver email') { expect(ActionMailer::Base.deliveries).to_not include(registration_email) } + it { expect(find_by_id('user_grade').native.attribute('validationMessage')).to be_present } + + it 'does not deliver email' do + perform_enqueued_jobs + expect(ActionMailer::Base.deliveries).to_not include(registration_email) + end end context 'without city' do @@ -67,8 +87,12 @@ before { click_button 'commit' } - it { expect(page).to have_content 'Місто не може бути порожнім' } - it('does not deliver email') { expect(ActionMailer::Base.deliveries).to_not include(registration_email) } + it { expect(find_by_id('user_city').native.attribute('validationMessage')).to be_present } + + it 'does not deliver email' do + perform_enqueued_jobs + expect(ActionMailer::Base.deliveries).to_not include(registration_email) + end end context 'without email' do @@ -78,7 +102,11 @@ it('stays on registration page') { expect(page).to have_current_path(registration_path) } it { expect(page).to_not have_content 'Ваш e-mail не може бути порожнім' } - it('does not deliver email') { expect(ActionMailer::Base.deliveries).to_not include(registration_email) } + + it 'does not deliver email' do + perform_enqueued_jobs + expect(ActionMailer::Base.deliveries).to_not include(registration_email) + end end context 'without institution' do @@ -86,8 +114,12 @@ before { click_button 'commit' } - it { expect(page).to have_content 'Ваш навчальний заклад не може бути порожнім' } - it('does not deliver email') { expect(ActionMailer::Base.deliveries).to_not include(registration_email) } + it { expect(find_by_id('user_institution').native.attribute('validationMessage')).to be_present } + + it 'does not deliver email' do + perform_enqueued_jobs + expect(ActionMailer::Base.deliveries).to_not include(registration_email) + end end context 'without name' do @@ -97,7 +129,11 @@ it('stays on registration page') { expect(page).to have_current_path(registration_path) } it { expect(page).to_not have_content 'Прізвище, Ім\'я, По батькові не може бути пустим' } - it('does not deliver email') { expect(ActionMailer::Base.deliveries).to_not include(registration_email) } + + it 'does not deliver email' do + perform_enqueued_jobs + expect(ActionMailer::Base.deliveries).to_not include(registration_email) + end end end @@ -115,7 +151,11 @@ before { click_button 'commit' } it { expect(page).to have_content 'Ви успішно зареєстровані.' } - it('delivers email') { expect(ActionMailer::Base.deliveries).to include(registration_email) } + + it 'delivers email' do + perform_enqueued_jobs + expect(ActionMailer::Base.deliveries).to include(registration_email) + end end context 'without contest_site' do @@ -125,7 +165,11 @@ it('stays on registration page') { expect(page).to have_current_path(registration_path) } it { expect(page).to_not have_content 'Заклад, у якому ви пишете олімпіаду не може бути порожнім' } - it('does not deliver email') { expect(ActionMailer::Base.deliveries).to_not include(registration_email) } + + it 'does not deliver email' do + perform_enqueued_jobs + expect(ActionMailer::Base.deliveries).to_not include(registration_email) + end end end @@ -143,7 +187,11 @@ before { click_button 'commit' } it { expect(page).to have_content 'Ви успішно зареєстровані.' } - it('delivers email') { expect(ActionMailer::Base.deliveries).to include(registration_email) } + + it 'delivers email' do + perform_enqueued_jobs + expect(ActionMailer::Base.deliveries).to include(registration_email) + end end context 'without institution' do @@ -153,7 +201,11 @@ it('stays on registration page') { expect(page).to have_current_path(registration_path) } it { expect(page).to_not have_content 'Ваш навчальний заклад не може бути порожнім' } - it('does not deliver email') { expect(ActionMailer::Base.deliveries).to_not include(registration_email) } + + it 'does not deliver email' do + perform_enqueued_jobs + expect(ActionMailer::Base.deliveries).to_not include(registration_email) + end end end @@ -171,7 +223,11 @@ before { click_button 'commit' } it { expect(page).to have_content 'Ви успішно зареєстровані.' } - it('delivers email') { expect(ActionMailer::Base.deliveries).to include(registration_email) } + + it 'delivers email' do + perform_enqueued_jobs + expect(ActionMailer::Base.deliveries).to include(registration_email) + end end context 'without city' do @@ -181,7 +237,11 @@ it('stays on registration page') { expect(page).to have_current_path(registration_path) } it { expect(page).to_not have_content 'Місто не може бути порожнім' } - it('does not deliver email') { expect(ActionMailer::Base.deliveries).to_not include(registration_email) } + + it 'does not deliver email' do + perform_enqueued_jobs + expect(ActionMailer::Base.deliveries).to_not include(registration_email) + end end end end diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 4ef819bc..88492a1f 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -108,6 +108,7 @@ # config.filter_gems_from_backtrace("gem name") config.include FactoryBot::Syntax::Methods config.include FormHelpers + config.include ActiveJob::TestHelper end browser = ENV.fetch('UI_TEST_ENGINE', :firefox).to_sym