diff --git a/.dockerignore b/.dockerignore index d5f19d89b..bae39c359 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1,39 @@ +# Dependencies node_modules package-lock.json +yarn-error.log +npm-debug.log + +# VCS +.git +.gitignore + +# Editor/OS +.DS_Store +.idea +.vscode + +# Rails runtime +log +tmp +tmp/cache +storage +.bundle + +# Bundler (keep Gemfile/Gemfile.lock!) +vendor/bundle + +# Tests and coverage (not needed in image) +spec +test +coverage + +# Env and local overrides +.env +.env.* +.ruby-version + +# Docker & CI artifacts +docker-compose*.yml +Dockerfile.* +.cache \ No newline at end of file diff --git a/Gemfile b/Gemfile index a9a238994..14bf87da2 100644 --- a/Gemfile +++ b/Gemfile @@ -21,7 +21,7 @@ gem 'freezolite', require: false gem 'hotwire-rails', '~> 0.1.3' gem 'jbuilder', '~> 2.11' gem 'jsbundling-rails' -gem 'jwt' +gem 'jwt', '~> 2.10.3' gem 'lograge' gem 'mimemagic', '~> 0.4.3' gem 'money' @@ -50,6 +50,7 @@ gem 'dartsass-rails' gem 'turbo-rails' gem 'valvat' gem 'view_component' +gem 'voog_footer', github: 'internetee/voog_footer' gem 'webpush' group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index 333c5f345..6edd768d3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -15,6 +15,13 @@ GIT omniauth (>= 1.9, < 3) openid_connect (~> 2.2) +GIT + remote: https://github.com/internetee/voog_footer.git + revision: ddbaeef72f380d8798a4df69cc93039a343b66fd + specs: + voog_footer (0.1.0) + nokogiri (~> 1.10) + GEM remote: https://rubygems.org/ specs: @@ -261,7 +268,7 @@ GEM bindata faraday (~> 2.0) faraday-follow_redirects - jwt (2.10.2) + jwt (2.10.3) base64 language_server-protocol (3.17.0.5) launchy (3.1.1) @@ -519,9 +526,6 @@ GEM faraday-multipart (>= 1) ruby-progressbar (1.13.0) rubyzip (3.1.0) - sass-embedded (1.93.2) - google-protobuf (~> 4.31) - rake (>= 13) sass-embedded (1.93.2-aarch64-linux-gnu) google-protobuf (~> 4.31) sass-embedded (1.93.2-aarch64-linux-musl) @@ -655,7 +659,7 @@ DEPENDENCIES i18n-debug jbuilder (~> 2.11) jsbundling-rails - jwt + jwt (~> 2.10.3) letter_opener (~> 1.8) letter_opener_web (~> 3.0) listen (>= 3.0.5, < 3.11) @@ -699,6 +703,7 @@ DEPENDENCIES turbo-rails valvat view_component + voog_footer! web-console (>= 3.3.0) webmock webpush diff --git a/app/components/common/footer/component.html.erb b/app/components/common/footer/component.html.erb index ba0d5f1cb..08a06b4e1 100644 --- a/app/components/common/footer/component.html.erb +++ b/app/components/common/footer/component.html.erb @@ -2,98 +2,64 @@
- <%= render 'svg/footer_eis_logo' %> +
-

-
- <%= t('common.footer.copyright') %> -
-

-
- <%= Setting.find_by(code: 'invoice_issuer_address').retrieve %>
- <%= t('reg_no') %>: <%= Setting.find_by(code: 'invoice_issuer_reg_no').retrieve %> -
-
+

<%= footer_highlight_title %>

+

<%= footer_highlight_info %>

- <%= render 'svg/email' %><%= Setting.find_by(code: 'contact_organization_email').retrieve %>
+ <%= render 'svg/email' %><%= footer_email_text %>
 - <%= render 'svg/phone' %><%= Setting.find_by(code: 'organization_phone').retrieve %> + <%= render 'svg/phone' %><%= footer_phone_text %>
-
-
- - <%= t('common.footer.help_and_info') %>
- -
-
- -
- -
-
- <%= t('common.footer.domain_regulation')%>
- <%= t('common.footer.faq')%>
- <%= t('common.footer.statistics')%>
- <%= t('common.footer.dispute_committee') %>
- <%= t('auctions.top_grid.terms_and_conditions_link').capitalize %> -

- + <% footer_navigation_columns.each_with_index do |column, index| %> +
+
+ + <%= column[:name] %>
 + +
+
+ +
+ +
+
+ <% column[:links].each do |link| %> + <%= link_to link[:label], link[:url], link[:html_options] %>
+ <% end %> + <% if index == 0 %> + <%= t('common.footer.labels.terms_and_conditions') %> + <% end %> + +
-
- + <% end %>
-
- <%= t('common.footer.registrars') %>
-
+
<%= footer_social_column_title %>

- -
+
+ <% footer_social_links.each do |social| %> + <% partial = "svg/#{social[:key]}" %> + <% next unless lookup_context.exists?(partial, [], true) %> -
-
<%= t('common.footer.estonian_internet') %>
-

-
- -
-
<%= t('common.footer.social_media') %>
-

