Replace URL check with mock parameter

zilverline · Apr 26, 2024 · 27cb818 · 27cb818
1 parent fb24c4d
commit 27cb818
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/lib/ups/connection.rb b/lib/ups/connection.rb
@@ -126,9 +126,10 @@ def label(label_builder = nil)
     # @param [String] account_number Account number to use for the request
     # @param [String] client_id Client ID to use
     # @param [String] client_secret Client secret to use
+    # @param [Boolean] mock If the request should be mocked
     # @return [void]
-    def authorize(account_number, client_id, client_secret)
-      if url == TEST_URL
+    def authorize(account_number, client_id, client_secret, mock = false)
+      if mock
         self.account_number = account_number
         self.client_id = client_id
         self.client_secret = client_secret

diff --git a/spec/ups/connection/label_spec.rb b/spec/ups/connection/label_spec.rb
@@ -15,7 +15,7 @@
 
   describe 'label request' do
     subject do
-      server.authorize ENV['UPS_ACCOUNT_NUMBER'], ENV['UPS_CLIENT_ID'], ENV['UPS_CLIENT_SECRET']
+      server.authorize ENV['UPS_ACCOUNT_NUMBER'], ENV['UPS_CLIENT_ID'], ENV['UPS_CLIENT_SECRET'], true
       server.label do |label_builder|
         label_builder.add_tracking_number '1Z1107YY8567985294'
         label_builder.add_label_specification 'PNG'

diff --git a/spec/ups/connection/rates_negotiated_spec.rb b/spec/ups/connection/rates_negotiated_spec.rb
@@ -25,7 +25,7 @@
     end
 
     subject do
-      server.authorize ENV['UPS_ACCOUNT_NUMBER'], ENV['UPS_CLIENT_ID'], ENV['UPS_CLIENT_SECRET']
+      server.authorize ENV['UPS_ACCOUNT_NUMBER'], ENV['UPS_CLIENT_ID'], ENV['UPS_CLIENT_SECRET'], true
       server.rates do |rate_builder|
         rate_builder.add_shipper shipper
         rate_builder.add_ship_from shipper

diff --git a/spec/ups/connection/rates_standard_spec.rb b/spec/ups/connection/rates_standard_spec.rb
@@ -18,7 +18,7 @@
 
   describe 'if requesting rates' do
     subject do
-      server.authorize ENV['UPS_ACCOUNT_NUMBER'], ENV['UPS_CLIENT_ID'], ENV['UPS_CLIENT_SECRET']
+      server.authorize ENV['UPS_ACCOUNT_NUMBER'], ENV['UPS_CLIENT_ID'], ENV['UPS_CLIENT_SECRET'], true
       server.rates do |rate_builder|
         rate_builder.add_shipper shipper
         rate_builder.add_ship_from shipper

diff --git a/spec/ups/connection/ship_spec.rb b/spec/ups/connection/ship_spec.rb
@@ -30,7 +30,7 @@
       end
 
       subject do
-        server.authorize ENV['UPS_ACCOUNT_NUMBER'], ENV['UPS_CLIENT_ID'], ENV['UPS_CLIENT_SECRET']
+        server.authorize ENV['UPS_ACCOUNT_NUMBER'], ENV['UPS_CLIENT_ID'], ENV['UPS_CLIENT_SECRET'], true
         server.ship do |shipment_builder|
           shipment_builder.add_shipper shipper
           shipment_builder.add_ship_from shipper
@@ -92,7 +92,7 @@
       end
 
       subject do
-        server.authorize ENV['UPS_ACCOUNT_NUMBER'], ENV['UPS_CLIENT_ID'], ENV['UPS_CLIENT_SECRET']
+        server.authorize ENV['UPS_ACCOUNT_NUMBER'], ENV['UPS_CLIENT_ID'], ENV['UPS_CLIENT_SECRET'], true
         server.ship do |shipment_builder|
           shipment_builder.add_shipper shipper
           shipment_builder.add_ship_from shipper
@@ -126,7 +126,7 @@
       let(:second_package) { subject.packages[1] }
 
       subject do
-        server.authorize ENV['UPS_ACCOUNT_NUMBER'], ENV['UPS_CLIENT_ID'], ENV['UPS_CLIENT_SECRET']
+        server.authorize ENV['UPS_ACCOUNT_NUMBER'], ENV['UPS_CLIENT_ID'], ENV['UPS_CLIENT_SECRET'], true
         server.ship do |shipment_builder|
           shipment_builder.add_shipper shipper
           shipment_builder.add_ship_from shipper
@@ -208,7 +208,7 @@
     end
 
     subject do
-      server.authorize ENV['UPS_ACCOUNT_NUMBER'], ENV['UPS_CLIENT_ID'], ENV['UPS_CLIENT_SECRET']
+      server.authorize ENV['UPS_ACCOUNT_NUMBER'], ENV['UPS_CLIENT_ID'], ENV['UPS_CLIENT_SECRET'], true
       server.ship do |shipment_builder|
         shipment_builder.add_shipper shipper
         shipment_builder.add_ship_from shipper

diff --git a/spec/ups/connection/track_spec.rb b/spec/ups/connection/track_spec.rb
@@ -18,7 +18,7 @@
 
   describe 'if tracking shipment' do
     subject do
-      server.authorize ENV['UPS_ACCOUNT_NUMBER'], ENV['UPS_CLIENT_ID'], ENV['UPS_CLIENT_SECRET']
+      server.authorize ENV['UPS_ACCOUNT_NUMBER'], ENV['UPS_CLIENT_ID'], ENV['UPS_CLIENT_SECRET'], true
       server.track '1Z12345E6692804405'
     end
 
@@ -42,7 +42,7 @@
 
   describe 'if tracking shipment with no tracking number' do
     subject do
-      server.authorize ENV['UPS_ACCOUNT_NUMBER'], ENV['UPS_CLIENT_ID'], ENV['UPS_CLIENT_SECRET']
+      server.authorize ENV['UPS_ACCOUNT_NUMBER'], ENV['UPS_CLIENT_ID'], ENV['UPS_CLIENT_SECRET'], true
       server.track ''
     end