Refactor Windows CI exclusions

Author: JonRowe

lib/rspec/support/spec.rb

@@ -36,9 +36,9 @@
 
   c.example_status_persistence_file_path = "./spec/examples.txt"
 
-  c.define_derived_metadata :failing_on_appveyor do |meta|
-    meta[:pending] ||= "This spec fails on AppVeyor and needs someone to fix it."
-  end if ENV['APPVEYOR']
+  c.define_derived_metadata :failing_on_windows_ci do |meta|
+    meta[:pending] ||= "This spec fails on Windows CI and needs someone to fix it."
+  end if RSpec::Support::OS.windows? && ENV['CI']
 end
 
 module RSpec

spec/rspec/support/directory_maker_spec.rb

@@ -28,9 +28,7 @@ def directory_exists?(dirname)
       context "when a file already exists" do
         before { File.open("tmp", "w") }
 
-        it "raises, as it can't make the directory", :failing_on_appveyor,
-           :pending => false,
-           :skip => (ENV['APPVEYOR'] ? "Failing on AppVeyor but :pending isn't working for some reason" : false) do
+        it "raises, as it can't make the directory", :failing_on_windows_ci do
           expect {
             mkdir_p.call(dirname)
           }.to raise_error(Errno::EEXIST)

spec/rspec/support/spec/stderr_splitter_spec.rb

@@ -32,7 +32,7 @@
     stderr_methods -= [:birthtime] if RUBY_VERSION =~ /^2\.2/
 
     # No idea why, but on our AppVeyor windows builds it doesn't respond to these...
-    stderr_methods -= [:close_on_exec?, :close_on_exec=] if RSpec::Support::OS.windows?
+    stderr_methods -= [:close_on_exec?, :close_on_exec=] if RSpec::Support::OS.windows? && ENV['CI']
 
     expect(splitter).to respond_to(*stderr_methods)
   end