workarea-storefront 3.5.10 → 3.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8ee66bdca09fe14b714c4593cecdd5a83f6dc256e294974e2314a480ae69c6a
-  data.tar.gz: '0469acdaf83ebefbfd1364dbc1d45d1b1c4cebbdebc67ca95141e730c7485487'
+  metadata.gz: 289c18606364caedb6713122b572dcb4040526a2082fd67e6628a8565c39d253
+  data.tar.gz: d4fb9525f5269f1525ee8a544f334103fc41ad6ae82ab20aa8f7e3cc7b65d000
 SHA512:
-  metadata.gz: d684e7669a8eff46a3cdc6ac95d778159621a93dd4341242dfd51ac6237e5a8de79edad7aeecc1aa9201744b3cbfd33bebc757bb8fc226d93a0c705f5944e1c7
-  data.tar.gz: 654ee0e80589bccd1cb1ef3be7b6fcdab0f9bc58610685e5883f094c96325b54caf0a5e5acfa2ca1e24da5e6c2f1282001427ede7b24ac120f192125049441a9
+  metadata.gz: d9a4f0962e3c17621d771949e9dc3e2bd92ef59fa02d916670a2104ab7a0158254a66e4e0b93ec28270846e2163e7990ac6cbc9cb8bbd07b3bb9171d8dd02d43
+  data.tar.gz: 441493667de93080551f774b54cb0295a223711e80d6cc9df186fc9b5b9f6e0b8336c5522a9181de303babace951522add351d5a2279f306612f8b5b18bd8150

data/app/controllers/workarea/storefront/checkout/addresses_controller.rb

@@ -46,6 +46,8 @@ module Workarea
         end
 
         def validate_shipping_options
+          return unless current_order.requires_shipping?
+
           available_options = Workarea::Storefront::CartViewModel.new(current_order).shipping_options
 
           if available_options.empty?

data/app/controllers/workarea/storefront/checkouts_controller.rb

@@ -44,7 +44,7 @@ module Workarea
           segment_ids: current_segments.map(&:id)
         )
 
-        update_tracking!(email: current_order.email)
+        update_tracking!(email: current_order.email) unless current_order.email.blank?
       end
 
       def with_order_lock

data/app/controllers/workarea/storefront/current_checkout.rb

@@ -26,7 +26,10 @@ module Workarea
       #
       def current_order=(order)
         @current_order = order
-        cookies.permanent.signed[:order_id] = order&.id
+
+        if order.blank? || order.persisted?
+          cookies.permanent.signed[:order_id] = order&.id
+        end
       end
 
       # Removes the current order from the session.

data/test/integration/workarea/storefront/accounts_integration_test.rb

@@ -123,6 +123,26 @@ module Workarea
 
         assert_redirected_to(storefront.login_path)
       end
+
+      def test_no_extra_order_id_cookies
+        user = create_user(password: 'Passw0rd!')
+        post storefront.login_path,
+          params: { email: user.email, password: 'Passw0rd!' }
+
+        follow_redirect!
+        assert(cookies[:order_id].blank?)
+
+        delete storefront.logout_path
+
+        follow_redirect!
+        assert(cookies[:order_id].blank?)
+
+        post storefront.login_path,
+          params: { email: user.email, password: 'Passw0rd!' }
+
+        follow_redirect!
+        assert(cookies[:order_id].blank?)
+      end
     end
   end
 end

data/test/integration/workarea/storefront/checkouts_integration_test.rb

@@ -345,6 +345,39 @@ module Workarea
 
         assert(flash[:error].present?)
       end
+
+      def test_not_setting_a_blank_tracking_email
+        cookies[:email] = 'foo@bar.com'
+        get storefront.checkout_shipping_path
+        assert_equal('foo@bar.com', cookies[:email])
+      end
+
+      def test_no_required_shipping_address_options_flash_message
+        product = create_product(name: 'Digital Product', variants: [{ sku: 'SKU' }])
+        create_fulfillment_sku(id: 'SKU', policy: :download, file: product_image_file)
+
+        post storefront.cart_items_path,
+          params: { product_id: product.id, sku: product.skus.first, quantity: 1 }
+
+        get storefront.checkout_addresses_path
+
+        patch storefront.checkout_addresses_path,
+          params: {
+            email: 'bcrouse@weblinc.com',
+            billing_address: {
+              first_name:   'Ben',
+              last_name:    'Crouse',
+              street:       '12 N. 3rd St.',
+              city:         'Philadelphia',
+              region:       'PA',
+              postal_code:  '19106',
+              country:      'US',
+              phone_number: '2159251800'
+            }
+          }
+
+        refute(flash[:error].present?)
+      end
     end
   end
 end

data/test/integration/workarea/storefront/current_checkout_integration_test.rb

@@ -13,7 +13,7 @@ module Workarea
 
         def test_login
           login(User.find(params[:user_id]))
-          self.current_order = Order.new(id: params[:order_id]) if params[:order_id].present?
+          self.current_order = Order.create!(id: params[:order_id]) if params[:order_id].present?
           head :ok
         end
 

data/test/integration/workarea/storefront/segments_integration_test.rb

@@ -271,6 +271,19 @@ module Workarea
           headers: { 'HTTP_REFERER' => 'https://www.facebook.com/' }
         assert_equal(google.id.to_s, response.headers['X-Workarea-Segments'])
       end
+
+      def test_missing_email_cookies
+        user = create_user(password: 'w0rkArea!', tags: %w(foo))
+        segment = create_segment(rules: [Segment::Rules::Tags.new(tags: %w(foo))])
+
+        post storefront.login_path,
+          params: { email: user.email, password: 'w0rkArea!' }
+
+        cookies[:email] = nil
+
+        get storefront.current_user_path(format: 'json')
+        assert_equal(segment.id.to_s, response.headers['X-Workarea-Segments'])
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-storefront
 version: !ruby/object:Gem::Version
-  version: 3.5.10
+  version: 3.5.15
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2020-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: workarea-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.10
+        version: 3.5.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.10
+        version: 3.5.15
 description: Provides user-facing ecommerce storefront functionality for the Workarea
   Commerce Platform.
 email: