Skip to content

Commit fb05000

Browse files
authored
Merge pull request #6421 from SuperGoodSoft/standardrb
Switch to standardrb
2 parents 0994f63 + 453e8fc commit fb05000

1,365 files changed

Lines changed: 13115 additions & 12983 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.git-blame-ignore-revs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,7 @@ b3007bb0973dcb987b0328b4e59306cd2549148d
77
c636624093fec55e38f14cade4dee4ec0a829802
88
# Rubocop: Autocorrect (Sep 12, 2024)
99
273e5bd54e2b1783206043e316c2de4c9e95eb45
10+
# Standardrb --fix (Feb 26, 2026)
11+
052ea410512c3f5eac29daa5ef13842820124133
12+
# Standardrb --fix-unsafely (Feb 26, 2026)
13+
76ab5374940d34a0fb0327977c7936203caa2516

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Store test results
3030
uses: actions/upload-artifact@v4
3131
with:
32-
name: rubocop-results
32+
name: standardrb-results
3333
path: test-results
3434

3535
erb:

.standard.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
parallel: true
2+
format: progress
3+
ruby_version: 3.1
4+
ignore:
5+
- "*/spec/dummy/**/*"
6+
- "sandbox/**/*"

Gemfile

Lines changed: 49 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,88 @@
11
# frozen_string_literal: true
22

3-
source 'https://rubygems.org'
3+
source "https://rubygems.org"
44

55
gemspec require: false
66

77
# rubocop:disable Bundler/DuplicatedGem
8-
if /(stable|main)/.match? ENV['RAILS_VERSION']
9-
gem 'rails', github: 'rails', require: false, branch: ENV['RAILS_VERSION']
8+
if /(stable|main)/.match? ENV["RAILS_VERSION"]
9+
gem "rails", github: "rails", require: false, branch: ENV["RAILS_VERSION"]
1010
else
11-
gem 'rails', ENV['RAILS_VERSION'] || ['> 7.2', '< 8.2'], require: false
11+
gem "rails", ENV["RAILS_VERSION"] || ["> 7.2", "< 8.2"], require: false
1212
end
1313
# rubocop:enable Bundler/DuplicatedGem
1414

1515
gem "debug"
16-
gem 'launchy', require: false
17-
18-
dbs = ENV['DB_ALL'] ? 'all' : ENV.fetch('DB', 'sqlite')
19-
gem 'mysql2', '~> 0.5.0', require: false if dbs.match?(/all|mysql/)
20-
gem 'pg', '~> 1.0', require: false if dbs.match?(/all|postgres/)
21-
gem 'fast_sqlite', require: false if dbs.match?(/all|sqlite/)
22-
gem 'sqlite3', '>= 2.1', require: false if dbs.match?(/all|sqlite/)
23-
24-
gem 'benchmark', '~> 0.5', require: false
25-
gem 'database_cleaner', '~> 2.0', require: false
26-
gem 'rspec-activemodel-mocks', '~> 1.1', require: false
27-
gem 'rspec-rails', '~> 6.0.3', require: false
28-
gem 'rspec-retry', '~> 0.6.2', require: false
29-
gem 'simplecov', require: false
30-
gem 'simplecov-cobertura', require: false
31-
gem 'rack', '< 3', require: false
32-
gem 'rake', require: false, groups: [:lint, :release]
33-
gem 'rails-controller-testing', require: false
34-
gem 'puma', '< 7', require: false
35-
gem 'i18n-tasks', '~> 1.1.0', require: false
36-
gem 'rspec_junit_formatter', require: false
37-
gem 'yard', require: false
38-
39-
if ENV['GITHUB_ACTIONS']
16+
gem "launchy", require: false
17+
18+
dbs = ENV["DB_ALL"] ? "all" : ENV.fetch("DB", "sqlite")
19+
gem "mysql2", "~> 0.5.0", require: false if dbs.match?(/all|mysql/)
20+
gem "pg", "~> 1.0", require: false if dbs.match?(/all|postgres/)
21+
gem "fast_sqlite", require: false if dbs.match?(/all|sqlite/)
22+
gem "sqlite3", ">= 2.1", require: false if dbs.match?(/all|sqlite/)
23+
24+
gem "benchmark", "~> 0.5", require: false
25+
gem "database_cleaner", "~> 2.0", require: false
26+
gem "rspec-activemodel-mocks", "~> 1.1", require: false
27+
gem "rspec-rails", "~> 6.0.3", require: false
28+
gem "rspec-retry", "~> 0.6.2", require: false
29+
gem "simplecov", require: false
30+
gem "simplecov-cobertura", require: false
31+
gem "rack", "< 3", require: false
32+
gem "rake", require: false, groups: [:lint, :release]
33+
gem "rails-controller-testing", require: false
34+
gem "puma", "< 7", require: false
35+
gem "i18n-tasks", "~> 1.1.0", require: false
36+
gem "rspec_junit_formatter", require: false
37+
gem "yard", require: false
38+
39+
if ENV["GITHUB_ACTIONS"]
4040
gem "rspec-github", "~> 3.0", require: false
4141
end
4242

