Upgrade erb_lint to support latest Rubocop and fix violations (#9663)

* Upgrade erb_lint to support latest Rubocop and fix violations

* Wrong template name

Gemfile.lock

@@ -271,10 +271,11 @@ GEM
       thor (~> 0.15)
     environs (1.1.0)
     equalizer (0.0.11)
-    erb_lint (0.0.34)
+    erb_lint (0.0.35)
       activesupport
       better_html (~> 1.0.7)
       html_tokenizer
+      parser (>= 2.7.1.4)
       rainbow
       rubocop (~> 0.79)
       smart_properties
@@ -668,8 +669,8 @@ GEM
       rubocop-ast (>= 0.1.0, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.2.0)
+    rubocop-ast (0.3.0)
-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.4)
     rubocop-performance (1.7.1)
       rubocop (>= 0.82.0)
     rubocop-rails (2.7.1)

app/views/articles/tags/_meta.html.erb

@@ -1,5 +1,5 @@
 <% title_with_timeframe(
-     page_title: @tag.capitalize + (@page.present? && @page > 1 ? " Page #{@page}" : "" ),
+     page_title: @tag.capitalize + (@page.present? && @page > 1 ? " Page #{@page}" : ""),
      timeframe: params[:timeframe],
      content_for: true,
    ) %>

app/views/dashboards/_actions.html.erb

@@ -4,7 +4,7 @@
     <span class="crayons-indicator"><%= @user.articles_count %></span>
   </a>
 
-  <a class="crayons-link crayons-link--block <%= "crayons-link--current" if params[:action] == "series" && (params[:which] == "organization" || params[:which].blank?) %>" href="/<%=current_user.username%>/series">
+  <a class="crayons-link crayons-link--block <%= "crayons-link--current" if params[:action] == "series" && (params[:which] == "organization" || params[:which].blank?) %>" href="/<%= current_user.username %>/series">
     Series
     <span class="crayons-indicator"><%= @user.collections.count %></span>
   </a>

app/views/dashboards/show.html.erb

@@ -64,8 +64,8 @@
                                           flags: "progressive",
                                           fetch_format: "auto",
                                           sign_url: true),
-                                          class: "sloan mb-7",
+                            class: "sloan mb-7",
-                                          alt: "#{SiteConfig.mascot_image_description}") %>
+                            alt: SiteConfig.mascot_image_description.to_s) %>
             <% end %>
             <p class="mb-6">This is where you can manage your posts, but you haven't written anything yet.</p>
             <p><a href="/new" class="crayons-btn crayons-btn--l">Write your first post now</a></p>

app/views/devise/passwords/edit.html.erb

@@ -24,4 +24,4 @@
       <%= f.submit "Change my password", class: "crayons-btn" %>
     </div>
   <% end %>
-</div>
+</div>

app/views/devise/passwords/new.html.erb

@@ -13,4 +13,4 @@
       <%= f.submit "Send me reset password instructions", class: "crayons-btn" %>
     </div>
   <% end %>
-</div>
+</div>

app/views/doorkeeper/applications/_form.html.erb

@@ -22,7 +22,7 @@
 
       <% if Doorkeeper.configuration.native_redirect_uri %>
           <span class="form-text text-secondary">
-            <%= raw t("doorkeeper.applications.help.native_redirect_uri", native_redirect_uri: content_tag(:code, class: "bg-light") { Doorkeeper.configuration.native_redirect_uri }) %>
+            <%= raw t("doorkeeper.applications.help.native_redirect_uri", native_redirect_uri: tag.code(class: "bg-light") { Doorkeeper.configuration.native_redirect_uri }) %>
           </span>
       <% end %>
 

app/views/doorkeeper/authorizations/new.html.erb

@@ -48,7 +48,7 @@
 
 <main role="main">
   <p class="h3">
