workarea-storefront 3.4.45 → 3.5.0.beta.1

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

@@ -184,6 +184,26 @@ module Workarea
         assert(page.has_content?('Error'))
       end
 
+      def test_fraud_payment_failure
+        assert_current_path(storefront.checkout_addresses_path)
+        fill_in 'email', with: 'decline@workarea.com'
+        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)
+        fill_in_credit_card
+        fill_in 'credit_card[number]', with: '1'
+        click_button t('workarea.storefront.checkouts.place_order')
+
+        assert_current_path(storefront.checkout_place_order_path)
+        assert(page.has_content?('Error'))
+      end
+
       def test_unavailable_inventory
         assert_current_path(storefront.checkout_addresses_path)
         fill_in_email

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

@@ -32,8 +32,9 @@ module Workarea
 
       def test_starting_checkout_as_guest
         travel(30.minutes) do
-          # Simulates the browser expiring the cookie
-          page.driver.browser.manage.delete_cookie('user_id')
+          # Simulates the browser expiring the session cookie
+          session_cookie = Rails.application.config.session_options[:key]
+          page.driver.browser.manage.delete_cookie(session_cookie)
 
           visit storefront.checkout_path
 
@@ -57,42 +58,40 @@ module Workarea
       end
 
       def test_preselecting_addresses_from_saved_addresses
-        Workarea.with_config do |config|
-          config.countries = [Country['US'], Country['CA']]
-
-          add_user_data
-
-          user = User.find_by_email('bcrouse@workarea.com')
-          user.auto_save_shipping_address(
-            first_name: 'Ben',
-            last_name: 'Crouse',
-            street: '1525 Robson St.',
-            city: 'Vancouver',
-            region: 'BC',
-            postal_code: 'V6G 1C3',
-            country: 'CA',
-            phone_number: '18444710783'
-          )
+        Workarea.config.countries = [Country['US'], Country['CA']]
+
+        add_user_data
+
+        user = User.find_by_email('bcrouse@workarea.com')
+        user.auto_save_shipping_address(
+          first_name: 'Ben',
+          last_name: 'Crouse',
+          street: '1525 Robson St.',
+          city: 'Vancouver',
+          region: 'BC',
+          postal_code: 'V6G 1C3',
+          country: 'CA',
+          phone_number: '18444710783'
+        )
 
-          visit storefront.checkout_addresses_path
+        visit storefront.checkout_addresses_path
 
-          select 'Ben Crouse 1019 S. 47th St. Philadelphia PA 19143', from: 'saved_addresses_0'
-          assert_equal(find('select[name="shipping_address[country]"]').value, 'US')
-          assert_equal(find('#shipping_address_region_select').value, 'PA')
+        select 'Ben Crouse 1019 S. 47th St. Philadelphia PA 19143', from: 'saved_addresses_0'
+        assert_equal(find('select[name="shipping_address[country]"]').value, 'US')
+        assert_equal(find('#shipping_address_region_select').value, 'PA')
 
-          select 'Ben Crouse 1525 Robson St. Vancouver BC V6G 1C3', from: 'saved_addresses_0'
-          assert_equal(find('select[name="shipping_address[country]"]').value, 'CA')
-          assert_equal(find('#shipping_address_region_select').value, 'BC')
+        select 'Ben Crouse 1525 Robson St. Vancouver BC V6G 1C3', from: 'saved_addresses_0'
+        assert_equal(find('select[name="shipping_address[country]"]').value, 'CA')
+        assert_equal(find('#shipping_address_region_select').value, 'BC')
 
-          select 'Ben Crouse 1019 S. 47th St. Philadelphia PA 19143', from: 'saved_addresses_1'
-          assert_equal(find('select[name="billing_address[country]"]').value, 'US')
-          assert_equal(find('#billing_address_region_select').value, 'PA')
+        select 'Ben Crouse 1019 S. 47th St. Philadelphia PA 19143', from: 'saved_addresses_1'
+        assert_equal(find('select[name="billing_address[country]"]').value, 'US')
+        assert_equal(find('#billing_address_region_select').value, 'PA')
 
-          click_button t('workarea.storefront.checkouts.continue_to_shipping')
+        click_button t('workarea.storefront.checkouts.continue_to_shipping')
 
-          assert(page.has_content?('1019 S. 47th St.'))
-          assert(page.has_no_content?('22 S. 3rd St.'))
-        end
+        assert(page.has_content?('1019 S. 47th St.'))
+        assert(page.has_no_content?('22 S. 3rd St.'))
       end
 
       def test_express_checkout

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

@@ -102,56 +102,54 @@ module Workarea
       end
 
       def test_admin_forcing_password_resets
-        Workarea.with_config do |config|
-          config.password_lifetime = 1.second
-          sleep(1)
+        Workarea.config.password_lifetime = 1.second
+        sleep(1)
 
-          # sign in for the first time
-          visit storefront.login_path
+        # sign in for the first time
+        visit storefront.login_path
 
-          within '#login_form' do
-            fill_in 'email', with: @admin_email
-            fill_in 'password', with: 'W3bl1nc!'
-            click_button t('workarea.storefront.users.login')
-          end
+        within '#login_form' do
+          fill_in 'email', with: @admin_email
+          fill_in 'password', with: 'W3bl1nc!'
+          click_button t('workarea.storefront.users.login')
+        end
 
-          assert_current_path(storefront.change_password_path)
+        assert_current_path(storefront.change_password_path)
 
-          # sign out
-          reset_session!
+        # sign out
+        reset_session!
 
-          visit storefront.login_path
+        visit storefront.login_path
 
-          # sign in again
-          within '#login_form' do
-            fill_in 'email', with: @admin_email
-            fill_in 'password', with: 'W3bl1nc!'
-            click_button t('workarea.storefront.users.login')
-          end
+        # sign in again
+        within '#login_form' do
+          fill_in 'email', with: @admin_email
+          fill_in 'password', with: 'W3bl1nc!'
+          click_button t('workarea.storefront.users.login')
+        end
 
-          assert_current_path(storefront.change_password_path)
+        assert_current_path(storefront.change_password_path)
 
-          # disallow all other page movement
-          visit storefront.root_path
-          assert_current_path(storefront.change_password_path)
+        # disallow all other page movement
+        visit storefront.root_path
+        assert_current_path(storefront.change_password_path)
 
-          config.password_lifetime = 1.hour
-          fill_in 'old_password', with: 'W3bl1nc!'
-          fill_in 'password', with: @password
-          click_button t('workarea.storefront.users.change_password')
+        Workarea.config.password_lifetime = 1.hour
+        fill_in 'old_password', with: 'W3bl1nc!'
+        fill_in 'password', with: @password
+        click_button t('workarea.storefront.users.change_password')
 
-          assert_current_path(storefront.users_account_path)
+        assert_current_path(storefront.users_account_path)
 
-          click_link t('workarea.storefront.users.logout')
-          visit storefront.login_path
+        click_link t('workarea.storefront.users.logout')
+        visit storefront.login_path
 
-          within '#login_form' do
-            fill_in 'email', with: @admin_email
-            fill_in 'password', with: @password
-            click_button t('workarea.storefront.users.login')
-          end
-          assert_current_path(admin.root_path)
+        within '#login_form' do
+          fill_in 'email', with: @admin_email
+          fill_in 'password', with: @password
+          click_button t('workarea.storefront.users.login')
         end
+        assert_current_path(admin.root_path)
       end
     end
   end

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

@@ -1,8 +1,8 @@
 require 'test_helper'
 
 module Workarea
-  module Admin
-    class PricingOverridesSystemTest < SystemTest
+  module Storefront
+    class PricingOverridesSystemTest < Workarea::SystemTest
       include Admin::IntegrationTest
       include Storefront::SystemTest
 
@@ -40,6 +40,17 @@ module Workarea
         assert(page.has_content?('Success'))
         assert(page.has_content?('$10.70')) # total w/ shipping
       end
+
+      def test_not_having_permission_to_override
+        admin_user.update!(super_admin: false, admin: true, orders_manager: false)
+
+        visit storefront.cart_path
+
+        wait_for_xhr
+        within_frame find('.admin-toolbar') do
+          assert(page.has_no_content?(t('workarea.admin.toolbar.adjust_order_pricing')))
+        end
+      end
     end
   end
 end

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