4343
# Ensure the requirement is also updated in core/lib/spree/testing_support/factory_bot.rb
44-
gem 'factory_bot_rails', '>= 4.8', require: false
44+
gem "factory_bot_rails", ">= 4.8", require: false
4545

4646
group :backend do
47-
gem 'capybara', '~> 3.13', require: false
48-
gem 'capybara-screenshot', '>= 1.0.18', require: false
49-
gem 'selenium-webdriver', require: false
47+
gem "capybara", "~> 3.13", require: false
48+
gem "capybara-screenshot", ">= 1.0.18", require: false
49+
gem "selenium-webdriver", require: false
5050

5151
# JavaScript testing
52-
gem 'teaspoon', require: false
53-
gem 'teaspoon-mocha', require: false
54-
gem 'webrick', require: false
52+
gem "teaspoon", require: false
53+
gem "teaspoon-mocha", require: false
54+
gem "webrick", require: false
5555
end
5656

5757
group :admin do
58-
gem 'tailwindcss-rails', '~> 3.0', require: false
58+
gem "tailwindcss-rails", "~> 3.0", require: false
5959
end
6060

6161
group :admin, :legacy_promotions, :promotions do
62-
gem 'solidus_admin', path: 'admin', require: false
63-
gem 'axe-core-rspec', '~> 4.8', require: false
64-
gem 'axe-core-capybara', '~> 4.8', require: false
62+
gem "solidus_admin", path: "admin", require: false
63+
gem "axe-core-rspec", "~> 4.8", require: false
64+
gem "axe-core-capybara", "~> 4.8", require: false
6565
end
6666

6767
group :legacy_promotions, :promotions do
68-
gem 'solidus_legacy_promotions', path: 'legacy_promotions', require: false
69-
gem 'solidus_backend', path: 'backend', require: false
68+
gem "solidus_legacy_promotions", path: "legacy_promotions", require: false
69+
gem "solidus_backend", path: "backend", require: false
7070
end
7171

7272
group :promotions do
73-
gem 'solidus_promotions', path: 'promotions', require: false
74-
gem 'shoulda-matchers', '~> 5.0', require: false
73+
gem "solidus_promotions", path: "promotions", require: false
74+
gem "shoulda-matchers", "~> 5.0", require: false
7575
end
7676

7777
group :lint do
78-
gem 'erb-formatter', '~> 0.7', require: false
79-
gem 'rubocop', '~> 1', require: false
80-
gem 'rubocop-performance', '~> 1.4', require: false
81-
gem 'rubocop-rails', '~> 2.9', require: false
78+
gem "erb-formatter", "~> 0.7", require: false
79+
gem "standard", "~> 1.50", require: false
8280
end
8381

8482
group :release do
85-
gem 'octokit', '~> 7.1', require: false
86-
gem 'faraday-retry', '~> 2.0', require: false
83+
gem "octokit", "~> 7.1", require: false
84+
gem "faraday-retry", "~> 2.0", require: false
8785
end
8886

