maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Routine rubocop fixes (#7743)

Browse source 
* Rubocop auto fixes

* Fix Capybara/VisibilityMatcher

* Regenerate todo
This commit is contained in:
rhymes 2020-05-08 19:38:06 +02:00 • committed by GitHub
parent ab248edfe5
commit b5ebf8f3dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 61 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
.rubocop_todo.yml
View file

@ -6,22 +6,22 @@ require:
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2020-04-17 11:30:37 +0200 using RuboCop version 0.82.0.
# on 2020-05-08 12:21:06 +0200 using RuboCop version 0.82.0.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
# versions of RuboCop, may require this file to be generated again.
# Offense count: 260
# Offense count: 264
# Configuration parameters: IgnoredMethods.
Metrics/AbcSize:
Max: 75
Max: 64
# Offense count: 8
# Offense count: 6
# Configuration parameters: CountComments, ExcludedMethods.
# ExcludedMethods: refine
Metrics/BlockLength:
Max: 60
Max: 53
# Offense count: 10
Performance/OpenStruct:
@ -41,8 +41,7 @@ RSpec/ExampleLength:
- 'spec/models/comment_spec.rb'
- 'spec/requests/display_ad_events_spec.rb'
# Offense count: 802
# Configuration parameters: AggregateFailuresByDefault.
# Offense count: 859
RSpec/MultipleExpectations:
Max: 10
@ -65,7 +64,7 @@ Rails/HelperInstanceVariable:
Exclude:
- 'app/helpers/application_helper.rb'
# Offense count: 15
# Offense count: 16
Rails/OutputSafety:
Exclude:
- 'app/helpers/application_helper.rb'
@ -76,7 +75,7 @@ Rails/OutputSafety:
- 'app/models/display_ad.rb'
- 'app/models/message.rb'
# Offense count: 25
# Offense count: 26
# Configuration parameters: Include.
# Include: app/models/**/*.rb
Rails/UniqueValidationWithoutIndex:
@ -96,7 +95,7 @@ Style/SingleLineBlockParams:
Exclude:
- 'app/labor/markdown_fixer.rb'
# Offense count: 4879
# Offense count: 5028
# Cop supports --auto-correct.
# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
# URISchemes: http, https

2
app/controllers/notifications_controller.rb
View file

@ -39,7 +39,7 @@ class NotificationsController < ApplicationController
@last_user_comment = @user.comments.last&.id
@organizations = @user.member_organizations if @user.organizations
@selected_organization = Organization.find(params[:org_id]) if params[:org_id].present?
@selected_organization = Organization.find(params[:org_id]) if params[:org_id].present?
# The first call, the one coming from the browser URL bar will render the "index" view, which renders
# the first few notifications. After that the JS frontend code (see `initNotification.js`)

4
app/models/message.rb
View file

@ -153,7 +153,7 @@ class Message < ApplicationRecord
Let's video chat 😄
</h1>
</a>".html_safe
elsif html.to_s.strip == "<p>/play codenames</p>" #proof of concept
elsif html.to_s.strip == "<p>/play codenames</p>" # proof of concept
"<a href='https://www.horsepaste.com/connect-channel-#{rand(1_000_000_000)}'
class='chatchannels__richlink chatchannels__richlink--base'
target='_blank' rel='noopener' data-content='sidecar-content-plus-video'>
@ -161,7 +161,7 @@ class Message < ApplicationRecord
Let's play codenames 🤐
</h1>
</a>".html_safe
end
end
html = response if response
html
end

4
db/seeds.rb
View file

@ -4,7 +4,7 @@ SEEDS_MULTIPLIER = [1, ENV["SEEDS_MULTIPLIER"].to_i].max
counter = 0
Rails.logger.info "Seeding with multiplication factor: #{SEEDS_MULTIPLIER}"
##############################################################################/
##############################################################################
counter += 1
Rails.logger.info "#{counter}. Creating Organizations"
@ -410,7 +410,7 @@ CATEGORIES = [
cost: 1,
name: "Miscellaneous",
rules: "Must not fit in any other category."
}
},
].freeze
CATEGORIES.each { |attributes| ClassifiedListingCategory.create(attributes) }

