workarea-admin 3.5.0.beta.1 → 3.5.0

data/test/integration/workarea/admin/data_file_imports_integration_test.rb

@@ -79,6 +79,14 @@ module Workarea
 
           file = create_tempfile(response.body, extension: file_type)
           assert(IO.read(file.path).present?)
+          assert_equal(
+            "#{MIME::Types.type_for(file_type).first.to_s}; charset=utf-8",
+            response.headers['Content-Type']
+          )
+          assert_equal(
+            %(attachment; filename="catalog product.#{file_type}"),
+            response.headers['Content-Disposition']
+          )
 
           assert_no_changes 'Catalog::Product.first' do
             post admin.data_file_imports_path,

data/test/integration/workarea/admin/fulfillment_skus_integration_test.rb

@@ -10,7 +10,7 @@ module Workarea
           params: {
             sku: {
               id: 'SKU1',
-              policy: 'ignore',
+              policy: 'shipping',
             }
           }
 
@@ -19,7 +19,7 @@ module Workarea
 
         sku = Fulfillment::Sku.first
         assert_equal('SKU1', sku.id)
-        assert_equal('ignore', sku.policy)
+        assert_equal('shipping', sku.policy)
       end
 
       def test_update

data/test/system/workarea/admin/alerts_system_test.rb

@@ -6,8 +6,10 @@ module Workarea
       include Admin::IntegrationTest
 
       def test_admins_see_a_list_of_alerts
+        segment = create_segment
+
         create_product(images: [], description: nil)