89-
custom_gemfile = File.expand_path('Gemfile-custom', __dir__)
90-
eval File.read(custom_gemfile), nil, custom_gemfile, 0 if File.exist?(custom_gemfile)
87+
custom_gemfile = File.expand_path("Gemfile-custom", __dir__)
88+
eval File.read(custom_gemfile), nil, custom_gemfile, 0 if File.exist?(custom_gemfile) # standard:disable Security/Eval

Rakefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# frozen_string_literal: true
22

3-
import 'tasks/cleaning.rake'
4-
import 'tasks/releasing.rake'
5-
import 'tasks/testing.rake'
6-
import 'tasks/linting.rake'
3+
import "tasks/cleaning.rake"
4+
import "tasks/releasing.rake"
5+
import "tasks/testing.rake"
6+
import "tasks/linting.rake"

admin/Rakefile

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# frozen_string_literal: true
22

3-
require 'rubygems'
4-
require 'rake'
5-
require 'rake/testtask'
6-
require 'rspec/core/rake_task'
7-
require 'spree/testing_support/dummy_app/rake_tasks'
8-
require 'solidus_admin/testing_support/dummy_app/rake_tasks'
9-
require 'bundler/gem_tasks'
3+
require "rubygems"
4+
require "rake"
5+
require "rake/testtask"
6+
require "rspec/core/rake_task"
7+
require "spree/testing_support/dummy_app/rake_tasks"
8+
require "solidus_admin/testing_support/dummy_app/rake_tasks"
9+
require "bundler/gem_tasks"
1010

1111
namespace :tailwindcss do
1212
tailwindcss_command = [
@@ -18,31 +18,31 @@ namespace :tailwindcss do
1818
"--input",
1919
"#{__dir__}/app/assets/stylesheets/solidus_admin/application.tailwind.css",
2020
"--output",
21-
"#{__dir__}/app/assets/builds/solidus_admin/tailwind.css",
21+
"#{__dir__}/app/assets/builds/solidus_admin/tailwind.css"
2222
]
2323

24-
desc 'Build Tailwind CSS'
24+
desc "Build Tailwind CSS"
2525
task :build do
2626
sh tailwindcss_command.shelljoin
2727
end
2828

29-
desc 'Watch Tailwind CSS'
29+
desc "Watch Tailwind CSS"
3030
task :watch do
31-
sh (tailwindcss_command + ['--watch']).shelljoin
31+
sh (tailwindcss_command + ["--watch"]).shelljoin
3232
end
3333
end
3434

35-
task build: 'tailwindcss:build'
35+
task build: "tailwindcss:build"
3636

3737
RSpec::Core::RakeTask.new
3838
task default: :spec
3939

4040
DummyApp::RakeTasks.new(
4141
gem_root: File.expand_path(__dir__),
42-
lib_name: 'solidus_admin'
42+
lib_name: "solidus_admin"
4343
)
4444

45-
task test_app: 'db:reset'
45+
task test_app: "db:reset"
4646

4747
# Namespace release tags, e.g. 'solidus_admin/v1.2.3'
48-
Bundler::GemHelper.tag_prefix = 'solidus_admin/'
48+
Bundler::GemHelper.tag_prefix = "solidus_admin/"

admin/app/components/solidus_admin/adjustment_reasons/index/component.rb

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ def search_key
1616
def page_actions
1717
render component("ui/button").new(
1818
tag: :a,
19-
text: t('.add'),
19+
text: t(".add"),
2020
href: solidus_admin.new_adjustment_reason_path(**search_filter_params),
21-
data: { turbo_frame: :resource_form },
21+
data: {turbo_frame: :resource_form},
2222
icon: "add-line",
23-
class: "align-self-end w-full",
23+
class: "align-self-end w-full"
2424
)
2525
end
2626

