Merge pull request #869 from cucumber/fix-new-rubocop-offenses

Fix new RuboCop offenses
cucumber · May 13, 2022 · d5bd6e3 · d5bd6e3
2 parents 4936a34 + 3920ad8
commit d5bd6e3
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/aruba.gemspec b/aruba.gemspec
@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", [">= 12.0", "< 14.0"]
   spec.add_development_dependency "rake-manifest", "~> 0.2.0"
   spec.add_development_dependency "rspec", "~> 3.11"
-  spec.add_development_dependency "rubocop", "~> 1.28"
+  spec.add_development_dependency "rubocop", ["~> 1.28", "!= 1.29.0"]
   spec.add_development_dependency "rubocop-packaging", "~> 0.5.0"
   spec.add_development_dependency "rubocop-performance", "~> 1.13"
   spec.add_development_dependency "rubocop-rspec", "~> 2.8"

diff --git a/fixtures/cli-app/lib/cli/app.rb b/fixtures/cli-app/lib/cli/app.rb
@@ -1,6 +1,6 @@
 require "cli/app/version"
 
-::Dir.glob(File.expand_path("**/*.rb", __dir__)).each { |f| require_relative f }
+::Dir.glob(File.expand_path("**/*.rb", __dir__)).sort.each { |f| require_relative f }
 
 module Cli
   module App

diff --git a/fixtures/cli-app/spec/spec_helper.rb b/fixtures/cli-app/spec/spec_helper.rb
@@ -4,5 +4,5 @@
 
 require_relative "support/aruba"
 
-::Dir.glob(::File.expand_path("support/**/*.rb", __dir__))
+::Dir.glob(::File.expand_path("support/**/*.rb", __dir__)).sort
      .each { |f| require_relative f }
diff --git a/lib/aruba/platforms/unix_platform.rb b/lib/aruba/platforms/unix_platform.rb
@@ -100,7 +100,7 @@ def current_ruby
       end
 
       def require_matching_files(pattern, base)
-        ::Dir.glob(::File.expand_path(pattern, base)).each { |f| require_relative f }
+        ::Dir.glob(::File.expand_path(pattern, base)).sort.each { |f| require_relative f }
       end
 
       # Create directory and subdirectories

diff --git a/spec/aruba/rspec_spec.rb b/spec/aruba/rspec_spec.rb
@@ -15,7 +15,7 @@
 
   describe "Setting up the environment" do
     it "sets HOME to the configured value" do
-      expect(ENV["HOME"]).to eq aruba.config.home_directory
+      expect(Dir.home).to eq aruba.config.home_directory
     end
 
     it "includes configured command search paths in PATH" do

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -9,5 +9,5 @@
 end
 
 # Loading support files
-Dir.glob(::File.expand_path("support/*.rb", __dir__)).each { |f| require_relative f }
-Dir.glob(::File.expand_path("support/**/*.rb", __dir__)).each { |f| require_relative f }
+Dir.glob(::File.expand_path("support/*.rb", __dir__)).sort.each { |f| require_relative f }
+Dir.glob(::File.expand_path("support/**/*.rb", __dir__)).sort.each { |f| require_relative f }