2
lib/tasks/fastly.rake
View file

@ -8,7 +8,7 @@ namespace :fastly do
if fastly_credentials.any? { |cred| ApplicationConfig[cred].blank? }
Rails.logger.info(
"Fastly not configured. Please set #{fastly_credentials.join(", ")} in your environment."
"Fastly not configured. Please set #{fastly_credentials.join(', ')} in your environment.",
)
next

2
lib/tasks/temporary/classified_listings.rake
View file

@ -17,7 +17,7 @@ namespace :temporary do
}
info.each do |slug, (description, color)|
ClassifiedListingCategory.
where(slug:slug).
where(slug: slug).
update(social_preview_description: description, social_preview_color: color)
end
end

5
spec/helpers/classified_listing_helper_spec.rb
View file

@ -10,7 +10,7 @@ RSpec.describe ClassifiedListingHelper, type: :helper do
[
["#{cat1.name} (1 Credit)", cat1.id],
["#{cat2.name} (5 Credits)", cat2.id],
]
],
)
end
end
@ -21,7 +21,7 @@ RSpec.describe ClassifiedListingHelper, type: :helper do
[
{ slug: cat1.slug, name: cat1.name },
{ slug: cat2.slug, name: cat2.name },
]
],
)
end
end
@ -38,4 +38,3 @@ RSpec.describe ClassifiedListingHelper, type: :helper do
end
end
end

3
spec/labor/bufferizer_spec.rb
View file

@ -3,7 +3,7 @@ require "rails_helper"
RSpec.describe Bufferizer, type: :labor do
let(:user) { create(:user) }
let(:listing) { create(:classified_listing, user_id: user.id) }
let(:tag) { create(:tag, buffer_profile_id_code: "test")}
let(:tag) { create(:tag, buffer_profile_id_code: "test") }
let(:article) { create(:article, user_id: user.id, tags: tag.name) }
it "sends to buffer twitter" do
@ -18,7 +18,6 @@ RSpec.describe Bufferizer, type: :labor do
expect(BufferUpdate.last.approver_user_id).to be user.id
end
it "sends to buffer sattelite twitter" do
tweet = "test tweet #DEVCommunity"
described_class.new("article", article, tweet).satellite_tweet!

4
spec/requests/user/user_show_spec.rb
View file

@ -15,7 +15,7 @@ RSpec.describe "UserShow", type: :request do
expect(response).to have_http_status(:ok)
end
# rubocop:disable Rspec/ExampleLength
# rubocop:disable RSpec/ExampleLength
it "renders the proper JSON-LD for a user" do
expect(response_json).to include(
"@context" => "http://schema.org",
@ -61,7 +61,7 @@ RSpec.describe "UserShow", type: :request do
"alumniOf" => user.education,
)
end
# rubocop:enable Rspec/ExampleLength
# rubocop:enable RSpec/ExampleLength
end
context "when user signed in" do

2
spec/system/articles/user_visits_an_article_spec.rb
View file

@ -20,7 +20,7 @@ RSpec.describe "Views an article", type: :system do
create_list(:comment, 3, commentable: article)
visit article.path
expect(page).to have_selector(".single-comment-node", visible: true, count: 3)
expect(page).to have_selector(".single-comment-node", visible: :visible, count: 3)
end
it "stops a user from moderating an article" do

20
spec/system/articles/user_visits_articles_by_timeframe_spec.rb
View file

