Skip to content

Commit 2a924be

Browse files
committed
Auto-correct RuboCop offenses
Output: ``` solidus_dev_support 17:27:56 $ bundle exec rubocop --auto-correct Inspecting 29 files ........CC...C..C............ Offenses: lib/solidus_dev_support/rake_tasks.rb:16:35: C: [Corrected] Style/FetchEnvVar: Use ENV.fetch('DUMMY_PATH', 'spec/dummy') instead of ENV['DUMMY_PATH'] || 'spec/dummy'. @test_app_path = @root.join(ENV['DUMMY_PATH'] || 'spec/dummy') ^^^^^^^^^^^^^^^^^ lib/solidus_dev_support/rake_tasks.rb:46:19: C: [Corrected] Style/FetchEnvVar: Use ENV.fetch('DUMMY_PATH') or ENV.fetch('DUMMY_PATH', nil) instead of ENV['DUMMY_PATH']. directory ENV['DUMMY_PATH'] do ^^^^^^^^^^^^^^^^^ lib/solidus_dev_support/rake_tasks.rb:64:60: C: [Corrected] Style/FetchEnvVar: Use ENV.fetch('DUMMY_PATH') or ENV.fetch('DUMMY_PATH', nil) instead of ENV['DUMMY_PATH']. ::RSpec::Core::RakeTask.new(:specs, [] => FileList[ENV['DUMMY_PATH']]) do |t| ^^^^^^^^^^^^^^^^^ lib/solidus_dev_support/rake_tasks.rb:85:37: C: [Corrected] Style/FetchEnvVar: Use ENV.fetch('UNRELEASED_VERSION') { gemspec.version } instead of ENV['UNRELEASED_VERSION'] || gemspec.version. config.future_release = "v#{ENV['UNRELEASED_VERSION'] || gemspec.version}" ^^^^^^^^^^^^^^^^^^^^^^^^^ lib/solidus_dev_support/rspec/capybara.rb:6:24: C: [Corrected] Style/RedundantParentheses: Don't use parentheses around a method call. CAPYBARA_WINDOW_SIZE = (ENV.fetch('CAPYBARA_WINDOW_SIZE', '1920x1080')).split('x', 2).map(&:to_i) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lib/solidus_dev_support/rspec/capybara.rb:6:25: C: [Corrected] Style/FetchEnvVar: Use ENV.fetch('CAPYBARA_WINDOW_SIZE', '1920x1080') instead of ENV['CAPYBARA_WINDOW_SIZE'] || '1920x1080'. CAPYBARA_WINDOW_SIZE = (ENV['CAPYBARA_WINDOW_SIZE'] || '1920x1080').split('x', 2).map(&:to_i) ^^^^^^^^^^^^^^^^^^^^^^^^^^^ lib/solidus_dev_support/rspec/capybara.rb:8:30: C: [Corrected] Style/RedundantParentheses: Don't use parentheses around a method call. Capybara.javascript_driver = (ENV.fetch('CAPYBARA_JAVASCRIPT_DRIVER', "solidus_chrome_headless")).to_sym ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lib/solidus_dev_support/rspec/capybara.rb:8:31: C: [Corrected] Style/FetchEnvVar: Use ENV.fetch('CAPYBARA_JAVASCRIPT_DRIVER', "solidus_chrome_headless") instead of ENV['CAPYBARA_JAVASCRIPT_DRIVER'] || "solidus_chrome_headless". Capybara.javascript_driver = (ENV['CAPYBARA_JAVASCRIPT_DRIVER'] || "solidus_chrome_headless").to_sym ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lib/solidus_dev_support/rspec/spec_helper.rb:17:22: C: [Corrected] Style/FetchEnvVar: Use ENV.fetch('FAIL_FAST', false) instead of ENV['FAIL_FAST'] || false. config.fail_fast = ENV['FAIL_FAST'] || false ^^^^^^^^^^^^^^^^ lib/solidus_dev_support/templates/extension/Gemfile:17:6: C: [Corrected] Style/FetchEnvVar: Use ENV.fetch('DB') or ENV.fetch('DB', nil) instead of ENV['DB']. case ENV['DB'] ^^^^^^^^^ 29 files inspected, 10 offenses detected, 10 offenses corrected ```
1 parent 7fe651b commit 2a924be

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

lib/solidus_dev_support/rake_tasks.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def self.install(*args)
1313

1414
def initialize(root: Dir.pwd)
1515
@root = Pathname(root)
16-
@test_app_path = @root.join(ENV['DUMMY_PATH'] || 'spec/dummy')
16+
@test_app_path = @root.join(ENV.fetch('DUMMY_PATH', 'spec/dummy'))
1717
@gemspec = Bundler.load_gemspec(@root.glob("{,*}.gemspec").first)
1818
end
1919

@@ -43,7 +43,7 @@ def install_test_app_task
4343
cd root
4444
end
4545

46-
directory ENV['DUMMY_PATH'] do
46+
directory ENV.fetch('DUMMY_PATH', nil) do
4747
Rake::Task['extension:test_app'].invoke
4848
end
4949
end
@@ -61,7 +61,7 @@ def install_rspec_task
6161
require 'rspec/core/rake_task'
6262

6363
namespace :extension do
64-
::RSpec::Core::RakeTask.new(:specs, [] => FileList[ENV['DUMMY_PATH']]) do |t|
64+
::RSpec::Core::RakeTask.new(:specs, [] => FileList[ENV.fetch('DUMMY_PATH', nil)]) do |t|
6565
# Ref: https://circleci.com/docs/2.0/configuration-reference#store_test_results
6666
# Ref: https://github.com/solidusio/circleci-orbs-extensions#test-results-rspec
6767
if ENV['TEST_RESULTS_PATH']
@@ -82,7 +82,7 @@ def install_changelog_task
8282

8383
config.user = repo.owner
8484
config.project = repo.name
85-
config.future_release = "v#{ENV['UNRELEASED_VERSION'] || gemspec.version}"
85+
config.future_release = "v#{ENV.fetch('UNRELEASED_VERSION') { gemspec.version }}"
8686

8787
rescue Octokit::InvalidRepository
8888
warn <<~WARN

lib/solidus_dev_support/rspec/capybara.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
require 'webdrivers/chromedriver'
44

55
# Allow to override the initial windows size
6-
CAPYBARA_WINDOW_SIZE = (ENV['CAPYBARA_WINDOW_SIZE'] || '1920x1080').split('x', 2).map(&:to_i)
6+
CAPYBARA_WINDOW_SIZE = ENV.fetch('CAPYBARA_WINDOW_SIZE', '1920x1080').split('x', 2).map(&:to_i)
77

8-
Capybara.javascript_driver = (ENV['CAPYBARA_JAVASCRIPT_DRIVER'] || "solidus_chrome_headless").to_sym
8+
Capybara.javascript_driver = ENV.fetch('CAPYBARA_JAVASCRIPT_DRIVER', "solidus_chrome_headless").to_sym
99
Capybara.default_max_wait_time = 10
1010
Capybara.server = :puma, { Silent: true } # A fix for rspec/rspec-rails#1897
1111

lib/solidus_dev_support/rspec/spec_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
config.mock_with :rspec
1515
config.color = true
1616

17-
config.fail_fast = ENV['FAIL_FAST'] || false
17+
config.fail_fast = ENV.fetch('FAIL_FAST', false)
1818
config.order = 'random'
1919

2020
config.raise_errors_for_deprecations!

lib/solidus_dev_support/templates/extension/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ gem 'rails', '>0.a'
1414
# Provides basic authentication functionality for testing parts of your engine
1515
gem 'solidus_auth_devise'
1616

17-
case ENV['DB']
17+
case ENV.fetch('DB', nil)
1818
when 'mysql'
1919
gem 'mysql2'
2020
when 'postgresql'

0 commit comments

Comments
 (0)