DEV: Fix new Rubocop offenses (#282)
This commit is contained in:
parent
f09e631636
commit
abe51c2aba
40
Gemfile.lock
40
Gemfile.lock
|
@ -1,35 +1,60 @@
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
|
activesupport (7.1.3.2)
|
||||||
|
base64
|
||||||
|
bigdecimal
|
||||||
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||||
|
connection_pool (>= 2.2.5)
|
||||||
|
drb
|
||||||
|
i18n (>= 1.6, < 2)
|
||||||
|
minitest (>= 5.1)
|
||||||
|
mutex_m
|
||||||
|
tzinfo (~> 2.0)
|
||||||
ast (2.4.2)
|
ast (2.4.2)
|
||||||
|
base64 (0.2.0)
|
||||||
|
bigdecimal (3.1.6)
|
||||||
|
concurrent-ruby (1.2.3)
|
||||||
|
connection_pool (2.4.1)
|
||||||
|
drb (2.2.0)
|
||||||
|
ruby2_keywords
|
||||||
|
i18n (1.14.1)
|
||||||
|
concurrent-ruby (~> 1.0)
|
||||||
json (2.7.1)
|
json (2.7.1)
|
||||||
language_server-protocol (3.17.0.3)
|
language_server-protocol (3.17.0.3)
|
||||||
|
minitest (5.22.2)
|
||||||
|
mutex_m (0.2.0)
|
||||||
parallel (1.24.0)
|
parallel (1.24.0)
|
||||||
parser (3.3.0.3)
|
parser (3.3.0.5)
|
||||||
ast (~> 2.4.1)
|
ast (~> 2.4.1)
|
||||||
racc
|
racc
|
||||||
prettier_print (1.2.1)
|
prettier_print (1.2.1)
|
||||||
|
prism (0.24.0)
|
||||||
racc (1.7.3)
|
racc (1.7.3)
|
||||||
rainbow (3.1.1)
|
rainbow (3.1.1)
|
||||||
regexp_parser (2.9.0)
|
regexp_parser (2.9.0)
|
||||||
rexml (3.2.6)
|
rexml (3.2.6)
|
||||||
rubocop (1.59.0)
|
rubocop (1.61.0)
|
||||||
json (~> 2.3)
|
json (~> 2.3)
|
||||||
language_server-protocol (>= 3.17.0)
|
language_server-protocol (>= 3.17.0)
|
||||||
parallel (~> 1.10)
|
parallel (~> 1.10)
|
||||||
parser (>= 3.2.2.4)
|
parser (>= 3.3.0.2)
|
||||||
rainbow (>= 2.2.2, < 4.0)
|
rainbow (>= 2.2.2, < 4.0)
|
||||||
regexp_parser (>= 1.8, < 3.0)
|
regexp_parser (>= 1.8, < 3.0)
|
||||||
rexml (>= 3.2.5, < 4.0)
|
rexml (>= 3.2.5, < 4.0)
|
||||||
rubocop-ast (>= 1.30.0, < 2.0)
|
rubocop-ast (>= 1.30.0, < 2.0)
|
||||||
ruby-progressbar (~> 1.7)
|
ruby-progressbar (~> 1.7)
|
||||||
unicode-display_width (>= 2.4.0, < 3.0)
|
unicode-display_width (>= 2.4.0, < 3.0)
|
||||||
rubocop-ast (1.30.0)
|
rubocop-ast (1.31.0)
|
||||||
parser (>= 3.2.1.0)
|
parser (>= 3.3.0.4)
|
||||||
|
prism (>= 0.24.0)
|
||||||
rubocop-capybara (2.20.0)
|
rubocop-capybara (2.20.0)
|
||||||
rubocop (~> 1.41)
|
rubocop (~> 1.41)
|
||||||
rubocop-discourse (3.6.0)
|
rubocop-discourse (3.7.1)
|
||||||
|
activesupport (>= 6.1)
|
||||||
rubocop (>= 1.59.0)
|
rubocop (>= 1.59.0)
|
||||||
|
rubocop-capybara (>= 2.0.0)
|
||||||
|
rubocop-factory_bot (>= 2.0.0)
|
||||||
rubocop-rspec (>= 2.25.0)
|
rubocop-rspec (>= 2.25.0)
|
||||||
rubocop-factory_bot (2.25.1)
|
rubocop-factory_bot (2.25.1)
|
||||||
rubocop (~> 1.41)
|
rubocop (~> 1.41)
|
||||||
|
@ -38,8 +63,11 @@ GEM
|
||||||
rubocop-capybara (~> 2.17)
|
rubocop-capybara (~> 2.17)
|
||||||
rubocop-factory_bot (~> 2.22)
|
rubocop-factory_bot (~> 2.22)
|
||||||
ruby-progressbar (1.13.0)
|
ruby-progressbar (1.13.0)
|
||||||
|
ruby2_keywords (0.0.5)
|
||||||
syntax_tree (6.2.0)
|
syntax_tree (6.2.0)
|
||||||
prettier_print (>= 1.2.0)
|
prettier_print (>= 1.2.0)
|
||||||
|
tzinfo (2.0.6)
|
||||||
|
concurrent-ruby (~> 1.0)
|
||||||
unicode-display_width (2.5.0)
|
unicode-display_width (2.5.0)
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
|
|
|
@ -81,11 +81,7 @@ after_initialize do
|
||||||
require_relative "lib/result_to_markdown"
|
require_relative "lib/result_to_markdown"
|
||||||
reloadable_patch do
|
reloadable_patch do
|
||||||
if defined?(DiscourseAutomation)
|
if defined?(DiscourseAutomation)
|
||||||
DiscourseAutomation::Scriptable::RECURRING_DATA_EXPLORER_RESULT_PM =
|
add_automation_scriptable("recurring_data_explorer_result_pm") do
|
||||||
"recurring_data_explorer_result_pm"
|
|
||||||
add_automation_scriptable(
|
|
||||||
DiscourseAutomation::Scriptable::RECURRING_DATA_EXPLORER_RESULT_PM,
|
|
||||||
) do
|
|
||||||
queries =
|
queries =
|
||||||
DiscourseDataExplorer::Query
|
DiscourseDataExplorer::Query
|
||||||
.where(hidden: false)
|
.where(hidden: false)
|
||||||
|
|
|
@ -3,9 +3,9 @@
|
||||||
require "rails_helper"
|
require "rails_helper"
|
||||||
|
|
||||||
describe "RecurringDataExplorerResultPm" do
|
describe "RecurringDataExplorerResultPm" do
|
||||||
fab!(:admin) { Fabricate(:admin) }
|
fab!(:admin)
|
||||||
|
|
||||||
fab!(:user) { Fabricate(:user) }
|
fab!(:user)
|
||||||
fab!(:another_user) { Fabricate(:user) }
|
fab!(:another_user) { Fabricate(:user) }
|
||||||
fab!(:group_user) { Fabricate(:user) }
|
fab!(:group_user) { Fabricate(:user) }
|
||||||
fab!(:not_allowed_user) { Fabricate(:user) }
|
fab!(:not_allowed_user) { Fabricate(:user) }
|
||||||
|
@ -14,13 +14,9 @@ describe "RecurringDataExplorerResultPm" do
|
||||||
fab!(:another_group) { Fabricate(:group, users: [group_user]) }
|
fab!(:another_group) { Fabricate(:group, users: [group_user]) }
|
||||||
|
|
||||||
fab!(:automation) do
|
fab!(:automation) do
|
||||||
Fabricate(
|
Fabricate(:automation, script: "recurring_data_explorer_result_pm", trigger: "recurring")
|
||||||
:automation,
|
|
||||||
script: DiscourseAutomation::Scriptable::RECURRING_DATA_EXPLORER_RESULT_PM,
|
|
||||||
trigger: "recurring",
|
|
||||||
)
|
|
||||||
end
|
end
|
||||||
fab!(:query) { Fabricate(:query) }
|
fab!(:query)
|
||||||
fab!(:query_group) { Fabricate(:query_group, query: query, group: group) }
|
fab!(:query_group) { Fabricate(:query_group, query: query, group: group) }
|
||||||
fab!(:query_group) { Fabricate(:query_group, query: query, group: another_group) }
|
fab!(:query_group) { Fabricate(:query_group, query: query, group: another_group) }
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
describe DiscourseDataExplorer::DataExplorer do
|
describe DiscourseDataExplorer::DataExplorer do
|
||||||
describe ".run_query" do
|
describe ".run_query" do
|
||||||
fab!(:topic) { Fabricate(:topic) }
|
fab!(:topic)
|
||||||
|
|
||||||
it "should run a query that includes PG template patterns" do
|
it "should run a query that includes PG template patterns" do
|
||||||
sql = <<~SQL
|
sql = <<~SQL
|
||||||
|
|
|
@ -19,7 +19,7 @@ describe Guardian do
|
||||||
|
|
||||||
let(:user) { build(:user) }
|
let(:user) { build(:user) }
|
||||||
let(:admin) { build(:admin) }
|
let(:admin) { build(:admin) }
|
||||||
fab!(:group) { Fabricate(:group) }
|
fab!(:group)
|
||||||
|
|
||||||
describe "#user_is_a_member_of_group?" do
|
describe "#user_is_a_member_of_group?" do
|
||||||
it "is true when the user is an admin" do
|
it "is true when the user is an admin" do
|
||||||
|
|
|
@ -11,7 +11,7 @@ describe "API keys scoped to query#run" do
|
||||||
fab!(:query2) do
|
fab!(:query2) do
|
||||||
DiscourseDataExplorer::Query.create!(name: "Query 2", sql: "SELECT 1 AS query2_res")
|
DiscourseDataExplorer::Query.create!(name: "Query 2", sql: "SELECT 1 AS query2_res")
|
||||||
end
|
end
|
||||||
fab!(:admin) { Fabricate(:admin) }
|
fab!(:admin)
|
||||||
|
|
||||||
let(:all_queries_api_key) do
|
let(:all_queries_api_key) do
|
||||||
key = ApiKey.create!
|
key = ApiKey.create!
|
||||||
|
|
|
@ -8,7 +8,7 @@ describe DiscourseDataExplorer::QueryGroupBookmarkable do
|
||||||
end
|
end
|
||||||
|
|
||||||
fab!(:admin_user) { Fabricate(:admin) }
|
fab!(:admin_user) { Fabricate(:admin) }
|
||||||
fab!(:user) { Fabricate(:user) }
|
fab!(:user)
|
||||||
fab!(:guardian) { Guardian.new(user) }
|
fab!(:guardian) { Guardian.new(user) }
|
||||||
fab!(:group0) { Fabricate(:group) }
|
fab!(:group0) { Fabricate(:group) }
|
||||||
fab!(:group1) { Fabricate(:group) }
|
fab!(:group1) { Fabricate(:group) }
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
require "rails_helper"
|
require "rails_helper"
|
||||||
|
|
||||||
describe DiscourseDataExplorer::ReportGenerator do
|
describe DiscourseDataExplorer::ReportGenerator do
|
||||||
fab!(:user) { Fabricate(:user) }
|
fab!(:user)
|
||||||
fab!(:unauthorised_user) { Fabricate(:user) }
|
fab!(:unauthorised_user) { Fabricate(:user) }
|
||||||
fab!(:unauthorised_group) { Fabricate(:group) }
|
fab!(:unauthorised_group) { Fabricate(:group) }
|
||||||
fab!(:group) { Fabricate(:group, users: [user]) }
|
fab!(:group) { Fabricate(:group, users: [user]) }
|
||||||
|
|
|
@ -5,7 +5,7 @@ require "rails_helper"
|
||||||
describe "Data explorer group serializer additions" do
|
describe "Data explorer group serializer additions" do
|
||||||
fab!(:group_user) { Fabricate(:user) }
|
fab!(:group_user) { Fabricate(:user) }
|
||||||
fab!(:other_user) { Fabricate(:user) }
|
fab!(:other_user) { Fabricate(:user) }
|
||||||
fab!(:group) { Fabricate(:group) }
|
fab!(:group)
|
||||||
let!(:query) { DiscourseDataExplorer::Query.create!(name: "My query", sql: "") }
|
let!(:query) { DiscourseDataExplorer::Query.create!(name: "My query", sql: "") }
|
||||||
|
|
||||||
before do
|
before do
|
||||||
|
|
|
@ -22,7 +22,7 @@ describe DiscourseDataExplorer::QueryController do
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "Admin" do
|
describe "Admin" do
|
||||||
fab!(:admin) { Fabricate(:admin) }
|
fab!(:admin)
|
||||||
|
|
||||||
before { sign_in(admin) }
|
before { sign_in(admin) }
|
||||||
|
|
||||||
|
@ -437,7 +437,7 @@ describe DiscourseDataExplorer::QueryController do
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "Non-Admin" do
|
describe "Non-Admin" do
|
||||||
fab!(:user) { Fabricate(:user) }
|
fab!(:user)
|
||||||
fab!(:group) { Fabricate(:group, users: [user]) }
|
fab!(:group) { Fabricate(:group, users: [user]) }
|
||||||
|
|
||||||
before { sign_in(user) }
|
before { sign_in(user) }
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
describe DiscourseDataExplorer::ResultToMarkdown do
|
describe DiscourseDataExplorer::ResultToMarkdown do
|
||||||
fab!(:user) { Fabricate(:user) }
|
fab!(:user)
|
||||||
fab!(:post) { Fabricate(:post) }
|
fab!(:post)
|
||||||
fab!(:query) { DiscourseDataExplorer::Query.find(-1) }
|
fab!(:query) { DiscourseDataExplorer::Query.find(-1) }
|
||||||
|
|
||||||
let(:query_params) { [{ from_days_ago: 0 }, { duration_days: 15 }] }
|
let(:query_params) { [{ from_days_ago: 0 }, { duration_days: 15 }] }
|
||||||
|
|
Loading…
Reference in New Issue