workarea-admin 3.4.45 → 3.5.0.beta.1

data/test/view_models/workarea/admin/changeset_view_model_test.rb

@@ -52,20 +52,70 @@ module Workarea
       end
 
       def test_old_value_for
+        Sidekiq::Testing.fake! # setting publish_at will schedule the job, which runs inline
+
+        @release.update_attributes!(publish_at: nil)
         @releasable.update_attributes!(name: 'foo')
-        @changeset.update_attributes!(changeset: { 'name' => 'bar' })
+        @release.as_current { @releasable.update_attributes!(name: 'bar') }
+        changeset = @releasable.changesets.first
 
-        assert_equal('foo', @view_model.old_value_for('name'))
+        view_model = ChangesetViewModel.wrap(changeset)
+        assert_equal('foo', view_model.old_value_for('name'))
+        assert_equal('foo', @releasable.name)
 
-        @changeset.update_attributes!(
-          changeset: { 'name' => 'baz' },
-          undo: { 'name' => 'bar' }
-        )
+        @release.update_attributes!(publish_at: 1.week.from_now)
+        view_model = ChangesetViewModel.wrap(changeset.reload)
+        assert_equal('foo', view_model.old_value_for('name'))
+        assert_equal('foo', @releasable.name)
+
+        previous = create_release(publish_at: 1.day.from_now)
+        previous.as_current { @releasable.update_attributes!(name: 'baz') }
+
+        view_model = ChangesetViewModel.wrap(changeset.reload)
+        assert_equal('baz', view_model.old_value_for('name'))
+        assert_equal('foo', @releasable.name)
+
+        undo = create_release(undoes: @release)
+        undo_changeset = @release.changesets.first.build_undo(release: undo).tap(&:save!)
 
-        assert_equal('bar', @view_model.old_value_for('name'))
+        view_model = ChangesetViewModel.wrap(changeset.reload)
+        assert_equal('baz', view_model.old_value_for('name'))
+        assert_equal('foo', @releasable.name)
+
+        @release.update_attributes!(publish_at: nil)
+        view_model = ChangesetViewModel.wrap(changeset.reload)
+        assert_equal('foo', view_model.old_value_for('name'))
+        assert_equal('foo', @releasable.name)
+
+        undo.update_attributes!(publish_at: 1.week.from_now)
+        view_model = ChangesetViewModel.wrap(changeset.reload)
+        assert_equal('foo', view_model.old_value_for('name'))
+        assert_equal('foo', @releasable.name)
+
+        undo.update_attributes!(publish_at: 1.week.from_now)
+        view_model = ChangesetViewModel.wrap(undo_changeset.reload)
+        assert_equal('baz', view_model.old_value_for('name'))
+        assert_equal('foo', @releasable.name)
+
+        @release.update_attributes!(publish_at: 1.day.from_now)
+        view_model = ChangesetViewModel.wrap(undo_changeset.reload)
+        assert_equal('bar', view_model.old_value_for('name'))
+        assert_equal('foo', @releasable.name)
+
+        undo.update_attributes!(publish_at: nil)
+        view_model = ChangesetViewModel.wrap(undo_changeset.reload)
+        assert_equal('bar', view_model.old_value_for('name'))
+        assert_equal('foo', @releasable.name)
+
+        @release.update_attributes!(publish_at: nil)
+        view_model = ChangesetViewModel.wrap(undo_changeset.reload)
+        assert_equal('bar', view_model.old_value_for('name'))
+        assert_equal('foo', @releasable.name)
+      end
 
-        @changeset.update_attributes!(undo: { 'name' => { 'en' => 'baz' } })
-        assert_equal('baz', @view_model.old_value_for('name'))
+      def test_missing_root
+        @releasable.destroy
+        assert_nil(@view_model.root)
       end
     end
   end

data/test/view_models/workarea/admin/code_list_view_model_test.rb

@@ -21,11 +21,6 @@ module Workarea
 
         view_model = CodeListViewModel.wrap(code_list)
         assert_equal(1, view_model.used_count)
