workarea-storefront 3.5.18 → 3.5.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73d0f3cc67a6f0fe570a8a9c8bc5cef2474426b3094bf04359e4fa20beaf414e
-  data.tar.gz: 251a2919ee9a1f423076c962988f2b2781c8affd0758aab01ea9edc4dc1a2c97
+  metadata.gz: b1da1deb30c161dd030c597ff2f756e7cada539898349cc1b69e792963300ff4
+  data.tar.gz: d1097a4b6978e1ea04f5b569d52540502f24b1b8251a2191289b25bc6ade1190
 SHA512:
-  metadata.gz: cc3b2d238021e016a3e1b4886b821823d5fc3e6c7731bb4a40fbe4ad9470935849f2f295f51974d07c6687e465ac7ed2cd7b847f0fb08d7a6019ed94e23bfdb7
-  data.tar.gz: eb4e7ff34f196d2bebf42a280c3405f67805536a45615e76f81ea19e0c251dd152b5a7852410c8377d91a9f079683bf8f4bdae7d07915e973c0f0113277ff7c6
+  metadata.gz: 66203f30dd011929002a066087c4d000bfe0a86e246b72f08fd2487a6d3cd6af4733f367ecf531969a786e1d671991a8188c2eba2fe9beaf3379e001ab1e881d
+  data.tar.gz: 9fcbcfce3d4df843a4bdcea43d90022f269314a8ccae27d23af2c99982bf0b255e4fad67304c0a87448e60d5553968cd270703b3c6f27a00be504ddf8f98b853

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

@@ -11,13 +11,14 @@ module Workarea
       after_action :check_inventory, except: :create
 
       def create
+        @cart = CartViewModel.new(current_order, view_model_options)
+
         # TODO: for v4, use AddItemToCart for this.
         if current_order.add_item(item_params.to_h.merge(item_details.to_h))
           check_inventory
 
           Pricing.perform(current_order, current_shippings)
 
