workarea-core 3.5.12 → 3.5.17

data/test/services/workarea/direct_upload_test.rb

@@ -112,6 +112,26 @@ module Workarea
       assert(DirectUpload.ensure_cors!('https://example.com/admin/direct_uploads'))
     end
 
+    def test_ensure_cors_with_no_existing_configuration
+      Workarea.s3.expects(:get_bucket_cors)
+                 .raises(Excon::Errors::NotFound.new('CORS configuration does not exist'))
+
+
+      Workarea.s3.expects(:put_bucket_cors).with(
+        Configuration::S3.bucket,
+        'CORSConfiguration' => [
+          {
+            'ID' => "direct_upload_http://test.host",
+            'AllowedMethod' => 'PUT',
+            'AllowedOrigin' => 'http://test.host',
+            'AllowedHeader' => '*'
+          }
+        ]
+      ).returns(true)
+
+      assert(DirectUpload.ensure_cors!('http://test.host/admin/content_assets'))
+    end
+
     private
 
     def upload_file

data/test/services/workarea/index_release_schedule_previews_test.rb

@@ -0,0 +1,28 @@
+require 'test_helper'
+
+module Workarea
+  class IndexReleaseSchedulePreviewsTest < TestCase
+    def test_affected_releases
+      release = create_release
+      results = IndexReleaseSchedulePreviews.new(release: release).affected_releases
+      assert_equal([release], results)
+
+      a = create_release(publish_at: 1.week.from_now)
+      b = create_release(publish_at: 2.weeks.from_now)
+      c = create_release(publish_at: 4.weeks.from_now)
+      assert_equal([a, b, c], IndexReleaseSchedulePreviews.new.affected_releases)
+
+      results = IndexReleaseSchedulePreviews
+        .new(starts_at: 3.days.from_now, ends_at: 17.days.from_now)
+        .affected_releases
+
+      assert_equal([a, b], results)
+
+      results = IndexReleaseSchedulePreviews
+        .new(release: release, starts_at: 3.days.from_now, ends_at: 10.days.from_now)
+        .affected_releases
+
+      assert_equal([a, release], results)
+    end
+  end
+end

data/test/workers/workarea/index_release_schedule_change_test.rb