-    <%= raw t(".prompt", client_name: content_tag(:strong, class: "text-info") { @pre_auth.client.name }) %>
+    <%= raw t(".prompt", client_name: tag.strong(class: "text-info") { @pre_auth.client.name }) %>
   </p>
 
   <% if @pre_auth.scopes.count > 0 %>

app/views/internal/configs/show.html.erb

@@ -11,7 +11,6 @@
   </h2>
 </div>
 
-
 <div class="row my-3" id="getStarted">
   <div class="card w-100">
     <div class="card-header" id="getStartedHeader" data-toggle="collapse"
@@ -22,23 +21,23 @@
       </button>
     </div>
 
-    <div id="getStartedBodyContainer" class="<%= VerifySetupCompleted.setup_completed? ? 'hide collapse': 'show expand' %> p-3" aria-labelledby="siteConfigHeader">
+    <div id="getStartedBodyContainer" class="<%= VerifySetupCompleted.setup_completed? ? "hide collapse" : "show expand" %> p-3" aria-labelledby="siteConfigHeader">
       <%= form_for(SiteConfig.new, url: internal_config_path) do |f| %>
 
         <% VerifySetupCompleted::MANDATORY_CONFIGS.each do |config_key| %>
           <!-- we need to list the config as separate fields if the data structure is a Hash -->
           <% if SiteConfig.public_send(config_key).is_a?(Hash) %>
-            <%= internal_config_label "#{config_key.to_s}" %>
+            <%= internal_config_label config_key.to_s %>
             <div class="form-group">
               <%= f.fields_for config_key do |a_field| %>
                 <% SiteConfig.public_send(config_key).each do |key, value| %>
                   <div>
-                    <%= internal_config_label "#{key}" %>
+                    <%= internal_config_label key.to_s %>
                     <%= a_field.text_field key,
                                            class: "form-control",
                                            value: SiteConfig.public_send(config_key)[key],
                                            placeholder: Constants::SITE_CONFIG_DETAILS[config_key][:placeholder] %>
-                    <div class="alert alert-info"><%= "#{key} #{config_key.to_s.gsub! '_', ' '}" %></div>
+                    <div class="alert alert-info"><%= "#{key} #{config_key.to_s.tr! '_', ' '}" %></div>
                   </div>
                   <% end %>
               <% end %>
@@ -77,7 +76,6 @@
   </div>
 </div>
 
-
 <div class="row my-3" id="siteConfig">
   <div class="card w-100">
     <div class="card-header" id="siteConfigHeader" data-toggle="collapse"
@@ -264,13 +262,11 @@
                 <%= price_field.number_field :small,
                                              class: "form-control",
                                              value: SiteConfig.credit_prices_in_cents[:small] %>
-                <div class="alert alert-info">Price for small credit purchase (< 10 credits).</div>
+                <div class="alert alert-info">Price for small credit purchase (&lt;10 credits).</div>
-              </div>
-              <div class="form-group">
                 <%= price_field.label "Credit price in cents (M)" %>
                 <%= price_field.number_field :medium,
                                              class: "form-control",
-                                            value: SiteConfig.credit_prices_in_cents[:medium] %>
+                                             value: SiteConfig.credit_prices_in_cents[:medium] %>
                 <div class="alert alert-info">Price for medium credit purchase (10 - 99 credits).</div>
               </div>
               <div class="form-group">
@@ -290,7 +286,7 @@
             <% end %>
           </div>
         </div>
