Quellcode durchsuchen

Set the default version as the actual method param default

Paulo Margarido vor 4 Jahren
Ursprung
Commit
5d13031cdf
2 geänderte Dateien mit 10 neuen und 7 gelöschten Zeilen
  1. 3 3
      lib/shopify_api/session.rb
  2. 7 4
      test/session_test.rb

+ 3 - 3
lib/shopify_api/session.rb

@@ -20,7 +20,7 @@ module ShopifyAPI
         params.each { |k,value| public_send("#{k}=", value) }
       end
 
-      def temp(domain:, token:, api_version: nil, &block)
+      def temp(domain:, token:, api_version: ShopifyAPI::Base.api_version, &block)
         session = new(domain: domain, token: token, api_version: api_version)
 
         with_session(session, &block)
@@ -84,9 +84,9 @@ module ShopifyAPI
       end
     end
 
-    def initialize(domain:, token:, api_version: nil, extra: {})
+    def initialize(domain:, token:, api_version: ShopifyAPI::Base.api_version, extra: {})
       self.domain = self.class.prepare_domain(domain)
-      self.api_version = api_version || ShopifyAPI::Base.api_version
+      self.api_version = api_version
       self.token = token
       self.extra = extra
     end

+ 7 - 4
test/session_test.rb

@@ -18,18 +18,21 @@ class SessionTest < Test::Unit::TestCase
     assert_not session.valid?
   end
 
-  test "not be valid without an api version" do
+  test "not be valid without an API version" do
+    session = ShopifyAPI::Session.new(domain: "testshop.myshopify.com", token: "any-token", api_version: nil)
+    assert_not session.valid?
+
     session = ShopifyAPI::Session.new(domain: "testshop.myshopify.com", token: "any-token", api_version: ShopifyAPI::ApiVersion::NullVersion)
     assert_not session.valid?
   end
 
-  test "default to base api version" do
-    session = ShopifyAPI::Session.new(domain: "testshop.myshopify.com", token: "any-token", api_version: nil)
+  test "default to base API version" do
+    session = ShopifyAPI::Session.new(domain: "testshop.myshopify.com", token: "any-token")
     assert session.valid?
     assert_equal session.api_version, ShopifyAPI::Base.api_version
   end
 
-  test "can override the base api version" do
+  test "can override the base API version" do
     different_api_version = '2020-01'
     session = ShopifyAPI::Session.new(domain: "testshop.myshopify.com", token: "any-token", api_version: different_api_version)
     assert session.valid?