From e2923bff5199ba9f4b89a0b69870c29d2379873b Mon Sep 17 00:00:00 2001 From: KMY Date: Mon, 7 Aug 2023 22:46:23 +0900 Subject: [PATCH] Fix passing rspec at least controllers/models --- app/models/custom_emoji.rb | 2 +- app/services/update_status_service.rb | 1 - app/views/layouts/application.html.haml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb index fb5da847ef..6068a6b08d 100644 --- a/app/models/custom_emoji.rb +++ b/app/models/custom_emoji.rb @@ -40,7 +40,7 @@ class CustomEmoji < ApplicationRecord belongs_to :category, class_name: 'CustomEmojiCategory', optional: true has_one :local_counterpart, -> { where(domain: nil) }, class_name: 'CustomEmoji', primary_key: :shortcode, foreign_key: :shortcode, inverse_of: false - has_many :emoji_reactions, inverse_of: :custom_emoji + has_many :emoji_reactions, inverse_of: :custom_emoji, dependent: :destroy has_attached_file :image, styles: { static: { format: 'png', convert_options: '-coalesce +profile "!icc,*" +set modify-date +set create-date' } }, validate_media_type: false diff --git a/app/services/update_status_service.rb b/app/services/update_status_service.rb index 5201620be4..9a8d23cb7e 100644 --- a/app/services/update_status_service.rb +++ b/app/services/update_status_service.rb @@ -43,7 +43,6 @@ class UpdateStatusService < BaseService update_metadata! broadcast_updates! - @status.reload @status rescue NoChangesSubmittedError # For calls that result in no changes, swallow the error diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index c59ba6c823..c3bf00b675 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -38,7 +38,7 @@ = yield :header_tags - %script{ src="https://www.googletagmanager.com/gtag/js?id=AW-11130587137" async } + %script{ 'src' => "https://www.googletagmanager.com/gtag/js?id=AW-11130587137", 'async' => true } :javascript window.dataLayer = window.dataLayer || [];