-
-        code_list.promo_codes.create!(code: "#{code_list.prefix}123")
-
-        view_model = CodeListViewModel.wrap(code_list)
-        assert_equal(1, view_model.used_count)
       end
 
       def test_last_used_at

data/test/view_models/workarea/admin/content_view_model_test.rb

@@ -13,17 +13,6 @@ module Workarea
           view_model.areas
         )
 
-        Workarea.with_config do |config|
-          config.content_areas['landing'] = %w(top bottom)
-          model = Content.new(contentable: create_page(template: 'landing'))
-          view_model = ContentViewModel.new(model)
-
-          assert_equal(
-            %w(top bottom),
-            view_model.areas
-          )
-        end
-
         model = Content.new(contentable: create_category)
         view_model = ContentViewModel.new(model)
 
@@ -39,6 +28,15 @@ module Workarea
           Workarea.config.content_areas['generic'],
           view_model.areas
         )
+
+        Workarea.config.content_areas['landing'] = %w(top bottom)
+        model = Content.new(contentable: create_page(template: 'landing'))
+        view_model = ContentViewModel.new(model)
+
+        assert_equal(
+          %w(top bottom),
+          view_model.areas
+        )
       end
 
       def test_new_block
@@ -98,6 +96,10 @@ module Workarea
         og_asset = view_model.open_graph_asset
         assert(og_asset.open_graph_placeholder?)
 
+        default_asset = create_asset(tag_list: 'og-default')
+        view_model = ContentViewModel.wrap(content)
+        assert_equal(default_asset, view_model.open_graph_asset)
+
         content.update_attributes(open_graph_asset_id: create_asset.id)
         view_model = ContentViewModel.wrap(content)
         og_asset = view_model.open_graph_asset

data/test/view_models/workarea/admin/insights/product_view_model_test.rb

@@ -77,13 +77,13 @@ module Workarea
 
           product = create_product(id: 'foo')
           view_model = ProductViewModel.wrap(product, starts_at: '2018-10-28', ends_at: '2018-10-29')
-          assert_equal(5.8, view_model.average_price)
-          assert_equal(5.0, view_model.previous_average_price)
+          assert_equal(11.6, view_model.average_price)
+          assert_equal(10, view_model.previous_average_price)
           assert_in_delta(15.999, view_model.average_price_percent_change)
 
           view_model = ProductViewModel.wrap(product, starts_at: '2018-10-29', ends_at: '2018-10-30')
-          assert_equal(5.5, view_model.average_price)
-          assert_in_delta(5.833, view_model.previous_average_price)
+          assert_equal(11, view_model.average_price)
+          assert_in_delta(11.666, view_model.previous_average_price)
           assert_in_delta(-5.714, view_model.average_price_percent_change)
         end
       end

data/test/view_models/workarea/admin/insights/segment_view_model_test.rb

@@ -0,0 +1,73 @@
+require 'test_helper'
+
+module Workarea
+  module Admin
+    module Insights
+      class SegmentViewModelTest < TestCase
+        def test_average_order_value
+          segment = create_segment
+
+          Metrics::SegmentByDay.inc(
+            key: { segment_id: segment.id },
+            at: Time.zone.local(2018, 10, 26),
+            orders: 1,
+            revenue: 10.to_m
+          )
+
+          Metrics::SegmentByDay.inc(
+            key: { segment_id: segment.id },
+            at: Time.zone.local(2018, 10, 27),
+            orders: 1,
+            revenue: 10.to_m
+          )
+
+          Metrics::SegmentByDay.inc(
+            key: { segment_id: segment.id },
+            at: Time.zone.local(2018, 10, 28),
+            orders: 2,
+            revenue: 15.to_m
+          )
+
+          Metrics::SegmentByDay.inc(
+            key: { segment_id: segment.id },
+            at: Time.zone.local(2018, 10, 29),
+            orders: 3,
+            revenue: 27.to_m
+          )
+
+          Metrics::SegmentByDay.inc(
+            key: { segment_id: 'bar' },
+            at: Time.zone.local(2018, 10, 27),
+            orders: 2,
+            revenue: 11.to_m
+          )
+
+          Metrics::SegmentByDay.inc(
+            key: { segment_id: 'bar' },
+            at: Time.zone.local(2018, 10, 28),
+            orders: 3,
+            revenue: 15.to_m
+          )
+
+          Metrics::SegmentByDay.inc(
+            key: { segment_id: 'bar' },
+            at: Time.zone.local(2018, 10, 29),
+            orders: 4,
+            revenue: 27.to_m
+          )
+
+
+          view_model = SegmentViewModel.wrap(segment, starts_at: '2018-10-28', ends_at: '2018-10-29')
+          assert_equal(8.4, view_model.average_order_value)
+          assert_equal(10, view_model.previous_average_order_value)
+          assert_in_delta(-15.999, view_model.average_order_value_percent_change)
+
+          view_model = SegmentViewModel.wrap(segment, starts_at: '2018-10-29', ends_at: '2018-10-30')
+          assert_equal(9, view_model.average_order_value)
+          assert_in_delta(8.333, view_model.previous_average_order_value)
+          assert_in_delta(7.999, view_model.average_order_value_percent_change)
+        end
+      end
+    end
+  end
+end

