workarea-core 3.5.17 → 3.5.22

data/lib/workarea/version.rb

@@ -2,7 +2,7 @@ module Workarea
   module VERSION
     MAJOR = 3
     MINOR = 5
-    PATCH = 17
+    PATCH = 22
     PRE   = nil
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
 

data/lib/workarea/visit.rb

@@ -6,7 +6,6 @@ module Workarea
     attr_writer :override_segments
 
     delegate :postal_code, :city, :subdivision, :region, :country, to: :geolocation
-    delegate :admin?, to: :metrics
 
     def initialize(env)
       @env = env
@@ -25,6 +24,14 @@ module Workarea
       session[:user_id].present?
     end
 
+    def impersonating?
+      session[:admin_id].present?
+    end
+
+    def admin?
+      (logged_in? && impersonating?) || metrics.admin?
+    end
+
     def request
       @request ||= ActionDispatch::Request.new(env)
     end

data/lib/workarea/warnings.rb

@@ -26,7 +26,7 @@ find their preference.
 
     def check_mongo_notable_scan
       if (Rails.env.development? &&
-          !Workarea.config.skip_service_connections &&
+          !Workarea.skip_services? &&
           Configuration::Mongoid.indexes_enforced?)
         warn <<~eos
 **************************************************

data/test/generators/workarea/install_generator_test.rb

@@ -55,8 +55,6 @@ module Workarea
       assert_file 'config/initializers/workarea.rb' do |file|
         assert_match(%(config.site_name =), file)
         assert_match(%(config.host =), file)
-        assert_match(%(config.email_to =), file)
-        assert_match(%(config.email_from =), file)
       end
     end
 

data/test/integration/workarea/authentication_test.rb

@@ -3,8 +3,9 @@ require 'test_helper'
 module Workarea
   class AuthenticationTest < IntegrationTest
     class AuthenticationController < Workarea::ApplicationController
-      include Authentication
       include HttpCaching
+      include Authentication
+      include Impersonation
       include Storefront::CurrentCheckout
 
       before_action :cache_page, only: :cached

data/test/lib/workarea/scheduled_jobs_test.rb

@@ -15,12 +15,8 @@ module Workarea
     end
 
     def test_redis_not_available
-      @_skip_services = Workarea.config.skip_service_connections
-      Workarea.config.skip_service_connections = true
-
+      Workarea.stubs(skip_services?: true)
       assert_nil(ScheduledJobs.clean)
-    ensure
-      Workarea.config.skip_service_connections = @_skip_services
     end
   end
 end

data/test/models/workarea/data_file/csv_test.rb

@@ -309,7 +309,8 @@ module Workarea
       end
 
       def test_blank_rows_are_ignored
