workarea-storefront 3.4.45 → 3.5.0.beta.1

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(next_year, payment.credit_card.year)
+        assert_equal(2020, 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: next_year.to_s,
+                year: '2020',
                 cvv: '999'
               }
             }
 
           credit_card.reload
           assert_equal(2, credit_card.month)
-          assert_equal(next_year, credit_card.year)
+          assert_equal(2020, credit_card.year)
         end
 
         def test_removes_credit_cards

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

@@ -31,7 +31,6 @@ 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
 
@@ -43,24 +42,6 @@ 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

data/test/javascripts/traffic_referrer_spec.js

@@ -15,7 +15,7 @@
             });
 
             it('does not set a cookie when host matches referrer', function () {
-                WORKAREA.trafficReferrer.setReferrer(window.location.origin);
+                WORKAREA.trafficReferrer.setReferrer('http://127.0.0.1');
 
                 WORKAREA.trafficReferrer.setCookie();
                 expect(WORKAREA.cookie.read('workarea_referrer')).to.equal(null);

data/test/mailers/workarea/storefront/transactional_mailer_test.rb

@@ -2,27 +2,23 @@ require 'test_helper'
 
 module Workarea
   module Storefront
-    class TransactionalMailerTest < Workarea::IntegrationTest
+    class TransactionalMailerTest < MailerTest
       def test_enabled_transactional_emails
-        Workarea.with_config do |config|
-          config.send_transactional_emails = true
+        Workarea.config.send_transactional_emails = true
 
-          order = create_placed_order
-          OrderMailer.confirmation(order.id).deliver_now
+        order = create_placed_order
+        OrderMailer.confirmation(order.id).deliver_now
 
-          assert(ActionMailer::Base.deliveries.last.present?)
-        end
+        assert_emails(1)
       end
 
       def test_disabling_transactionl_email
-        Workarea.with_config do |config|
-          config.send_transactional_emails = false
+        Workarea.config.send_transactional_emails = false
 
-          order = create_placed_order
-          OrderMailer.confirmation(order.id).deliver_now
+        order = create_placed_order
+        OrderMailer.confirmation(order.id).deliver_now
 
-          assert_nil(ActionMailer::Base.deliveries.last)
-        end
+        assert_no_emails
       end
     end
   end

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

@@ -144,7 +144,7 @@ module Workarea
       def test_announcing_product_click_event
         visit storefront.category_path(@category)
 
-        disable_dom_events
+        disable_analytics_dom_events
         within '.product-summary__name', match: :first do
           click_link 'Test Product 2'
         end
@@ -163,25 +163,6 @@ module Workarea
         assert_page_view
       end
 
-      def test_announcing_product_click_event_search_type_ahead
-        @products.each { |p| Search::Storefront::Product.new(p).save }
-        visit storefront.root_path
-        disable_dom_events
-
-        page.evaluate_script('$("#storefront_search").categorizedAutocomplete("search", "test");')
-
-        find('li', text: 'Test Product 1').click
-
-        events = find_analytics_events(for_event: 'productClick')
-        assert_equal(1, events.count)
-        payload = events.first['arguments'].first
-
-        assert_equal('PROD1', payload['id'])
-        assert_equal('Test Product 1', payload['name'])
-        assert_equal(false, payload['sale'])
-        assert_equal(10, payload['price'])
-      end
-
       def test_announcing_add_to_cart_event
         visit storefront.product_path(@products.second)
 
@@ -210,7 +191,7 @@ module Workarea
 
         visit storefront.cart_path
 
-        disable_dom_events
+        disable_analytics_dom_events
         fill_in 'quantity', with: '1'
 
         events = find_analytics_events(for_event: 'updateCartItem')
@@ -236,7 +217,7 @@ module Workarea
         click_button t('workarea.storefront.products.add_to_cart')
         click_link t('workarea.storefront.carts.view_cart')
 
-        disable_dom_events
+        disable_analytics_dom_events
         click_button t('workarea.storefront.carts.remove')
 
         events = find_analytics_events(for_event: 'removeFromCart')
@@ -487,7 +468,7 @@ module Workarea
 
         fill_in 'footer_email_signup_field', with: 'foo@bar.com'
 
-        disable_dom_events
+        disable_analytics_dom_events
         click_button t('workarea.storefront.users.join')
 
         events = find_analytics_events(for_event: 'emailSignup')
@@ -502,7 +483,7 @@ module Workarea
 
         visit storefront.checkout_path
 
-        disable_dom_events
+        disable_analytics_dom_events
         click_link t('workarea.storefront.users.login')
 
         events = find_analytics_events(for_event: 'checkoutLogin')
@@ -526,7 +507,7 @@ module Workarea
 
         fill_in 'password', with: 'W3bl1nc!'
 
-        disable_dom_events
+        disable_analytics_dom_events
         click_button t('workarea.storefront.users.create_account')
 
         events = find_analytics_events(for_event: 'checkoutSignup')
@@ -543,7 +524,7 @@ module Workarea
           fill_in 'email', with: 'bcrouse@workarea.com'
           fill_in 'password', with: 'W3bl1nc!'
 
-          disable_dom_events
+          disable_analytics_dom_events
           click_button t('workarea.storefront.users.login')
         end
 
@@ -559,7 +540,7 @@ module Workarea
         within '#forgot_password_form' do
           fill_in 'email', with: 'bcrouse@workarea.com'
 
-          disable_dom_events
+          disable_analytics_dom_events
           click_button t('workarea.storefront.forms.send')
         end
 
@@ -576,7 +557,7 @@ module Workarea
           fill_in 'email', with: 'bcrouse@workarea.com'
           fill_in 'password', with: 'W3bl1nc!'
 
-          disable_dom_events
+          disable_analytics_dom_events
           click_button t('workarea.storefront.users.create_account')
         end
 
@@ -592,7 +573,7 @@ module Workarea
 
         visit storefront.root_path
 
-        disable_dom_events
+        disable_analytics_dom_events
         click_link 'First Level'
 
         events = find_analytics_events(for_event: 'primaryNavigationClick')
@@ -612,7 +593,7 @@ module Workarea
         fill_in_shipping_address
         click_button t('workarea.storefront.checkouts.continue_to_shipping')
 
-        disable_dom_events
+        disable_analytics_dom_events
         click_link t('workarea.storefront.forms.edit')
 
         events = find_analytics_events(for_event: 'checkoutEdit')
@@ -700,25 +681,58 @@ module Workarea
         assert_equal('Home Page Content Block', payload['data']['html'])
       end
 
-      private
+      def test_sessions
+        create_life_cycle_segments
 
-      def find_analytics_events(for_event: nil)
-        all_events = page.evaluate_script('WORKAREA.analytics.events')
+        visit storefront.root_path
+        assert_equal(1, find_analytics_events(for_event: 'newSession').size)
+        assert_equal(1, Metrics::SalesByDay.today.sessions)
+        assert_equal(1, Metrics::SegmentByDay.find_by(segment_id: 'first_time_visitor').sessions)
 
-        if for_event.blank?
-          all_events
-        else
-          all_events.select { |e| e['name'] == for_event }
-        end
+        visit storefront.category_path(@category)
+        assert_equal(0, find_analytics_events(for_event: 'newSession').size)
+        assert_equal(1, Metrics::SalesByDay.today.sessions)
+        assert_equal(1, Metrics::SegmentByDay.find_by(segment_id: 'first_time_visitor').sessions)
+
+        expire_analytics_session
+        visit storefront.root_path
+        assert_equal(1, find_analytics_events(for_event: 'newSession').size)
+        assert_equal(2, Metrics::SalesByDay.today.sessions)
+        assert_equal(1, Metrics::SegmentByDay.find_by(segment_id: 'first_time_visitor').sessions)
+        assert_equal(1, Metrics::SegmentByDay.find_by(segment_id: 'returning_visitor').sessions)
+
+        setup_checkout_specs
+        add_user_data
+        start_guest_checkout
+
+        fill_in_email
+        fill_in_shipping_address
+        click_button t('workarea.storefront.checkouts.continue_to_shipping')
+        click_button t('workarea.storefront.checkouts.continue_to_payment')
+
+        fill_in_credit_card
+        click_button t('workarea.storefront.checkouts.place_order')
+        assert_current_path(storefront.checkout_confirmation_path)
+
+        expire_analytics_session
+        visit storefront.root_path
+        assert_equal(1, find_analytics_events(for_event: 'newSession').size)
+        assert_equal(3, Metrics::SalesByDay.today.sessions)
+        assert_equal(1, Metrics::SegmentByDay.find_by(segment_id: 'first_time_visitor').sessions)
+        assert_equal(1, Metrics::SegmentByDay.find_by(segment_id: 'returning_visitor').sessions)
+        assert_equal(1, Metrics::SegmentByDay.find_by(segment_id: 'first_time_customer').sessions)
       end
 
+      private
+
       def assert_page_view
         page_view = find_analytics_events(for_event: 'pageView')
         assert_equal(1, page_view.count)
       end
 
-      def disable_dom_events
-        page.execute_script('WORKAREA.analytics.disableDomEvents();')
+      def expire_analytics_session
+        # Simulate session expiration where this cookie would disappear
+        page.execute_script("WORKAREA.cookie.destroy('analytics_session');")
       end
     end
   end

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

@@ -20,7 +20,7 @@ module Workarea
         product1 = create_product(name: 'PL Product 1')
         product2 = create_product(name: 'PL Product 2')
 
-        asset = create_asset
+        asset = create_asset(alt_text: 'Foobarbq')
 
         content = Content.for(@content_page)
         content.blocks.build(
@@ -35,6 +35,13 @@ module Workarea
           type: :image,
           data: { image: asset.id }
         )
+        content.blocks.build(
+          type: :image,
+          data: {
+             image: asset.id,
+             alt: 'Corgenator'
+          }
+        )
         content.blocks.build(
           type: :hero,
           data: {
@@ -65,6 +72,8 @@ module Workarea
         assert(page.has_content?('test html'))
         assert(page.has_content?('text'))
         assert(page.has_content?('foo headline'))
+        assert_match(/alt.*Foobarbq/, page.html)
+        assert_match(/alt.*Corgenator/, page.html)
         assert_match(/iframe/, page.html)
         assert(page.has_content?('Test Standard Category'))
         page.all(:css, '.category-summary-content-block').each do |el|

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

@@ -2,6 +2,8 @@ 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
 

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

@@ -0,0 +1,145 @@
+require 'test_helper'
+
+module Workarea
+  module Storefront
+    class DownloadSystemTest < Workarea::SystemTest
+      include Storefront::SystemTest
+
+      def test_checking_out_with_downloadable_product
+        setup_checkout_specs
+
+        Order.first.items.delete_all
+
+        product = create_product(
+          name: 'Digital Product',
+          variants: [
+            { sku: 'SKU1', regular: 10.to_m, tax_code: '001' },
+            { sku: 'SKU2', regular: 15.to_m, tax_code: '001' }
+          ]
+        )
+
+        create_fulfillment_sku(id: 'SKU1', policy: :download, file: product_image_file)
+        create_fulfillment_sku(id: 'SKU2', policy: :download, file: product_image_file)
+
+        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'))
+        assert(page.has_content?('$0.70'))
+        assert(page.has_content?('$10.70'))
+        assert(page.has_content?(t('workarea.storefront.orders.download')))
+      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 downloadable product
+
+        Order.first.items.delete_all
+
+        product = create_product(
+          name: 'Digital Product',
+          variants: [
+            { sku: 'SKU1', regular: 10.to_m },
+            { sku: 'SKU2', regular: 15.to_m }
+          ]
+        )
+
+        create_fulfillment_sku(id: 'SKU1', policy: :download, file: product_image_file)
+        create_fulfillment_sku(id: 'SKU2', policy: :download, file: product_image_file)
+
+        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