-        create_product(variants: [])
+        create_product(variants: [], active_segment_ids: [segment.id])
         create_product(variants: [{ sku: 'NODETAILS' }])
         create_product(
           variants: [
@@ -19,9 +21,10 @@ module Workarea
         create_release(name: 'Foo', publish_at: 1.hour.from_now)
         create_inventory(id: 'NODETAILS', policy: :standard, available: 1)
 
+        segment.destroy!
         visit admin.root_path
-        assert(page.has_content?('9 Alerts'))
-        find('button', text: '9 Alerts').hover
+        assert(page.has_content?('10 Alerts'))
+        find('button', text: '10 Alerts').hover
 
         within '#alert_menu' do
           assert(page.has_content?('1 empty category'))
@@ -32,6 +35,7 @@ module Workarea
           assert(page.has_content?('1 product with low inventory'))
           assert(page.has_content?('2 products with variants missing details'))
           assert(page.has_content?('1 product with inconsistent variant details'))
+          assert(page.has_content?(t('workarea.admin.layout.alert.missing_segments', count: 1)))
           assert_match(/Foo publishes on/, page.text)
         end
 

data/test/system/workarea/admin/content_system_test.rb

@@ -63,6 +63,52 @@ module Workarea
         assert(page.has_selector?('.ui-sortable'))
       end
 
+      def test_active_by_segment
+        create_life_cycle_segments
+        create_content(name: 'home_page')
+
+        visit admin.content_index_path
+        click_link 'Home Page'
+        within '.card--content' do
+          click_link 'Content'
+        end
+
+        click_link 'add_new_block'
+        click_link 'HTML'
+
+        fill_in 'block[data][html]', with: '<h1>Some Content!</h1>'
+        click_button 'create_block'
+        assert(page.has_content?('Success'))
+
+        find('.content-block-list__name', text: 'HTML').click
+        find('.tabs__menu-link', text: t('workarea.admin.content.form.display')).click
+
+        within '.tabs__panel' do
+          find('.select2-selection--multiple').click
+        end
+
+        find('.select2-results__option:first-of-type').click
+
+        find('body').click # close the select2 UI
+
+        click_button t('workarea.admin.form.save_changes')
+        assert(page.has_content?('Success'))
+
+        find('.content-block-list__name', text: 'HTML').click
+        click_link t('workarea.admin.content.form.display')
+
+        assert_selector('.select2-selection__choice')
+        find('.select2-selection__choice__remove').click
+
+        click_button t('workarea.admin.form.save_changes')
+        assert(page.has_content?('Success'))
+
+        find('.content-block-list__name', text: 'HTML').click
+        click_link t('workarea.admin.content.form.display')
+
+        refute_selector('.select2-selection__choice')
+      end
+
       def test_managing_content_blocks_for_a_release
         home = create_content(name: 'home_page', blocks: [])
         release = create_release(name: 'Foo')

data/test/system/workarea/admin/guest_browsing_system_test.rb

@@ -35,7 +35,7 @@ module Workarea
           click_button t('workarea.admin.toolbar.stop_guest_browsing')
         end
 
-        assert_current_path(admin.users_path)
+        assert_current_path(admin.root_path)
         assert(page.has_content?('Success'))
       end
 

data/test/system/workarea/admin/orders_system_test.rb

@@ -57,9 +57,9 @@ module Workarea
 
       def test_payment
         Workarea.config.checkout_payment_action = {
-          not_shipped: 'authorize!',
-          shipped: 'authorize!',
-          mixed: 'authorize!'
+          shipping: 'authorize!',
+          partial_shipping: 'authorize!',
+          no_shipping: 'authorize!'
         }
 
         order = create_placed_order

data/test/system/workarea/admin/payment_transactions_system_test.rb

@@ -7,9 +7,9 @@ module Workarea
 
       def test_viewing_transactions
         Workarea.config.checkout_payment_action = {
-          not_shipped: 'authorize!',
-          shipped: 'authorize!',
-          mixed: 'authorize!'
+          shipping: 'authorize!',
+          partial_shipping: 'authorize!',
+          no_shipping: 'authorize!'
         }
 
         order = create_placed_order(id: 'FOO')

data/test/system/workarea/admin/reports_system_test.rb

@@ -473,11 +473,60 @@ module Workarea
       end
 
       def test_reports_chart
+        yesterday = 1.day.ago
+        last_week = 1.week.ago
+
+        create_release(name: 'Foo Release', published_at: yesterday)
+
+        visit admin.timeline_report_path
+
         # Since we don't explicitly depend on Chart.js, but rather depend on
         # ChartKick which depends on Chart.js, we want to make sure the library
         # still works as we upgrade ChartKick.
-        visit admin.timeline_report_path
         assert_match(/class=('|")chartjs-render-monitor/, page.body)
+
+        within '.timeline-report__sidebar' do
+          assert_text 'Foo Release'
+          click_link 'Foo Release'
+        end
+
+        within '.tooltipster-box' do
+          assert_text 'Foo Release'
+        end
+
+        find('body').click # close tooltip
+
+        click_link t('workarea.admin.reports.timeline.add_custom')
+
+        within '.tooltipster-box' do
+          fill_in 'custom_event[name]', with: 'Foo Event'
+          fill_in 'custom_event_occurred_at_date', with: yesterday.strftime('%Y-%m-%d')
+          click_button t('workarea.admin.reports.timeline.add_custom_event')
+        end
+
+        within '.timeline-report__event-group' do
+          assert_text 'Foo Release'
+          assert_text 'Foo Event'
+          click_link 'Foo Event'
+        end
+
+        within '.tooltipster-box' do
+          fill_in 'custom_event[name]', with: 'Bar Event'
+          fill_in t('workarea.admin.js.datetime_picker.date'), with: last_week.strftime('%Y-%m-%d')
+          click_button t('workarea.admin.reports.timeline.update_event')
+        end
+
+        within '.timeline-report__event-group:first-of-type' do
+          refute_text 'Foo Release'
+          refute_text 'Foo Event'
+          assert_text 'Bar Event'
+        end
+
+        within '.timeline-report__event-group:last-of-type' do
+          assert_text 'Foo Release'
+          refute_text 'Foo Event'
+          refute_text 'Bar Event'
+        end
       end
     end
   end

data/test/system/workarea/admin/segments_system_test.rb

@@ -47,11 +47,11 @@ module Workarea
       end
 
       def test_managing_active_by_segment
-        one = create_segment(name: 'Foo')
-        two = create_segment(name: 'Bar')
-        three = create_segment(name: 'Baz')
+        create_segment(name: 'Foo')
+        bar_segment = create_segment(name: 'Bar')
+        create_segment(name: 'Baz')
 
-        category = create_category(active: false, active_segment_ids: [])
+        category = create_category(name: 'Test Category', active: false, active_segment_ids: [])
         visit admin.edit_catalog_category_path(category)
 
         within '.active-field' do
@@ -95,6 +95,34 @@ module Workarea
 
         assert_selector('.select2-selection__choice', text: 'Bar')
         assert_selector('.select2-selection__choice', text: 'Baz')
+
+        visit admin.segment_path(bar_segment)
+        assert_content('Test Category')
+        click_link t('workarea.admin.segments.cards.segmentables.header')
+        assert_content('Test Category')
+      end
+
+      def test_publishing_by_segment
+        create_segment(name: 'Bar')
+        visit admin.create_catalog_categories_path
+        fill_in 'category[name]', with: 'Test Category'
+        click_button 'save_setup'
+
+        assert(page.has_content?('Success'))
+        click_link t('workarea.admin.create_catalog_categories.workflow.skip_this')
+        click_link t('workarea.admin.create_catalog_categories.workflow.skip_this')
+        click_link t('workarea.admin.create_catalog_categories.workflow.skip_this')
+
+
+        find('#publish-segments').click
+        assert_content(t('workarea.admin.segments.publish.description'))
+        find('.select2-selection--multiple').click
+        find('.select2-results__option', text: 'Bar').click
+        click_button 'publish'
+
+        assert(page.has_content?('Success'))
+        click_link t('workarea.admin.cards.attributes.title')
+        assert_content('Bar')
       end
 
       def test_insights

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

@@ -23,7 +23,20 @@ module Workarea
             customers: 13
           )
 
-          create_release(published_at: Time.zone.local(2018, 1, 1))
+          create_release(
+            name: 'Foo Release',
+            published_at: Time.zone.local(2018, 1, 1)
+          )
+
+          Workarea::Reports::CustomEvent.create!(
+            name: 'Foo Event',
+            occurred_at: Time.zone.local(2018, 1, 2, 12)
+          );
+
+          Workarea::Reports::CustomEvent.create!(
+            name: 'Bar Event',
+            occurred_at: Time.zone.local(2018, 1, 2, 6)
+          );
 
           travel_to Time.zone.local(2018, 1, 3)
         end
@@ -41,6 +54,7 @@ module Workarea
           assert_equal(24, view_model.summary[:units_sold])
           assert_equal(16, view_model.summary[:customers])
           assert_equal(1, view_model.summary[:releases])
+          assert_equal(2, view_model.summary[:custom_events])
         end
 
         def test_graph_data
@@ -69,6 +83,23 @@ module Workarea
           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)
+          assert_equal({ x: labels.second.to_time, y: 2 }, datasets[:custom_events].second)
+        end
+
+        def test_events
+          report = Workarea::Reports::SalesOverTime.new(
+            starts_at: 2.days.ago,
+            group_by: 'day'
+          )
+
+          view_model = TimelineViewModel.wrap(report)
+
+          assert_equal(1, view_model.events[Time.zone.local(2018, 1, 1).to_date].count)
+          assert_equal(2, view_model.events[Time.zone.local(2018, 1, 2).to_date].count)
+
+          assert_equal('Foo Release', view_model.events[Time.zone.local(2018, 1, 1).to_date].first.name)
+          assert_equal('Bar Event', view_model.events[Time.zone.local(2018, 1, 2).to_date].first.name)
+          assert_equal('Foo Event', view_model.events[Time.zone.local(2018, 1, 2).to_date].second.name)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-admin
 version: !ruby/object:Gem::Version
-  version: 3.5.0.beta.1
+  version: 3.5.0
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-07 00:00:00.000000000 Z
+date: 2019-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: workarea-core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0.beta.1
+        version: 3.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0.beta.1
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: workarea-storefront
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0.beta.1
+        version: 3.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0.beta.1
+        version: 3.5.0
 description: Provides site administration functionality for the Workarea Commerce
   Platform.
 email:
@@ -371,6 +371,7 @@ files:
 - app/assets/stylesheets/workarea/admin/components/_takeover.scss
 - app/assets/stylesheets/workarea/admin/components/_text_box.scss
 - app/assets/stylesheets/workarea/admin/components/_text_button.scss
+- app/assets/stylesheets/workarea/admin/components/_timeline_report.scss
 - app/assets/stylesheets/workarea/admin/components/_toggle_button.scss
 - app/assets/stylesheets/workarea/admin/components/_top_help_articles.scss
 - app/assets/stylesheets/workarea/admin/components/_view.scss
@@ -446,6 +447,7 @@ files:
 - app/controllers/workarea/admin/create_releases_controller.rb
 - app/controllers/workarea/admin/create_segments_controller.rb
 - app/controllers/workarea/admin/create_users_controller.rb
+- app/controllers/workarea/admin/custom_events_controller.rb
 - app/controllers/workarea/admin/dashboards_controller.rb
 - app/controllers/workarea/admin/data_file_exports_controller.rb
 - app/controllers/workarea/admin/data_file_imports_controller.rb
@@ -488,6 +490,7 @@ files:
 - app/controllers/workarea/admin/searches_controller.rb
 - app/controllers/workarea/admin/segment_overrides_controller.rb
 - app/controllers/workarea/admin/segment_rules_controller.rb
+- app/controllers/workarea/admin/segmentables_controller.rb
 - app/controllers/workarea/admin/segments_controller.rb
 - app/controllers/workarea/admin/shipping_services_controller.rb
 - app/controllers/workarea/admin/shippings_controller.rb
@@ -1114,6 +1117,7 @@ files:
 - app/views/workarea/admin/segment_rules/summaries/_sessions.html.haml
 - app/views/workarea/admin/segment_rules/summaries/_tags.html.haml
 - app/views/workarea/admin/segment_rules/summaries/_traffic_referrer.html.haml
+- app/views/workarea/admin/segmentables/index.html.haml
 - app/views/workarea/admin/segments/_cards.html.haml
 - app/views/workarea/admin/segments/_publish.html.haml
 - app/views/workarea/admin/segments/edit.html.haml
@@ -1281,6 +1285,7 @@ files:
 - test/dummy/public/favicon.ico
 - test/dummy/script/rails
 - test/helpers/workarea/admin/application_helper_test.rb
+- test/helpers/workarea/admin/facets_helper_test.rb
 - test/helpers/workarea/admin/icons_helper_test.rb
 - test/helpers/workarea/admin/imports_helper_test.rb
 - test/helpers/workarea/admin/insights_helper_test.rb
@@ -1312,6 +1317,7 @@ files:
 - test/integration/workarea/admin/create_releases_integration_test.rb
 - test/integration/workarea/admin/create_segments_integration_test.rb
 - test/integration/workarea/admin/create_users_integration_test.rb
+- test/integration/workarea/admin/custom_events_integration_test.rb
 - test/integration/workarea/admin/data_file_exports_integration_test.rb
 - test/integration/workarea/admin/data_file_imports_integration_test.rb
 - test/integration/workarea/admin/direct_uploads_integration_test.rb
@@ -1509,9 +1515,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.6
 signing_key: