Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fakefs: Allow 2.x #131

Merged
merged 3 commits into from
Jul 11, 2023
+4 −11
Merged

fakefs: Allow 2.x #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8822521
fakefs: Allow 2.x
bastelfreak Jul 11, 2023
5f50a73
use rake task from voxpupuli-rubocop
bastelfreak Jul 11, 2023
4509e71
rubocop: autofix
bastelfreak Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,7 @@ else
end

begin
require 'rubocop/rake_task'
require 'voxpupuli/rubocop/rake'
rescue LoadError
# RuboCop is an optional group
else
RuboCop::RakeTask.new(:rubocop) do |task|
# These make the rubocop experience maybe slightly less terrible
task.options = ['--display-cop-names', '--display-style-guide', '--extra-details']
# Use Rubocop's Github Actions formatter if possible
task.formatters << 'github' if ENV['GITHUB_ACTIONS'] == 'true'
end
# the voxpupuli-rubocop gem is optional
end
2 changes: 1 addition & 1 deletion beaker-rspec.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Gem::Specification.new do |s|
s.require_paths = ['lib']

# Testing dependencies
s.add_development_dependency 'fakefs', '>= 0.6', '< 2'
s.add_development_dependency 'fakefs', '>= 0.6', '< 3'
s.add_development_dependency 'minitest', '~> 5.4'
s.add_development_dependency 'rake', '~> 13.0'
s.add_development_dependency 'voxpupuli-rubocop', '~> 1.3'
Expand Down
2 changes: 1 addition & 1 deletion lib/beaker-rspec/spec_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
debug: ENV['BEAKER_DEBUG'] || ENV['BEAKER_debug'] || ENV.fetch('RS_DEBUG', nil),
destroy: ENV['BEAKER_DESTROY'] || ENV['BEAKER_destroy'] || ENV.fetch('RS_DESTROY', nil),
optionsfile: ENV['BEAKER_OPTIONS_FILE'] || ENV['BEAKER_options_file'] || ENV.fetch('RS_OPTIONS_FILE', nil),
}.delete_if { |_key, value| value.nil? }
}.compact
# combine defaults and env_vars to determine overall options
options = defaults.merge(env_vars)

Expand Down