Make spec runnable

With marking Ruby 2.2/2.3 builds as experimental because of the Segfault issue. https://github.com/carrierwaveuploader/carrierwave/actions/runs/3507035938
carrierwaveuploader · Nov 20, 2022 · 8c4c91f · 8c4c91f
1 parent c74579d
commit 8c4c91f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,10 +14,10 @@ jobs:
         include:
           - ruby: 2.2
             gemfile: gemfiles/rails-5-0.gemfile
-            experimental: false
+            experimental: true
           - ruby: 2.3
             gemfile: gemfiles/rails-5-1.gemfile
-            experimental: false
+            experimental: true
           - ruby: 2.4
             gemfile: gemfiles/rails-5-2.gemfile
             experimental: false

diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,5 @@
 source "https://rubygems.org"
 
 gem "activemodel-serializers-xml"
-# See https://github.com/fog/fog-google/issues/535 for this restriction.
-gem "fog-google", "~> 1.13.0" if RUBY_VERSION.to_f < 2.6
 
 gemspec
diff --git a/carrierwave.gemspec b/carrierwave.gemspec
@@ -39,7 +39,12 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec-retry"
   s.add_development_dependency "webmock"
   s.add_development_dependency "fog-aws"
-  s.add_development_dependency "fog-google", ["~> 1.7", "!= 1.12.1"]
+  if 2.3 < RUBY_VERSION.to_f && RUBY_VERSION.to_f < 2.7
+    # See https://github.com/fog/fog-google/issues/535 for this restriction.
+    s.add_development_dependency "fog-google", "~> 1.13.0"
+  else
+    s.add_development_dependency "fog-google", ["~> 1.7", "!= 1.12.1"]
+  end
   s.add_development_dependency "fog-local"
   s.add_development_dependency "fog-rackspace"
   s.add_development_dependency "mini_magick", ">= 3.6.0"

diff --git a/gemfiles/rails-master.gemfile b/gemfiles/rails-master.gemfile
@@ -1,11 +1,6 @@
 source "https://rubygems.org"
 
 gem "rails", github: "rails/rails", branch: "main"
-gem "rack", github: "rack/rack", branch: "master"
-gem "arel", github: "rails/arel", branch: "master"
-gem "sprockets", github: "rails/sprockets", branch: "master"
-gem "sprockets-rails", github: "rails/sprockets-rails", branch: "master"
-gem "sass-rails", github: "rails/sass-rails"
 gem "activemodel-serializers-xml"
 gem "activerecord-jdbcpostgresql-adapter", github: "jruby/activerecord-jdbc-adapter", platforms: :jruby
 

diff --git a/spec/storage/file_spec.rb b/spec/storage/file_spec.rb
@@ -39,7 +39,6 @@
   end
 
   describe '#cache!' do
-    before { pending "Fails in JRuby with 'undefined local variable or method __memoized...'" if RUBY_ENGINE == 'jruby' }
     context "when FileUtils.mkdir_p raises Errno::EMLINK" do
       before { fake_failed_mkdir_p(Errno::EMLINK) }
       after { storage.cache!(sanitized_temp_file) }