about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorysksn <bluewhale1982@gmail.com>2018-12-28 16:18:47 +0900
committerEugen Rochko <eugen@zeonfederated.com>2018-12-28 08:18:47 +0100
commitccb9c1b952e87dd954bfb651db59dc02a4d9341f (patch)
tree80770756d940c7c4ca050dd4a181e2e5d3a943d6 /app
parentc1693827aeea8e14c1dadd94506d5cf74635dd40 (diff)
Add pending specs for StatusLengthValidator (#9647)
* Add pending specs of StatusLengthValidator

* Use instance variable
Diffstat (limited to 'app')
-rw-r--r--app/validators/status_length_validator.rb22
1 files changed, 12 insertions, 10 deletions
diff --git a/app/validators/status_length_validator.rb b/app/validators/status_length_validator.rb
index ed5563f64..93bae2fa8 100644
--- a/app/validators/status_length_validator.rb
+++ b/app/validators/status_length_validator.rb
@@ -5,27 +5,29 @@ class StatusLengthValidator < ActiveModel::Validator
 
   def validate(status)
     return unless status.local? && !status.reblog?
-    status.errors.add(:text, I18n.t('statuses.over_character_limit', max: MAX_CHARS)) if too_long?(status)
+
+    @status = status
+    status.errors.add(:text, I18n.t('statuses.over_character_limit', max: MAX_CHARS)) if too_long?
   end
 
   private
 
-  def too_long?(status)
-    countable_length(status) > MAX_CHARS
+  def too_long?
+    countable_length > MAX_CHARS
   end
 
-  def countable_length(status)
-    total_text(status).mb_chars.grapheme_length
+  def countable_length
+    total_text.mb_chars.grapheme_length
   end
 
-  def total_text(status)
-    [status.spoiler_text, countable_text(status)].join
+  def total_text
+    [@status.spoiler_text, countable_text].join
   end
 
-  def countable_text(status)
-    return '' if status.text.nil?
+  def countable_text
+    return '' if @status.text.nil?
 
-    status.text.dup.tap do |new_text|
+    @status.text.dup.tap do |new_text|
       new_text.gsub!(FetchLinkCardService::URL_PATTERN, 'x' * 23)
       new_text.gsub!(Account::MENTION_RE, '@\2')
     end