data/test/view_models/workarea/admin/product_rules_preview_view_model_test.rb

@@ -0,0 +1,37 @@
+require 'test_helper'
+
+module Workarea
+  module Admin
+    class ProductRulesPreviewViewModelTest < TestCase
+      def test_only_uses_active_rules
+        customization = create_search_customization(
+          id: 'foo',
+          product_rules: [
+            { name: 'excluded_products', operator: 'equals', value: '1' },
+            { name: 'excluded_products', operator: 'equals', value: '2', active: false }
+          ]
+        )
+
+        view_model = ProductRulesPreviewViewModel.wrap(customization)
+        assert(view_model.display_results?)
+        assert_equal(customization.product_rules.take(1), view_model.search.params[:rules])
+
+        category = create_category(
+          product_rules: [
+            { name: 'excluded_products', operator: 'equals', value: '1' },
+            { name: 'excluded_products', operator: 'equals', value: '2', active: false }
+          ]
+        )
+
+        view_model = ProductRulesPreviewViewModel.wrap(category)
+        assert(view_model.display_results?)
+        assert_equal(category.product_rules.take(1), view_model.search.params[:rules])
+
+        category.product_rules.first.update!(active: false)
+        view_model = ProductRulesPreviewViewModel.wrap(category)
+        refute(view_model.display_results?)
+        assert_empty(view_model.search.params[:rules])
+      end
+    end
+  end
+end

data/test/view_models/workarea/admin/product_view_model_test.rb

@@ -14,16 +14,14 @@ module Workarea
       end
 
       def test_templates_includes_template_options_without_test
-        Workarea.with_config do |config|
-          config.product_templates = [:foo, :test]
-          assert_equal(
-            [['Generic', 'generic'], ['Foo', 'foo']],
-            @view_model.templates
-          )
-        end
+        Workarea.config.product_templates = [:foo, :test]
+        assert_equal(
+          [['Generic', 'generic'], ['Foo', 'foo']],
+          @view_model.templates
+        )
       end
 
