workarea-storefront 3.5.0.beta.1 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fc7579774a32bc9746b0213537251f654ade0cb5cfa5764b7a80e211cc457d2
-  data.tar.gz: 640c178f253dc782cf057823ed1ca695b8fc80d17d1fb2fca58f512c6381b4dd
+  metadata.gz: d693a55944192cf23fd6341859c366277a01988b2b5ff34040183828ca6c12c7
+  data.tar.gz: 1e6c57484728ebca2384547e5e4ccd1dfceae3847eac886e3bb1f28c342758e8
 SHA512:
-  metadata.gz: 6682f2b247acfc7eab72935986f0e58f634f1e2ee903203cda187aca005bcdfc209b624b64da25550f07eb46320df539ebe3a7b6662ccf0718a23a01220d59e2
-  data.tar.gz: b29492053eaeb0185cdb11f61b2efc777df1da1e0f855c5ed4b155d914b51480a8b1755108b63bb69c7feea8605cb51a40674dd97fe0e78f1bf1a18450302853
+  metadata.gz: 7764b11b9cd1ed0f1b62ded7893a4bed21c8d7ae847a6a578f0a39252b09a9334a84a3fcc00f3a9c236ea6ee70fc24158fe0f5b9a7a23ea2ca37f9ff890c9b7c
+  data.tar.gz: 2187e4020b5486ae615e93860cc6015d62aa65925517130fd1181a418bd6bfae70bccc5616e6774224d66a3e50928bab1e0f84fa0ccdcf87decec153d5d8fa73

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

@@ -6,7 +6,6 @@ module Workarea
       include CurrentCheckout
       include CurrentRelease
       include OrderLookup
-      include CurrentReferrer
 
       layout :current_layout
 

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

@@ -192,9 +192,9 @@ module Workarea
         if current_variant.present?
           fulfillment_skus
             .detect { |sku| sku.id == current_variant.sku }
-            .requires_shipping?
+            .shipping?
         else
-          fulfillment_skus.any?(&:requires_shipping?)
+          fulfillment_skus.any?(&:shipping?)
         end
       end
     end

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

@@ -74,7 +74,7 @@ module Workarea
         assert_equal('Crouse', credit_card.last_name)
         assert_equal('XXXX-XXXX-XXXX-1', credit_card.display_number)
         assert_equal(1, credit_card.month)
-        assert_equal(2020, credit_card.year)
+        assert_equal(next_year, credit_card.year)
         refute(credit_card.token.blank?)
 
         complete_checkout('bcrouse@workarea.com', 'W3bl1nc!')

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

@@ -182,7 +182,7 @@ module Workarea
             credit_card: {
               number: '2',
               month:  1,
-              year:   2020,
+              year:   next_year,
               cvv:    '999'
             }
           }

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

@@ -19,7 +19,7 @@ module Workarea
         assert_equal(1, token.reload.downloads)
 
         token.update!(enabled: true)
-        sku.update!(policy: 'ignore')
+        sku.update!(policy: 'shipping')
 
         get storefront.download_path(token)
         assert_redirected_to(storefront.root_path)

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

@@ -69,7 +69,7 @@ module Workarea
             credit_card: {
               number: '1',
               month: 1,
-              year: 2020,
+              year: next_year,
               cvv: '999'
             }
           }

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

@@ -100,7 +100,7 @@ module Workarea
         assert_equal('Test Card', payment.credit_card.issuer)
         assert_equal('XXXX-XXXX-XXXX-1', payment.credit_card.display_number)
         assert_equal(1, payment.credit_card.month)
-        assert_equal(2020, payment.credit_card.year)
+        assert_equal(next_year, payment.credit_card.year)
         refute(payment.credit_card.token.blank?)
         assert(payment.credit_card.saved_card_id.blank?)
 

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

@@ -66,7 +66,7 @@ module Workarea
             credit_card: {
               number: '1',
               month:  1,
-              year:   2020,
+              year:   next_year,
               cvv:    '999'
             }
           }
@@ -81,7 +81,7 @@ module Workarea
             credit_card: {
               number: '2',
               month:  1,
-              year:   2020,
+              year:   next_year,
               cvv:    '999'
             }
           }
@@ -97,7 +97,7 @@ module Workarea
             credit_card: {
               number: '1',
               month:  1,
-              year:   2020,
+              year:   next_year,
               cvv:    '999'
             }
           }
@@ -117,7 +117,7 @@ module Workarea
             credit_card: {
               number: '1',
               month:  1,
-              year:   2020,
+              year:   next_year,
               cvv:    '999'
             }
           }

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