-
- <%= render 'svg/facebook' %> - <%= render 'svg/twitter' %> - <% if false %><%= render 'svg/linkedin' %><% end %> - <%= render 'svg/youtube' %> - <%= render 'svg/rss' %> -
+ <%= render 'svg/sviiter' %>
- <%= render 'svg/sviiter' %>
-
diff --git a/app/components/common/footer/component.rb b/app/components/common/footer/component.rb index a613ae096..c3198ff3a 100644 --- a/app/components/common/footer/component.rb +++ b/app/components/common/footer/component.rb @@ -1,42 +1,437 @@ module Common module Footer class Component < ApplicationViewComponent - def footer_link(key) = if I18n.locale == :et - et_footer_links[key] - else - en_footer_links[key] - end - - # rubocop:disable Metrics/MethodLength - def et_footer_links + FOOTER_SOCIAL_KEYS = %i[facebook twitter youtube linkedin instagram spotify rss].freeze + + FOOTER_SOCIAL_ICONS = { + 'facebook' => 'fab fa-facebook-square', + 'twitter' => 'fab fa-twitter', + 'youtube' => 'fab fa-youtube-square', + 'linkedin' => 'fab fa-linkedin', + 'instagram' => 'fab fa-instagram', + 'spotify' => 'fab fa-spotify', + 'rss' => 'fas fa-rss-square' + }.freeze + + SOCIAL_HOST_KEYS = { + 'facebook.com' => 'facebook', + 'twitter.com' => 'twitter', + 'x.com' => 'twitter', + 'linkedin.com' => 'linkedin', + 'youtube.com' => 'youtube', + 'instagram.com' => 'instagram', + 'spotify.com' => 'spotify', + 'open.spotify.com' => 'spotify' + }.freeze + + # Voog may list these keys, but the app renders them separately (see FOOTER_INJECTED_LINKS). + FOOTER_VOOG_SKIP_SLOTS = %i[ + cookie_settings cookies_on_internet_ee_webpage kupsised_internet_ee_lehel accessibility + ligipaasetavus 2025 become_a_ee_elite_partner_2 + ].freeze + + # App-only links inserted after a Voog-mapped slot (not taken from Voog URLs/text). + FOOTER_INJECTED_LINKS = [ + { key: :cookie_settings, after: :content_management_principles } + ].freeze + + # Static column layout when Voog is disabled (order preserved). + FOOTER_NAV_COLUMNS_FALLBACK = [ + { + title_key: :help_and_info, + links: %i[ + domain_regulation faq statistics dispute_committee + data_protection_policy content_management_principles + ] + }, { - dispute_committee: 'https://www.internet.ee/domeenivaidlused/domeenivaidluste-komisjon', - list_of_accredited_registrars: 'https://www.internet.ee/registripidaja/akrediteeritud-registripidajad', - terms_and_conditions_for_registrars: 'https://www.internet.ee/registripidaja/kuidas-saada-ee-akrediteeritud-registripidajaks', - partner_programme: 'https://www.internet.ee/registripidaja/kuidas-saada-ee-elite-partneriks', - contact_us: 'https://www.internet.ee/eis', - management: 'https://www.internet.ee/eis/ulesanded-juhatus-ja-noukogu', - newsletter: 'https://www.internet.ee/eis/uudiskirjad', - domain_regulation: 'https://www.internet.ee/domeenid/ee-domeenireeglid', - faq: 'https://www.internet.ee/abi-ja-info/kkk', - statistics: 'https://www.internet.ee/abi-ja-info/statistika' + title_key: :registrars, + links: %i[ + list_of_accredited_registrars + terms_and_conditions_for_registrars + partner_programme + ] + }, + { + title_key: :estonian_internet, + links: %i[ + contact_us management documents newsletter + information_security_principles + ] } + ].freeze + + # App footer slots -> Voog path-derived keys (EN first, then ET). Inspect: voog_footer_available_link_keys + FOOTER_LINK_VOOG_KEYS = { + domain_regulation: %w[ee_domain_regulation ee_domeenireeglid], + faq: %w[faq kkk], + statistics: %w[statistics statistika], + dispute_committee: %w[domain_disputes domeenivaidluste_komisjon], + data_protection_policy: %w[ + eif_s_data_protection_policy + eis_i_isikuandmete_kasutamise_alused + ], + cookie_settings: %w[cookie_settings kuupäeviku_seaded], + content_management_principles: %w[ + principles_for_the_content_management_of_estonian_internet + sisu_haldamise_pohimotted_eesti_internetis + ], + list_of_accredited_registrars: %w[accredited_registrars akrediteeritud_registripidajad], + terms_and_conditions_for_registrars: %w[ + terms_and_conditions_for_becoming_a_registrar + kuidas_saada_ee_akrediteeritud_registripidajaks + ], + partner_programme: %w[ + become_a_ee_elite_partner + kuidas_saada_ee_elite_partneriks + ], + contact_us: %w[eif eis], + management: %w[tasks_and_management ulesanded_juhatus_ja_noukogu], + documents: %w[documents dokumendid], + newsletter: %w[newsletter uudiskiri], + information_security_principles: %w[ + information_security_principles + infoturbe_pohimotted_eesti_interneti_sihtasutuses + ] + }.freeze + + def footer_link(key) + footer_link_url(key) + end + + def footer_link_url(key) + key = key.to_sym + return i18n_footer_link_url(key) || '#' if key == :cookie_settings + + voog_key = resolve_voog_footer_key(key) + voog_footer_links_by_key[voog_key]&.dig('url') || + i18n_footer_link_url(key) || + '#' + end + + def footer_link_label(key) + key = key.to_s + voog_key = resolve_voog_footer_key(key) + i18n_footer_link_label(key).presence || + (voog_footer_enabled? && voog_footer_links_by_key[voog_key]&.dig('text').presence) || + key.tr('_', ' ').capitalize + end + + def footer_navigation_columns + columns = voog_footer_navigation_columns.presence || footer_navigation_columns_fallback + inject_footer_special_links(columns) end - def en_footer_links + def footer_social_column_title + return t('common.footer.social_media') unless voog_footer_enabled? + + voog_social_column&.dig('name').presence || t('common.footer.social_media') + end + + def footer_social_links + voog_links = voog_social_links_from_structure + if voog_links.present? + return voog_links.filter_map { |link| build_footer_social_link(link) } + end + + FOOTER_SOCIAL_KEYS.filter_map do |key| + url = i18n_footer_link_url(key) + next if url.blank? + + { + key: key, + url: url, + title: footer_social_title(key), + icon_class: footer_social_icon_class(key) + } + end + end + + def footer_highlight_title + voog_footer_structure&.dig('highlight', 'title').presence || + t('common.footer.copyright') + end + + def footer_highlight_info + info = voog_footer_structure&.dig('highlight', 'info') + if info.present? + sanitize(info, tags: %w[br]) + else + safe_join( + [t('common.footer.address'), t('common.footer.registration_code')], + tag.br + ) + end + end + + def footer_email_href + contact_url_for('email', type: 'email') || 'mailto:info@internet.ee' + end + + def footer_email_text + contact_text_for('email', type: 'email') || 'info@internet.ee' + end + + def footer_phone_text + contact = voog_footer_contacts.find { |c| c['type'] == 'phone' || c['key'].to_s.start_with?('phone') } + contact&.dig('text').presence || '727 1000' + end + + def footer_logo_url + VoogFooter.configuration.site_url.presence || 'https://internet.ee' + end + + def voog_footer_available_link_keys + voog_footer_links_by_key.keys.sort + end + + private + + def voog_footer_enabled? + VoogFooter.configuration.enabled + end + + def voog_footer_structure + return @voog_footer_structure if defined?(@voog_footer_structure) + + @voog_footer_structure = if voog_footer_enabled? + VoogFooter.structure&.dig(I18n.locale.to_s) + end + end + + def voog_footer_links_by_key + return @voog_footer_links_by_key if defined?(@voog_footer_links_by_key) + + @voog_footer_links_by_key = {} + structure = voog_footer_structure + return @voog_footer_links_by_key unless structure + + structure['columns']&.each do |column| + column['links']&.each { |link| store_voog_link(link) } + column['social_links']&.each { |link| store_voog_link(link) } + end + structure['highlight']&.fetch('contacts', [])&.each { |contact| store_voog_link(contact) } + structure['extras']&.each { |extra| store_voog_link(extra) } + @voog_footer_links_by_key + end + + def store_voog_link(link) + key = link['key'] + return if key.blank? + + @voog_footer_links_by_key[key] = link + end + + def resolve_voog_footer_key(key) + key_s = key.to_s + return key_s if voog_footer_links_by_key.key?(key_s) + + aliases = FOOTER_LINK_VOOG_KEYS[key.to_sym] + return key_s unless aliases + + aliases.find { |candidate| voog_footer_links_by_key.key?(candidate) } || key_s + end + + def voog_footer_navigation_columns + return [] unless voog_footer_structure + + voog_footer_structure['columns'].filter_map do |column| + next if column['follow_us'] + + links = column['links']&.filter_map { |link| build_footer_nav_link(link) } + next if links.blank? + + { + name: column['name'].presence, + links: links + } + end + end + + def footer_navigation_columns_fallback + FOOTER_NAV_COLUMNS_FALLBACK.filter_map do |column| + links = column[:links].filter_map { |key| build_footer_nav_link_from_slot(key) } + next if links.blank? + + { + name: t("common.footer.#{column[:title_key]}"), + links: links + } + end + end + + def inject_footer_special_links(columns) + FOOTER_INJECTED_LINKS.each do |spec| + inject_footer_nav_link(columns, spec[:key], after: spec[:after]) + end + columns + end + + def inject_footer_nav_link(columns, key, after:) + link = build_footer_nav_link_from_slot(key) + return columns unless link + + columns.each do |column| + next if column[:links].any? { |entry| entry[:key] == key } + + anchor_index = column[:links].index { |entry| entry[:key] == after } + next unless anchor_index + + column[:links].insert(anchor_index + 1, link) + return columns + end + + columns + end + + def build_footer_nav_link_from_slot(key) + url = footer_link_url(key) + return nil if url.blank? || url == '#' + + { + key: key, + url: url, + label: footer_link_label(key), + html_options: footer_nav_link_html_options(key) + } + end + + def build_footer_nav_link(voog_link) + voog_key = voog_link['key'] + return nil if voog_key.blank? + + app_slot = app_slot_for_voog_key(voog_key) + return nil if footer_voog_skip_slot?(voog_key: voog_key, app_slot: app_slot) + + url = voog_link['url'].presence || footer_link_url(app_slot) + return nil if url.blank? || url == '#' + + { + key: app_slot, + url: url, + label: footer_nav_link_label(app_slot, voog_link), + html_options: footer_nav_link_html_options(app_slot) + } + end + + def footer_nav_link_label(app_slot, voog_link) + i18n_footer_link_label(app_slot.to_s).presence || + voog_link['text'].presence || + app_slot.to_s.tr('_', ' ').capitalize + end + + def footer_nav_link_html_options(key) + return cookie_settings_link_html_options if key.to_sym == :cookie_settings + + { target: '_blank', rel: 'noopener' } + end + + def cookie_settings_link_html_options + { + target: '_blank', + rel: 'noopener', + title: footer_link_label(:cookie_settings), + 'data-cc': 'c-settings' + } + end + + def footer_voog_skip_slot?(voog_key: nil, app_slot: nil) + slot = app_slot || app_slot_for_voog_key(voog_key) + FOOTER_VOOG_SKIP_SLOTS.include?(slot) + end + + def app_slot_for_voog_key(voog_key) + key_s = voog_key.to_s + FOOTER_LINK_VOOG_KEYS.each do |slot, aliases| + return slot if aliases.include?(key_s) + end + + return key_s.to_sym if i18n_footer_link_label(key_s).present? || i18n_footer_link_url(key_s).present? + + key_s.to_sym + end + + def voog_social_column + voog_footer_structure&.dig('columns')&.find { |column| column['follow_us'] } + end + + def voog_social_links_from_structure + voog_social_column&.dig('social_links') + end + + def voog_footer_contacts + voog_footer_structure&.dig('highlight', 'contacts') || [] + end + + def contact_url_for(key, type: nil) + contact = voog_footer_contacts.find do |entry| + entry['key'] == key || (type && entry['type'] == type) + end + contact&.dig('url') + end + + def contact_text_for(key, type: nil) + contact = voog_footer_contacts.find do |entry| + entry['key'] == key || (type && entry['type'] == type) + end + contact&.dig('text').presence + end + + def i18n_footer_link_url(key) + t("common.footer.links.#{key}", default: nil).presence + end + + def footer_social_title(key) + footer_link_label(key) + end + + def i18n_footer_link_label(key) + t("common.footer.labels.#{key}", default: '').presence || + t("common.footer.social.#{key}", default: '').presence + end + + def footer_social_icon_class(key) + FOOTER_SOCIAL_ICONS.fetch(key.to_s, 'fas fa-external-link-alt') + end + + def build_footer_social_link(link) + url = link['url'].presence + return nil if url.blank? + + key = social_key_for(link)&.to_sym + return nil unless key + { - dispute_committee: 'https://www.internet.ee/domain-disputes/domain-disputes-committee', - list_of_accredited_registrars: 'https://www.internet.ee/registrar-portal/accredited-registrars', - terms_and_conditions_for_registrars: 'https://www.internet.ee/registrar-portal/terms-and-conditions-for-becoming-a-registrar', - partner_programme: 'https://www.internet.ee/registrar-portal/become-a-ee-elite-partner', - contact_us: 'https://www.internet.ee/eif', - management: 'https://www.internet.ee/eif/tasks-and-management', - newsletter: 'https://www.internet.ee/eif/newsletter', - domain_regulation: 'https://internet.ee/domains/ee-domain-regulation', - faq: 'https://internet.ee/help-and-info/faq', - statistics: 'https://internet.ee/help-and-info/statistics' + key: key, + url: url, + title: footer_social_title(key), + icon_class: footer_social_icon_class(key) } end + + def social_key_for(link) + icon_name = link.dig('icon', 'name').presence + return icon_name if icon_name && FOOTER_SOCIAL_ICONS.key?(icon_name) + + host_key = social_key_from_url(link['url']) + return host_key if host_key + + parsed_key = link['key'].to_s + parsed_key if FOOTER_SOCIAL_ICONS.key?(parsed_key) + end + + def social_key_from_url(url) + host = URI.parse(url).host.to_s.sub(/\Awww\./, "").downcase + return nil if host.empty? + + SOCIAL_HOST_KEYS.each do |domain, key| + return key if host == domain || host.end_with?(".#{domain}") + end + + nil + rescue URI::InvalidURIError + nil + end end end end diff --git a/app/controllers/invoices_controller.rb b/app/controllers/invoices_controller.rb index a2ff7a708..1656ba00c 100644 --- a/app/controllers/invoices_controller.rb +++ b/app/controllers/invoices_controller.rb @@ -140,7 +140,9 @@ def update_params end def set_invoice - @invoice = Invoice.accessible_by(current_ability).find_by!(uuid: params[:uuid]) + @invoice = Invoice.accessible_by(current_ability) + .where(user_id: current_user.id) + .find_by!(uuid: params[:uuid]) end def authorize_user diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 74c2f20ad..2fa7a5a45 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -82,12 +82,6 @@ def administrator_link_list { name: t(:statistics_name), path: admin_statistics_path, data: { turbolinks: false } }] end - def cached_footer - Rails.cache.fetch("footer/#{I18n.locale}_partial", expires_in: 12.hours) do - RemoteViewPartial.find_by(name: 'footer', locale: I18n.locale) - end - end - def ended_auctions_link_available? AuctionCenter::Application.config.customization[:ended_auctions_link_available] end diff --git a/app/jobs/shared_footer_fetcher_job.rb b/app/jobs/shared_footer_fetcher_job.rb deleted file mode 100644 index 6eb19a016..000000000 --- a/app/jobs/shared_footer_fetcher_job.rb +++ /dev/null @@ -1,65 +0,0 @@ -class SharedFooterFetcherJob < ApplicationJob - include HttpRequester - - def perform - return unless SharedFooterFetcherJob.needs_to_run? - - api_token = Setting.find_by(code: 'voog_api_key').retrieve - main_site_path = Setting.find_by(code: 'voog_site_url').retrieve - - translated_footers = compose_localized_footers(site: main_site_path, api_token: api_token) - - return if translated_footers.empty? - - save_localized_partials(partials: translated_footers) - end - - def remote_languages(site:, api_token:) - url = URI("#{site}/admin/api/languages?api_token=#{api_token}") - response = default_get_request_response(url: url) - - return [] unless response[:status] == 200 - - body = response[:body] - languages = [] - body.each { |language| languages.append(language['code']) } - languages - end - - def get_translated_footer(site:, language_code:) - url = URI.parse("#{site}/#{language_code}") - page = Nokogiri::HTML(url.open) - footer = page.css('.site-footer').to_html.to_s - footer.gsub! 'href="/', "href=\"#{site}/" - footer.gsub! 'src="/', "src=\"#{site}/" - footer.gsub! 'fas fa-', 'icon ' - footer.gsub! 'fab fa-', 'icon ' - footer.gsub! '-square', ' square' - footer - end - - def compose_localized_footers(site:, api_token:) - translated_footers = {} - - remote_languages(site: site, api_token: api_token).each do |lang| - footer = get_translated_footer(site: site, language_code: lang) - if (footer.include? '') - translated_footers[lang] = footer - end - end - translated_footers - end - - def self.needs_to_run? - Setting.find_by(code: 'voog_site_fetching_enabled').retrieve - end - - def save_localized_partials(partials:) - partials.keys.each do |localized_partial| - remote_partial = RemoteViewPartial.where(name: 'footer', - locale: localized_partial).first_or_create - remote_partial.content = partials[localized_partial] - remote_partial.save - end - end -end diff --git a/app/models/ability.rb b/app/models/ability.rb index f1a44f630..2059fd43c 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -17,7 +17,7 @@ def participant can :manage, BillingProfile, user_id: user.id can :manage, Notification, user_id: user.id can :pay_deposit, Auction - can %i[read update], Invoice + can %i[read update], Invoice, user_id: user.id can %i[read create], PaymentOrder, user_id: user.id can :manage, PhoneConfirmation do |phone_confirmation| user.id == phone_confirmation.user.id diff --git a/app/models/job.rb b/app/models/job.rb index e34d7818e..7767f9457 100644 --- a/app/models/job.rb +++ b/app/models/job.rb @@ -3,7 +3,7 @@ class Job AuctionCreationJob DomainRegistrationCheckJob ResultStatusUpdateJob DomainRegistrationReminderJob UnpaidInvoiceReminderJob DailySummaryJob DailyBroadcastAuctionsJob DailyViewRefreshJob - SharedFooterFetcherJob DirectoInvoiceForwardJob ActiveAuctionsAiSortingJob].freeze + DirectoInvoiceForwardJob ActiveAuctionsAiSortingJob].freeze include ActiveModel::Model diff --git a/app/views/svg/_instagram.html.erb b/app/views/svg/_instagram.html.erb new file mode 100644 index 000000000..ad96a7af9 --- /dev/null +++ b/app/views/svg/_instagram.html.erb @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/app/views/svg/_spotify.html.erb b/app/views/svg/_spotify.html.erb new file mode 100644 index 000000000..bd2c1050f --- /dev/null +++ b/app/views/svg/_spotify.html.erb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/bin/docker-entrypoint b/bin/docker-entrypoint index b12bd79a7..3fe64cc22 100644 --- a/bin/docker-entrypoint +++ b/bin/docker-entrypoint @@ -55,29 +55,6 @@ else echo "Database connection settings not found. Skipping database checks." fi -# Check for Redis connection if Redis is used -if [ -n "$REDIS_URL" ]; then - echo "Redis URL is set to $REDIS_URL" - # Attempting Redis connection - if command -v redis-cli &> /dev/null; then - echo "Checking Redis connection..." - REDIS_HOST=$(echo $REDIS_URL | sed -E 's/^redis:\/\/(.*):([0-9]+)\/([0-9]+)$/\1/') - REDIS_PORT=$(echo $REDIS_URL | sed -E 's/^redis:\/\/(.*):([0-9]+)\/([0-9]+)$/\2/') - - if [ -n "$REDIS_HOST" ] && [ -n "$REDIS_PORT" ]; then - until redis-cli -h $REDIS_HOST -p $REDIS_PORT ping > /dev/null 2>&1; do - echo "Waiting for Redis to become available..." - sleep 2 - done - echo "Redis is available." - else - echo "Could not parse Redis host and port from REDIS_URL. Skipping Redis connection check." - fi - else - echo "redis-cli not available. Skipping Redis connection check." - fi -fi - # Prepare assets if needed (precompilation should have been done during build) if [ "${PRECOMPILE_ASSETS:-false}" = "true" ] && { [ ! -d /opt/webapps/app/public/assets ] || [ -z "$(ls -A /opt/webapps/app/public/assets)" ]; }; then echo "Precompiling assets..." diff --git a/config/cable.yml b/config/cable.yml index a16ac7dc5..de0408944 100644 --- a/config/cable.yml +++ b/config/cable.yml @@ -1,23 +1,17 @@ development: adapter: redis - url: <%= ENV.fetch("REDIS_URL") { AuctionCenter::Application.config.customization[:cable_redis_url] } %> + url: <%= ENV.fetch("REDIS_CABLE_URL") { AuctionCenter::Application.config.customization[:cable_redis_url] } %> channel_prefix: auction_center_development test: adapter: async staging: - url: <%= AuctionCenter::Application.config.customization[:cable_redis_url] %> + url: <%= ENV.fetch("REDIS_CABLE_URL") { AuctionCenter::Application.config.customization[:cable_redis_url] } %> adapter: redis channel_prefix: auction_center_staging production: adapter: redis - url: <%= AuctionCenter::Application.config.customization[:cable_redis_url] %> + url: <%= ENV.fetch("REDIS_CABLE_URL") { AuctionCenter::Application.config.customization[:cable_redis_url] } %> channel_prefix: auction_center_production - - #production: - #adapter: redis - #url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> - #channel_prefix: auction_center_production -# AuctionCenter::Application.config.customization[:cable_redis_url] \ No newline at end of file diff --git a/config/customization.yml.sample b/config/customization.yml.sample index 89192daff..85e813d0e 100644 --- a/config/customization.yml.sample +++ b/config/customization.yml.sample @@ -18,6 +18,11 @@ default: &default vapid_public: "BGgFbsalgk-emt7f0f279JsxF15NOfEJKQ-7w04FmXseeWt4pRvCaD7EMl6PqS-BHrwO3QWsPUOGkAjNWNBOVLY=" vapid_private: "2xl1lvaQARjFHRCKrPo2B-MbTAc1IZ3UrfugDh6cJiE=" + voog_site_url: "https://www.internet.ee" + voog_api_key: "" + voog_site_fetching_enabled: false + voog_footer_cache_ttl: "3600" + mobile_sms_sent_time_limit_in_minutes: 1 auction_filter_available: false ended_auctions_link_available: false @@ -117,7 +122,7 @@ default: &default secret_access_word: 'please-Give-Me-accesS' secret_word: 'this-secret-should-be-change' billing_system_integrated: 'true' - billing_secret: '' + billing_secret: 'dummy-test-billing-secret' development: <<: *default diff --git a/config/environments/production.rb b/config/environments/production.rb index bfc1f2eea..b5b6fdd35 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -64,6 +64,12 @@ } # Use a different cache store in production. # config.cache_store = :mem_cache_store + config.cache_store = :redis_cache_store, { + url: ENV.fetch('REDIS_CACHE_URL', 'redis://localhost:6379/2'), + error_handler: lambda { |method:, returning:, exception:| + Rails.logger.warn("[Redis cache] #{method} #{exception.class}: #{exception.message}") + } + } # Use a real queuing backend for Active Job (and separate queues per environment) # config.active_job.queue_adapter = :resque diff --git a/config/initializers/voog_footer.rb b/config/initializers/voog_footer.rb new file mode 100644 index 000000000..b182e5c16 --- /dev/null +++ b/config/initializers/voog_footer.rb @@ -0,0 +1,16 @@ +Rails.application.config.to_prepare do + c = Rails.configuration.customization + VoogFooter.configure do |config| + config.site_url = c[:voog_site_url].presence || 'https://www.internet.ee' + config.api_key = c[:voog_api_key].presence + config.enabled = ActiveModel::Type::Boolean.new.cast(c.fetch(:voog_site_fetching_enabled, 'false')) + config.cache_ttl = c.fetch(:voog_footer_cache_ttl, '3600').to_i + config.ssl_verify = if c[:voog_ssl_verify].present? + ActiveModel::Type::Boolean.new.cast(c[:voog_ssl_verify]) + else + Rails.env.production? || Rails.env.staging? + end + config.cache_store = Rails.cache + config.locales = %w[en et] + end +end diff --git a/config/locales/common.en.yml b/config/locales/common.en.yml index 6ea82fc96..994a59b3a 100644 --- a/config/locales/common.en.yml +++ b/config/locales/common.en.yml @@ -10,10 +10,9 @@ en: notifications: "Notifications" footer: - copyright: "© 2024 Estonian Internet Foundation" + copyright: "© 2026 Estonian Internet Foundation" address: "Paldiski mnt 80, 10617 Tallinn, Estonia" registration_code: "Registration code: 90010019" - help_and_info: "Help and info" domain_regulation: ".ee Domain Regulation" faq: "Frequently asked questions" @@ -34,6 +33,54 @@ en: registrars_working_group: "Registrar's Working group" social_media: "Social media" + labels: + domain_regulation: ".ee Domain Regulation" + faq: "FAQ" + statistics: ".ee Statistics" + dispute_committee: "Domain Disputes" + data_protection_policy: "Data Protection Policy" + content_management_principles: "Content Management" + list_of_accredited_registrars: "Accredited .ee registrars" + terms_and_conditions_for_registrars: "Becoming accredited registrar" + partner_programme: "\"Elite Partner\" programme" + contact_us: "Contact" + management: "Management" + documents: "Documents" + newsletter: "Newsletter" + information_security_principles: "Information Security" + cookie_settings: "Cookie Settings" + terms_and_conditions: "Terms and Conditions" + social: + facebook: "Facebook" + twitter: "Twitter" + youtube: "Youtube" + linkedin: "LinkedIn" + instagram: "Instagram" + spotify: "Spotify" + rss: "RSS" + links: + domain_regulation: "https://www.internet.ee/domains/ee-domain-regulation" + faq: "https://www.internet.ee/help-and-info/faq" + statistics: "https://www.internet.ee/help-and-info/statistics" + dispute_committee: "https://www.internet.ee/domain-disputes/domain-disputes-committee" + data_protection_policy: "https://www.internet.ee/domains/eif-s-data-protection-policy" + newsletter: "https://www.internet.ee/eif/newsletter" + information_security_principles: "https://www.internet.ee/information-security-principles" + content_management_principles: "https://www.internet.ee/domains/principles-for-the-content-management-of-estonian-internet" + cookie_settings: "javascript:void(0)" + list_of_accredited_registrars: "https://www.internet.ee/registrar-portal/accredited-registrars" + terms_and_conditions: "https://www.internet.ee/domains/auction-environment-user-agreement" + partner_programme: "https://www.internet.ee/registrar-portal/become-a-ee-elite-partner" + contact_us: "https://www.internet.ee/eif" + management: "https://www.internet.ee/eif/tasks-and-management" + documents: "https://www.internet.ee/eif/documents" + facebook: "https://www.facebook.com/EE-748656818569233/" + twitter: "https://twitter.com/Eesti_Internet" + youtube: "https://www.youtube.com/channel/UC7nTB6zIwZYPFarlbKuEPRA" + linkedin: "https://www.linkedin.com/company/eesti-interneti-sa/" + instagram: "https://www.instagram.com/eestiinternet" + spotify: "https://open.spotify.com/show/5OSbOQScBgFtpoL7pqGvii" + rss: "https://internet.ee/index.rss" webpush_modal: webpush_title: 'Enable Web Push notifications' diff --git a/config/locales/common.et.yml b/config/locales/common.et.yml index ed22b68e0..fcac0102c 100644 --- a/config/locales/common.et.yml +++ b/config/locales/common.et.yml @@ -10,7 +10,7 @@ et: notifications: "Teavitused" footer: - copyright: "© 2024 Eesti Interneti Sihtasutus" + copyright: "© 2026 Eesti Interneti Sihtasutus" address: "Paldiski mnt 80, 10617 Tallinn" registration_code: "Registrikood: 90010019" @@ -33,6 +33,55 @@ et: documents: "Dokumendid" social_media: "Sotsiaalmeedia" + labels: + domain_regulation: ".ee domeenireeglid" + faq: "Korduma kippuvad küsimused" + statistics: ".ee statistika" + dispute_committee: "Domeenivaidluste Komisjon" + data_protection_policy: "Isikuandmete kasutamine" + content_management_principles: "Interneti sisu haldamise põhimõtted" + list_of_accredited_registrars: "Akrediteeritud registripidajate nimekiri" + terms_and_conditions_for_registrars: "Akrediteeritud registripidajaks saamine" + partner_programme: "Eliitpartner programm" + contact_us: "Võta ühendust" + management: "Juhtimine" + documents: "Dokumendid" + newsletter: "Liitu uudiskirjaga!" + information_security_principles: "Infoturve" + cookie_settings: "Küpsiste seaded" + terms_and_conditions: "Kasutustingimused" + social: + facebook: "Facebook" + twitter: "Twitter" + youtube: "Youtube" + linkedin: "LinkedIn" + instagram: "Instagram" + spotify: "Spotify" + rss: "RSS" + links: + domain_regulation: "https://internet.ee/domeenid/ee-domeenireeglid" + faq: "https://internet.ee/abi-ja-info/kkk" + statistics: "https://internet.ee/abi-ja-info/statistika" + dispute_committee: "https://internet.ee/domeenivaidlused/domeenivaidluste-komisjon" + data_protection_policy: "https://www.internet.ee/domeenid/eis-i-isikuandmete-kasutamise-alused" + information_security_principles: "https://www.internet.ee/infoturbe-pohimotted-eesti-interneti-sihtasutuses" + content_management_principles: "https://www.internet.ee/domeenid/sisu-haldamise-pohimotted-eesti-internetis" + cookie_settings: "javascript:void(0)" + newsletter: "https://www.internet.ee/eis/uudiskiri" + list_of_accredited_registrars: "https://www.internet.ee/registripidaja/akrediteeritud-registripidajad" + terms_and_conditions_for_registrars: "https://www.internet.ee/registripidaja/kuidas-saada-ee-akrediteeritud-registripidajaks" + terms_and_conditions: "https://www.internet.ee/domeenid/domeenide-oksjonikeskkonna-kasutajatingimused" + partner_programme: "https://www.internet.ee/registripidaja/kuidas-saada-ee-elite-partneriks" + contact_us: "https://internet.ee/eis" + management: "https://internet.ee/eis/ulesanded-juhatus-ja-noukogu" + documents: "https://www.internet.ee/eis/dokumendid" + facebook: "https://www.facebook.com/EE-748656818569233/" + twitter: "https://twitter.com/Eesti_Internet" + youtube: "https://www.youtube.com/channel/UC7nTB6zIwZYPFarlbKuEPRA" + linkedin: "https://www.linkedin.com/company/eesti-interneti-sa/" + instagram: "https://www.instagram.com/eestiinternet" + spotify: "https://open.spotify.com/show/5OSbOQScBgFtpoL7pqGvii" + rss: "https://internet.ee/index.rss" webpush_modal: webpush_title: Luba veebiteavitused diff --git a/config/routes.rb b/config/routes.rb index b27a451cc..853a02074 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -148,4 +148,6 @@ mount OkComputer::Engine, at: '/healthcheck', as: :healthcheck mount LetterOpenerWeb::Engine, at: "/letter_opener" if Rails.env.development? + + get 'health' => 'rails/health#show', as: :rails_health_check end diff --git a/db/seeds.rb b/db/seeds.rb index 775286d8d..2d8724b84 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -402,36 +402,6 @@ check_tara_url.save -# Voog site default URL -voog_site_url_description = <<~TEXT.squish - VOOG site from which to fetch localized footer elements. Defaults to https://www.internet.ee. -TEXT - -voog_site_url_setting = Setting.new(code: :voog_site_url, value: 'https://www.internet.ee', - description: voog_site_url_description, - value_format: 'string') -voog_site_url_setting.save - -# Voog site API token -voog_api_key_description = <<~TEXT.squish - VOOG site API key. Required to fetch footer content. -TEXT - -voog_api_key_setting = Setting.new(code: :voog_api_key, value: 'changeme', - description: voog_api_key_description, - value_format: 'string') -voog_api_key_setting.save - -# Voog site API fetching enabled boolean -voog_site_fetching_enabled_description = <<~TEXT.squish - Boolean whether to enable fetching & showing footer element from VOOG site. Defaults to false. -TEXT - -voog_site_fetching_enabled_setting = Setting.new(code: :voog_site_fetching_enabled, value: 'false', - description: voog_site_fetching_enabled_description, - value_format: 'boolean') -voog_site_fetching_enabled_setting.save - # Daily reminder on paid but not registered domains flag daily_reminder_description = <<~TEXT.squish Days remaining to the registration deadline that triggers daily reminder email until diff --git a/test/components/common/footer_test.rb b/test/components/common/footer_test.rb index 87e895fc6..13205afa8 100644 --- a/test/components/common/footer_test.rb +++ b/test/components/common/footer_test.rb @@ -3,63 +3,85 @@ class FooterTest < ViewComponent::TestCase include ViewComponent::SystemTestHelpers + def setup + VoogFooter.configure { |config| config.enabled = false } + end + def test_render_component I18n.with_locale(:en) do render_inline(Common::Footer::Component.new) - expected_copyrigth_text = I18n.t('common.footer.copyright') - assert_selector '.c-footer__highlight__title div', text: expected_copyrigth_text - - expected_address = Setting.find_by(code: 'invoice_issuer_address').retrieve - expected_reg_no = Setting.find_by(code: 'invoice_issuer_reg_no').retrieve - expected_reg_no_text = I18n.t('reg_no') + ": " + expected_reg_no - - assert_selector '.c-footer__highlight__info', text: expected_address - assert_selector '.c-footer__highlight__info', text: expected_reg_no_text + assert_selector "h3.c-footer__highlight__title", text: I18n.t("common.footer.copyright") + assert_selector ".c-footer__highlight__info", text: I18n.t("common.footer.address") + assert_selector ".c-footer__highlight__info", text: I18n.t("common.footer.registration_code") - email = Setting.find_by(code: 'contact_organization_email').retrieve - phone = Setting.find_by(code: 'organization_phone').retrieve - + email = Setting.find_by(code: "contact_organization_email").retrieve assert_selector '.c-footer__highlight__contact a[href^="mailto:"]', text: email - - assert_selector '.c-footer__highlight__contact a[href^="tel:"]', text: phone - - assert_selector '.c-footer__row__col.s-footer-col', text: I18n.t('common.footer.help_and_info') - assert_selector '.c-footer__row__col.s-footer-col', text: I18n.t('common.footer.domain_regulation') - assert_selector '.c-footer__row__col.s-footer-col', text: I18n.t('common.footer.faq') - assert_selector '.c-footer__row__col.s-footer-col', text: I18n.t('common.footer.statistics') - assert_selector '.c-footer__row__col.s-footer-col', text: I18n.t('common.footer.dispute_committee') - - assert_selector '.c-footer__row__col.s-footer-col a[href="https://internet.ee/domains/ee-domain-regulation"]' - assert_selector '.c-footer__row__col.s-footer-col a[href="https://internet.ee/help-and-info/faq"]' - assert_selector '.c-footer__row__col.s-footer-col a[href="https://internet.ee/help-and-info/statistics"]' - assert_selector '.c-footer__row__col.s-footer-col a[href="https://www.internet.ee/domain-disputes/domain-disputes-committee"]' - - assert_selector '.c-footer__row__col.s-footer-col', text: I18n.t('common.footer.registrars') - assert_selector '.c-footer__row__col.s-footer-col', text: I18n.t('common.footer.list_of_accredited_registrars') - assert_selector '.c-footer__row__col.s-footer-col', text: I18n.t('common.footer.terms_and_conditions_for_registrars') - assert_selector '.c-footer__row__col.s-footer-col', text: I18n.t('common.footer.partner_programme') - - assert_selector '.c-footer__row__col.s-footer-col a[href="https://www.internet.ee/registrar-portal/accredited-registrars"]' - assert_selector '.c-footer__row__col.s-footer-col a[href="https://www.internet.ee/registrar-portal/terms-and-conditions-for-becoming-a-registrar"]' - assert_selector '.c-footer__row__col.s-footer-col a[href="https://www.internet.ee/registrar-portal/become-a-ee-elite-partner"]' - - assert_selector '.c-footer__row__col.s-footer-col', text: I18n.t('common.footer.estonian_internet') - assert_selector '.c-footer__row__col.s-footer-col', text: I18n.t('common.footer.contact_us') - assert_selector '.c-footer__row__col.s-footer-col', text: I18n.t('common.footer.management') - assert_selector '.c-footer__row__col.s-footer-col', text: I18n.t('common.footer.newsletter') - - assert_selector '.c-footer__row__col.s-footer-col a[href="https://www.internet.ee/eif"]' - assert_selector '.c-footer__row__col.s-footer-col a[href="https://www.internet.ee/eif/tasks-and-management"]' - assert_selector '.c-footer__row__col.s-footer-col a[href="https://www.internet.ee/eif/newsletter"]' - - assert_selector '.c-footer__row__col.s-footer-col', text: I18n.t('common.footer.social_media') - - assert_selector 'a.c-socials__link[href="https://www.facebook.com/EE-748656818569233/"]' - assert_selector 'a.c-socials__link[href="https://twitter.com/Eesti_Internet"]' - # assert_selector 'a.c-socials__link[href=""]', text: '' - assert_selector 'a.c-socials__link[href="https://www.youtube.com/channel/UC7nTB6zIwZYPFarlbKuEPRA"]' - assert_selector 'a.c-socials__link[href="https://internet.ee/index.rss"]' + + assert_selector ".c-footer__highlight__contact", text: "727 1000" + + assert_column I18n.t("common.footer.help_and_info") + assert_column I18n.t("common.footer.registrars") + assert_column I18n.t("common.footer.estonian_internet") + assert_column I18n.t("common.footer.social_media") + + assert_nav_link :domain_regulation + assert_nav_link :faq + assert_nav_link :statistics + assert_nav_link :dispute_committee + assert_nav_link :data_protection_policy + assert_nav_link :content_management_principles + assert_cookie_settings_link + assert_nav_link :list_of_accredited_registrars + assert_nav_link :partner_programme + assert_nav_link :contact_us + assert_nav_link :management + assert_nav_link :documents + assert_nav_link :newsletter + assert_nav_link :information_security_principles + + terms_url = Setting.find_by(code: "terms_and_conditions_link").retrieve + assert_selector( + ".c-footer__row__col.s-footer-col a[href='#{terms_url}']", + text: I18n.t("common.footer.labels.terms_and_conditions") + ) + + assert_social_link :facebook + assert_social_link :twitter + assert_social_link :youtube + assert_social_link :linkedin + assert_social_link :instagram + assert_social_link :spotify + assert_social_link :rss + + assert_selector "a.c-footer__sviiter[href='https://sviiter.ee']" end end -end \ No newline at end of file + + private + + def assert_column(title) + assert_selector ".c-footer__row__col.s-footer-col", text: title + end + + def assert_nav_link(key) + url = I18n.t("common.footer.links.#{key}") + label = I18n.t("common.footer.labels.#{key}") + assert_selector(".c-footer__row__col.s-footer-col a[href='#{url}']", text: label) + end + + def assert_cookie_settings_link + url = I18n.t("common.footer.links.cookie_settings") + label = I18n.t("common.footer.labels.cookie_settings") + assert_selector( + ".c-footer__row__col.s-footer-col a[data-cc='c-settings'][href='#{url}']", + text: label + ) + end + + def assert_social_link(key) + url = I18n.t("common.footer.links.#{key}") + title = I18n.t("common.footer.social.#{key}") + assert_selector(".c-socials a[href='#{url}'][title='#{title}']") + end +end diff --git a/test/integration/invoices_test.rb b/test/integration/invoices_test.rb index bc7c98d46..f13fef193 100644 --- a/test/integration/invoices_test.rb +++ b/test/integration/invoices_test.rb @@ -169,26 +169,25 @@ def test_download_serves_pdf_without_wkhtmltopdf assert response.body.start_with?('%PDF-1.4') end - def test_show_returns_internal_server_error_for_other_users_invoice + def test_show_returns_not_found_for_other_users_invoice sign_in @user_two get invoice_path(@invoice.uuid) - assert_response :internal_server_error + assert_response :not_found end - def test_oneoff_returns_internal_server_error_for_other_users_invoice + def test_oneoff_returns_not_found_for_other_users_invoice sign_in @user_two post oneoff_invoice_path(@invoice.uuid), params: { amount: '1.0' } - assert_response :internal_server_error + assert_response :not_found end - def test_update_redirects_to_invoices_for_other_users_invoice + def test_update_returns_not_found_for_other_users_invoice sign_in @user_two patch invoice_path(@invoice.uuid), params: { invoice: { billing_profile_id: @invoice.billing_profile_id } } - assert_includes [302, 500], response.status - assert_redirected_to invoices_path if response.redirect? + assert_response :not_found end def test_index_shows_only_current_users_invoices diff --git a/test/jobs/shared_footer_fetcher_job_test.rb b/test/jobs/shared_footer_fetcher_job_test.rb deleted file mode 100644 index 3c39c216e..000000000 --- a/test/jobs/shared_footer_fetcher_job_test.rb +++ /dev/null @@ -1,36 +0,0 @@ -require 'test_helper' - -class SharedFooterFetcherJobTest < ActiveJob::TestCase - def setup - super - @voog_site_url = settings(:voog_site_url) - @voog_api_key = settings(:voog_api_key) - @voog_site_fetching_enabled = settings(:voog_site_fetching_enabled) - - @voog_site_url.update!(value: 'https://test.url') - @voog_api_key.update!(value: '123') - @voog_site_fetching_enabled.update!(value: 'true') - end - - def test_perform_now - locales_body = [{"id":1,"code": "et"}, {"id":2,"code": "en"}] - et_footer_html = '

