From 1cb990e87fac936ce64b9f55e0d0a7715d70e2aa Mon Sep 17 00:00:00 2001
From: Michael Kohl <citizen428@dev.to>
Date: Wed, 23 Dec 2020 22:26:12 +0700
Subject: [PATCH] Routine Rubocop fixes (#12016)

---
 app/models/user.rb                                  |  2 +-
 app/services/site_configs/upsert.rb                 |  2 +-
 spec/requests/api/v0/admin/configs_spec.rb          | 13 +++++++------
 .../welcome_notification/generator_spec.rb          |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index e540fbe36..d6d2e9614 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -654,7 +654,7 @@ class User < ApplicationRecord
     return unless persisted?
 
     index_to_elasticsearch_inline
-  rescue => e
+  rescue StandardError => e
     Honeybadger.notify(e, context: { user_id: id })
   end
 
diff --git a/app/services/site_configs/upsert.rb b/app/services/site_configs/upsert.rb
index 2aa80a930..26d094f99 100644
--- a/app/services/site_configs/upsert.rb
+++ b/app/services/site_configs/upsert.rb
@@ -14,7 +14,7 @@ module SiteConfigs
         onboarding_taskcard_image
       ].freeze
 
-    VALID_URL = %r{\A(http|https)://([/|.|\w|\s|-])*.[a-z]{2,5}(:[0-9]{1,5})?(/.*)?\z}.freeze
+    VALID_URL = %r{\A(http|https)://([/|.\w\s-])*.[a-z]{2,5}(:[0-9]{1,5})?(/.*)?\z}.freeze
 
     VALID_DOMAIN = /^[a-zA-Z0-9][a-zA-Z0-9-]{1,61}[a-zA-Z0-9](?:\.[a-zA-Z]{2,})+$/.freeze
 
diff --git a/spec/requests/api/v0/admin/configs_spec.rb b/spec/requests/api/v0/admin/configs_spec.rb
index e0647e154..2c922b381 100644
--- a/spec/requests/api/v0/admin/configs_spec.rb
+++ b/spec/requests/api/v0/admin/configs_spec.rb
@@ -65,32 +65,33 @@ RSpec.describe "Api::V0::Admin::Configs", type: :request do
       it "enables proper domains to allow list" do
         proper_list = "dev.to, forem.com, forem.dev"
         put api_admin_config_path, params: { site_config: { allowed_registration_email_domains: proper_list } }.to_json,
-          headers: headers
+                                   headers: headers
         expect(SiteConfig.allowed_registration_email_domains).to eq(%w[dev.to forem.com forem.dev])
       end
 
       it "does not allow improper domain list" do
         improper_list = "dev.to, foremcom, forem.dev"
-        put api_admin_config_path, params: { site_config: { allowed_registration_email_domains: improper_list } }.to_json,
-          headers: headers
+        put api_admin_config_path,
+            params: { site_config: { allowed_registration_email_domains: improper_list } }.to_json,
+            headers: headers
         expect(SiteConfig.allowed_registration_email_domains).not_to eq(%w[dev.to foremcom forem.dev])
       end
 
       it "removes space suggested_tags" do
         put api_admin_config_path, params: { site_config: { suggested_tags: "hey, haha,hoho, bobo fofo" } }.to_json,
-          headers: headers
+                                   headers: headers
         expect(SiteConfig.suggested_tags).to eq(%w[hey haha hoho bobofofo])
       end
 
       it "downcases suggested_tags" do
         put api_admin_config_path, params: { site_config: { suggested_tags: "hey, haha,hoHo, Bobo Fofo" } }.to_json,
-          headers: headers
+                                   headers: headers
         expect(SiteConfig.suggested_tags).to eq(%w[hey haha hoho bobofofo])
       end
 
       it "Renders siteconfig result" do
         put api_admin_config_path, params: { site_config: { community_name: "new" } }.to_json,
-          headers: headers
+                                   headers: headers
 
         expect(response.parsed_body["community_name"]).to eq SiteConfig.community_name
       end
diff --git a/spec/services/broadcasts/welcome_notification/generator_spec.rb b/spec/services/broadcasts/welcome_notification/generator_spec.rb
index cb3ae51b9..e8272f6a0 100644
--- a/spec/services/broadcasts/welcome_notification/generator_spec.rb
+++ b/spec/services/broadcasts/welcome_notification/generator_spec.rb
@@ -65,7 +65,7 @@ RSpec.describe Broadcasts::WelcomeNotification::Generator, type: :service do
       not_github = [
         facebook_connect_broadcast,
         twitter_connect_broadcast,
-        apple_connect_broadcast
+        apple_connect_broadcast,
       ].include?(user.notifications.last.notifiable)
       expect(not_github).to be(true)