-        model = Foo.new(id: nil)
+        model = Foo.new
+        Foo.fields.keys.each { |f| model.send("#{f}=", nil) }
 
         import = create_import(
           model_type: Foo.name,

data/test/models/workarea/metrics/user_test.rb

@@ -134,7 +134,7 @@ module Workarea
       def test_merging_metrics
         freeze_time
 
-        metrics = User.create!(
+        first = User.create!(
           first_order_at: 2.weeks.ago,
           last_order_at: 1.day.ago,
           orders: 2,
@@ -147,41 +147,43 @@ module Workarea
           purchased: { product_ids: ['qoo'], category_ids: ['quo'], search_ids: ['qux'] }
         )
 
-        metrics.merge!(User.new)
-        metrics.reload
-        assert_equal(2.weeks.ago, metrics.first_order_at)
-        assert_equal(1.day.ago, metrics.last_order_at)
-        assert_equal(2, metrics.orders)
-        assert_equal(100, metrics.revenue)
-        assert_equal(-10, metrics.discounts)
-        assert_equal(50, metrics.average_order_value)
-        assert_equal(1, metrics.cancellations)
-        assert_equal(-20, metrics.refund)
-        assert_equal(['foo'], metrics.viewed.product_ids)
-        assert_equal(['bar'], metrics.viewed.category_ids)
-        assert_equal(['baz'], metrics.viewed.search_ids)
-        assert_equal(['qoo'], metrics.purchased.product_ids)
-        assert_equal(['quo'], metrics.purchased.category_ids)
-        assert_equal(['qux'], metrics.purchased.search_ids)
-
-        blank = User.create!(id: 'foo').tap { |u| u.merge!(metrics) }
-        blank.reload
-        assert_equal(2.weeks.ago, blank.first_order_at)
-        assert_equal(1.day.ago, blank.last_order_at)
-        assert_equal(2, blank.orders)
-        assert_equal(100, blank.revenue)
-        assert_equal(-10, blank.discounts)
-        assert_equal(50, blank.average_order_value)
-        assert_equal(1, blank.cancellations)
-        assert_equal(-20, blank.refund)
-        assert_equal(['foo'], blank.viewed.product_ids)
-        assert_equal(['bar'], blank.viewed.category_ids)
-        assert_equal(['baz'], blank.viewed.search_ids)
-        assert_equal(['qoo'], blank.purchased.product_ids)
-        assert_equal(['quo'], blank.purchased.category_ids)
-        assert_equal(['qux'], blank.purchased.search_ids)
-
-        existing = User.create!(
+        first.merge!(User.new)
+        first.reload
+        assert_equal(1, Metrics::User.count)
+        assert_equal(2.weeks.ago, first.first_order_at)
+        assert_equal(1.day.ago, first.last_order_at)
+        assert_equal(2, first.orders)
+        assert_equal(100, first.revenue)
+        assert_equal(-10, first.discounts)
+        assert_equal(50, first.average_order_value)
+        assert_equal(1, first.cancellations)
+        assert_equal(-20, first.refund)
+        assert_equal(['foo'], first.viewed.product_ids)
+        assert_equal(['bar'], first.viewed.category_ids)
+        assert_equal(['baz'], first.viewed.search_ids)
+        assert_equal(['qoo'], first.purchased.product_ids)
+        assert_equal(['quo'], first.purchased.category_ids)
+        assert_equal(['qux'], first.purchased.search_ids)
+
+        second = User.create!(id: 'foo').tap { |u| u.merge!(first) }
+        second.reload
+        assert_equal(1, Metrics::User.count)
+        assert_equal(2.weeks.ago, second.first_order_at)
+        assert_equal(1.day.ago, second.last_order_at)
+        assert_equal(2, second.orders)
+        assert_equal(100, second.revenue)
+        assert_equal(-10, second.discounts)
+        assert_equal(50, second.average_order_value)
+        assert_equal(1, second.cancellations)
+        assert_equal(-20, second.refund)
+        assert_equal(['foo'], second.viewed.product_ids)
+        assert_equal(['bar'], second.viewed.category_ids)
+        assert_equal(['baz'], second.viewed.search_ids)
+        assert_equal(['qoo'], second.purchased.product_ids)
+        assert_equal(['quo'], second.purchased.category_ids)
+        assert_equal(['qux'], second.purchased.search_ids)
+
+        third = User.create!(
           first_order_at: 3.weeks.ago,
           last_order_at: 3.weeks.ago,
           orders: 2,
@@ -191,22 +193,23 @@ module Workarea
           purchased: { product_ids: ['four'], category_ids: ['five'], search_ids: ['six'] }
         )
 
-        existing.merge!(metrics)
-        existing.reload
-        assert_equal(3.weeks.ago, existing.first_order_at)
-        assert_equal(1.day.ago, existing.last_order_at)
-        assert_equal(4, existing.orders)
-        assert_equal(220, existing.revenue)
-        assert_equal(-10, existing.discounts)
-        assert_equal(55, existing.average_order_value)
-        assert_equal(1, existing.cancellations)
-        assert_equal(-20, existing.refund)
-        assert_equal(%w(one foo), existing.viewed.product_ids)
-        assert_equal(%w(two bar), existing.viewed.category_ids)
-        assert_equal(%w(three baz), existing.viewed.search_ids)
-        assert_equal(%w(four qoo), existing.purchased.product_ids)
-        assert_equal(%w(five quo), existing.purchased.category_ids)
-        assert_equal(%w(six qux), existing.purchased.search_ids)
+        third.merge!(second)
+        third.reload
+        assert_equal(1, Metrics::User.count)
+        assert_equal(3.weeks.ago, third.first_order_at)
+        assert_equal(1.day.ago, third.last_order_at)
+        assert_equal(4, third.orders)
+        assert_equal(220, third.revenue)
+        assert_equal(-10, third.discounts)
+        assert_equal(55, third.average_order_value)
+        assert_equal(1, third.cancellations)
+        assert_equal(-20, third.refund)
+        assert_equal(%w(one foo), third.viewed.product_ids)
+        assert_equal(%w(two bar), third.viewed.category_ids)
+        assert_equal(%w(three baz), third.viewed.search_ids)
+        assert_equal(%w(four qoo), third.purchased.product_ids)
+        assert_equal(%w(five quo), third.purchased.category_ids)
+        assert_equal(%w(six qux), third.purchased.search_ids)
       end
     end
   end

data/test/models/workarea/order/item_test.rb

@@ -55,6 +55,15 @@ module Workarea
         )
         assert(item.on_sale?)
       end
+
+      def test_fulfilled_by?
+        item.fulfillment = 'shipping'
+        assert(item.fulfilled_by?(:shipping))
+        assert(item.fulfilled_by?(:shipping, :download))
+        refute(item.fulfilled_by?(:download))
+        assert(item.shipping?)
+        refute(item.download?)
+      end
     end
   end
 end

data/test/models/workarea/shipping/service_test.rb

@@ -35,6 +35,32 @@ module Workarea
         assert_equal(3.to_m, shipping_service.find_rate(7.to_m).price)
         assert_equal(2.to_m, shipping_service.find_rate(10.to_m).price)
       end
+
+      def test_find_tax_code
+        create_shipping_service(name: 'Ground', carrier: 'UPS', tax_code: '001')
+        create_shipping_service(name: 'Express', carrier: 'UPS', tax_code: nil)
+        Workarea.config.default_shipping_service_tax_code = nil
+
+        assert_equal('001', Service.find_tax_code('UPS', 'Ground'))
+        assert_nil(Service.find_tax_code('UPS', 'Express'))
+        assert_nil(Service.find_tax_code('FedEx', 'Express'))
+
+        Workarea.config.default_shipping_service_tax_code = '101'
+
+        assert_equal('001', Service.find_tax_code('UPS', 'Ground'))
+        assert_nil(Service.find_tax_code('UPS', 'Express'))
+        assert_equal('101', Service.find_tax_code('FedEx', 'Express'))
+        assert_equal('101', Service.find_tax_code('FedEx', 'Express'))
+
+        Workarea.config.default_shipping_service_tax_code = -> (carrier, name) do
+          carrier == 'FedEx' ? '101' : '001'
+        end
+
+        assert_equal('001', Service.find_tax_code('UPS', 'Ground'))
+        assert_nil(Service.find_tax_code('UPS', 'Express'))
+        assert_equal('101', Service.find_tax_code('FedEx', 'Express'))
+        assert_equal('001', Service.find_tax_code('DHL', 'Overnight'))
+      end
     end
   end
 end

data/test/queries/workarea/search/admin_search_test.rb

@@ -81,6 +81,16 @@ module Workarea
         assert_equal(results.reverse, search.results)
       end
 
+      def test_default_sort_by_score
+        # Unlike other admin searches (primarily indexes), we want searching to
+        # default sort by score. Testing scores directly is unreliable so just
+        # do a simple check here.
+        assert_equal(
+          [{ _score: :desc }, { updated_at: :desc }],
+          AdminSearch.new.default_admin_sort
+        )
+      end
+
       def test_selected_sorting
         results = [
           create_product(name: 'A', variants: []),

data/test/workers/workarea/status_reporter_test.rb

@@ -12,8 +12,10 @@ module Workarea
 
       StatusReporter.new.perform
 
-      assert(2, ActionMailer::Base.deliveries.count)
+      assert_equal(2, ActionMailer::Base.deliveries.count)
+
       delivery_emails = ActionMailer::Base.deliveries.map(&:to).flatten
+
       assert(delivery_emails.include?('foo@workarea.com'))
       assert(delivery_emails.include?('bar@workarea.com'))
     end

data/test/workers/workarea/update_email_test.rb

@@ -0,0 +1,39 @@
+require 'test_helper'
+
+module Workarea
+  class UpdateEmailTest < TestCase
+    def test_updating_payment_profile
+      user = create_user(email: 'user@workarea.com')
+      profile = Payment::Profile.lookup(PaymentReference.new(user))
+
+      UpdateEmail.new.perform(user.id.to_s, 'email' => [nil, 'user@workarea.com'])
+      assert_equal(profile.reload.email, 'user@workarea.com')
+
+      UpdateEmail.new.perform(
+        user.id.to_s,
+        'email' => ['user@workarea.com', 'test@workarea.com']
+      )
+      assert_equal(profile.reload.email, 'test@workarea.com')
+    end
+
+    def test_updating_metrics
+      user = create_user(email: 'user@workarea.com')
+      old_metrics = Metrics::User.find_or_initialize_by(id: 'user@workarea.com')
+      old_metrics.update!(orders: 3)
+
+      UpdateEmail.new.perform(user.id.to_s, 'email' => [nil, 'user@workarea.com'])
+      assert_equal(1, Metrics::User.count)
+      assert_equal(3, old_metrics.reload.orders)
+
+      new_metrics = Metrics::User.create!(id: 'test@workarea.com', orders: 1)
+
+      UpdateEmail.new.perform(
+        user.id.to_s,
+        'email' => ['user@workarea.com', 'test@workarea.com']
+      )
+      assert_equal(1, Metrics::User.count)
+      assert_raises(Mongoid::Errors::DocumentNotFound) { old_metrics.reload }
+      assert_equal(4, new_metrics.reload.orders)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.5.17
+  version: 3.5.22
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-19 00:00:00.000000000 Z
+date: 2020-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -1795,7 +1795,7 @@ files:
 - app/workers/workarea/status_reporter.rb
 - app/workers/workarea/synchronize_user_metrics.rb
 - app/workers/workarea/update_elasticsearch_settings.rb
-- app/workers/workarea/update_payment_profile_email.rb
+- app/workers/workarea/update_email.rb
 - app/workers/workarea/verify_scheduled_releases.rb
 - bin/rails
 - config/i18n-js.yml
@@ -1990,6 +1990,12 @@ files:
 - lib/workarea/string_id.rb
 - lib/workarea/svg_asset_finder.rb
 - lib/workarea/swappable_list.rb
+- lib/workarea/tasks/cache.rb
+- lib/workarea/tasks/help.rb
+- lib/workarea/tasks/insights.rb
+- lib/workarea/tasks/migrate.rb
+- lib/workarea/tasks/search.rb
+- lib/workarea/tasks/services.rb
 - lib/workarea/url_token.rb
 - lib/workarea/validators/email_validator.rb
 - lib/workarea/validators/ip_address_validator.rb
@@ -2493,7 +2499,7 @@ files:
 - test/workers/workarea/send_refund_email_test.rb
 - test/workers/workarea/status_reporter_test.rb
 - test/workers/workarea/synchronize_user_metrics_test.rb
-- test/workers/workarea/update_payment_profile_email_test.rb
+- test/workers/workarea/update_email_test.rb
 - test/workers/workarea/verify_scheduled_releases_test.rb
 - vendor/active_shipping/.gitignore
 - vendor/active_shipping/.travis.yml

data/app/workers/workarea/update_payment_profile_email.rb

@@ -1,22 +0,0 @@
-module Workarea
-  class UpdatePaymentProfileEmail
-    include Sidekiq::Worker
-    include Sidekiq::CallbacksWorker
-
-    sidekiq_options(
-      enqueue_on: { User => :update, with: -> { [id, changes] } }
-    )
-
-    def perform(id, changes)
-      if changes['email'].present? && changes['email'].first.present?
-        old_email = changes['email'].first
-        new_email = changes['email'].last
-
-        user = User.find(id)
-        user.email = old_email # set old email so we lookup by old email value
-
-        Payment::Profile.update_email(PaymentReference.new(user), new_email)
-      end
-    end
-  end
-end

data/test/workers/workarea/update_payment_profile_email_test.rb

@@ -1,27 +0,0 @@
-require 'test_helper'
-
-module Workarea
-  class UpdatePaymentProfileEmailTest < Workarea::TestCase
-    setup do
-      @user = create_user(email: 'user@workarea.com')
-      @profile = Payment::Profile.lookup(PaymentReference.new(@user))
-      @worker = UpdatePaymentProfileEmail.new
-    end
-
-    def test_updating_payment_profile_email_address
-      @worker.perform(
-        @user.id.to_s,
-        'email' => ['user@workarea.com', 'test@workarea.com']
-      )
-
-      @profile.reload
-      assert_equal(@profile.email, 'test@workarea.com')
-    end
-
-    def test_skipping_update_if_email_change_is_nil
-      @worker.perform(@user.id.to_s, 'email' => [nil, 'user@workarea.com'])
-      @profile.reload
-      assert_equal(@profile.email, 'user@workarea.com')
-    end
-  end
-end