@@ -76,7 +76,7 @@ module Workarea
             credit_card: {
               number: '1',
               month: 1,
-              year: 2020,
+              year: next_year,
               cvv: '999'
             }
           }

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

@@ -245,6 +245,32 @@ module Workarea
         refute_match(/public/, response.headers['Cache-Control'])
         assert_equal('true', response.headers['X-Workarea-Segmented-Content'])
       end
+
+      def test_referrer_based_segments
+        google = create_segment(rules: [Segment::Rules::TrafficReferrer.new(source: %w(Google))])
+        facebook = create_segment(rules: [Segment::Rules::TrafficReferrer.new(url: 'facebook')])
+
+        get storefront.current_user_path(format: 'json'),
+          headers: { 'HTTP_REFERER' => 'https://www.google.com/' }
+        assert_equal(google.id.to_s, response.headers['X-Workarea-Segments'])
+
+        get storefront.current_user_path(format: 'json'),
+          headers: { 'HTTP_REFERER' => 'https://www.facebook.com/' }
+        assert_equal(facebook.id.to_s, response.headers['X-Workarea-Segments'])
+
+        cookies[:workarea_referrer] = 'https://www.google.com/'
+        get storefront.current_user_path(format: 'json')
+        assert_equal(google.id.to_s, response.headers['X-Workarea-Segments'])
+
+        cookies[:workarea_referrer] = 'https://www.facebook.com/'
+        get storefront.current_user_path(format: 'json')
+        assert_equal(facebook.id.to_s, response.headers['X-Workarea-Segments'])
+
+        cookies[:workarea_referrer] = 'https://www.google.com/'
+        get storefront.current_user_path(format: 'json'),
+          headers: { 'HTTP_REFERER' => 'https://www.facebook.com/' }
+        assert_equal(google.id.to_s, response.headers['X-Workarea-Segments'])
+      end
     end
   end
 end

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

@@ -98,7 +98,7 @@ module Workarea
         assert_equal('Test Card', payment.credit_card.issuer)
         assert_equal('XXXX-XXXX-XXXX-1', payment.credit_card.display_number)
         assert_equal(1, payment.credit_card.month)
-        assert_equal(2020, payment.credit_card.year)
+        assert_equal(next_year, payment.credit_card.year)
         assert_equal(13.19.to_m, payment.credit_card.amount)
         refute(payment.credit_card.token.blank?)
         assert_equal(1, payment.credit_card.transactions.length)

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

@@ -49,14 +49,14 @@ module Workarea
             params: {
               credit_card: {
                 month: '2',
-                year: '2020',
+                year: next_year.to_s,
                 cvv: '999'
               }
             }
 
           credit_card.reload
           assert_equal(2, credit_card.month)
-          assert_equal(2020, credit_card.year)
+          assert_equal(next_year, credit_card.year)
         end
 
         def test_removes_credit_cards

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

@@ -233,8 +233,8 @@ module Workarea
 
       def test_requires_shipping?
         product = create_product(variants: [{ sku: 'SKU1' }, { sku: 'SKU2' }])
-        sku_1 = create_fulfillment_sku(id: 'SKU1', policy: 'ignore')
-        sku_2 = create_fulfillment_sku(id: 'SKU2', policy: 'ship')
+        sku_1 = create_fulfillment_sku(id: 'SKU1', policy: 'download', file: product_image_file)
+        sku_2 = create_fulfillment_sku(id: 'SKU2', policy: 'shipping')
 
         view_model = ProductViewModel.wrap(product)
         assert(view_model.requires_shipping?)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-storefront
 version: !ruby/object:Gem::Version
-  version: 3.5.0.beta.1
+  version: 3.5.0
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-07 00:00:00.000000000 Z
+date: 2019-11-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.0.beta.1
+        version: 3.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0.beta.1
+        version: 3.5.0
 description: Provides user-facing ecommerce storefront functionality for the Workarea
   Commerce Platform.
 email:
@@ -657,7 +657,6 @@ files:
 - test/system/workarea/storefront/content_system_test.rb
 - test/system/workarea/storefront/credit_cards_system_test.rb
 - test/system/workarea/storefront/customer_service_system_test.rb
-- test/system/workarea/storefront/digital_products_system_test.rb
 - test/system/workarea/storefront/discounting_multiple_system_test.rb
 - test/system/workarea/storefront/discounting_system_test.rb
 - test/system/workarea/storefront/download_system_test.rb
@@ -730,9 +729,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.6
 signing_key: 

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