-      def test_variant_details
+      def test_options
         @view_model.variants.build(
           sku: 'SKU1',
           name: 'name',
@@ -42,7 +40,7 @@ module Workarea
 
         assert_equal(
           { 'Color' => ['Red', 'Black', 'White'], 'Size' => ['S', 'M', 'L'] },
-          @view_model.variant_details
+          @view_model.options
         )
       end
 
@@ -60,16 +58,12 @@ module Workarea
       end
 
       def test_customization_options
-        Workarea.with_config do |config|
-          config.customization_types = []
-          assert_equal([['None', nil]], @view_model.customization_options)
-        end
-
-        Workarea.with_config do |config|
-          config.customization_types = [FooBar]
-          customizations = @view_model.customization_options
-          assert_equal([['None', nil], ['Foo Bar', 'foo_bar']], customizations)
-        end
+        Workarea.config.customization_types = []
+        assert_equal([['None', nil]], @view_model.customization_options)
+
+        Workarea.config.customization_types = [FooBar]
+        customizations = @view_model.customization_options
+        assert_equal([['None', nil], ['Foo Bar', 'foo_bar']], customizations)
       end
 
       def test_pricing

data/test/view_models/workarea/admin/release_calendar_view_model_test.rb

@@ -31,6 +31,22 @@ module Workarea
         assert_equal(@release.id, day.first.id)
       end
 
+      def test_days_sorts_results
+        travel_to Time.zone.local(2019, 6, 24, 9, 35)
+
+        @release.update_attributes!(name: 'Third', publish_at: 3.hours.from_now)
+        create_release(name: 'First', published_at: 1.hour.ago)
+        create_release(name: 'Second', publish_at: 2.hours.from_now)
+
+        view_model = ReleaseCalendarViewModel.wrap(@release)
+        day = view_model.days[(@release.publish_at).strftime('%Y-%m-%d').to_s]
+
+        assert_equal(3, day.length)
+        assert_equal('First', day.first.name)
+        assert_equal('Second', day.second.name)
+        assert_equal('Third', day.third.name)
+      end
+
       def test_prev_week
         view_model = ReleaseCalendarViewModel.new(@release)
         assert_equal(Time.zone.today - 1.week, view_model.prev_week)

data/test/view_models/workarea/admin/release_view_model_test.rb

@@ -3,76 +3,33 @@ require 'test_helper'
 module Workarea
   module Admin
     class ReleaseViewModelTest < TestCase
-      setup :set_release
+      def test_calendar_on_returns_the_rescheduled_date
+        release = create_release
 
-      def set_release
-        @release = create_release
-      end
-
-      def test_published_on_date_returns_true_if_the_release_was_published_on_the_supplied_date
-        @release.published_at = Time.current
-        @release.save!
-
-        view_model = ReleaseViewModel.new(@release)
-        assert(view_model.published_on_date?(Date.current))
-      end
-
-      def test_published_on_returns_true_if_the_release_was_scheduled_for_the_supplied_date
-        @release.publish_at = Time.current + 1.day
-        @release.save!
-
-        view_model = ReleaseViewModel.new(@release)
-        assert(view_model.published_on_date?(Date.current + 1.day))
-      end
-
-      def test_ended_on_date
-        @release.published_at = Time.current
-        @release.undo_at = Time.current + 1.month
-        @release.save!
-
-        view_model = ReleaseViewModel.new(@release)
-        assert(view_model.ended_on_date?(Date.current + 1.month))
-      end
-
-      def test_content_release
-        view_model = ReleaseViewModel.new(@release)
-        assert(view_model.content_release?)
-      end
-
-      def test_publish_time_returns_the_rescheduled_publish_time
-        now = Time.current
-
-        @release.published_at = now - 1.month
-        @release.publish_at = now + 1.month
-        @release.save!
-
-        view_model = ReleaseViewModel.new(@release)
-        assert_equal(now + 1.month, view_model.publish_time)
-      end
-
-      def test_publish_time_returns_the_time_it_was_published_if_not_rescheduled
-        now = Time.current
-
-        @release.published_at = now - 1.month
-        @release.save!
+        release.published_at = Date.current - 1.month
+        release.publish_at = Date.current + 1.month
+        view_model = ReleaseViewModel.wrap(release)
+        assert_equal(Date.current + 1.month, view_model.calendar_on)
 
-        view_model = ReleaseViewModel.new(@release)
-        assert_equal(now - 1.month, view_model.publish_time)
+        release.publish_at = nil
+        view_model = ReleaseViewModel.wrap(release)
+        assert_equal(Date.current - 1.month, view_model.calendar_on)
       end
 
       def test_nil_changesets_are_excluded_from_changesets_with_releasable
+        release = create_release
         pricing_sku = create_pricing_sku(prices: [{ regular: 3, sale: 1, min_quantity: 1 }])
         releasable = pricing_sku.prices.first
         releasable.changesets.create!(
-          release: @release,
+          release: release,
           document_path: releasable.document_path
         )
 
-        view_model = ReleaseViewModel.new(@release)
+        view_model = ReleaseViewModel.new(release)
         assert_equal(view_model.changesets_with_releasable.length, 1)
 
         pricing_sku.prices.first.delete
-        view_model = ReleaseViewModel.new(@release)
+        view_model = ReleaseViewModel.new(release)
         assert_empty(view_model.changesets_with_releasable)
       end
     end

data/test/view_models/workarea/admin/releases_feed_view_model_test.rb

@@ -4,35 +4,22 @@ module Workarea
   module Admin
     class ReleasesFeedViewModelTest < TestCase
       def test_calendar
-        foo_publish_at = 1.hour.from_now
-        foo_undo_at = 2.hours.from_now
-        foo_release = create_release(
-          name: 'Foo',
-          publish_at: foo_publish_at,
-          undo_at: foo_undo_at
-        )
+        foo_release = create_release(name: 'Foo', publish_at: 1.hour.from_now)
+        bar_release = create_release(name: 'Bar', publish_at: 1.week.from_now)
 
-        bar_publish_at = 1.week.from_now
-        bar_undo_at = 2.weeks.from_now
-        bar_release = create_release(
-          name: 'Bar',
-          publish_at: bar_publish_at,
-          undo_at: bar_undo_at
-        )
-
-        vm = ReleasesFeedViewModel.wrap(nil)
-        feed = vm.calendar
+        view_model = ReleasesFeedViewModel.new
+        feed = view_model.calendar
 
         assert_equal(2, feed.events.length)
 
         assert_equal('Foo', feed.events.first.summary)
         assert_equal('Bar', feed.events.second.summary)
 
-        assert_equal(foo_publish_at.to_s, feed.events.first.dtstart.to_s)
-        assert_equal(foo_undo_at.to_s, feed.events.first.dtend.to_s)
+        assert_equal(foo_release.publish_at.to_s, feed.events.first.dtstart.to_s)
+        assert(feed.events.first.dtend.present?)
 
-        assert_equal(bar_publish_at.to_date.to_s, feed.events.second.dtstart.to_s)
-        assert_equal(bar_undo_at.to_date.to_s, feed.events.second.dtend.to_s)
+        assert_equal(bar_release.publish_at.to_s, feed.events.second.dtstart.to_s)
+        assert(feed.events.second.dtend.present?)
       end
     end
   end

data/test/view_models/workarea/admin/reports/timeline_view_model_test.rb

@@ -0,0 +1,76 @@
+require 'test_helper'
+
+module Workarea
+  module Admin
+    module Reports
+      class TimelineViewModelTest < TestCase
+        setup :create_metrics
+
+        def create_metrics
+          Metrics::SalesByDay.inc(
+            at: Time.zone.local(2018, 1, 1),
+            revenue: 14.99,
+            orders: 10,
+            units_sold: 15,
+            customers: 3
+          )
+
+          Metrics::SalesByDay.inc(
+            at: Time.zone.local(2018, 1, 2),
+            revenue: 34.22,
+            orders: 5,
+            units_sold: 9,
+            customers: 13
+          )
+
+          create_release(published_at: Time.zone.local(2018, 1, 1))
+
+          travel_to Time.zone.local(2018, 1, 3)
+        end
+
+        def test_summary_data
+          report = Workarea::Reports::SalesOverTime.new(
+            starts_at: 2.days.ago,
+            group_by: 'day'
+          )
+
+          view_model = TimelineViewModel.wrap(report)
+
+          assert_equal(14.99 + 34.22, view_model.summary[:revenue])
+          assert_equal(15, view_model.summary[:orders])
+          assert_equal(24, view_model.summary[:units_sold])
+          assert_equal(16, view_model.summary[:customers])
+          assert_equal(1, view_model.summary[:releases])
+        end
+
+        def test_graph_data
+          report = Workarea::Reports::SalesOverTime.new(
+            starts_at: 2.days.ago,
+            group_by: 'day'
+          )
+
+          view_model = TimelineViewModel.wrap(report)
+
+          labels = view_model.graph_data[:labels]
+          assert_equal(3, labels.size)
+
+          assert_equal(Time.zone.local(2018, 1, 3).to_date, labels.first)
+          assert_equal(Time.zone.local(2018, 1, 2).to_date, labels.second)
+          assert_equal(Time.zone.local(2018, 1, 1).to_date, labels.third)
+
+          datasets = view_model.graph_data[:datasets]
+          assert_equal({ x: labels.third.to_time, y: 14.99 }, datasets[:revenue].third)
+          assert_equal({ x: labels.second.to_time, y: 34.22 }, datasets[:revenue].second)
+          assert_equal({ x: labels.third.to_time, y: 10 }, datasets[:orders].third)
+          assert_equal({ x: labels.second.to_time, y: 5 }, datasets[:orders].second)
+          assert_equal({ x: labels.third.to_time, y: 15 }, datasets[:units_sold].third)
+          assert_equal({ x: labels.second.to_time, y: 9 }, datasets[:units_sold].second)
+          assert_equal({ x: labels.third.to_time, y: 3 }, datasets[:customers].third)
+          assert_equal({ x: labels.second.to_time, y: 13 }, datasets[:customers].second)
+          assert_equal({ x: labels.third.to_time, y: 1 }, datasets[:releases].third)
+          assert_equal({ x: labels.second.to_time, y: 0 }, datasets[:releases].second)
+        end
+      end
+    end
+  end
+end

data/test/view_models/workarea/admin/search_analysis_view_model_test.rb

@@ -39,24 +39,22 @@ module Workarea
         BulkIndexProducts.perform
         view_model = SearchAnalysisViewModel.wrap(customization)
 
-        Workarea.with_config do |config|
-          config.storefront_search_middleware = SwappableList.new(
-            %w(
-              Workarea::Search::StorefrontSearch::Redirect
-              Workarea::Search::StorefrontSearch::ExactMatches
-              Workarea::Search::StorefrontSearch::ProductMultipass
-              Workarea::Search::StorefrontSearch::SpellingCorrection
-              Workarea::Search::StorefrontSearch::Template
-            )
+        Workarea.config.storefront_search_middleware = SwappableList.new(
+          %w(
+            Workarea::Search::StorefrontSearch::Redirect
+            Workarea::Search::StorefrontSearch::ExactMatches
+            Workarea::Search::StorefrontSearch::ProductMultipass
+            Workarea::Search::StorefrontSearch::SpellingCorrection
+            Workarea::Search::StorefrontSearch::Template
           )
+        )
 
-          assert_equal(5, view_model.middleware.size)
-          assert_equal(:pass, view_model.middleware[Search::StorefrontSearch::Redirect])
-          assert_equal(:last, view_model.middleware[Search::StorefrontSearch::ExactMatches])
-          assert_equal(:ignore, view_model.middleware[Search::StorefrontSearch::ProductMultipass])
-          assert_equal(:ignore, view_model.middleware[Search::StorefrontSearch::SpellingCorrection])
-          assert_equal(:ignore, view_model.middleware[Search::StorefrontSearch::Template])
-        end
+        assert_equal(5, view_model.middleware.size)
+        assert_equal(:pass, view_model.middleware[Search::StorefrontSearch::Redirect])
+        assert_equal(:last, view_model.middleware[Search::StorefrontSearch::ExactMatches])
+        assert_equal(:ignore, view_model.middleware[Search::StorefrontSearch::ProductMultipass])
+        assert_equal(:ignore, view_model.middleware[Search::StorefrontSearch::SpellingCorrection])
+        assert_equal(:ignore, view_model.middleware[Search::StorefrontSearch::Template])
       end
 
       def test_tokens

data/test/view_models/workarea/admin/timeline_view_model_test.rb

@@ -16,7 +16,7 @@ module Workarea
         assert_equal(view_model.upcoming_changesets.first.release_id, release.id)
 
         release = create_release(name: 'Bar', publish_at: 4.days.from_now)
-        release.as_current { @releasable.update_attributes!(name: 'Changed') }
+        release.as_current { @releasable.update_attributes!(name: 'Changed Again') }
 
         view_model = TimelineViewModel.new(@releasable)
         assert_equal(view_model.upcoming_changesets.length, 2)