forked from mirrors/catstodon
Fix tests, add applications to eager loading/cache for statuses, fix
application website validation, don't link to app website if website isn't set, also comment out animated boost icon from #464 until it's consistent with non-animated versionmain
parent
ab165547fd
commit
e9737c2235
@ -0,0 +1,9 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
module ApplicationExtension
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
included do
|
||||
validates :website, url: true, unless: 'website.blank?'
|
||||
end
|
||||
end
|
@ -0,0 +1,14 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class UrlValidator < ActiveModel::EachValidator
|
||||
def validate_each(record, attribute, value)
|
||||
record.errors.add(attribute, I18n.t('applications.invalid_url')) unless compliant?(value)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def compliant?(url)
|
||||
parsed_url = Addressable::URI.parse(url)
|
||||
!parsed_url.nil? && %w(http https).include?(parsed_url.scheme) && parsed_url.host
|
||||
end
|
||||
end
|
@ -1,8 +0,0 @@
|
||||
module ApplicationExtension
|
||||
extend ActiveSupport::Concern
|
||||
included do
|
||||
validates :website
|
||||
end
|
||||
end
|
||||
|
||||
Doorkeeper::Application.send :include, ApplicationExtension
|
@ -1,3 +1,3 @@
|
||||
object @application
|
||||
|
||||
attributes :id, :name, :website
|
||||
attributes :name, :website
|
||||
|
@ -0,0 +1,5 @@
|
||||
Fabricator(:application, from: Doorkeeper::Application) do
|
||||
name 'Example'
|
||||
website 'http://example.com'
|
||||
redirect_uri 'http://example.com/callback'
|
||||
end
|
Loading…
Reference in New Issue