Fix preview version resolution

Author: k0kubun

lib/shopify_ruby_definitions/ruby_versions.rb

@@ -2,13 +2,19 @@
 
 module ShopifyRubyDefinitions
   module RubyVersions
+    class << self
+      def build_version_overrides(all_versions)
+        all_versions.sort_by do |version|
+          version.scan(/\d+/).map(&:to_i)
+        end.to_h do |version|
+          [version.partition("-pshopify").first, version]
+        end.freeze
+      end
+    end
+
     VERSIONS_DIRECTORY = File.expand_path("../../../rubies", __FILE__)
     ALL_VERSIONS = Dir["#{VERSIONS_DIRECTORY}/*"].map { |f| File.basename(f) }
-    VERSION_OVERRIDES = ALL_VERSIONS.sort_by do |version|
-      version.scan(/\d+/).map(&:to_i)
-    end.to_h do |version|
-      [version.split("-").first, version]
-    end.freeze
+    VERSION_OVERRIDES = build_version_overrides(ALL_VERSIONS)
 
     def version_overrides
       VERSION_OVERRIDES

test/shopify_ruby_definitions/test_ruby_versions.rb

@@ -20,5 +20,29 @@ def test_version_overrides
     def test_resolve_version
       assert_equal("3.0.2-pshopify3", ShopifyRubyDefinitions.resolve_version("3.0"))
     end
+
+    def test_resolve_preview_version
+      with_versions(["3.3.0-preview2-pshopify1", "3.3.0-pshopify1"]) do
+        assert_equal("3.3.0-preview2-pshopify1", ShopifyRubyDefinitions.resolve_version("3.3.0-preview2"))
+        assert_equal("3.3.0-pshopify1", ShopifyRubyDefinitions.resolve_version("3.3"))
+      end
+    end
+
+    private
+
+    def with_versions(new_versions)
+      old_versions = RubyVersions::ALL_VERSIONS
+      old_version_overrides = RubyVersions::VERSION_OVERRIDES
+      RubyVersions.send(:remove_const, :ALL_VERSIONS)
+      RubyVersions.const_set(:ALL_VERSIONS, new_versions)
+      RubyVersions.send(:remove_const, :VERSION_OVERRIDES)
+      RubyVersions.const_set(:VERSION_OVERRIDES, RubyVersions.build_version_overrides(new_versions))
+      yield
+    ensure
+      RubyVersions.send(:remove_const, :ALL_VERSIONS)
+      RubyVersions.const_set(:ALL_VERSIONS, old_versions)
+      RubyVersions.send(:remove_const, :VERSION_OVERRIDES)
+      RubyVersions.const_set(:VERSION_OVERRIDES, old_version_overrides)
+    end
   end
 end