@ -17,7 +17,7 @@ RSpec.describe "User visits articles by timeframe", type: :system do
end
it "shows the main article" do
expect(page).to have_selector(".big-article", visible: true, count: 1)
expect(page).to have_selector(".big-article", visible: :visible, count: 1)
end
it "shows the correct articles" do
@ -36,7 +36,7 @@ RSpec.describe "User visits articles by timeframe", type: :system do
end
it "shows the main article" do
expect(page).to have_selector(".big-article", visible: true, count: 1)
expect(page).to have_selector(".big-article", visible: :visible, count: 1)
end
it "shows the correct articles" do
@ -56,7 +56,7 @@ RSpec.describe "User visits articles by timeframe", type: :system do
end
it "shows the main article" do
expect(page).to have_selector(".big-article", visible: true, count: 1)
expect(page).to have_selector(".big-article", visible: :visible, count: 1)
end
it "shows the correct articles" do
@ -78,7 +78,7 @@ RSpec.describe "User visits articles by timeframe", type: :system do
end
it "shows the main article" do
expect(page).to have_selector(".big-article", visible: true, count: 1)
expect(page).to have_selector(".big-article", visible: :visible, count: 1)
end
it "shows the correct articles" do
@ -101,7 +101,7 @@ RSpec.describe "User visits articles by timeframe", type: :system do
end
it "shows the main article" do
expect(page).to have_selector(".big-article", visible: true, count: 1)
expect(page).to have_selector(".big-article", visible: :visible, count: 1)
end
it "shows the correct articles" do
@ -129,7 +129,7 @@ RSpec.describe "User visits articles by timeframe", type: :system do
end
it "shows the main article" do
expect(page).to have_selector(".big-article", visible: true, count: 1)
expect(page).to have_selector(".big-article", visible: :visible, count: 1)
end
it "shows the correct articles" do
@ -147,7 +147,7 @@ RSpec.describe "User visits articles by timeframe", type: :system do
end
it "shows the main article" do
expect(page).to have_selector(".big-article", visible: true, count: 1)
expect(page).to have_selector(".big-article", visible: :visible, count: 1)
end
it "shows the correct articles" do
@ -167,7 +167,7 @@ RSpec.describe "User visits articles by timeframe", type: :system do
end
it "shows the main article" do
expect(page).to have_selector(".big-article", visible: true, count: 1)
expect(page).to have_selector(".big-article", visible: :visible, count: 1)
end
it "shows the correct articles" do
@ -188,7 +188,7 @@ RSpec.describe "User visits articles by timeframe", type: :system do
end
it "shows the main article" do
expect(page).to have_selector(".big-article", visible: true, count: 1)
expect(page).to have_selector(".big-article", visible: :visible, count: 1)
end
it "shows the correct articles" do
@ -210,7 +210,7 @@ RSpec.describe "User visits articles by timeframe", type: :system do
end
it "shows the main article" do
expect(page).to have_selector(".big-article", visible: true, count: 1)
expect(page).to have_selector(".big-article", visible: :visible, count: 1)
end
it "shows the correct articles" do

14
spec/system/comments/user_fills_out_comment_spec.rb
View file

@ -56,7 +56,7 @@ RSpec.describe "Creating Comment", type: :system, js: true do
attach_file(
"image-upload-main",
Rails.root.join("app/assets/images/sloan.png"),
visible: false,
visible: :hidden,
)
expect(page).to have_no_css("div.file-upload-error")
@ -67,12 +67,12 @@ RSpec.describe "Creating Comment", type: :system, js: true do
reduce_max_file_size = 'document.querySelector("#image-upload-main").setAttribute("data-max-file-size-mb", "0")'
page.execute_script(reduce_max_file_size)
expect(page).to have_selector('input[data-max-file-size-mb="0"]', visible: false)
expect(page).to have_selector('input[data-max-file-size-mb="0"]', visible: :hidden)
attach_file(
"image-upload-main",
Rails.root.join("app/assets/images/sloan.png"),
visible: false,
visible: :hidden,
)
expect(page).to have_css("div.file-upload-error")
@ -87,12 +87,12 @@ RSpec.describe "Creating Comment", type: :system, js: true do
allow_only_videos = 'document.querySelector("#image-upload-main").setAttribute("data-permitted-file-types", "[\"video\"]")'
page.execute_script(allow_only_videos)
expect(page).to have_selector('input[data-permitted-file-types="[\"video\"]"]', visible: false)
expect(page).to have_selector('input[data-permitted-file-types="[\"video\"]"]', visible: :hidden)
attach_file(
"image-upload-main",
Rails.root.join("app/assets/images/sloan.png"),
visible: false,
visible: :hidden,
)
expect(page).to have_css("div.file-upload-error")
@ -107,12 +107,12 @@ RSpec.describe "Creating Comment", type: :system, js: true do
limit_file_name_length = 'document.querySelector("#image-upload-main").setAttribute("data-max-file-name-length", "5")'
page.execute_script(limit_file_name_length)
expect(page).to have_selector('input[data-max-file-name-length="5"]', visible: false)
expect(page).to have_selector('input[data-max-file-name-length="5"]', visible: :hidden)
attach_file(
"image-upload-main",
Rails.root.join("app/assets/images/sloan.png"),
visible: false,
visible: :hidden,
)
expect(page).to have_css("div.file-upload-error")

