Reorganize fog specs for better maintainability and execution speed

Author: mshibuya

carrierwave.gemspec

@@ -36,9 +36,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rails", ">= 5.0.0"
   s.add_development_dependency "cucumber", "~> 2.3"
   s.add_development_dependency "rspec", "~> 3.4"
+  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"
+  s.add_development_dependency "fog-google", ["~> 1.7", "!= 1.12.1"]
   s.add_development_dependency "fog-local"
   s.add_development_dependency "fog-rackspace"
   s.add_development_dependency "mini_magick", ">= 3.6.0"

spec/spec_helper.rb

@@ -19,11 +19,10 @@
 require 'mini_magick'
 require "vips"
 require 'active_support/core_ext'
+require 'rspec/retry'
 
 I18n.enforce_available_locales = false
 
-CARRIERWAVE_DIRECTORY = "carrierwave#{Time.now.to_i}" unless defined?(CARRIERWAVE_DIRECTORY)
-
 alias :running :lambda
 
 def file_path( *paths )
@@ -137,6 +136,14 @@ def stub_request(method, uri)
   config.include CarrierWave::Test::I18nHelpers
   config.include CarrierWave::Test::ManipulationHelpers
   config.prepend CarrierWave::Test::SsrfProtectionAwareWebMock
+  config.verbose_retry = true
+  config.display_try_failure_messages = true
+  config.around :each, :with_retry do |example|
+    example.run_with_retry retry: 2
+  end
+  config.retry_callback = proc do |example|
+    sleep 1
+  end
   if RUBY_ENGINE == 'jruby'
     config.filter_run_excluding :rmagick => true
   end

spec/storage/fog_credentials.rb

@@ -20,27 +20,29 @@
     end
 
     FOG_CREDENTIALS = credentials
+    CARRIERWAVE_DIRECTORY = "carrierwave"
   else
     Fog.credential = :carrierwave
 
     mappings = {
       'AWS'       => [:aws_access_key_id, :aws_secret_access_key],
-      'Google'    => [:google_storage_access_key_id, :google_storage_secret_access_key],
-      'Local'     => [:local_root],
-      'Rackspace' => [:rackspace_api_key, :rackspace_username]
+      'Google'    => [:google_storage_access_key_id, :google_storage_secret_access_key, :google_project, :google_json_key_string],
+      #'Local'     => [:local_root],
+      #'Rackspace' => [:rackspace_api_key, :rackspace_username]
     }
 
     mappings.each do |provider, keys|
       unless (creds = Fog.credentials.reject {|key, value| ![*keys].include?(key)}).empty?
         data = {:provider => provider}
         keys.each do |key|
-          data[key] = creds[key]
+          data[key] = creds[key] unless creds[key].blank?
         end
         credentials << data
       end
     end
 
     FOG_CREDENTIALS = credentials
+    CARRIERWAVE_DIRECTORY = "carrierwave-#{ENV['USER']}-dev" unless defined?(CARRIERWAVE_DIRECTORY)
   end
 
 end