-          @cart = CartViewModel.new(current_order, view_model_options)
           @item = OrderItemViewModel.wrap(
             current_order.items.find_existing(
               item_params[:sku],

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

@@ -10,6 +10,8 @@ module Workarea
         else
           new(model, options)
         end
+      rescue NameError
+        new(model, options)
       end
 
       def breadcrumbs

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

@@ -47,6 +47,18 @@ module Workarea
         assert_equal(5.to_m, order.items.first.total_price)
       end
 
+      def test_fail_to_add_an_item
+        post storefront.cart_items_path,
+          params: {
+            product_id: @product.id,
+            sku: 'SKU1',
+            quantity: -1
+          }
+
+        assert_response(:success)
+        assert_empty(Order.all)
+      end
+
       def test_adding_product_with_shared_skus
         product_2 = Catalog::Product.create!(name: 'Product', variants: [{ sku: 'SKU1' }])
 

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

@@ -123,6 +123,84 @@ module Workarea
 
         assert(response.ok?)
       end
+
+      def test_metrics_tracking
+        super_admin = create_user(password: 'W3bl1nc!', super_admin: true)
+        customer = create_user(email: 'bcrouse@workarea.com', password: 'W3bl1nc!')
+        product = create_product
+        create_shipping_service(
+          name: 'Ground',
+          tax_code: '001',
+          rates: [{ price: 7.to_m }]
+        )
+
+        post storefront.login_path,
+          params: { email: super_admin.email, password: 'W3bl1nc!' }
+
+        admin_current_email_cookie = cookies[:email]
+
+        post admin.impersonations_path,
+          params: { user_id: customer.id }
+
+        refute_equal(admin_current_email_cookie, cookies[:email])
+        customer_current_email_cookie = cookies[:email]
+
+        post storefront.cart_items_path,
+          params: {
+            product_id: product.id,
+            sku: product.skus.first,
+            quantity: 2
+          }
+
+        patch storefront.checkout_addresses_path,
+          params: {
+            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'
+            },
+            shipping_address: {
+              first_name: 'Ben',
+              last_name: 'Crouse',
+              street: '22 S. 3rd St.',
+              city: 'Philadelphia',
+              region: 'PA',
+              postal_code: '19106',
+              country: 'US',
+              phone_number: '2159251800'
+            }
+          }
+
+        assert_equal(customer_current_email_cookie, cookies[:email])
+
+        patch storefront.checkout_place_order_path,
+          params: {
+            payment: 'new_card',
+            credit_card: {
+              number: '1',
+              month: 1,
+              year: next_year,
+              cvv: '999'
+            }
+          }
+
+        assert_equal(customer_current_email_cookie, cookies[:email])
+        delete admin.impersonations_path
+        assert_equal(admin_current_email_cookie, cookies[:email])
+
+        super_admin_metrics = Metrics::User.find(super_admin.email)
+        assert_equal(0, super_admin_metrics.orders)
+        assert_equal(0, super_admin_metrics.revenue)
+
+        customer_metrics = Metrics::User.find(customer.email)
+        assert_equal(1, customer_metrics.orders)
+        assert(customer_metrics.revenue.positive?)
+      end
     end
   end
 end

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

@@ -5,7 +5,9 @@ module Workarea
     class StoreCreditIntegrationTest < Workarea::IntegrationTest
       include Storefront::IntegrationTest
 
-      def setup
+      setup :setup_supporting_data
+
+      def setup_supporting_data
         @user = create_user(email: 'bcrouse@workarea.com', password: 'W3bl1nc!')
 
         @tax = create_tax_category(

data/test/system/workarea/storefront/content_system_test.rb

@@ -113,7 +113,7 @@ module Workarea
         assert(page.has_content?('foo bar'))
 
         resize_window_to('medium')
-        refute(page.has_content?('foo bar'))
+        refute_text('foo bar')
 
         resize_window_to('wide')
         assert(page.has_content?('foo bar'))

data/test/system/workarea/storefront/credit_cards_system_test.rb

@@ -69,7 +69,7 @@ module Workarea
           click_button t('workarea.storefront.forms.save')
         end
 
-        refute(page.has_content?('Success'))
+        refute_text('Success')
         assert(page.has_content?(I18n.t('workarea.payment.store_credit_card_failure')))
       end
     end

data/test/system/workarea/storefront/navigation_system_test.rb

@@ -54,7 +54,7 @@ module Workarea
         assert_current_path(storefront.root_path)
 
         page.execute_script("$('body').trigger('click');")
-        refute(page.has_content?('Foo'))
+        refute_text('Foo')
       end
 
       def test_left_navigation
@@ -66,7 +66,7 @@ module Workarea
 
         secondary.navigable.update_attributes!(active: false)
         visit storefront.page_path(primary.navigable)
-        refute(page.has_content?('Foo'))
+        refute_text('Foo')
       end
     end
   end

data/test/system/workarea/storefront/pagination_system_test.rb

@@ -59,7 +59,7 @@ module Workarea
 
         scroll_to_bottom
 
-        refute(page.has_content?(t('workarea.storefront.pagination.next_page')))
+        refute_text(t('workarea.storefront.pagination.next_page'))
         click_link t('workarea.storefront.pagination.load_more')
 
         assert_current_path(storefront.category_path(category))
@@ -70,7 +70,7 @@ module Workarea
         assert(page.has_content?('Product 5'))
         assert(page.has_content?('Product 6'))
 
-        refute(page.has_content?(t('workarea.storefront.pagination.load_more')))
+        refute_text(t('workarea.storefront.pagination.load_more'))
 
         find('a', text: 'Product 6').click
         page.execute_script("history.back()")
@@ -79,7 +79,7 @@ module Workarea
 
         wait_for_xhr
 
-        refute(page.has_content?(t('workarea.storefront.pagination.load_more')))
+        refute_text(t('workarea.storefront.pagination.load_more'))
 
         assert_match(/PROD1.*PROD2.*PROD3.*PROD4.*PROD5.*PROD6/m, page.html)
       end
@@ -95,7 +95,7 @@ module Workarea
 
         scroll_to_bottom
 
-        refute(page.has_content?(t('workarea.storefront.pagination.next_page')))
+        refute_text(t('workarea.storefront.pagination.next_page'))
         click_link t('workarea.storefront.pagination.load_more')
 
         assert_current_path(storefront.search_path(q: 'Product'))
@@ -106,7 +106,7 @@ module Workarea
         assert(page.has_content?('Product 5'))
         assert(page.has_content?('Product 6'))
 
-        refute(page.has_content?(t('workarea.storefront.pagination.load_more')))
+        refute_text(t('workarea.storefront.pagination.load_more'))
 
         find('a', text: 'Product 6').click
         page.execute_script("history.back()")
@@ -115,7 +115,7 @@ module Workarea
 
         wait_for_xhr
 
-        refute(page.has_content?(t('workarea.storefront.pagination.load_more')))
+        refute_text(t('workarea.storefront.pagination.load_more'))
 
         assert(page.has_content?('Product 1'))
         assert(page.has_content?('Product 2'))

data/test/view_models/workarea/storefront/product_view_model_test.rb

@@ -15,6 +15,14 @@ module Workarea
         view_model = ProductViewModel.wrap(@product, one: '1')
         assert_instance_of(ProductTemplates::OptionSelectsViewModel, view_model)
         assert_equal('1', view_model.options[:one])
+
+        Workarea.with_config do |config|
+          config.product_templates << :no_view_model
+          @product.template = 'no_view_model'
+          view_model = ProductViewModel.wrap(@product, one: '1')
+
+          assert_kind_of(ProductViewModel, view_model)
+        end
       end
 
       def test_cache_key

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-storefront
 version: !ruby/object:Gem::Version
-  version: 3.5.18
+  version: 3.5.23
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-01 00:00:00.000000000 Z
+date: 2020-11-25 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.18
+        version: 3.5.23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.18
+        version: 3.5.23
 description: Provides user-facing ecommerce storefront functionality for the Workarea
   Commerce Platform.
 email: