workarea-core 3.5.15 → 3.5.20

data/lib/workarea/version.rb

@@ -2,7 +2,7 @@ module Workarea
   module VERSION
     MAJOR = 3
     MINOR = 5
-    PATCH = 15
+    PATCH = 20
     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/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
 
@@ -81,5 +79,11 @@ module Workarea
     def test_favicon
       assert_no_file 'public/favicon.ico'
     end
+
+    def test_development_mailer_port
+      assert_file 'config/environments/development.rb' do |file|
+        assert_match(%(config.action_mailer.default_url_options = { port: 3000 }), file)
+      end
+    end
   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/mailers/workarea/application_mailer_test.rb

@@ -21,5 +21,15 @@ module Workarea
         assert_equal([changed_email], changed_mail.from)
       end
     end
+
+    def test_default_url_options
+      @current_options = Rails.application.config.action_mailer.default_url_options.deep_dup
+      Rails.application.config.action_mailer.default_url_options = { port: 12345 }
+
+      assert_equal(12345, ApplicationMailer.new.default_url_options[:port])
+
+    ensure
+      Rails.application.config.action_mailer.default_url_options = @current_options
+    end
   end
 end

data/test/models/workarea/checkout_test.rb

@@ -51,6 +51,63 @@ module Workarea
       refute_equal(payment_id, checkout.payment.object_id)
     end
 
+    def test_update
+      create_shipping_service
+      checkout = Checkout.new(@order)
+
+      checkout.start_as(:guest)
+
+      refute(
+        checkout.update(
+          email: 'test@workarea.com',
+          shipping_address: {
+            last_name: 'Crouse',
+            street: '22 S. 3rd St.',
+            street_2: 'Second Floor',
+            city: 'Philadelphia',
+            region: 'PA',
+            postal_code: '19106',
+            country: 'US'
+          },
+          billing_address: {
+            first_name: 'Ben',
+            street: '22 S. 3rd St.',
+            street_2: 'Second Floor',
+            city: 'Philadelphia',
+            region: 'PA',
+            postal_code: '19106',
+            country: 'US'
+          }
+        )
+      )
+
+      assert(
+        checkout.update(
+          email: 'test@workarea.com',
+          shipping_address: {
+            first_name: 'Ben',
+            last_name: 'Crouse',
+            street: '22 S. 3rd St.',
+            street_2: 'Second Floor',
+            city: 'Philadelphia',
+            region: 'PA',
+            postal_code: '19106',
+            country: 'US'
+          },
+          billing_address: {
+            first_name: 'Ben',
+            last_name: 'Crouse',
+            street: '22 S. 3rd St.',
+            street_2: 'Second Floor',
+            city: 'Philadelphia',
+            region: 'PA',
+            postal_code: '19106',
+            country: 'US'
+          }
+        )
+      )
+    end
+
     def test_continue_as
       checkout = Checkout.new(@order)
       checkout.continue_as(@user)

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

@@ -132,6 +132,46 @@ module Workarea
         refute(import.error?)
         assert(import.successful?)
       end
+
+      def test_csv_embedded_changes_for_release
+        release = create_release
+        product = create_product(
+          name: 'Foo',
+          variants: [{ sku: '1', name: 'Bar' }, { sku: '2', name: 'Baz' }]
+        )
+        product.name = 'Foo Changed'
+        product.variants.first.name = 'Bar Changed'
+
+        import = create_import(
+          model_type: product.class.name,
+          file: create_tempfile(Csv.new.serialize(product), extension: 'csv'),
+          file_type: 'csv',
+          release_id: release.id
+        )
+
+        assert_equal('csv', import.file_type)
+        assert_nothing_raised { import.process! }
+
+        product.reload
+        assert_equal('Foo', product.name)
+        assert_equal('Bar', product.variants.first.name)
+        assert_equal('Baz', product.variants.second.name)
+
+        Release.with_current(release) do
+          product.reload
+          assert_equal('Foo Changed', product.name)
+          assert_equal('Bar Changed', product.variants.first.name)
+          assert_equal('Baz', product.variants.second.name)
+        end
+
+        import.reload
+        assert_equal(2, import.total)
+        assert_equal(2, import.succeeded)
+        assert_equal(0, import.failed)
+        assert(import.complete?)
+        refute(import.error?)
+        assert(import.successful?)
+      end
     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/workarea-core.gemspec

@@ -91,7 +91,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'loofah', '~> 2.3.1'
   s.add_dependency 'referer-parser', '~> 0.3.0'
   s.add_dependency 'serviceworker-rails', '~> 0.5.5'
-  s.add_dependency 'chartkick', '~> 3.3.0'
+  s.add_dependency 'chartkick', '~> 3.4.0'
   s.add_dependency 'browser', '~> 2.6.1'
   s.add_dependency 'puma', '>= 4.3.1'
   s.add_dependency 'rack' , '>= 2.1.4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.5.15
+  version: 3.5.20
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-07 00:00:00.000000000 Z
+date: 2020-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -1100,14 +1100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: browser
   requirement: !ruby/object:Gem::Requirement
@@ -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