@@ -0,0 +1,69 @@
+require 'test_helper'
+
+module Workarea
+  module Storefront
+    class SegmentOverridesSystemTest < Workarea::SystemTest
+      def test_previewing_a_segment
+        admin = create_user(super_admin: true)
+        segment_one = create_segment(name: 'Test One', rules: [])
+        segment_two = create_segment(name: 'Test Two', rules: [])
+
+        content = Content.for('home_page')
+        content.blocks.create!(
+          type: 'html',
+          data: { 'html' => '<p>Foo</p>' },
+          active_segment_ids: [segment_one.id]
+        )
+        content.blocks.create!(
+          type: 'html',
+          data: { 'html' => '<p>Bar</p>' },
+          active_segment_ids: [segment_two.id]
+        )
+
+        # Don't use `set_current_user` because we need to test middleware stack
+        visit storefront.login_path
+
+        within '#login_form' do
+          fill_in 'email', with: admin.email
+          fill_in 'password', with: admin.password
+          click_button t('workarea.storefront.users.login')
+        end
+
+        assert(page.has_content?('Success'))
+
+        visit storefront.root_path
+        within_frame find('.admin-toolbar') do
+          wait_for_iframe
+          click_link 'select_segments'
+        end
+
+        assert_content(t('workarea.admin.segment_overrides.show.title'))
+        find("#segment_ids_#{segment_one.id}_#{segment_one.id}_true_label").click
+        click_button 'set_overrides'
+
+        assert_current_path(storefront.root_path)
+        assert_content('Foo')
+        assert_no_content('Bar')
+        within_frame find('.admin-toolbar') do
+          wait_for_iframe
+          assert_content('Test One')
+          click_link 'select_segments'
+        end
+
+        assert_content(t('workarea.admin.segment_overrides.show.title'))
+        find("#segment_ids_#{segment_one.id}_#{segment_one.id}_false_label").click
+        find("#segment_ids_#{segment_two.id}_#{segment_two.id}_true_label").click
+        click_button 'set_overrides'
+
+        assert_current_path(storefront.root_path)
+        assert_no_content('Foo')
+        assert_content('Bar')
+        within_frame find('.admin-toolbar') do
+          wait_for_iframe
+          refute_content('Test One')
+          assert_content('Test Two')
+        end
+      end
+    end
+  end
+end

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

@@ -46,6 +46,26 @@ module Workarea
         )
       end
 
+      def test_rules
+        @category.product_rules.create!(
+          name: 'search',
+          operator: 'equals',
+          value: 'foo'
+        )
+        @category.product_rules.create!(
+          name: 'search',
+          operator: 'equals',
+          value: 'bar',
+          active: false
+        )
+
+        view_model = CategoryViewModel.new(@category)
+        assert_equal(
+          @category.product_rules.take(1),
+          view_model.search_query.params[:rules]
+        )
+      end
+
       def test_sorts
         view_model = CategoryViewModel.new(@category)
         refute_includes(view_model.sorts.map(&:last), :featured)

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

@@ -19,7 +19,7 @@ module Workarea
       end
 
       def test_wrap
-        Content.define_block_types do
+        Content::BlockTypeDefinition.define do
           block_type 'Bar' do
             view_model FooBarViewModel.name
             field 'Display', :string
@@ -36,7 +36,16 @@ module Workarea
       end
 
       def test_find_asset
-        view_model = ContentBlockViewModel.new
+        Content::BlockTypeDefinition.define do
+          block_type 'Bar' do
+            view_model FooBarViewModel.name
+            field 'Image', :asset
+          end
+        end
+
+        block = Content::Block.new(type_id: 'bar')
+
+        view_model = ContentBlockViewModel.new(block)
         assert_equal(Content::Asset.image_placeholder, view_model.find_asset('asdf'))
 
         asset = create_asset
@@ -44,7 +53,7 @@ module Workarea
       end
 
       def test_series
-        Content.define_block_types do
+        Content::BlockTypeDefinition.define do
           block_type 'Bar' do
             view_model FooBarViewModel.name
 
@@ -81,6 +90,129 @@ module Workarea
         assert_equal('Hey', view_model.series.second.data[:display])
         assert_equal('Sup', view_model.series.third.data[:display])
       end