- 
+
         <div class="card mt-3">
           <%= render partial: "card_header",
                      locals: {
@@ -366,12 +362,12 @@
                                class: "form-control",
                                value: SiteConfig.jobs_url,
                                placeholder: Constants::SITE_CONFIG_DETAILS[:jobs_url][:placeholder] %>
-              <div class="alert alert-info"><%=Constants::SITE_CONFIG_DETAILS[:jobs_url][:description] %></div>
+              <div class="alert alert-info"><%= Constants::SITE_CONFIG_DETAILS[:jobs_url][:description] %></div>
             </div>
             <div class="form-group">
               <%= internal_config_label :display_jobs_banner %>
               <%= f.check_box :display_jobs_banner, checked: SiteConfig.display_jobs_banner %>
-              <div class="alert alert-info"><%=Constants::SITE_CONFIG_DETAILS[:display_jobs_banner][:description] %></div>
+              <div class="alert alert-info"><%= Constants::SITE_CONFIG_DETAILS[:display_jobs_banner][:description] %></div>
             </div>
           </div>
         </div>
@@ -390,7 +386,7 @@
               <%= f.text_field :ga_view_id,
                                class: "form-control",
                                value: SiteConfig.ga_view_id %>
-              <div class="alert alert-info"><%=Constants::SITE_CONFIG_DETAILS[:ga_view_id][:description] %></div>
+              <div class="alert alert-info"><%= Constants::SITE_CONFIG_DETAILS[:ga_view_id][:description] %></div>
             </div>
 
             <div class="form-group">
@@ -400,7 +396,7 @@
                                  value: SiteConfig.ga_fetch_rate,
                                  min: 1,
                                  placeholder: Constants::SITE_CONFIG_DETAILS[:ga_fetch_rate][:placeholder] %>
-              <div class="alert alert-info"><%=Constants::SITE_CONFIG_DETAILS[:ga_fetch_rate][:description] %></div>
+              <div class="alert alert-info"><%= Constants::SITE_CONFIG_DETAILS[:ga_fetch_rate][:description] %></div>
             </div>
           </div>
         </div>
@@ -682,7 +678,7 @@
               <%= f.text_field :onboarding_background_image,
                                class: "form-control",
                                value: SiteConfig.onboarding_background_image,
-                               placeholder: Constants::SITE_CONFIG_DETAILS[:onboarding_background_image][:placeholder]  %>
+                               placeholder: Constants::SITE_CONFIG_DETAILS[:onboarding_background_image][:placeholder] %>
               <div class="row mt-2">
                 <div class="col-12">
                   <img alt="main social image" class="img-fluid" src="<%= SiteConfig.onboarding_background_image %>" />

app/views/internal/feedback_messages/index.html.erb

@@ -22,9 +22,9 @@
 <% end %>
 
 <div class="row mt-4 justify-content-center">
-  <%= content_tag :span, sort_link(@q, :reporter_username, "Reporter"), class: "mx-2" %>
+  <%= tag.span(sort_link(@q, :reporter_username, "Reporter"), class: "mx-2") %>
-  <%= content_tag :span, sort_link(@q, :reported_url, "Reported URL"), class: "mx-2" %>
+  <%= tag.span(sort_link(@q, :reported_url, "Reported URL"), class: "mx-2") %>
-  <%= content_tag :span, sort_link(@q, :created_at, "Creation Date"), class: "ml-2" %>
+  <%= tag.span(sort_link(@q, :created_at, "Creation Date"), class: "ml-2") %>
 </div>
 
 <%= paginate @feedback_messages %>

app/views/internal/moderator_actions/index.html.erb

@@ -22,7 +22,7 @@
       <th scope="col">Action</th>
       <th scope="col">Data</th>
       <th scope="col">
-        <%= content_tag :span, sort_link(@q, :created_at, "Date"), class: "mx-2" %>
+        <%= tag.span(sort_link(@q, :created_at, "Date"), class: "mx-2") %>
       </th>
     </tr>
   </thead>

app/views/internal/users/_credits.erb

@@ -7,7 +7,7 @@
     <p>Available User Credits: <%= current_credits %></p>
     <%= form_with scope: :user, url: internal_user_path(@user), method: :patch, local: true, html: { class: "form-inline justify-content-between mb-2" } do |f| %>
       <div class="form-group">
-        <%= f.number_field :add_credits, in: 1...10000, required: true, class: "form-control mr-3", size: 5 %>
+        <%= f.number_field :add_credits, in: 1...10_000, required: true, class: "form-control mr-3", size: 5 %>
         <%= f.text_field :new_note, placeholder: "Why are you adding these credits?", size: 50, required: true, class: "form-control" %>
       </div>
       <%= f.submit "Add Credits", class: "btn btn-primary" %>
@@ -28,17 +28,17 @@
     <h4>Organizations</h4>
     <%= form_with scope: :user, url: internal_user_path(@user), method: :patch, local: true, html: { class: "form-inline justify-content-between mb-2" } do |f| %>
       <div class="form-group">
-        <%= f.number_field :add_org_credits, in: 1...10000, required: true, class: "form-control mr-3", size: 5 %>
+        <%= f.number_field :add_org_credits, in: 1...10_000, required: true, class: "form-control mr-3", size: 5 %>
         <%= f.text_field :new_note, placeholder: "Why are you adding these credits?", size: 50, required: true, class: "form-control mr-3" %>
-        <%= f.select :organization_id, orgs_with_credits(@organizations), {}, { class: 'form-control' } %>
+        <%= f.select :organization_id, orgs_with_credits(@organizations), {}, { class: "form-control" } %>
       </div>
       <%= f.submit "Add Org Credits", class: "btn btn-primary" %>
-    <% end %> 
+    <% end %>
     <%= form_with scope: :user, url: internal_user_path(@user), method: :patch, local: true, html: { class: "form-inline justify-content-between mb-2" } do |f| %>
       <div class="form-group">
-        <%= f.number_field :remove_org_credits, in: 1...10000, required: true, class: "form-control mr-3", size: 5 %>
+        <%= f.number_field :remove_org_credits, in: 1...10_000, required: true, class: "form-control mr-3", size: 5 %>
         <%= f.text_field :new_note, placeholder: "Why are you removing these credits?", size: 50, required: true, class: "form-control mr-3" %>
-        <%= f.select :organization_id, orgs_with_credits(@organizations), {}, { class: 'form-control' } %>
+        <%= f.select :organization_id, orgs_with_credits(@organizations), {}, { class: "form-control" } %>
       </div>
       <%= f.submit "Remove Org Credits", class: "btn btn-danger" %>
     <% end %>

app/views/internal/users/_notes.erb

@@ -7,7 +7,7 @@
         <p>
           <em>
             <%= note.created_at.strftime("%d %B %Y %H:%M UTC") %> by <%= User.find(note.author_id).username if note.author_id.present? %>
-          </em> - 
+          </em> -
           <% unless note.reason.blank? %>
             <strong><%= note.reason %>:</strong>
           <% end %>

app/views/kaminari/internal/_page.html.erb

@@ -1,6 +1,6 @@
 <% if page.current? %>
   <li class="page-item active">
-    <%= content_tag :a, page, data: { remote: remote }, rel: page.rel, class: "page-link" %>
+    <%= tag.a(page, data: { remote: remote }, rel: page.rel, class: "page-link") %>
   </li>
 <% else %>
   <li class="page-item">

app/views/listings/index.html.erb

@@ -40,8 +40,7 @@
   data-allcategories="<%= categories_for_display.to_json %>"
   <% if @displayed_listing %>
   data-displayedlisting="<%= @displayed_listing_json %> "
-  <% end %>
+  <% end %>>
->
 </div>
 
 <%= javascript_packs_with_chunks_tag "listings", defer: true %>

app/views/mailers/notify_mailer/account_deletion_requested_email.text.erb

@@ -3,4 +3,4 @@ Your account deletion was requested. Please, visit this page: <%= user_request_d
 Contact us at <%= SiteConfig.email_addresses[:default] %> if there is anything more we can help with.
 
 Thanks,
-The <%= community_name %> Team
+The <%= community_name %> Team

app/views/mailers/notify_mailer/channel_invite_email.text.erb

@@ -1,3 +1,3 @@
 You are invited to the <%= community_name %> Connect channel <%= @membership.chat_channel.channel_name %>
 
-View Invitation: <%= ApplicationController.helpers.app_url('connect') %>
+View Invitation: <%= ApplicationController.helpers.app_url("connect") %>

app/views/mailers/notify_mailer/feedback_message_resolution_email.text.erb

@@ -1 +1 @@
-<%= @email_body %>
+<%= @email_body %>

app/views/mailers/notify_mailer/tag_moderator_confirmation_email.text.erb

@@ -15,9 +15,12 @@ To aid in communication, we’ve added you to the following <%= community_name %
 - Tag Moderators <%= app_url("/connect/tag-moderators") %>
 - #<%= @tag %>
 
-You can use these channels to meet other tag moderators across the site and co-moderators within your tag while coordinating with the <%= community_name %> team. When in doubt about how to exercise your new privileges, please ask! If these Connect channels become too distracting, you can mute or leave any channel as you wish.
+You can use these channels to meet other tag moderators across the site and co-moderators within your tag while coordinating with the <%= community_name %> team.
+When in doubt about how to exercise your new privileges, please ask! If these Connect channels become too distracting, you can mute or leave any channel as you wish.
 
-Tag moderation is something we're continuously iterating on, so you can expect adjustments and expanding features over time as we receive feedback. We regularly send out a biweekly Mod Newsletter to keep mods up to date on these changes, so look out for it! Of course, don't hesitate to reach out to us at any moment if you have any feedback — feel free to write to <%= SiteConfig.email_addresses[:default] %> and share your thoughts.
+Tag moderation is something we're continuously iterating on, so you can expect adjustments and expanding features over time as we receive feedback.
+We regularly send out a biweekly Mod Newsletter to keep mods up to date on these changes, so look out for it!
+Of course, don't hesitate to reach out to us at any moment if you have any feedback — feel free to write to <%= SiteConfig.email_addresses[:default] %> and share your thoughts.
 
 Thanks so much for volunteering your time to benefit the <%= community_qualified_name %>. We sincerely appreciate your help!
 

app/views/notifications/_broadcast.html.erb

@@ -6,7 +6,7 @@
       <img src="<%= ProfileImage.new(user).get %>" alt="link to <%= json_data["user"]["username"] %>'s profile">
     </div>
   </a>
-  <div class="content notification-content broadcast-content" id="<%= sanitized_broadcast_id(json_data['broadcast']['title']) %>">
+  <div class="content notification-content broadcast-content" id="<%= sanitized_broadcast_id(json_data["broadcast"]["title"]) %>">
     <%= json_data["broadcast"]["processed_html"].html_safe %>
 
     <% if notification.json_data['broadcast']['type_of'] == "Welcome" %>

app/views/onboardings/show.html.erb

@@ -16,8 +16,7 @@
   data-community-name="<%= community_name %>"
   data-community-description="<%= SiteConfig.community_description %>"
   data-community-logo="<%= cloudinary safe_logo_url(SiteConfig.onboarding_logo_image) %>"
-  data-community-background="<%= cloudinary(SiteConfig.onboarding_background_image, "1680", 75) %>"
+  data-community-background="<%= cloudinary(SiteConfig.onboarding_background_image, "1680", 75) %>">
->
   <%= javascript_packs_with_chunks_tag "Onboarding", defer: true %>
 </div>
 

app/views/shared/authentication/_providers_registration_form.html.erb

@@ -12,4 +12,4 @@
 
 <% if authentication_enabled_providers.any? %>
   <p class="pt-6 pb-8"><em>We require social registration to prevent abuse.</em></p>
-<% end %>
+<% end %>

app/views/shared/authentication/_providers_signup_modal.html.erb

@@ -9,4 +9,4 @@
 <% end %>
 <a href="/enter"
   class="crayons-btn crayons-btn--secondary crayons-btn--xl m-1"
-  data-no-instant>More Sign In Options</a>
+  data-no-instant>More Sign In Options</a>