Rename trustee JSON fields (#472)

juankuquintana · web-flow · commit ad584406ff8e · 2026-05-04T10:00:04.000-06:00
diff --git a/lib/dnsimple/struct/domain.rb b/lib/dnsimple/struct/domain.rb
@@ -27,8 +27,8 @@ class Domain < Base
       # @return [Bool] True if the domain WHOIS privacy is enabled, false otherwise.
       attr_accessor :private_whois
 
-      # @return [Bool] True if the domain Trustee service is enabled, false otherwise.
-      attr_accessor :trustee_service
+      # @return [Bool] True if the domain trustee is enabled, false otherwise.
+      attr_accessor :trustee
 
       # @return [String] The timestamp when domain will expire.
       attr_accessor :expires_at
diff --git a/lib/dnsimple/struct/domain_price.rb b/lib/dnsimple/struct/domain_price.rb
@@ -18,8 +18,8 @@ class DomainPrice < Base
       # @return [Float] The price for transfer
       attr_accessor :transfer_price
 
-      # @return [Float] The Trustee service price
-      attr_accessor :trustee_service_price
+      # @return [Float] The trustee price
+      attr_accessor :trustee_price
     end
   end
 end
diff --git a/lib/dnsimple/struct/domain_registration.rb b/lib/dnsimple/struct/domain_registration.rb
@@ -24,8 +24,8 @@ class DomainRegistration < Base
       # @return [Bool] True if the domain WHOIS privacy was requested.
       attr_accessor :whois_privacy
 
-      # @return [Bool] True if the domain Trustee service was requested.
-      attr_accessor :trustee_service
+      # @return [Bool] True if trustee was requested.
+      attr_accessor :trustee
 
       # @return [String] When the domain renewal was created in DNSimple.
       attr_accessor :created_at
diff --git a/lib/dnsimple/struct/domain_transfer.rb b/lib/dnsimple/struct/domain_transfer.rb
@@ -21,8 +21,8 @@ class DomainTransfer < Base
       # @return [Bool] True if the domain WHOIS privacy was requested.
       attr_accessor :whois_privacy
 
-      # @return [Bool] True if the domain Trustee service was requested.
-      attr_accessor :trustee_service
+      # @return [Bool] True if trustee was requested.
+      attr_accessor :trustee
 
       # @return [String,nil] The reason if transfer failed.
       attr_accessor :status_description
diff --git a/test/dnsimple/client/domains_test.rb b/test/dnsimple/client/domains_test.rb
@@ -172,7 +172,7 @@ def setup
     assert_equal("registered", result.state)
     refute(result.auto_renew)
     refute(result.private_whois)
-    refute(result.trustee_service)
+    refute(result.trustee)
     assert_equal("2021-06-05T02:15:00Z", result.expires_at)
     assert_equal("2020-06-04T19:15:14Z", result.created_at)
     assert_equal("2020-06-04T19:15:21Z", result.updated_at)
diff --git a/test/dnsimple/client/registrar_test.rb b/test/dnsimple/client/registrar_test.rb
@@ -62,10 +62,10 @@ def setup
     assert_in_delta(20.0, result.registration_price)
     assert_in_delta(20.0, result.renewal_price)
     assert_in_delta(20.0, result.transfer_price)
-    if result.trustee_service_price.nil?
-      assert_nil result.trustee_service_price
+    if result.trustee_price.nil?
+      assert_nil result.trustee_price
     else
-      assert_in_delta(20.0, result.trustee_service_price)
+      assert_in_delta(20.0, result.trustee_price)
     end
   end
 
@@ -83,7 +83,7 @@ def setup
     stub_request(:post, %r{/v2/#{@account_id}/registrar/domains/.+/registrations$})
         .to_return(read_http_fixture("registerDomain/success.http"))
 
-    attributes = { registrant_id: "10", trustee_service: true }
+    attributes = { registrant_id: "10", trustee: true }
     @subject.register_domain(@account_id, domain_name = "example.com", attributes)
 
     assert_requested(:post, "https://api.dnsimple.test/v2/#{@account_id}/registrar/domains/#{domain_name}/registrations",
@@ -105,7 +105,7 @@ def setup
     assert_kind_of(Dnsimple::Struct::DomainRegistration, result)
     assert_kind_of(Integer, result.id)
     assert_kind_of(Integer, result.domain_id)
-    refute(result.trustee_service)
+    refute(result.trustee)
   end
 
   test "register domain when attributes are incomplete raises argument error" do
@@ -138,7 +138,7 @@ def setup
     assert_kind_of(Dnsimple::Struct::DomainRegistration, result)
     assert_kind_of(Integer, result.id)
     assert_kind_of(Integer, result.domain_id)
-    refute(result.trustee_service)
+    refute(result.trustee)
   end
 
 
@@ -211,7 +211,7 @@ def setup
     stub_request(:post, %r{/v2/#{@account_id}/registrar/domains/.+/transfers$})
         .to_return(read_http_fixture("transferDomain/success.http"))
 
-    attributes = { registrant_id: "10", auth_code: "x1y2z3", trustee_service: true }
+    attributes = { registrant_id: "10", auth_code: "x1y2z3", trustee: true }
     @subject.transfer_domain(@account_id, domain_name = "example.com", attributes)
 
     assert_requested(:post, "https://api.dnsimple.test/v2/#{@account_id}/registrar/domains/#{domain_name}/transfers",
@@ -233,7 +233,7 @@ def setup
     assert_kind_of(Dnsimple::Struct::DomainTransfer, result)
     assert_kind_of(Integer, result.id)
     assert_kind_of(Integer, result.domain_id)
-    refute(result.trustee_service)
+    refute(result.trustee)
   end
 
   test "transfer domain when attributes are incomplete raises argument error" do
@@ -289,7 +289,7 @@ def setup
     assert_equal("cancelled", result.state)
     refute(result.auto_renew)
     refute(result.whois_privacy)
-    refute(result.trustee_service)
+    refute(result.trustee)
     assert_equal("Canceled by customer", result.status_description)
     assert_equal("2020-06-05T18:08:00Z", result.created_at)
     assert_equal("2020-06-05T18:10:01Z", result.updated_at)
@@ -323,7 +323,7 @@ def setup
     assert_equal("transferring", result.state)
     refute(result.auto_renew)
     refute(result.whois_privacy)
-    refute(result.trustee_service)
+    refute(result.trustee)
     assert_nil(result.status_description)
     assert_equal("2020-06-05T18:08:00Z", result.created_at)
     assert_equal("2020-06-05T18:08:04Z", result.updated_at)
diff --git a/test/fixtures.http/cancelDomainTransfer/success.http b/test/fixtures.http/cancelDomainTransfer/success.http
@@ -15,4 +15,4 @@ x-xss-protection: 1; mode=block
 x-download-options: noopen
 x-permitted-cross-domain-policies: none
 
-{"data":{"id":361,"domain_id":182245,"registrant_id":2715,"state":"transferring","auto_renew":false,"whois_privacy":false,"trustee_service":false,"status_description":null,"created_at":"2020-06-05T18:08:00Z","updated_at":"2020-06-05T18:08:04Z"}}
+{"data":{"id":361,"domain_id":182245,"registrant_id":2715,"state":"transferring","auto_renew":false,"whois_privacy":false,"trustee":false,"status_description":null,"created_at":"2020-06-05T18:08:00Z","updated_at":"2020-06-05T18:08:04Z"}}
diff --git a/test/fixtures.http/getDomain/success.http b/test/fixtures.http/getDomain/success.http
@@ -17,4 +17,4 @@ x-download-options: noopen
 x-permitted-cross-domain-policies: none
 strict-transport-security: max-age=31536000
 
-{"data":{"id":181984,"account_id":1385,"registrant_id":2715,"name":"example-alpha.com","unicode_name":"example-alpha.com","state":"registered","auto_renew":false,"private_whois":false,"trustee_service":false,"expires_on":"2021-06-05","expires_at":"2021-06-05T02:15:00Z","created_at":"2020-06-04T19:15:14Z","updated_at":"2020-06-04T19:15:21Z"}}
+{"data":{"id":181984,"account_id":1385,"registrant_id":2715,"name":"example-alpha.com","unicode_name":"example-alpha.com","state":"registered","auto_renew":false,"private_whois":false,"trustee":false,"expires_on":"2021-06-05","expires_at":"2021-06-05T02:15:00Z","created_at":"2020-06-04T19:15:14Z","updated_at":"2020-06-04T19:15:21Z"}}
diff --git a/test/fixtures.http/getDomainPrices/success.http b/test/fixtures.http/getDomainPrices/success.http
@@ -18,4 +18,4 @@ x-permitted-cross-domain-policies: none
 content-security-policy: frame-ancestors 'none'
 strict-transport-security: max-age=31536000
 
-{"data":{"domain":"bingo.pizza","premium":true,"registration_price":20.0,"renewal_price":20.0,"transfer_price":20.0,"restore_price":20.0,"trustee_service_price":20.0}}
+{"data":{"domain":"bingo.pizza","premium":true,"registration_price":20.0,"renewal_price":20.0,"transfer_price":20.0,"restore_price":20.0,"trustee_price":20.0}}
diff --git a/test/fixtures.http/getDomainRegistration/success.http b/test/fixtures.http/getDomainRegistration/success.http
@@ -17,4 +17,4 @@ x-download-options: noopen
 x-permitted-cross-domain-policies: none
 strict-transport-security: max-age=31536000
 
-{"data":{"id":361,"domain_id":104040,"registrant_id":2715,"period":1,"state":"registering","auto_renew":false,"whois_privacy":false,"trustee_service":false,"created_at":"2023-01-27T17:44:32Z","updated_at":"2023-01-27T17:44:40Z"}}
+{"data":{"id":361,"domain_id":104040,"registrant_id":2715,"period":1,"state":"registering","auto_renew":false,"whois_privacy":false,"trustee":false,"created_at":"2023-01-27T17:44:32Z","updated_at":"2023-01-27T17:44:40Z"}}
diff --git a/test/fixtures.http/getDomainTransfer/success.http b/test/fixtures.http/getDomainTransfer/success.http
@@ -17,4 +17,4 @@ x-download-options: noopen
 x-permitted-cross-domain-policies: none
 strict-transport-security: max-age=31536000
 
-{"data":{"id":361,"domain_id":182245,"registrant_id":2715,"state":"cancelled","auto_renew":false,"whois_privacy":false,"trustee_service":false,"status_description":"Canceled by customer","created_at":"2020-06-05T18:08:00Z","updated_at":"2020-06-05T18:10:01Z"}}
+{"data":{"id":361,"domain_id":182245,"registrant_id":2715,"state":"cancelled","auto_renew":false,"whois_privacy":false,"trustee":false,"status_description":"Canceled by customer","created_at":"2020-06-05T18:08:00Z","updated_at":"2020-06-05T18:10:01Z"}}
diff --git a/test/fixtures.http/listCharges/success.http b/test/fixtures.http/listCharges/success.http
@@ -9,4 +9,4 @@ cache-control: no-store, must-revalidate, private, max-age=0
 x-request-id: a57a87c8-626a-4361-9fb8-b55ca9be8e5d
 x-runtime: 0.060526
 
-{"data":[{"invoiced_at":"2023-08-17T05:53:36Z","total_amount":"14.50","balance_amount":"0.00","reference":"1-2","state":"collected","items":[{"description":"Register bubble-registered.com","amount":"14.50","product_id":1,"product_type":"domain-registration","product_reference":"bubble-registered.com"}]},{"invoiced_at":"2023-08-17T05:57:53Z","total_amount":"14.50","balance_amount":"0.00","reference":"2-2","state":"refunded","items":[{"description":"Register example.com","amount":"14.50","product_id":2,"product_type":"domain-registration","product_reference":"example.com"}]},{"invoiced_at":"2023-10-24T07:49:05Z","total_amount":"1099999.99","balance_amount":"0.00","reference":"4-2","state":"collected","items":[{"description":"Test Line Item 1","amount":"99999.99","product_id":null,"product_type":"manual","product_reference":null},{"description":"Test Line Item 2","amount":"1000000.00","product_id":null,"product_type":"manual","product_reference":null}]},{"invoiced_at":"2023-10-24T09:00:00Z","total_amount":"20.00","balance_amount":"0.00","reference":"5-2","state":"collected","items":[{"description":"Purchase Certificate www.bubble-registered.com","amount":"20.00","product_id":42,"product_type":"certificate-purchase","product_reference":"42"}]}],"pagination":{"current_page":1,"per_page":30,"total_entries":4,"total_pages":1}}
+{"data":[{"invoiced_at":"2023-08-17T05:53:36Z","total_amount":"14.50","balance_amount":"0.00","reference":"1-2","state":"collected","items":[{"description":"Register bubble-registered.com","amount":"14.50","product_id":1,"product_type":"domain-registration","product_reference":"bubble-registered.com"}]},{"invoiced_at":"2023-08-17T05:57:53Z","total_amount":"14.50","balance_amount":"0.00","reference":"2-2","state":"refunded","items":[{"description":"Register example.com","amount":"14.50","product_id":2,"product_type":"domain-registration","product_reference":"example.com"}]},{"invoiced_at":"2023-10-24T07:49:05Z","total_amount":"1099999.99","balance_amount":"0.00","reference":"4-2","state":"collected","items":[{"description":"Test Line Item 1","amount":"99999.99","product_id":null,"product_type":"manual","product_reference":null},{"description":"Test Line Item 2","amount":"1000000.00","product_id":null,"product_type":"manual","product_reference":null}]},{"invoiced_at":"2023-10-24T09:00:00Z","total_amount":"20.00","balance_amount":"0.00","reference":"5-2","state":"collected","items":[{"description":"Purchase Certificate www.bubble-registered.com","amount":"20.00","product_id":42,"product_type":"certificate-purchase","product_reference":"42"}]}],"pagination":{"current_page":1,"per_page":30,"total_entries":4,"total_pages":1}}
diff --git a/test/fixtures.http/registerDomain/success.http b/test/fixtures.http/registerDomain/success.http
@@ -17,4 +17,4 @@ x-permitted-cross-domain-policies: none
 x-xss-protection: 1; mode=block
 strict-transport-security: max-age=31536000
 
-{"data":{"id":1,"domain_id":999,"registrant_id":2,"period":1,"state":"new","auto_renew":false,"whois_privacy":false,"trustee_service":false,"created_at":"2016-12-09T19:35:31Z","updated_at":"2016-12-09T19:35:31Z"}}
+{"data":{"id":1,"domain_id":999,"registrant_id":2,"period":1,"state":"new","auto_renew":false,"whois_privacy":false,"trustee":false,"created_at":"2016-12-09T19:35:31Z","updated_at":"2016-12-09T19:35:31Z"}}
diff --git a/test/fixtures.http/transferDomain/success.http b/test/fixtures.http/transferDomain/success.http
@@ -17,4 +17,4 @@ x-permitted-cross-domain-policies: none
 x-xss-protection: 1; mode=block
 strict-transport-security: max-age=31536000
 
-{"data":{"id":1,"domain_id":999,"registrant_id":2,"state":"transferring","auto_renew":false,"whois_privacy":false,"trustee_service":false,"created_at":"2016-12-09T19:43:41Z","updated_at":"2016-12-09T19:43:43Z"}}
+{"data":{"id":1,"domain_id":999,"registrant_id":2,"state":"transferring","auto_renew":false,"whois_privacy":false,"trustee":false,"created_at":"2016-12-09T19:43:41Z","updated_at":"2016-12-09T19:43:43Z"}}