@@ -1,142 +0,0 @@
-require 'test_helper'
-
-module Workarea
-  module Storefront
-    # TODO: delete this for v3.6
-    # Leaving this in v3.5 for compatibility with existing builds
-    class DigitalProductsSystemTest < Workarea::SystemTest
-      include Storefront::SystemTest
-
-      def test_checking_out_with_a_digital_product
-        setup_checkout_specs
-
-        Order.first.items.delete_all
-
-        product = create_product(
-          name: 'Digital Product',
-          digital: true,
-          variants: [
-            { sku: 'SKU1', regular: 10.to_m },
-            { sku: 'SKU2', regular: 15.to_m },
-            { sku: 'SKU3', regular: 25.to_m }
-          ]
-        )
-
-        visit storefront.product_path(product)
-
-        within '.product-details__add-to-cart-form' do
-          select product.skus.first, from: 'sku'
-          click_button t('workarea.storefront.products.add_to_cart')
-        end
-
-        assert(page.has_content?('Success'))
-
-        start_guest_checkout
-
-        assert_current_path(storefront.checkout_addresses_path)
-
-        fill_in_email
-        fill_in_billing_address
-        click_button t('workarea.storefront.checkouts.continue_to_payment')
-
-        assert_current_path(storefront.checkout_payment_path)
-        assert(page.has_content?('Success'))
-
-        fill_in_credit_card
-        click_button t('workarea.storefront.checkouts.place_order')
-
-        assert_current_path(storefront.checkout_confirmation_path)
-        assert(page.has_content?('Success'))
-        assert(page.has_content?(t('workarea.storefront.flash_messages.order_placed')))
-        assert(page.has_content?(Order.first.id))
-
-        assert(page.has_content?('1019 S. 47th St.'))
-        assert(page.has_content?('Philadelphia'))
-        assert(page.has_content?('PA'))
-        assert(page.has_content?('19143'))
-
-        assert(page.has_content?('Test Card'))
-        assert(page.has_content?('XX-1'))
-
-        assert(page.has_content?('Digital Product'))
-        assert(page.has_content?('$10.00'))
-      end
-
-      def test_order_not_requiring_shipping
-        setup_checkout_specs
-        start_guest_checkout
-
-        create_shipping_service(
-          name: 'Next Day',
-          tax_code: '001',
-          rates: [{ price: 20.to_m }]
-        )
-
-        assert_current_path(storefront.checkout_addresses_path)
-        fill_in_email
-        fill_in_shipping_address
-
-        uncheck 'same_as_shipping'
-        fill_in_billing_address
-
-        click_button t('workarea.storefront.checkouts.continue_to_shipping')
-
-        assert_current_path(storefront.checkout_shipping_path)
-        click_button t('workarea.storefront.checkouts.continue_to_payment')
-
-        assert_current_path(storefront.checkout_payment_path)
-        assert(page.has_content?('Success'))
-
-        visit storefront.checkout_shipping_path
-        choose "shipping_service_Next_Day"
-        click_button t('workarea.storefront.checkouts.continue_to_payment')
-
-        assert_current_path(storefront.checkout_payment_path)
-        assert(page.has_content?('Success'))
-
-        # switch to digital product
-
-        Order.first.items.delete_all
-
-        product = create_product(
-          name: 'Digital Product',
-          digital: true,
-          variants: [
-            { sku: 'SKU1', regular: 10.to_m },
-            { sku: 'SKU2', regular: 15.to_m },
-            { sku: 'SKU3', regular: 25.to_m }
-          ]
-        )
-
-        visit storefront.product_path(product)
-
-        within '.product-details__add-to-cart-form' do
-          select product.skus.first, from: 'sku'
-          click_button t('workarea.storefront.products.add_to_cart')
-        end
-
-        click_link t('workarea.storefront.carts.checkout')
-
-        assert_current_path(storefront.checkout_addresses_path)
-
-        fill_in_email
-        fill_in_billing_address
-        click_button t('workarea.storefront.checkouts.continue_to_payment')
-
-        assert_current_path(storefront.checkout_payment_path)
-        assert(page.has_content?('Success'))
-
-        assert(page.has_content?('1019 S. 47th St.'))
-        assert(page.has_content?('Philadelphia'))
-        assert(page.has_content?('PA'))
-        assert(page.has_content?('19143'))
-
-        assert(page.has_no_content?("#{t('workarea.storefront.orders.tax')} $1.40"))
-        assert(page.has_no_content?("#{t('workarea.storefront.orders.total')} $31.40"))
-        assert(page.has_content?("#{t('workarea.storefront.orders.shipping')} #{t('workarea.storefront.checkouts.not_applicable')}"))
-        assert(page.has_content?("#{t('workarea.storefront.orders.tax')} $0.00"))
-        assert(page.has_content?("#{t('workarea.storefront.orders.total')} $10.00"))
-      end
-    end
-  end
-end