@@ -0,0 +1,107 @@
+require 'test_helper'
+
+module Workarea
+  class IndexReleaseScheduleChangeTest < TestCase
+    include TestCase::SearchIndexing
+
+    setup :set_product
+
+    def set_product
+      @product = create_product(name: 'Foo')
+    end
+
+    def test_reschedule
+      a = create_release(name: 'A', publish_at: 1.week.from_now)
+      b = create_release(name: 'B', publish_at: 2.weeks.from_now)
+      c = create_release(name: 'C', publish_at: 4.weeks.from_now)
+
+      b.as_current { @product.update!(name: 'Bar') }
+      IndexProduct.perform(@product)
+
+      a.as_current { assert_empty(Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      b.as_current { assert_equal([@product], Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      c.as_current { assert_equal([@product], Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+
+      # Changing publish_at via `update` causes the release to publish due to Sidekiq inline
+      previous_publish_at = b.publish_at
+      b.set(publish_at: 5.weeks.from_now)
+
+      Sidekiq::Callbacks.enable(IndexProduct) do
+        IndexReleaseScheduleChange.new.perform(b.id, previous_publish_at, b.publish_at)
+      end
+
+      a.as_current { assert_empty(Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      b.as_current { assert_equal([@product], Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      c.as_current { assert_empty(Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+    end
+
+    def test_removing_from_schedule
+      a = create_release(name: 'A', publish_at: 1.week.from_now)
+      b = create_release(name: 'B', publish_at: 2.weeks.from_now)
+      c = create_release(name: 'C', publish_at: 4.weeks.from_now)
+
+      b.as_current { @product.update!(name: 'Bar') }
+      IndexProduct.perform(@product)
+
+      a.as_current { assert_empty(Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      b.as_current { assert_equal([@product], Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      c.as_current { assert_equal([@product], Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+
+      # Changing publish_at via `update` causes the release to publish due to Sidekiq inline
+      previous_publish_at = b.publish_at
+      b.set(publish_at: nil)
+
+      Sidekiq::Callbacks.enable(IndexProduct) do
+        IndexReleaseScheduleChange.new.perform(b.id, previous_publish_at, nil)
+      end
+
+      a.as_current { assert_empty(Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      b.as_current { assert_equal([@product], Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      c.as_current { assert_empty(Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+    end
+
+    def test_adding_to_schedule
+      a = create_release(name: 'A', publish_at: 1.week.from_now)
+      b = create_release(name: 'B')
+      c = create_release(name: 'C', publish_at: 4.weeks.from_now)
+
+      b.as_current { @product.update!(name: 'Bar') }
+      IndexProduct.perform(@product)
+
+      a.as_current { assert_empty(Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      b.as_current { assert_equal([@product], Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      c.as_current { assert_empty(Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+
+      # Changing publish_at via `update` causes the release to publish due to Sidekiq inline
+      b.set(publish_at: 2.weeks.from_now)
+
+      Sidekiq::Callbacks.enable(IndexProduct) do
+        IndexReleaseScheduleChange.new.perform(b.id, nil, b.publish_at)
+      end
+
+      a.as_current { assert_empty(Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      b.as_current { assert_equal([@product], Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      c.as_current { assert_equal([@product], Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+    end
+
+    def test_destroyed
+      a = create_release(name: 'A', publish_at: 1.week.from_now)
+      b = create_release(name: 'B', publish_at: 2.weeks.from_now)
+      c = create_release(name: 'C', publish_at: 4.weeks.from_now)
+
+      b.as_current { @product.update!(name: 'Bar') }
+      IndexProduct.perform(@product)
+
+      a.as_current { assert_empty(Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      b.as_current { assert_equal([@product], Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      c.as_current { assert_equal([@product], Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+
+      Sidekiq::Callbacks.enable(IndexReleaseScheduleChange, IndexProduct) do
+        b.destroy
+      end
+
+      a.as_current { assert_empty(Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      c.as_current { assert_empty(Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+    end
+  end
+end

data/test/workers/workarea/publish_release_test.rb

@@ -2,6 +2,8 @@ require 'test_helper'
 
 module Workarea
   class PublishReleaseTest < TestCase
+    include TestCase::SearchIndexing
+
     def test_publishes_the_release
       release = create_release
       PublishRelease.new.perform(release.id)
@@ -16,5 +18,27 @@ module Workarea
       assert_equal(1, Mongoid::AuditLog::Entry.count)
       assert(Mongoid::AuditLog::Entry.first.modifier.system?)
     end
+
+    def test_reindexes_release_schedule
+      product = create_product(name: 'Foo')
+
+      a = create_release(publish_at: 1.week.from_now)
+      b = create_release(publish_at: 2.weeks.from_now)
+      c = create_release(publish_at: 4.weeks.from_now)
+
+      b.as_current { product.update!(name: 'Bar') }
+      IndexProduct.perform(product)
+
+      assert_empty(Search::ProductSearch.new(q: 'bar').results.pluck(:model))
+      a.as_current { assert_empty(Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      b.as_current { assert_equal([product], Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      c.as_current { assert_equal([product], Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+
+      Sidekiq::Callbacks.enable(IndexProduct) { PublishRelease.new.perform(b.id) }
+
+      assert_equal([product], Search::ProductSearch.new(q: 'bar').results.pluck(:model))
+      a.as_current { assert_equal([product], Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      c.as_current { assert_equal([product], Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+    end
   end
 end

data/workarea-core.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'mongoid-sample', '~> 0.1.0'
   s.add_dependency 'mongoid-encrypted', '~> 1.0.0'
   s.add_dependency 'elasticsearch', '~> 5.0.1'
-  s.add_dependency 'kaminari', '~> 0.17.0'
+  s.add_dependency 'kaminari', '~> 1.2.1'
   s.add_dependency 'kaminari-mongoid', '~> 0.1.2'
   s.add_dependency 'activemerchant', '~> 1.52'
   s.add_dependency 'dragonfly', '~> 1.1.2'
@@ -33,7 +33,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'sidekiq-cron', '~> 0.6.3'
   s.add_dependency 'sidekiq-unique-jobs', '~> 6.0.6'
   s.add_dependency 'sidekiq-throttled', '~> 0.8.2'
-  s.add_dependency 'geocoder', '~> 1.4.4'
+  s.add_dependency 'geocoder', '~> 1.6.3'
+  s.add_dependency 'redis-rails', '~> 5.0.0'
   s.add_dependency 'redis-rack-cache', '~> 2.2.0'
   s.add_dependency 'easymon', '~> 1.4.0'
   s.add_dependency 'image_optim', '~> 0.26.0'
@@ -65,7 +66,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'chart-horizontalbar-rails', '~> 1.0.4' # TODO remove v4
   s.add_dependency 'select2-rails', '~> 4.0.3'
   s.add_dependency 'wysihtml-rails', '~> 0.6.0.beta2'
-  s.add_dependency 'rack-attack', '~> 5.0.1'
+  s.add_dependency 'rack-attack', '~> 6.3.1'
   s.add_dependency 'jquery-livetype-rails', '~> 0.1.0' # TODO remove v4
   s.add_dependency 'redcarpet', '~> 3.4.0'
   s.add_dependency 'jquery-unique-clone-rails', '~> 1.0.0'
@@ -90,10 +91,10 @@ 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.0.8'
+  s.add_dependency 'rack' , '>= 2.1.4'
 
   # HACK for vendoring active_shipping
   s.add_dependency 'active_utils', '~> 3.3.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.5.12
+  version: 3.5.17
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2020-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: kaminari-mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -282,14 +282,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 1.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 1.6.3
+- !ruby/object:Gem::Dependency
+  name: redis-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: redis-rack-cache
   requirement: !ruby/object:Gem::Requirement
@@ -730,14 +744,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 6.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 6.3.1
 - !ruby/object:Gem::Dependency
   name: jquery-livetype-rails
   requirement: !ruby/object:Gem::Requirement
@@ -1086,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
@@ -1128,14 +1142,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: active_utils
   requirement: !ruby/object:Gem::Requirement
@@ -1720,6 +1734,7 @@ files:
 - app/services/workarea/direct_upload/product_image.rb
 - app/services/workarea/export_report.rb
 - app/services/workarea/hash_update.rb
+- app/services/workarea/index_release_schedule_previews.rb
 - app/services/workarea/inventory_adjustment.rb
 - app/services/workarea/login.rb
 - app/services/workarea/new_discount.rb
@@ -1757,6 +1772,7 @@ files:
 - app/workers/workarea/index_product.rb
 - app/workers/workarea/index_product_children.rb
 - app/workers/workarea/index_product_rule.rb
+- app/workers/workarea/index_release_schedule_change.rb
 - app/workers/workarea/index_search_customizations.rb
 - app/workers/workarea/index_skus.rb
 - app/workers/workarea/keep_product_index_fresh.rb
@@ -1930,6 +1946,7 @@ files:
 - lib/workarea/ext/freedom_patches/string.rb
 - lib/workarea/ext/freedom_patches/uri.rb
 - lib/workarea/ext/jbuilder/jbuilder_append_partials.rb
+- lib/workarea/ext/jbuilder/jbuilder_cache.rb
 - lib/workarea/ext/mongoid/audit_log_entry.decorator
 - lib/workarea/ext/mongoid/each_by.rb
 - lib/workarea/ext/mongoid/embedded_children.rb
@@ -1964,6 +1981,7 @@ files:
 - lib/workarea/ping_home_base.rb
 - lib/workarea/plugin.rb
 - lib/workarea/plugin/asset_appends_helper.rb
+- lib/workarea/queues_pauser.rb
 - lib/workarea/routes_constraints/redirect.rb
 - lib/workarea/routes_constraints/super_admin.rb
 - lib/workarea/scheduled_jobs.rb
@@ -2314,6 +2332,7 @@ files:
 - test/models/workarea/search/storefront/product/inventory_test.rb
 - test/models/workarea/search/storefront/product/pricing_test.rb
 - test/models/workarea/search/storefront/product/text_test.rb
+- test/models/workarea/search/storefront/product_releases_test.rb
 - test/models/workarea/search/storefront/product_test.rb
 - test/models/workarea/search/storefront_test.rb
 - test/models/workarea/segment/life_cycle_test.rb
@@ -2365,7 +2384,6 @@ files:
 - test/queries/workarea/pricing_override_params_test.rb
 - test/queries/workarea/product_primary_image_url_test.rb
 - test/queries/workarea/product_primary_navigation_test.rb
-- test/queries/workarea/product_releases_test.rb
 - test/queries/workarea/recommendation/order_based_test.rb
 - test/queries/workarea/recommendation/product_based_test.rb
 - test/queries/workarea/recommendation/searches_test.rb
@@ -2426,6 +2444,7 @@ files:
 - test/services/workarea/direct_upload_test.rb
 - test/services/workarea/export_report_test.rb
 - test/services/workarea/hash_update_test.rb
+- test/services/workarea/index_release_schedule_previews_test.rb
 - test/services/workarea/inventory_adjustment_test.rb
 - test/services/workarea/login_test.rb
 - test/services/workarea/order_merge_test.rb
@@ -2458,6 +2477,7 @@ files:
 - test/workers/workarea/index_payment_transactions_test.rb
 - test/workers/workarea/index_product_rule_test.rb
 - test/workers/workarea/index_product_test.rb
+- test/workers/workarea/index_release_schedule_change_test.rb
 - test/workers/workarea/index_skus_test.rb
 - test/workers/workarea/keep_product_index_fresh_test.rb
 - test/workers/workarea/mark_discounts_as_redeemed_test.rb

data/test/queries/workarea/product_releases_test.rb

@@ -1,56 +0,0 @@
-require 'test_helper'
-
-module Workarea
-  class ProductReleasesTest < TestCase
-    def test_product_changes
-      product = create_product(name: 'Foo')
-      release_one = create_release
-      release_one.as_current { product.update!(name: 'Bar') }
-
-      assert_equal([release_one], ProductReleases.new(product).releases)
-
-      release_one.update!(publish_at: 1.day.from_now)
-      release_two = create_release(publish_at: 3.days.from_now)
-      assert_equal([release_one, release_two], ProductReleases.new(product).releases)
-    end
-
-    def test_featured_product_changes
-      product = create_product
-      category = create_category
-
-      release_one = create_release
-      release_one.as_current { category.update!(product_ids: [product.id]) }
-      assert_equal([release_one], ProductReleases.new(product).releases)
-
-      release_one.update!(publish_at: 1.day.from_now)
-      release_two = create_release(publish_at: 3.days.from_now)
-      assert_equal([release_one, release_two], ProductReleases.new(product).releases)
-    end
-
-    def test_variant_changes
-      product = create_product(variants: [{ sku: 'SKU' }])
-      release = create_release
-      release.as_current { product.variants.first.update!(details: { color: 'Red' }) }
-      assert_equal([release], ProductReleases.new(product).releases)
-    end
-
-    def test_pricing_changes
-      product = create_product(variants: [{ sku: 'SKU' }])
-      pricing = Pricing::Sku.find('SKU')
-
-      release = create_release
-      release.as_current { pricing.prices.first.update!(regular: 10_000) }
-      assert_equal([release], ProductReleases.new(product).releases)
-    end
-
-    def test_changesets_with_missing_releases
-      product = create_product(name: 'Foo')
-      release = create_release
-      release.as_current { product.update!(name: 'Bar') }
-      release.delete
-
-      assert_nil(product.reload.changesets.first.release)
-      assert_equal([], ProductReleases.new(product).releases)
-    end
-  end
-end