@@ -37,11 +37,11 @@ def edit_path(adjustment_reason)
3737
def batch_actions
3838
[
3939
{
40-
label: t('.batch_actions.delete'),
40+
label: t(".batch_actions.delete"),
4141
action: solidus_admin.adjustment_reasons_path(**search_filter_params),
4242
method: :delete,
43-
icon: 'delete-bin-7-line',
44-
},
43+
icon: "delete-bin-7-line"
44+
}
4545
]
4646
end
4747

@@ -51,24 +51,24 @@ def columns
5151
header: :name,
5252
data: ->(adjustment_reason) do
5353
link_to adjustment_reason.name, edit_path(adjustment_reason),
54-
class: 'body-link',
55-
data: { turbo_frame: :resource_form }
54+
class: "body-link",
55+
data: {turbo_frame: :resource_form}
5656
end
5757
},
5858
{
5959
header: :code,
6060
data: ->(adjustment_reason) do
6161
link_to adjustment_reason.code, edit_path(adjustment_reason),
62-
class: 'body-link',
63-
data: { turbo_frame: :resource_form }
62+
class: "body-link",
63+
data: {turbo_frame: :resource_form}
6464
end
6565
},
6666
{
6767
header: :active,
6868
data: ->(adjustment_reason) do
69-
adjustment_reason.active? ? component('ui/badge').yes : component('ui/badge').no
69+
adjustment_reason.active? ? component("ui/badge").yes : component("ui/badge").no
7070
end
71-
},
71+
}
7272
]
7373
end
7474
end

admin/app/components/solidus_admin/base_component.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ def icon_tag(name, **attrs)
1919
def missing_translation(key, options)
2020
keys = I18n.normalize_keys(options[:locale] || I18n.locale, key, options[:scope])
2121

22-
logger.debug " [#{self.class}] Missing translation: #{keys.join('.')}"
22+
logger.debug " [#{self.class}] Missing translation: #{keys.join(".")}"
2323

2424
if (options[:locale] || I18n.default_locale) != :en
2525
t(key, **options, locale: :en)
2626
else
27-
"translation missing: #{keys.join('.')}"
27+
"translation missing: #{keys.join(".")}"
2828
end
2929
end
3030

admin/app/components/solidus_admin/layout/flashes/alerts/component.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class SolidusAdmin::Layout::Flashes::Alerts::Component < SolidusAdmin::BaseCompo
1111
# and default title (see +SolidusAdmin::UI::Alert::Component+).
1212
def initialize(alerts:)
1313
if alerts.is_a?(String)
14-
alerts = { danger: { message: alerts } }
14+
alerts = {danger: {message: alerts}}
1515
end
1616

1717
@alerts = alerts.slice(*SolidusAdmin::UI::Alert::Component::SCHEMES.keys)

admin/app/components/solidus_admin/layout/navigation/account/component.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def locale_options_for_select(available_locales)
1212
available_locales.map do |locale|
1313
[
1414
t("spree.i18n.this_file_language", locale:, default: locale.to_s, fallback: false),
15-
locale,
15+
locale
1616
]
1717
end.sort
1818
end
@@ -22,14 +22,14 @@ def theme_options_for_select
2222
end
2323

2424
def autosubmit_select_tag(name, options, icon:, &block)
25-
form_tag(request.fullpath, method: :get, 'data-turbo': false, class: "w-full") do
25+
form_tag(request.fullpath, method: :get, "data-turbo": false, class: "w-full") do
2626
safe_join([
2727
block_given? ? capture(&block) : nil,
2828
tag.label(safe_join([
2929
icon_tag(icon, class: "w-full max-w-[20px] h-5 fill-current shrink"),
3030
tag.select(options, name:, onchange: "this.form.requestSubmit()", class: "w-full appearance-none grow bg-transparent outline-none"),
31-
icon_tag("expand-up-down-line", class: "w-full max-w-[20px] h-5 fill-current shrink"),
32-
]), class: "flex gap-2 items-center px-2"),
31+
icon_tag("expand-up-down-line", class: "w-full max-w-[20px] h-5 fill-current shrink")
32+
]), class: "flex gap-2 items-center px-2")
3333
])
3434
end
3535
end

0 commit comments

Comments
 (0)