+
+      def test_assets
+        asset_1 = create_asset
+        asset_2 = create_asset
+
+        Content::BlockTypeDefinition.define do
+          block_type 'Foo' do
+            view_model FooBarViewModel.name
+
+            field 'Gralph', :asset
+            field 'Corge', :asset
+          end
+        end
+
+        Content::BlockTypeDefinition.define do
+          block_type 'Bar' do
+            view_model FooBarViewModel.name
+
+            field 'Gralph', :asset, default: asset_1.id
+            field 'Corge', :asset
+          end
+        end
+
+        Content::BlockTypeDefinition.define do
+          block_type 'Baz' do
+            view_model FooBarViewModel.name
+
+            field 'Gralph', :asset, default: asset_1.id
+            field 'Corge', :asset, default: asset_2.id
+          end
+        end
+
+        Content::BlockTypeDefinition.define do
+          block_type 'Qux' do
+            view_model FooBarViewModel.name
+
+            field 'Gralph', :asset, default: asset_1.id
+            field 'Corge', :asset, default: 'foobar'
+          end
+        end
+
+        block_type = Content::BlockType.find(:foo)
+        block = Content::Block.new(type: 'foo', data: block_type.defaults)
+        view_model = ContentBlockViewModel.wrap(block)
+
+        assert_empty(view_model.assets)
+
+        block_type = Content::BlockType.find(:bar)
+        block = Content::Block.new(type: 'bar', data: block_type.defaults)
+        view_model = ContentBlockViewModel.wrap(block)
+
+        assert_equal(1, view_model.assets.size)
+        assert_equal(asset_1.id.to_s, view_model.assets.keys.first)
+        assert_equal(asset_1, view_model.assets.values.first)
+
+        block_type = Content::BlockType.find(:baz)
+        block = Content::Block.new(type: 'baz', data: block_type.defaults)
+        view_model = ContentBlockViewModel.wrap(block)
+
+        assert_equal(2, view_model.assets.size)
+        assert_equal(asset_1, view_model.assets.values.first)
+        assert_equal(asset_2, view_model.assets.values.last)
+
+        block_type = Content::BlockType.find(:qux)
+        block = Content::Block.new(type: 'qux', data: block_type.defaults)
+        view_model = ContentBlockViewModel.wrap(block)
+
+        assert_equal(2, view_model.assets.size)
+        assert_equal(asset_1, view_model.assets.values.first)
+        assert_equal(Content::Asset.image_placeholder, view_model.assets.values.last)
+      end
+
+      def test_asset_alt_text
+        asset = create_asset(alt_text: 'Foo Bar')
+
+        Content::BlockTypeDefinition.define do
+          block_type 'Foo' do
+            view_model FooBarViewModel.name
+
+            field 'Image', :asset, default: asset.id, alt_field: 'Alt text field'
+            field 'Alt Text Field', :string, default: 'Bar Baz'
+          end
+        end
+
+        block_type = Content::BlockType.find(:foo)
+        block = Content::Block.new(type: 'foo', data: block_type.defaults)
+        view_model = ContentBlockViewModel.wrap(block)
+
+        assert_equal(1, view_model.asset_alt_text.size)
+        assert_equal(:alt_text_field, view_model.asset_alt_text.keys.first)
+        assert_equal('Foo Bar', view_model.asset_alt_text[:alt_text_field])
+      end
+
+      def test_locals_contain_alt_text
+        asset = create_asset
+        asset_with_alt = create_asset(alt_text: 'Foo Bar')
+
+        Content::BlockTypeDefinition.define do
+          block_type 'Foo' do
+            view_model FooBarViewModel.name
+
+            # Image without alt text
+            field 'Image 1', :asset, default: asset.id, alt_field: 'Alt text 1'
+            field 'Alt text 1', :string
+
+            # Image with alt text from asset
+            field 'Image 2', :asset, default: asset_with_alt.id, alt_field: 'Alt text 2'
+            field 'Alt text 2', :string
+
+            # Image with alt text overridden by field
+            field 'Image 3', :asset, default: asset_with_alt.id, alt_field: 'Alt text 3'
+            field 'Alt text 3', :string, default: 'Bar Baz'
+          end
+        end
+
+        block_type = Content::BlockType.find(:foo)
+        block = Content::Block.new(type: 'foo', data: block_type.defaults)
+        view_model = ContentBlockViewModel.wrap(block)
+
+        assert_nil(view_model.locals[:alt_text_1])
+        assert_equal('Foo Bar', view_model.locals[:alt_text_2])
+        assert_equal('Bar Baz', view_model.locals[:alt_text_3])
+      end
     end
   end
 end