Now that\'s one nice et footer

' - en_footer_html = '' - - stub_request(:get, %r{admin/api/}).to_return(body: locales_body.to_json, status: 200, headers: {}) - stub_request(:get, %r{/et}).to_return(body: et_footer_html, status: 200, headers: {}) - stub_request(:get, %r{/en}).to_return(body: en_footer_html, status: 200, headers: {}) - - SharedFooterFetcherJob.perform_now - - assert RemoteViewPartial.find_by(name: 'footer', locale: 'et').present? - assert RemoteViewPartial.find_by(name: 'footer', locale: 'en').present? - end - - def test_job_runnability_is_determined_by_setting_value - assert SharedFooterFetcherJob.needs_to_run? - - @voog_site_fetching_enabled.update!(value: 'false') - assert !SharedFooterFetcherJob.needs_to_run? - end -end diff --git a/test/models/ability/participant_ability_test.rb b/test/models/ability/participant_ability_test.rb index b16f8993c..657555757 100644 --- a/test/models/ability/participant_ability_test.rb +++ b/test/models/ability/participant_ability_test.rb @@ -82,6 +82,10 @@ def test_participant_can_edit_their_own_invoices assert(@participant_ability.can?(:read, Invoice.new(user_id: @participant.id))) assert(@participant_ability.can?(:update, Invoice.new(user_id: @participant.id))) + other_users_invoice = Invoice.new(user_id: users(:second_place_participant).id) + assert_not(@participant_ability.can?(:read, other_users_invoice)) + assert_not(@participant_ability.can?(:update, other_users_invoice)) + assert_not(@participant_ability.can?(:delete, Invoice.new(user_id: @participant.id))) assert_not(@participant_ability.can?(:create, Invoice.new(user_id: @participant.id))) assert_not(@participant_ability.can?(:manage, Invoice.new))