workarea-storefront 3.5.7 → 3.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5233fecc9c68b244d4518511eac8ff35e0d1f75512ec960837b33acd3eb15eda
-  data.tar.gz: 4f35b7f3c705c604918b1aff633d7e23ae1a3d484e9ef8c7214f9f4a9380e5de
+  metadata.gz: 5927c378602c40ee9b4597baf1afa11d4bc0af1168eceac4ae32135864c09e1c
+  data.tar.gz: aad145d930b02c1b4ac12d1032d58591327f236f37c9ac0cf3a5a9dd825cc08c
 SHA512:
-  metadata.gz: ceb45daa9e304cccd5c576692d67a8895a4c29e4b0cfe80a418a0ad01d25ec5437bb0693bb069642e402f864b29b8f53c9106d5698a9d4265208800047be0b03
-  data.tar.gz: 3f87b6707871d4654c9bc5cfd82858ea2d75e60d2f9a607242ef8084dfeca87231a29f97fc3abbc7d43cf393460324022a736085c5d057467bedb9b934f9917c
+  metadata.gz: 70ad91e1b06aceb9dba188fd711068a6cba35f9709c162e08b0fba876c953bfe8550441ada2f8753282536744918af55d0c8a09ecc0c31800cdff3e9793f3444
+  data.tar.gz: 3b4d4ccb95b1f7898b4f07873c5c54b191a6903cbe1459a898d134c02646b345c93993f6bcdb69aab99f0a60faa452fce363eb5cb2e3cf073e81db8ab4a790fb

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/app/controllers/workarea/storefront/users/passwords_controller.rb

@@ -8,7 +8,11 @@ module Workarea
 
     def edit
       reset = User::PasswordReset.find_by(token: params[:token]) rescue nil
-      redirect_to forgot_password_path unless reset
+
+      unless reset
+        flash[:error] = t('workarea.storefront.flash_messages.password_reset_expired')
+        redirect_to forgot_password_path
+      end
     end
 
     def create

data/app/view_models/workarea/storefront/category_view_model.rb

@@ -27,7 +27,7 @@ module Workarea
 
       def search_query
         @search_query ||= Search::CategoryBrowse.new(
-          options.merge(
+          options.except(:per_page).merge(
             category_ids: [model.id],
             rules: model.product_rules.usable,
             terms_facets: terms_facets - %w(category),

data/app/views/workarea/storefront/fulfillment_mailer/shipped.html.haml

@@ -3,7 +3,7 @@
 = render_schema_org(fulfillment_email_schema(@order, @package))
 
 - content_for :preheader_text do
-  = t('workarea.storefront.email.order_cancellation.heading', order_id: @order.id)
+  = t('workarea.storefront.email.order_shipped.heading', order_id: @order.id)
 
 %tr
   %td

data/app/views/workarea/storefront/products/templates/_option_selects.html.haml

@@ -10,6 +10,8 @@
     .product-prices.product-prices--details
       = render 'workarea/storefront/products/pricing', product: product
 
+    = append_partials('storefront.product_pricing_details', product: product)
+
     - if product.description.present?
       .product-details__description
         %p= truncated_product_description(product, t('workarea.storefront.products.read_more'))

data/app/views/workarea/storefront/products/templates/_option_thumbnails.html.haml

@@ -10,6 +10,8 @@
     .product-prices.product-prices--details
       = render 'workarea/storefront/products/pricing', product: product
 
+    = append_partials('storefront.product_pricing_details', product: product)
+
     - if product.description.present?
       .product-details__description
         %p= truncated_product_description(product, t('workarea.storefront.products.read_more'))

data/config/locales/en.yml

@@ -210,14 +210,14 @@ en:
         credit_card_update_error: There were errors updating your credit card.
         credit_card_removed: Your credit card has been removed.
         password_reset_expired: This password reset is expired.
-        password_reset_email_sent: If a valid e-mail address was entered, instructions to reset your password have been sent to "%{email}"
+        password_reset_email_sent: If a valid email address was entered, instructions to reset your password have been sent to "%{email}"
         password_reset: Your password has been reset.
         old_password_invalid: Your old password is not valid.
         password_required: Password is required.
         items_required: You must add an item to your cart to checkout
         order_custom_pricing: Your cart has custom pricing, you cannot edit the contents of your cart.
         download_unavailable: This download is no longer available. Contact customer support for more information.
-        no_available_shipping_options: There are no available shipping options for your shipping adddress.
+        no_available_shipping_options: There are no available shipping options for your shipping address.
 
       forms:
         required: '*'

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/categories_integration_test.rb

@@ -16,6 +16,16 @@ module Workarea
         get storefront.category_path(create_category(active: false))
         assert(response.ok?)
       end
+
+      def test_not_accepting_per_page_param
+        products = [create_product, create_product]
+        category = create_category(product_ids: products.map(&:id))
+
+        get storefront.category_path(category, page: 1, per_page: 1)
+        assert(response.ok?)
+        assert_includes(response.body, storefront.product_path(products.first))
+        assert_includes(response.body, storefront.product_path(products.second))
+      end
     end
   end
 end

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

@@ -345,6 +345,12 @@ 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
     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/search_integration_test.rb

@@ -87,6 +87,16 @@ module Workarea
         assert_includes(response.body, 'Foo A')
         assert_includes(response.body, 'Foo B')
       end
+
+      def test_not_accepting_per_page_param
+        one = create_product(name: 'Foo A')
+        two = create_product(name: 'Foo B')
+
+        get storefront.search_path(q: 'foo', page: 1, per_page: 1)
+        assert(response.ok?)
+        assert_includes(response.body, storefront.product_path(one))
+        assert_includes(response.body, storefront.product_path(two))
+      end
     end
   end
 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

data/test/integration/workarea/storefront/users/passwords_integration_test.rb

@@ -31,6 +31,7 @@ module Workarea
 
         def test_handles_a_missing_password_reset
           get storefront.reset_password_path(token: 'foo')
+          assert(flash[:error].present?)
           assert_redirected_to(storefront.forgot_password_path)
         end
 
@@ -42,6 +43,24 @@ module Workarea
           assert(flash[:error].present?)
           assert(response.redirect?)
         end
+
+        def test_expired_resets
+          post storefront.forgot_password_path, params: { email: 'passwords@workarea.com' }
+          first = User::PasswordReset.desc(:created_at).first
+
+          get storefront.reset_password_path(token: first.token)
+          assert(response.ok?)
+
+          post storefront.forgot_password_path, params: { email: 'passwords@workarea.com' }
+          second = User::PasswordReset.desc(:created_at).first
+
+          get storefront.reset_password_path(token: second.token)
+          assert(response.ok?)
+
+          get storefront.reset_password_path(token: first.token)
+          assert(flash[:error].present?)
+          assert_redirected_to(storefront.forgot_password_path)
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-storefront
 version: !ruby/object:Gem::Version
-  version: 3.5.7
+  version: 3.5.12
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2020-05-26 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.7
+        version: 3.5.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.7
+        version: 3.5.12
 description: Provides user-facing ecommerce storefront functionality for the Workarea
   Commerce Platform.
 email:
@@ -734,7 +734,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Storefront for the Workarea Commerce Platform