workarea-admin 3.4.45 → 3.5.0.beta.1

data/config/routes.rb

@@ -50,8 +50,12 @@ Workarea::Admin::Engine.routes.draw do
       only: [:show, :edit, :update], controller: :bulk_action_exports
 
     resources :commentables, only: [] do
-      resources :comments, except: :new
-      get :unsubscribe, to: 'comments#unsubscribe'
+      resources :comments, except: :new do
+        collection do
+          put :subscribe
+          put :unsubscribe
+        end
+      end
     end
 
     resources :content_assets do
@@ -104,14 +108,20 @@ Workarea::Admin::Engine.routes.draw do
     resources :releases do
       resources :changesets, only: [:index, :destroy]
       resources :releasables, only: [:index, :show]
+      resource :undo, controller: 'create_release_undos', only: [:new, :create] do
+        get :review
+        post :complete
+      end
 
       member do
         get 'edit_for/:type', action: :edit_for, as: :edit_for
+        get :undo
+        get :original
         patch :publish
-        patch :undo
       end
 
       collection do
+        get 'list'
         get 'calendar_feed/:token/site_planner.ics', action: :calendar_feed, as: :calendar_feed
       end
     end
@@ -131,10 +141,12 @@ Workarea::Admin::Engine.routes.draw do
       get :sales_by_country
       get :sales_by_discount
       get :sales_by_product
-      get :sales_by_traffic_referrer
       get :sales_by_sku
+      get :sales_by_tender
+      get :sales_by_traffic_referrer
       get :sales_over_time
       get :searches
+      get :timeline
 
       post :export
       get '/:id/download', action: :download, as: :download
@@ -146,6 +158,7 @@ Workarea::Admin::Engine.routes.draw do
       member do
         get :attributes
         get :timeline
+        get :fraud
       end
 
       resources :shippings, only: :index
@@ -159,6 +172,9 @@ Workarea::Admin::Engine.routes.draw do
     resources :payment_transactions, only: [:index, :show]
 
     resources :fulfillments, only: :show
+    resources :fulfillment_skus do
+      resources :fulfillment_tokens, as: :tokens
+    end
 
     resources :catalog_products, except: [:new, :create] do
       resources :variants, controller: 'catalog_variants', except: :show do
@@ -296,6 +312,8 @@ Workarea::Admin::Engine.routes.draw do
     end
 
     resources :pricing_discounts, except: [:new, :create] do
+      resources :redemptions, only: [:index], controller: 'pricing_discount_redemptions'
+
       member do
         get :rules
         get :insights
@@ -334,6 +352,38 @@ Workarea::Admin::Engine.routes.draw do
         get :addresses
         get :permissions
         get :insights
+        post :send_password_reset
+        patch :unlock
+      end
+    end
+
+    resources :unsubscribes, only: [] do
+      member do
+        get :status_report
+        get :commentable
+      end
+    end
+
+    resources :segments, except: [:new, :create] do
+      resources :rules, except: [:show, :new, :edit], controller: 'segment_rules'
+
+      member do
+        get :insights
+      end
+    end
+    resource :segment_override, only: [:show, :create]
+    resources :segment_rules, only: [] do
+      collection do
+        get :geolocation_options
+      end
+    end
+
+    resources :create_segments, except: :show do
+      member do
+        get :rules
+        get :new_rule
+        get 'edit_rule/:rule_id', action: :edit_rule, as: :edit_rule
+        get :review
       end
     end
 
@@ -341,7 +391,7 @@ Workarea::Admin::Engine.routes.draw do
 
     resources :shipping_services
     resources :tax_categories do
-      resources :tax_rates, only: :index, as: :rates, path: 'rates'
+      resources :tax_rates, except: :show, as: :rates, path: 'rates'
     end
 
     get 'toolbar', to: 'toolbar#show', as: 'toolbar'
@@ -368,5 +418,7 @@ Workarea::Admin::Engine.routes.draw do
     get :settings
   end
 
+  resource :configuration, only: [:show, :update]
+
   root to: 'dashboards#index', via: :get
 end

data/lib/workarea/mailer_previews/admin/status_report_mailer_preview.rb

@@ -2,7 +2,9 @@ module Workarea
   module Admin
     class StatusReportMailerPreview < ActionMailer::Preview
       def report
-        StatusReportMailer.report('test@workarea.com', Date.current)
+        user = User.status_email_recipients.to_a.first
+        email = user&.email || 'test@workarea.com'
+        StatusReportMailer.report(email, user: user)
       end
     end
   end

data/public/workarea/import_samples/tax_rates.csv

@@ -1,3 +1,3 @@
-state,zip_code,tax_region_name,tax_region_code,estimated_combined_rate,state_rate,county_rate,city_rate,special_rate,country,tier_min,tier_max,charge_on_shipping
-PA,19106,PHILADELPHIA COUNTY,BMWV,0.080000,0.060000,0.020000,0,0,US,0,10000.00,false
-PA,19021,,,0.060000,,,,,,,
+state,zip_code,tax_region_name,tax_region_code,estimated_combined_rate,federal_rate,state_rate,county_rate,city_rate,special_rate,country,tier_min,tier_max,charge_on_shipping
+PA,19106,PHILADELPHIA COUNTY,BMWV,0.080000,0,0.060000,0.020000,0,0,US,0,10000.00,false
+PA,19021,,,0.060000,0,0.060000,0,0,0,,,

data/test/dummy/config/initializers/session_store.rb

@@ -1,3 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
-Rails.application.config.session_store :cookie_store, key: '_dummy_session'
+Rails.application.config.session_store :cookie_store, key: '_dummy_session', expire_after: 30.minutes

data/test/helpers/workarea/admin/application_helper_test.rb

@@ -78,22 +78,6 @@ module Workarea
         result = pagination_path_for(page: 2)
         assert_equal('/foo?asdf=blah&page=2', result)
       end
-
-      def test_duration_in_words
-        assert_equal(
-          t('workarea.duration.days', count: 2),
-          duration_in_words(2.days)
-        )
-
-        assert_equal(
-          [
-            t('workarea.duration.years', count: 1),
-            t('workarea.duration.months', count: 2),
-            t('workarea.duration.days', count: 12),
-          ].to_sentence,
-          duration_in_words(2.months + 1.years + 12.days)
-        )
-      end
     end
   end
 end

data/test/helpers/workarea/admin/icons_helper_test.rb

@@ -57,6 +57,15 @@ module Workarea
         result = trending_icon_for(ProductViewModel.wrap(product))
         assert_equal('workarea/admin/icons/fire.svg', result.first)
       end
+
+      def test_fraud_icon_for
+        order = create_order
+        assert_nil(fraud_icon_for(order))
+
+        order = create_order(fraud_suspected_at: Time.current)
+        result = fraud_icon_for(order)
+        assert_equal('workarea/admin/icons/alert.svg', result.first)
+      end
     end
   end
 end

data/test/helpers/workarea/admin/products_helper_test.rb

@@ -0,0 +1,73 @@
+require 'test_helper'
+
+module Workarea
+  module Admin
+    class ProductsHelperTest < ViewTest
+      setup :create_products
+
+      def create_products
+        inactive = create_product(active: false)
+        @inactive = ProductViewModel.wrap(inactive)
+
+        backordered = create_product(variants: [{ sku: 'BACKORDERED' }])
+        @backordered = ProductViewModel.wrap(backordered)
+
+        out_of_stock = create_product(variants: [{ sku: 'OUTOFSTOCK' }])
+        @out_of_stock = ProductViewModel.wrap(out_of_stock)
+
+        low_inventory = create_product(variants: [{ sku: 'LOWINVENTORY' }])
+        @low_inventory = ProductViewModel.wrap(low_inventory)
+
+        displayable = create_product(variants: [{ sku: 'DISPLAYABLE' }])
+        @displayable = ProductViewModel.wrap(displayable)
+
+        create_inventory(
+          id: 'BACKORDERED',
+          policy: 'allow_backorder',
+          backordered: 1,
+          available: 0
+        )
+
+        create_inventory(
+          id: 'OUTOFSTOCK',
+          policy: 'standard',
+          backordered: 0,
+          available: 0
+        )
+
+        create_inventory(
+          id: 'LOWINVENTORY',
+          available: Workarea.config.low_inventory_threshold - 1
+        )
+
+        create_inventory(
+          id: 'DISPLAYABLE',
+          policy: 'displayable_when_out_of_stock',
+          backordered: 0,
+          available: 0
+        )
+      end
+
+      def test_summary_inventory_status_css_classes
+        result = summary_inventory_status_css_classes(@inactive)
+        assert_includes(result, 'product-summary--inactive')
+        assert_includes(result, 'product-summary--status-issue')
+
+        result = summary_inventory_status_css_classes(@backordered)
+        assert_includes(result, 'product-summary--backordered')
+        assert_includes(result, 'product-summary--status-issue')
+
+        result = summary_inventory_status_css_classes(@out_of_stock)
+        assert_includes(result, 'product-summary--out-of-stock')
+        assert_includes(result, 'product-summary--status-issue')
+
+        result = summary_inventory_status_css_classes(@low_inventory)
+        assert_includes(result, 'product-summary--low-inventory')
+        assert_includes(result, 'product-summary--status-issue')
+
+        result = summary_inventory_status_css_classes(@displayable)
+        assert(result.empty?)
+      end
+    end
+  end
+end