12
spec/system/comments/user_views_article_comments_spec.rb
View file

@ -18,15 +18,15 @@ RSpec.describe "Visiting article comments", type: :system, js: true do
before { visit "#{article.path}/comments" }
it "displays comments" do
expect(page).to have_selector(".single-comment-node", visible: true, count: 8)
expect(page).to have_selector(".single-comment-node", visible: :visible, count: 8)
end
it "displays child comments" do
expect(page).to have_selector(".comment-deep-1", visible: true, count: 3)
expect(page).to have_selector(".comment-deep-1", visible: :visible, count: 3)
end
it "displays grandchild comments" do
expect(page).to have_selector("#comment-node-#{grandchild_comment.id}.comment-deep-2", visible: true, count: 1)
expect(page).to have_selector("#comment-node-#{grandchild_comment.id}.comment-deep-2", visible: :visible, count: 1)
end
end
@ -34,15 +34,15 @@ RSpec.describe "Visiting article comments", type: :system, js: true do
before { visit "#{article.path}/comments/#{comment.id.to_s(26)}" }
it "displays related comments" do
expect(page).to have_selector(".single-comment-node", visible: true, count: 4)
expect(page).to have_selector(".single-comment-node", visible: :visible, count: 4)
end
it "displays child comments" do
expect(page).to have_selector(".comment-deep-1", visible: true, count: 2)
expect(page).to have_selector(".comment-deep-1", visible: :visible, count: 2)
end
it "displays grandchild comments" do
expect(page).to have_selector("#comment-node-#{grandchild_comment.id}.comment-deep-2", visible: true, count: 1)
expect(page).to have_selector("#comment-node-#{grandchild_comment.id}.comment-deep-2", visible: :visible, count: 1)
end
end
end

8
spec/system/homepage/user_visits_homepage_articles_spec.rb
View file

@ -14,7 +14,7 @@ RSpec.describe "User visits a homepage", type: :system do
end
it "shows the main article" do
expect(page).to have_selector(".big-article", visible: true)
expect(page).to have_selector(".big-article", visible: :visible)
end
it "shows the main article readable date", js: true do
@ -62,17 +62,17 @@ RSpec.describe "User visits a homepage", type: :system do
it "contains the qualified community name in og:title" do
selector = "meta[property='og:title'][content='#{community_qualified_name}']"
expect(page).to have_selector(selector, visible: false)
expect(page).to have_selector(selector, visible: :hidden)
end
it "contains the qualified community name in og:site_name" do
selector = "meta[property='og:site_name'][content='#{community_qualified_name}']"
expect(page).to have_selector(selector, visible: false)
expect(page).to have_selector(selector, visible: :hidden)
end
it "contains the qualified community name in twitter:title" do
selector = "meta[name='twitter:title'][content='#{community_qualified_name}']"
expect(page).to have_selector(selector, visible: false)
expect(page).to have_selector(selector, visible: :hidden)
end
end
end

2
spec/system/homepage/user_visits_homepage_spec.rb
View file

