Merge pull request #813 from cucumber/easy-windows-detection

Use Ruby's built-in windows platform detection
cucumber · Jun 20, 2021 · 01eefdf · 01eefdf
2 parents b402e74 + a726aa9
commit 01eefdf
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/lib/aruba/platforms/unix_platform.rb b/lib/aruba/platforms/unix_platform.rb
@@ -31,7 +31,7 @@ module Platforms
     # @private
     class UnixPlatform
       def self.match?
-        !Cucumber::WINDOWS
+        !Gem.win_platform?
       end
 
       def environment_variables

diff --git a/lib/aruba/platforms/windows_platform.rb b/lib/aruba/platforms/windows_platform.rb
@@ -1,5 +1,3 @@
-require "cucumber/platform"
-
 require "aruba/platforms/unix_platform"
 require "aruba/platforms/windows_command_string"
 require "aruba/platforms/windows_environment_variables"
@@ -20,7 +18,7 @@ module Platforms
     # @private
     class WindowsPlatform < UnixPlatform
       def self.match?
-        Cucumber::WINDOWS
+        Gem.win_platform?
       end
 
       # @see UnixPlatform#command_string

diff --git a/spec/aruba/api/commands_spec.rb b/spec/aruba/api/commands_spec.rb
@@ -46,10 +46,10 @@
     end
 
     context "when running a relative command" do
-      let(:cmd) { Cucumber::WINDOWS ? "bin/testcmd.bat" : "bin/testcmd" }
+      let(:cmd) { Gem.win_platform? ? "bin/testcmd.bat" : "bin/testcmd" }
 
       before do
-        if Cucumber::WINDOWS
+        if Gem.win_platform?
           @aruba.write_file cmd, <<~BAT
             exit 0
           BAT

diff --git a/spec/aruba/processes/spawn_process_spec.rb b/spec/aruba/processes/spawn_process_spec.rb
@@ -194,7 +194,7 @@
   end
 
   describe "#send_signal" do
-    let(:signal) { Cucumber::WINDOWS ? 9 : "KILL" }
+    let(:signal) { Gem.win_platform? ? 9 : "KILL" }
 
     context "with a command that is running" do
       let(:cmd) { "bin/test-cli" }