data/test/helpers/workarea/admin/releases_helper_test.rb

@@ -98,55 +98,6 @@ module Workarea
         assert(classes.include?('calendar__day--today'))
         assert_equal(start_of_week, classes.include?('calendar__day--start-of-week'))
       end
-
-      def test_calendar_release_classes
-        today = Time.zone.today
-        day = today.strftime('%Y-%m-%d')
-
-        release = create_release({ published_at: today })
-        view_model = ReleaseViewModel.new(release)
-
-        classes = calendar_release_classes(day, view_model)
-
-        assert(classes.include?('calendar__release'))
-        assert(classes.include?('calendar__release--start'))
-        assert(classes.include?('calendar__release--end'))
-        assert(classes.include?('calendar__release--content'))
-
-        today = Time.zone.today
-        day = today.strftime('%Y-%m-%d')
-
-        release = create_release({ published_at: today, undo_at: today + 1.day })
-        view_model = ReleaseViewModel.new(release)
-
-        classes = calendar_release_classes(day, view_model)
-
-        assert(classes.include?('calendar__release'))
-        assert(classes.include?('calendar__release--start'))
-        refute(classes.include?('calendar__release--end'))
-        refute(classes.include?('calendar__release--content'))
-      end
-
-      def test_calendar_release_styles
-        release = ReleaseViewModel.new(create_release(published_at: Time.zone.today))
-
-        assert_nil(calendar_release_styles(release))
-
-        dark_release = ReleaseViewModel.new(create_release(
-          name: "Foo",
-          published_at: Time.zone.today,
-          undo_at: Time.zone.today + 1.day
-        ))
-
-        light_release = ReleaseViewModel.new(create_release(
-          name: "Bar",
-          published_at: Time.zone.today + 1.week,
-          undo_at: Time.zone.today + 2.weeks
-        ))
-
-        assert_match(/; color: #ffffff/, calendar_release_styles(dark_release))
-        assert_match(/; color: #000000/, calendar_release_styles(light_release))
-      end
     end
   end
 end

data/test/helpers/workarea/admin/settings_helper_test.rb

@@ -7,7 +7,8 @@ module Workarea
 
       def test_sanitize_config_value
         assert(sanitize_config_value([]).blank?)
-        assert(sanitize_config_value(Object.new).blank?)
+        assert(sanitize_config_value('').blank?)
+        assert(sanitize_config_value(nil).blank?)
 
         assert_equal(
           '<code class="code code--block">foo</code>',
@@ -19,6 +20,21 @@ module Workarea
           sanitize_config_value(':foo')
         )
 
+        assert_equal(
+          '<code class="code code--block">3</code>',
+          sanitize_config_value(3)
+        )
+
+        assert_equal(
+          '<code class="code code--block">false</code>',
+          sanitize_config_value(false)
+        )
+
+        assert_equal(
+          '<code class="code code--block">30 days</code>',
+          sanitize_config_value(30.days)
+        )
+
         assert_match(
           /pre.*expandable.*code.*{\n.*foo.*bar.*\n.*}/,
           sanitize_config_value({ foo: 'bar' })
@@ -28,6 +44,11 @@ module Workarea
           /pre.*expandable.*code.*\[\n.*foo.*\n.*bar.*\n.*\]/,
           sanitize_config_value(['foo', 'bar'])
         )
+
+        assert_match(
+          /pre.*expandable.*code.*\[\n.*foo.*\n.*bar.*\n.*\]/,
+          sanitize_config_value(SwappableList.new(['foo', 'bar']))
+        )
       end
     end
   end

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

@@ -6,16 +6,13 @@ module Workarea
       include Admin::IntegrationTest
 
       def test_ensures_cors_policy_for_bulk_upload
-        Workarea.s3.expects(:get_bucket_cors).returns(mock_s3_cors_response).once
-        Workarea.s3.expects(:put_bucket_cors).once
+        DirectUpload.expects(:ensure_cors!).once
         get admin.content_assets_path
         assert(response.ok?)
 
+        DirectUpload.expects(:ensure_cors!).never
         get admin.content_assets_path, xhr: true
         assert(response.ok?)
-
-        get admin.content_assets_path
-        assert(response.ok?)
       end
 
       def test_can_create_an_asset

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

@@ -50,6 +50,16 @@ module Workarea
         end
       end
 
+      def test_viewing_comments_without_an_author
+        create_comment(
+          commentable: commentable,
+          body: 'system generated comment'
+        )
+
+        get admin.commentable_comments_path(commentable.to_global_id)
+        assert(response.ok?)
+      end
+
       def test_adding_comment_and_subscribing
         create_comment(commentable: commentable, body: 'comment history')
 
@@ -112,13 +122,6 @@ module Workarea
         assert_equal(0, Comment.count)
       end
 
-      def test_unsubscribing_from_email_notifications
-        get admin.commentable_unsubscribe_url(commentable.to_global_id)
-
-        commentable.reload
-        assert_equal([user_1.id.to_s], commentable.subscribed_user_ids)
-      end
-
       def test_commenting_with_active_release
         product = create_product(name: 'Foo')
         release = create_release
@@ -142,6 +145,23 @@ module Workarea
         assert_equal('Foo', product.name)
         release.as_current { assert_equal('Bar', product.reload.name) }
       end
+
+      def test_subscribing_to_comments
+        put admin.subscribe_commentable_comments_path(commentable.to_global_id)
+
+        assert_redirected_to(admin.commentable_comments_path(commentable.to_global_id))
+        assert(flash[:success].present?)
+        assert_includes(commentable.reload.subscribed_user_ids, current_user.id.to_s)
+      end
+
+      def test_unsubscribing_to_comments
+        commentable.update!(subscribed_user_ids: [current_user.id])
+        put admin.unsubscribe_commentable_comments_path(commentable.to_global_id)
+
+        assert_redirected_to(admin.commentable_comments_path(commentable.to_global_id))
+        assert(flash[:success].present?)
+        refute_includes(commentable.reload.subscribed_user_ids, current_user.id.to_s)
+      end
     end
   end
 end

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

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+module Workarea
+  module Admin
+    class ConfigurationsIntegrationTest < Workarea::IntegrationTest
+      include Admin::IntegrationTest
+
+      def test_update
+        patch admin.configuration_path,
+          params: {
+            'configuration' => {
+              'allow_shipping_address_po_box' => 'false'
+            }
+          }
+
+        assert_redirected_to(admin.configuration_path)
+        refute(Workarea.config.allow_shipping_address_po_box)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+require 'test_helper'
+
+module Workarea
+  module Admin
+    class CreateReleaseUndosIntegrationTest < Workarea::IntegrationTest
+      include Admin::IntegrationTest
+
+      def test_create
+        releasable = create_page(name: 'Foo')
+        release = create_release
+
+        release.as_current { releasable.update_attributes!(name: 'Bar') }
+
+        post admin.release_undo_path(release),
+          params: { release: { name: 'Undo Bar', tag_list: 'foo,bar,baz' } }
+
+        assert_equal(2, Release.count)
+        undo_release = Release.desc(:created_at).first
+
+        assert_equal(undo_release, release.reload.undo)
+        assert_equal('Undo Bar', undo_release.name)
+        assert_equal(%w(foo bar baz), undo_release.tags)
+        assert_equal(1, undo_release.changesets.size)
+        assert_equal(1, undo_release.changesets.first.changeset.size)
+        assert_equal(releasable, undo_release.changesets.first.releasable)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+module Workarea
+  module Admin
+    class CreateSegmentsIntegrationTest < Workarea::IntegrationTest
+      include Admin::IntegrationTest
+
+      def test_creates_segments
+        post admin.create_segments_path, params: { segment: { name: 'foo bar' } }
+
+        assert_equal(1, Segment.count)
+        assert_equal('foo bar', Segment.desc(:created_at).first.name)
+      end
+
+      def test_updates_segments
+        segment = create_segment(name: 'Custom Segment')
+
+        post admin.create_segments_path,
+          params: { id: segment.id, segment: { name: 'foo bar' } }
+
+        assert_equal(1, Segment.count)
+        assert_equal('foo bar', Segment.first.name)
+      end
+    end
+  end
+end

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

@@ -79,14 +79,6 @@ 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,
@@ -156,6 +148,40 @@ module Workarea
 
         assert_equal(subject, email.subject)
       end
+
+      def test_importing_for_a_release
+        sample = create_product(name: 'Test Product')
+        sample.name = "Test Product Changed"
+        format = Workarea::DataFile::Csv.new
+        file = create_tempfile(format.serialize(sample), extension: 'csv')
+        release = create_release
+
+        post admin.data_file_imports_path,
+          params: {
+            return_to: admin.catalog_products_path,
+            publishing: release.id,
+            import: {
+              model_type: 'Workarea::Catalog::Product',
+              file: Rack::Test::UploadedFile.new(file.path)
+            }
+          }
+
+        assert_redirected_to(admin.catalog_products_path)
+
+        assert_equal(1, Catalog::Product.count)
+
+        sample.reload
+        assert_equal('Test Product', sample.name)
+
+        Release.with_current(release) do
+          assert_equal('Test Product Changed', sample.reload.name)
+        end
+
+        assert_equal(1, DataFile::Import.count)
+        import = DataFile::Import.first
+        assert(import.created_by_id.present?)
+        assert_equal(release.id.to_s, import.release_id)
+      end
     end
   end
 end

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

@@ -0,0 +1,55 @@
+require 'test_helper'
+
+module Workarea
+  module Admin
+    class FulfillmentSkusIntegrationTest < Workarea::IntegrationTest
+      include Admin::IntegrationTest
+
+      def test_create
+        post admin.fulfillment_skus_path,
+          params: {
+            sku: {
+              id: 'SKU1',
+              policy: 'ignore',
+            }
+          }
+
+        assert_equal(1, Fulfillment::Sku.count)
+        assert_redirected_to(admin.fulfillment_sku_path('SKU1'))
+
+        sku = Fulfillment::Sku.first
+        assert_equal('SKU1', sku.id)
+        assert_equal('ignore', sku.policy)
+      end
+
+      def test_update
+        sku = create_fulfillment_sku(id: 'SKU1')
+
+        patch admin.fulfillment_sku_path('SKU1'),
+          params: {
+            sku: {
+              policy: 'download',
+              file: Rack::Test::UploadedFile.new(product_image_file_path)
+            }
+          }
+
+        assert_equal(1, Fulfillment::Sku.count)
+
+        assert_redirected_to(admin.fulfillment_sku_path('SKU1'))
+
+        sku.reload
+        assert_equal('SKU1', sku.id)
+        assert_equal('download', sku.policy)
+        assert(sku.file_name.present?)
+      end
+
+      def test_destroy
+        sku = create_fulfillment_sku(id: 'SKU1')
+        delete admin.fulfillment_sku_path('SKU1')
+
+        assert_equal(0, Fulfillment::Sku.count)
+        assert_redirected_to(admin.fulfillment_skus_path)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+require 'test_helper'
+
+module Workarea
+  module Admin
+    class FulfillmentTokensIntegrationTest < Workarea::IntegrationTest
+      include Admin::IntegrationTest
+
+      def test_create
+        sku = create_fulfillment_sku(
+          id: 'SKU1',
+          policy: 'download',
+          file: product_image_file_path
+        )
+
+        post admin.fulfillment_sku_tokens_path(sku)
+
+        assert_equal(1, Fulfillment::Token.count)
+
+        token = Fulfillment::Token.first
+        assert_equal('SKU1', token.sku)
+
+        assert_redirected_to(
+          admin.fulfillment_sku_tokens_path(sku, new_token: token.id)
+        )
+      end
+
+      def test_update
+        sku = create_fulfillment_sku(id: 'SKU1')
+        token = Fulfillment::Token.create!(sku: sku.id)
+
+        patch admin.fulfillment_sku_token_path(sku, token),
+          params: { token: { enabled: '0' } }
+
+        assert_equal(1, Fulfillment::Token.count)
+
+        assert_redirected_to(admin.fulfillment_sku_tokens_path(sku))
+
+        token.reload
+        assert(token.disabled?)
+      end
+    end
+  end
+end