@ -28,7 +28,7 @@ RSpec.describe "User visits a homepage", type: :system do
describe "link tags" do
it "contains the qualified community name in the search link" do
selector = "link[rel='search'][title='#{community_qualified_name}']"
expect(page).to have_selector(selector, visible: false)
expect(page).to have_selector(selector, visible: :hidden)
end
end
end

8
spec/system/podcasts/user_visits_podcast_episode_spec.rb
View file

@ -15,8 +15,8 @@ RSpec.describe "User visits podcast show page", type: :system do
it "see the new comment box on the page" do
visit podcast_episode.path.to_s
expect(page).to have_css "form#new_comment"
expect(find("#comment_commentable_type", visible: false).value).to eq("PodcastEpisode")
expect(find("#comment_commentable_id", visible: false).value).to eq(podcast_episode.id.to_s)
expect(find("#comment_commentable_type", visible: :hidden).value).to eq("PodcastEpisode")
expect(find("#comment_commentable_id", visible: :hidden).value).to eq(podcast_episode.id.to_s)
end
context "when mobile apps read the podcast episode metadata" do
@ -74,8 +74,8 @@ RSpec.describe "User visits podcast show page", type: :system do
it "sees the comments", js: true do
visit podcast_episode.path.to_s
expect(page).to have_selector(".comment-deep-0#comment-node-#{comment.id}", visible: true, count: 1)
expect(page).to have_selector(".comment-deep-1#comment-node-#{comment2.id}", visible: true, count: 1)
expect(page).to have_selector(".comment-deep-0#comment-node-#{comment.id}", visible: :visible, count: 1)
expect(page).to have_selector(".comment-deep-1#comment-node-#{comment2.id}", visible: :visible, count: 1)
end
end
end

2
spec/system/podcasts/user_visits_podcast_page_spec.rb
View file

@ -16,7 +16,7 @@ RSpec.describe "User visits a podcast page", type: :system do
end
it "displays podcast episodes" do
expect(page).to have_selector("div.single-article", visible: true, count: 2)
expect(page).to have_selector("div.single-article", visible: :visible, count: 2)
end
it "displays podcast publish_at" do

2
spec/system/user_views_a_reading_list_spec.rb
View file

@ -13,7 +13,7 @@ RSpec.describe "Reading list", type: :system do
it "shows the large reading list" do
visit "/readinglist"
expect(page).to have_selector("#reading-list", visible: true)
expect(page).to have_selector("#reading-list", visible: :visible)
end
end
end

8
spec/system/user_visits_a_comments_page_spec.rb
View file

@ -10,13 +10,13 @@ RSpec.describe "Views an article", type: :system, js: true do
it "shows all comments" do
create(:comment, commentable: article)
visit "#{article.path}/comments"
expect(page).to have_selector(".single-comment-node", visible: true, count: 3)
expect(page).to have_selector(".single-comment-node", visible: :visible, count: 3)
end
it "shows a thread" do
visit "#{article.path}/comments/#{comment.id_code_generated}"
expect(page).to have_selector(".single-comment-node", visible: true, count: 2)
expect(page).to have_selector(".comment-deep-0#comment-node-#{comment.id}", visible: true, count: 1)
expect(page).to have_selector(".comment-deep-1#comment-node-#{child_comment.id}", visible: true, count: 1)
expect(page).to have_selector(".single-comment-node", visible: :visible, count: 2)
expect(page).to have_selector(".comment-deep-0#comment-node-#{comment.id}", visible: :visible, count: 1)
expect(page).to have_selector(".comment-deep-1#comment-node-#{child_comment.id}", visible: :visible, count: 1)
end
end

2
spec/system/videos/user_visits_videos_spec.rb
View file

@ -7,7 +7,7 @@ RSpec.describe "User visits the videos page", type: :system do
describe "meta tags" do
it "contains the qualified community name in og:site_name" do
selector = "meta[property='og:site_name'][content='#{community_qualified_name}']"
expect(page).to have_selector(selector, visible: false)
expect(page).to have_selector(selector, visible: :hidden)
end
end
end