From e008edb4873aca89fe4aee079a89bd9b2dcdcfd4 Mon Sep 17 00:00:00 2001
From: Sutou Kouhei <kou@clear-code.com>
Date: Wed, 8 Jan 2020 10:41:56 +0900
Subject: Revert unskippable skips

---
 spec/install/gemfile/platform_spec.rb | 6 ++++++
 spec/install/gems/resolving_spec.rb   | 8 ++++++++
 2 files changed, 14 insertions(+)

(limited to 'spec')

diff --git a/spec/install/gemfile/platform_spec.rb b/spec/install/gemfile/platform_spec.rb
index c096531398..52e1cf86fa 100644
--- a/spec/install/gemfile/platform_spec.rb
+++ b/spec/install/gemfile/platform_spec.rb
@@ -274,6 +274,8 @@ end
 
 RSpec.describe "bundle install with platform conditionals" do
   it "installs gems tagged w/ the current platforms" do
+    skip "platform issues" if Gem.win_platform?
+
     install_gemfile <<-G
       source "#{file_uri_for(gem_repo1)}"
 
@@ -299,6 +301,8 @@ RSpec.describe "bundle install with platform conditionals" do
   end
 
   it "installs gems tagged w/ the current platforms inline" do
+    skip "platform issues" if Gem.win_platform?
+
     install_gemfile <<-G
       source "#{file_uri_for(gem_repo1)}"
       gem "nokogiri", :platforms => :#{local_tag}
@@ -317,6 +321,8 @@ RSpec.describe "bundle install with platform conditionals" do
   end
 
   it "installs gems tagged w/ the current platform inline" do
+    skip "platform issues" if Gem.win_platform?
+
     install_gemfile <<-G
       source "#{file_uri_for(gem_repo1)}"
       gem "nokogiri", :platform => :#{local_tag}
diff --git a/spec/install/gems/resolving_spec.rb b/spec/install/gems/resolving_spec.rb
index a1a61ea065..0e933bfd8e 100644
--- a/spec/install/gems/resolving_spec.rb
+++ b/spec/install/gems/resolving_spec.rb
@@ -19,6 +19,8 @@ RSpec.describe "bundle install with install-time dependencies" do
   end
 
   it "installs gems with a dependency with no type" do
+    skip "incorrect data check error" if Gem.win_platform?
+
     build_repo2
 
     path = "#{gem_repo2}/#{Gem::MARSHAL_SPEC_DIR}/actionpack-2.3.2.gemspec.rz"
@@ -101,6 +103,10 @@ RSpec.describe "bundle install with install-time dependencies" do
 
   describe "when a required ruby version" do
     context "allows only an older version" do
+      before do
+        skip "gem not found" if Gem.win_platform?
+      end
+
       it "installs the older version" do
         build_repo2 do
           build_gem "rack", "9001.0.0" do |s|
@@ -160,6 +166,8 @@ RSpec.describe "bundle install with install-time dependencies" do
 
       shared_examples_for "ruby version conflicts" do
         it "raises an error during resolution" do
+          skip "ruby requirement includes platform and it shouldn't" if Gem.win_platform?
+
           install_gemfile <<-G, :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo2.to_s }
             source "http://localgemserver.test/"
             ruby #{ruby_requirement}
-- 
cgit v1.2.1