workarea-core 3.4.45 → 3.5.0.beta.1

data/test/services/workarea/copy_order_test.rb

@@ -79,5 +79,22 @@ module Workarea
         @placed_order.checkout_started_at
       )
     end
+
+    def test_anonymize!
+      user = create_user
+      placed_order = create_placed_order(id: '2356', user_id: user.id, email: user.email)
+
+      copy = CopyOrder.new(placed_order).tap(&:perform)
+      assert(copy.new_order.email.present?)
+      assert(copy.new_order.user_id.present?)
+      assert(copy.new_payment.persisted?)
+      assert(copy.new_shippings.all?(&:persisted?))
+
+      copy.anonymize!
+      refute(copy.new_order.email.present?)
+      refute(copy.new_order.user_id.present?)
+      refute(copy.new_payment.persisted?)
+      assert(copy.new_shippings.none?(&:persisted?))
+    end
   end
 end

data/test/services/workarea/direct_upload_test.rb

@@ -47,14 +47,6 @@ module Workarea
     end
 
     def test_ensure_cors
-      response = mock('Excon::Response')
-      response.expects(:data)
-              .times(3)
-              .returns(body: { 'CORSConfiguration' => [] })
-      Workarea.s3.expects(:get_bucket_cors)
-                 .times(3)
-                 .with(Configuration::S3.bucket)
-                 .returns(response)
       Workarea.s3.expects(:put_bucket_cors).with(
         Configuration::S3.bucket,
         'CORSConfiguration' => [
@@ -69,12 +61,6 @@ module Workarea
       Workarea.s3.expects(:put_bucket_cors).with(
         Configuration::S3.bucket,
         'CORSConfiguration' => [
-          {
-            'ID' => "direct_upload_http://test.host",
-            'AllowedMethod' => 'PUT',
-            'AllowedOrigin' => 'http://test.host',
-            'AllowedHeader' => '*'
-          },
           {
             'ID' => "direct_upload_http://localhost:3000",
             'AllowedMethod' => 'PUT',
@@ -86,18 +72,6 @@ module Workarea
       Workarea.s3.expects(:put_bucket_cors).with(
         Configuration::S3.bucket,
         'CORSConfiguration' => [
-          {
-            'ID' => "direct_upload_http://test.host",
-            'AllowedMethod' => 'PUT',
-            'AllowedOrigin' => 'http://test.host',
-            'AllowedHeader' => '*'
-          },
-          {
-            'ID' => "direct_upload_http://localhost:3000",
-            'AllowedMethod' => 'PUT',
-            'AllowedOrigin' => 'http://localhost:3000',
-            'AllowedHeader' => '*'
-          },
           {
             'ID' => "direct_upload_https://example.com",
             'AllowedMethod' => 'PUT',
@@ -107,31 +81,12 @@ module Workarea
         ]
       ).returns(true)
 
+
       assert(DirectUpload.ensure_cors!('http://test.host/admin/content_assets'))
       assert(DirectUpload.ensure_cors!('http://localhost:3000/admin/content_assets'))
       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/export_report_test.rb

@@ -11,56 +11,52 @@ module Workarea
     end
 
     def test_persistence
-      Workarea.with_config do |config|
-        config.reports_max_results = 1
-        csv = CSV.new(Tempfile.new)
-        export = ExportReport.new(Reports::SalesByProduct.new, csv)
+      Workarea.config.reports_max_results = 1
+      csv = CSV.new(Tempfile.new)
+      export = ExportReport.new(Reports::SalesByProduct.new, csv)
 
-        export.save!
-        assert_equal(2, export.collection.count)
+      export.save!
+      assert_equal(2, export.collection.count)
 
-        export.destroy!
-        assert_equal(0, export.collection.count)
-      end
+      export.destroy!
+      assert_equal(0, export.collection.count)
     end
 
     def test_csv_construction
-      Workarea.with_config do |config|
-        config.reports_max_results = 1
-
-        csv = CSV.new(Tempfile.new)
-        export = ExportReport.new(
-          Reports::SalesByProduct.new(sort_by: 'orders', sort_direction: 'desc'),
-          csv
-        )
-
-        export.perform!
-        results = csv.tap(&:rewind).read
-
-        assert_equal(3, results.size)
-        assert_equal(7, results.first.size)
-        assert_equal('_id', results.first[0])
-        assert_equal('orders', results.first[1])
-        assert_equal(7, results.second.size)
-        assert_equal('bar', results.second[0])
-        assert_equal('2', results.second[1])
-        assert_equal(7, results.third.size)
-        assert_equal('foo', results.third[0])
-        assert_equal('1', results.third[1])
-
-        assert_equal(0, export.collection.count)
-
-        csv = CSV.new(Tempfile.new)
-        export = ExportReport.new(
-          Reports::SalesByProduct.new(sort_by: 'orders', sort_direction: 'asc'),
-          csv
-        )
-
-        export.perform!
-        results = csv.tap(&:rewind).read
-        assert_equal('foo', results.second[0])
-        assert_equal('bar', results.third[0])
-      end
+      Workarea.config.reports_max_results = 1
+
+      csv = CSV.new(Tempfile.new)
+      export = ExportReport.new(
+        Reports::SalesByProduct.new(sort_by: 'orders', sort_direction: 'desc'),
+        csv
+      )
+
+      export.perform!
+      results = csv.tap(&:rewind).read
+
+      assert_equal(3, results.size)
+      assert_equal(10, results.first.size)
+      assert_equal('_id', results.first[0])
+      assert_equal('orders', results.first[1])
+      assert_equal(10, results.second.size)
+      assert_equal('bar', results.second[0])
+      assert_equal('2', results.second[1])
+      assert_equal(10, results.third.size)
+      assert_equal('foo', results.third[0])
+      assert_equal('1', results.third[1])
+
+      assert_equal(0, export.collection.count)
+
+      csv = CSV.new(Tempfile.new)
+      export = ExportReport.new(
+        Reports::SalesByProduct.new(sort_by: 'orders', sort_direction: 'asc'),
+        csv
+      )
+
+      export.perform!
+      results = csv.tap(&:rewind).read
+      assert_equal('foo', results.second[0])
+      assert_equal('bar', results.third[0])
     end
   end
 end

data/test/services/workarea/hash_update_test.rb

@@ -2,23 +2,23 @@ require 'test_helper'
 
 module Workarea
   class HashUpdateTest < TestCase
-    def test_result
-      original = { 'foo' => 'bar' }
+    def test_apply
+      hash = { 'foo' => 'bar' }
 
-      result = HashUpdate.new(original: original, adds: %w(key value)).result
-      assert_equal(%w(value), result['key'])
+      HashUpdate.new(adds: %w(key value)).apply(hash)
+      assert_equal(%w(value), hash['key'])
 
-      result = HashUpdate.new(original: original, updates: %w(foo baz)).result
-      assert_equal(%w(baz), result['foo'])
+      HashUpdate.new(updates: %w(foo baz)).apply(hash)
+      assert_equal(%w(baz), hash['foo'])
 
-      result = HashUpdate.new(original: original, removes: %w(foo)).result
-      refute_includes(result.keys, 'foo')
+      HashUpdate.new(removes: %w(foo)).apply(hash)
+      refute_includes(hash.keys, 'foo')
 
-      result = HashUpdate.new(original: original, adds: ['key', 'one, two ']).result
-      assert_equal(%w(one two), result['key'])
+      HashUpdate.new(adds: ['key', 'one, two ']).apply(hash)
+      assert_equal(%w(one two), hash['key'])
 
-      result = HashUpdate.new(original: original, updates: ['key', 'one,  two, three ']).result
-      assert_equal(%w(one two three), result['key'])
+      HashUpdate.new(updates: ['key', 'one,  two, three ']).apply(hash)
+      assert_equal(%w(one two three), hash['key'])
     end
   end
 end

data/test/services/workarea/packaging_test.rb

@@ -30,20 +30,18 @@ module Workarea
     end
 
     def test_total_dimensions
-      Workarea.with_config do |config|
-        Workarea.config.shipping_dimensions = [1, 2, 3]
+      Workarea.config.shipping_dimensions = [1, 2, 3]
 
-        packaging = Packaging.new(order)
-        assert_equal([1, 2, 3], packaging.total_dimensions)
+      packaging = Packaging.new(order)
+      assert_equal([1, 2, 3], packaging.total_dimensions)
 
-        create_shipping_sku(id: 'SKU1', dimensions: [2, 3, 4])
-        create_shipping_sku(id: 'SKU2', dimensions: [5, 6, 8])
+      create_shipping_sku(id: 'SKU1', dimensions: [2, 3, 4])
+      create_shipping_sku(id: 'SKU2', dimensions: [5, 6, 8])
 
-        packaging = Packaging.new(order)
-        assert_equal(8, packaging.total_dimensions.first)
-        assert_equal(6, packaging.total_dimensions.second)
-        assert_equal(12, packaging.total_dimensions.third)
-      end
+      packaging = Packaging.new(order)
+      assert_equal(8, packaging.total_dimensions.first)
+      assert_equal(6, packaging.total_dimensions.second)
+      assert_equal(12, packaging.total_dimensions.third)
     end
 
     def test_total_value

data/test/services/workarea/save_publishing_test.rb

@@ -42,5 +42,28 @@ module Workarea
 
       release.as_current { assert(product.reload.active?) }
     end
+
+    def test_saving_active_segment_ids
+      segment = create_segment
+      product = create_product(active: false)
+      release = create_release
+
+      save = SavePublishing.new(
+        product,
+        activate: release.id,
+        active_segment_ids: [segment.id]
+      )
+
+      assert(save.perform)
+
+      product.reload
+      refute(product.active?)
+      assert_equal([], product.active_segment_ids)
+
+      release.as_current do
+        Segment.with_current(segment) { assert(product.reload.active?) }
+        assert_equal([segment.id], product.active_segment_ids)
+      end
+    end
   end
 end

data/test/workers/sidekiq/callbacks_test.rb

@@ -133,9 +133,6 @@ module Sidekiq
       end
     end
 
-    class TestTrackingWorkerOne; end
-    class TestTrackingWorkerTwo; end
-
     setup :setup_sidekiq
     teardown :teardown_sidekiq
 
@@ -432,24 +429,5 @@ module Sidekiq
 
       assert(Worker.enabled?)
     end
-
-    def test_tracking_workers
-      current_workers = ::Rails.application.config.sidekiq_callbacks_workers
-      ::Rails.application.config.sidekiq_callbacks_workers = []
-
-      Sidekiq::Callbacks.add_worker(TestTrackingWorkerOne)
-      assert_includes(Sidekiq::Callbacks.workers, TestTrackingWorkerOne)
-
-      current_cache_classes = ::Rails.application.config.cache_classes
-      ::Rails.application.config.cache_classes = false
-      ::Rails.application.config.sidekiq_callbacks_workers = []
-
-      Sidekiq::Callbacks.add_worker(TestTrackingWorkerTwo)
-      assert_includes(Sidekiq::Callbacks.workers, TestTrackingWorkerTwo)
-
-    ensure
-      ::Rails.application.config.sidekiq_callbacks_workers = current_workers
-      ::Rails.application.config.cache_classes = current_cache_classes
-    end
   end
 end

data/test/workers/workarea/deactivate_stale_discounts_test.rb

@@ -4,7 +4,7 @@ module Workarea
   class DeactivateStaleDiscountsTest < TestCase
     def create_category_discount(attributes = {})
       before_ttl = (Workarea.config.discount_staleness_ttl + 1.day).ago
-      super(attributes.reverse_merge(updated_at: before_ttl))
+      super(attributes.reverse_merge(created_at: before_ttl))
     end
 
     def test_perform
@@ -71,7 +71,7 @@ module Workarea
     end
 
     def test_all_active_discount_ids
-      too_new = create_category_discount(active: true, updated_at: Time.current)
+      too_new = create_category_discount(active: true, created_at: Time.current)
       active = create_category_discount(active: true)
 
       worker = DeactivateStaleDiscounts.new

data/test/workers/workarea/index_category_changes_test.rb

@@ -25,15 +25,13 @@ module Workarea
 
       products = Array.new(4) { create_product }
 
-      Workarea.with_config do |config|
-        config.category_inline_index_product_max_count = 3
+      Workarea.config.category_inline_index_product_max_count = 3
 
-        IndexCategoryChanges.new.perform(
-          'product_ids' => [[], products.map(&:id)]
-        )
+      IndexCategoryChanges.new.perform(
+        'product_ids' => [[], products.map(&:id)]
+      )
 
-        assert_equal(2, BulkIndexProducts.jobs.size)
-      end
+      assert_equal(4, IndexProduct.jobs.size)
     ensure
       Sidekiq::Testing.inline!
     end

data/test/workers/workarea/keep_product_index_fresh_test.rb

@@ -34,7 +34,7 @@ module Workarea
       IndexProduct.perform(product_2)
       IndexProduct.perform(product_3)
 
-      current_last_indexed_at = product_1.last_indexed_at
+      current_last_indexed_at = product_1.reload.last_indexed_at
 
       travel_to(Time.current + 1.second)
       KeepProductIndexFresh.new.perform

data/test/workers/workarea/process_import_test.rb

@@ -53,11 +53,5 @@ module Workarea
         t('workarea.admin.data_file_mailer.import_failure.errors')
       )
     end
-
-    def test_perform_with_missing_import
-      assert_raises Mongoid::Errors::DocumentNotFound do
-        ProcessImport.new.perform('foo')
-      end
-    end
   end
 end

data/test/workers/workarea/process_search_recommendations_test.rb

@@ -3,9 +3,8 @@ require 'test_helper'
 module Workarea
   class ProcessSearchRecommendationsTest < Workarea::TestCase
     def test_processing_user_activity
-      Recommendation::UserActivity.create!(searches: %w(foo bars))
-      Recommendation::UserActivity.create!(searches: %w(foo @#$%))
-      2.times { Recommendation::UserActivity.create!(searches: %w(foos baz)) }
+      Metrics::User.create!(viewed: { search_ids: %w(foo bar) })
+      2.times { Metrics::User.create!(viewed: { search_ids: %w(foo baz) }) }
 
       ProcessSearchRecommendations.new.perform
 
@@ -14,9 +13,9 @@ module Workarea
     end
 
     def test_within_expiration
-      Recommendation::UserActivity.create!(searches: %w(1 2))
+      Metrics::User.create!(viewed: { search_ids: %w(1 2) })
       travel_to((Workarea.config.recommendation_expiration + 1.day).from_now)
-      2.times { Recommendation::UserActivity.create!(searches: %w(1 3)) }
+      2.times { Metrics::User.create!(viewed: { search_ids: %w(1 3) }) }
 
       ProcessSearchRecommendations.new.perform
 

data/test/workers/workarea/status_reporter_test.rb

@@ -12,7 +12,8 @@ module Workarea
 
       StatusReporter.new.perform
 
-      delivery_emails = ActionMailer::Base.deliveries.map(&:bcc).flatten
+      assert(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/synchronize_user_metrics_test.rb

@@ -0,0 +1,57 @@
+require 'test_helper'
+
+module Workarea
+  class SynchronizeUserMetricsTest < IntegrationTest
+    def test_enqueuing
+      Sidekiq::Testing.fake!
+      SynchronizeUserMetrics.async
+
+      assert_difference -> { SynchronizeUserMetrics.jobs.size }, 1 do
+        create_user
+      end
+
+      assert_difference -> { SynchronizeUserMetrics.jobs.size }, 2 do
+        user = create_user
+        user.update!(tags: %w(foo bar))
+      end
+
+      assert_difference -> { SynchronizeUserMetrics.jobs.size }, 2 do
+        user = create_user
+        user.update!(admin: true)
+      end
+
+      assert_difference -> { SynchronizeUserMetrics.jobs.size }, 1 do
+        create_user.update!(password: 's0m3th1ng_3ls3!')
+      end
+    end
+
+    def test_perform
+      user = create_user(tags: %w(foo bar))
+
+      assert_equal(1, Metrics::User.count)
+      metrics = Metrics::User.first
+      assert_equal(user.email, metrics.id)
+      assert_equal(user.tags, metrics.tags)
+
+      user.update!(tags: %w(bar baz))
+      assert_equal(1, Metrics::User.count)
+      assert_equal(%w(bar baz), metrics.reload.tags)
+
+      user.update!(admin: true)
+      assert_equal(1, Metrics::User.count)
+      assert(metrics.reload.admin?)
+
+      user.update!(admin: false)
+      assert_equal(1, Metrics::User.count)
+      refute(metrics.reload.admin?)
+
+      user.update!(super_admin: true)
+      assert_equal(1, Metrics::User.count)
+      assert(metrics.reload.admin?)
+
+      user.update!(super_admin: false)
+      assert_equal(1, Metrics::User.count)
+      refute(metrics.reload.admin?)
+    end
+  end
+end

data/test/workers/workarea/update_payment_profile_email_test.rb

@@ -0,0 +1,27 @@
+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

data/test/workers/workarea/verify_scheduled_releases_test.rb

@@ -41,31 +41,5 @@ module Workarea
       assert_equal('123', release.publish_job_id)
       assert_equal(0, @scheduled_set.size)
     end
-
-    def test_rescheduling_undo
-      release = create_release(published_at: Time.current, undo_at: Time.current + 1.hour)
-
-      assert(release.undo_job_id.present?)
-      original_job_id = release.undo_job_id
-      @scheduled_set.clear
-
-      VerifyScheduledReleases.new.perform
-      release.reload
-
-      refute_equal(original_job_id, release.undo_job_id)
-      assert_equal(1, @scheduled_set.size)
-    end
-
-    def test_skipping_undo_dates_in_the_past
-      release = create_release(published_at: Time.current)
-      release.update_attribute(:undo_at, Time.current - 1.hour)
-      release.update_attribute(:undo_job_id, '123')
-
-      VerifyScheduledReleases.new.perform
-      release.reload
-
-      assert_equal('123', release.undo_job_id)
-      assert_equal(0, @scheduled_set.size)
-    end
   end
 end

data/workarea-core.gemspec

@@ -17,14 +17,16 @@ Gem::Specification.new do |s|
   s.add_dependency 'bundler', '>= 1.8.0' # 1.8.0 added env variable for secrets
   s.add_dependency 'rails', '~> 5.2.0'
   s.add_dependency 'mongoid', '~> 6.4.0'
+  s.add_dependency 'bson', '~> 4.3.0'
   s.add_dependency 'bcrypt', '~> 3.1.10'
   s.add_dependency 'money-rails', '~> 1.12.0'
   s.add_dependency 'mongoid-audit_log', '>= 0.5.0'
   s.add_dependency 'mongoid-document_path', '~> 0.1.0'
   s.add_dependency 'mongoid-tree', '~> 2.1.0'
   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', '~> 1.2.1'
+  s.add_dependency 'kaminari', '~> 0.17.0'
   s.add_dependency 'kaminari-mongoid', '~> 0.1.2'
   s.add_dependency 'activemerchant', '~> 1.52'
   s.add_dependency 'dragonfly', '~> 1.1.2'
@@ -32,9 +34,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.6.3'
-  s.add_dependency 'redis-rails', '~> 5.0.0'
-  s.add_dependency 'redis-rack-cache', '~> 2.2.0'
+  s.add_dependency 'geocoder', '~> 1.4.4'
+  s.add_dependency 'redis-rack-cache', '~> 2.0.2'
   s.add_dependency 'easymon', '~> 1.4.0'
   s.add_dependency 'image_optim', '~> 0.26.0'
   s.add_dependency 'image_optim_pack', '0.5.0.20171101'
@@ -58,22 +59,23 @@ Gem::Specification.new do |s|
   s.add_dependency 'i18n-js', '~> 3.2.1'
   s.add_dependency 'local_time', '~> 1.0.3'
   s.add_dependency 'lodash-rails', '~> 4.17.4'
-  s.add_dependency 'jquery-rails', '~> 4.4.0'
+  s.add_dependency 'jquery-rails', '~> 4.3.1'
   s.add_dependency 'jquery-ui-rails', '~> 6.0.1'
   s.add_dependency 'tooltipster-rails', '~> 4.1.2'
   s.add_dependency 'chart-js-rails', '~> 0.0.9' # TODO remove v4
   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', '~> 6.3.1'
+  s.add_dependency 'wysihtml-rails', '~> 0.6.x'
+  s.add_dependency 'rack-attack', '~> 5.0.1'
   s.add_dependency 'jquery-livetype-rails', '~> 0.1.0' # TODO remove v4
-  s.add_dependency 'redcarpet', '~> 3.5.1', '>= 3.5.1'
+  s.add_dependency 'redcarpet', '~> 3.4.0'
   s.add_dependency 'jquery-unique-clone-rails', '~> 1.0.0'
   s.add_dependency 'avalanche-rails', '~> 1.2.0'
   s.add_dependency 'inline_svg', '~> 1.3.0'
   s.add_dependency 'haml', '~> 5.0.1'
   s.add_dependency 'ejs', '~> 1.1.1'
   s.add_dependency 'jbuilder', '~> 2.7.0'
+  s.add_dependency 'tribute', '~> 3.6.0.0'
   s.add_dependency 'turbolinks', '~> 5.0.1'
   s.add_dependency 'jquery-validation-rails', '~> 1.19.0'
   s.add_dependency 'minitest', '~> 5.10.3', '>= 5.10.1'
@@ -90,9 +92,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'referer-parser', '~> 0.3.0'
   s.add_dependency 'serviceworker-rails', '~> 0.5.5'
   s.add_dependency 'logstasher', '~> 1.2.2'
-  s.add_dependency 'chartkick', '~> 3.4.0'
-  s.add_dependency 'puma', '>= 4.3.1'
-  s.add_dependency 'rack' , '>= 2.1.4'
+  s.add_dependency 'chartkick', '~> 3.2.0'
+  s.add_dependency 'puma', '~> 4.0'
+  s.add_dependency 'browser', '~> 2.6.1'
 
   # HACK for vendoring active_shipping
   s.add_dependency 'active_utils', '~> 3.3.1'