workarea-admin 3.5.19 → 3.5.25

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

@@ -60,7 +60,7 @@ module Workarea
         click_link t('workarea.admin.catalog.dashboard_link')
 
         visit admin.catalog_products_path
-        refute(page.has_content?('1 selected'))
+        refute_text('1 selected')
       end
 
       def test_persistence
@@ -85,7 +85,7 @@ module Workarea
         click_button t('workarea.admin.catalog_products.index.edit')
         click_link t('workarea.admin.form.cancel')
 
-        refute(page.has_content?('3 selected'))
+        refute_text('3 selected')
       end
 
       def test_select_all
@@ -95,7 +95,7 @@ module Workarea
         assert(page.has_content?("5 #{t('workarea.admin.shared.bulk_actions.selected')}"))
 
         uncheck 'select_all'
-        refute(page.has_content?(t('workarea.admin.shared.bulk_actions.selected')))
+        refute_text(t('workarea.admin.shared.bulk_actions.selected'))
 
         check 'select_all'
         uncheck "catalog_product_#{@products.fifth.id}"
@@ -103,14 +103,14 @@ module Workarea
         assert(page.has_content?("3 #{t('workarea.admin.shared.bulk_actions.selected')}"))
 
         check 'select_all'
-        refute(page.has_content?(t('workarea.admin.shared.bulk_actions.selected')))
+        refute_text(t('workarea.admin.shared.bulk_actions.selected'))
 
         check "catalog_product_#{@products.fifth.id}"
         check "catalog_product_#{@products.fourth.id}"
         assert(page.has_content?("2 #{t('workarea.admin.shared.bulk_actions.selected')}"))
 
         check 'select_all'
-        refute(page.has_content?(t('workarea.admin.shared.bulk_actions.selected')))
+        refute_text(t('workarea.admin.shared.bulk_actions.selected'))
       end
 
       def test_bulk_editing

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

@@ -39,7 +39,7 @@ module Workarea
 
         find_field('comment[body]').send_keys(['@'])
 
-        refute(page.has_content?('Bar Baby'))
+        refute_text('Bar Baby')
         assert(page.has_content?('Baz Bat'))
 
         find('.tribute-container li', text: 'Baz Bat (baz@workarea.com)').click

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

@@ -35,7 +35,7 @@ module Workarea
 
         find('.content-block').click
         click_link t('workarea.admin.actions.delete')
-        refute(page.has_selector?('.content-block'))
+        refute_selector('.content-block')
       end
 
       def test_reordering_content_blocks

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

@@ -64,7 +64,7 @@ module Workarea
         Workarea.config.hide_from_settings = %i(fooconfig)
 
         visit admin.settings_dashboards_path
-        refute(page.has_content?('Fooconfig'))
+        refute_text('Fooconfig')
       end
     end
   end

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

@@ -34,12 +34,9 @@ module Workarea
           click_button 'Stop Impersonation'
         end
 
-        assert_equal(admin.user_path(user), current_path)
+        assert_equal(storefront.root_path, current_path)
         assert(page.has_content?('Success'))
 
-        find('.view').hover # Ensure tooltipster menu isn't open
-        assert(page.has_content?('bcrouse@workarea.com'))
-
         visit storefront.users_account_path
         assert(page.has_no_content?('impersonated@workarea.com'))
 
@@ -52,7 +49,7 @@ module Workarea
           click_button 'Stop Impersonation'
         end
 
-        assert_equal(admin.user_path(user), current_path)
+        assert_equal(admin.root_path, current_path)
         assert(page.has_content?('Success'))
       end
     end

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

@@ -28,7 +28,7 @@ module Workarea
 
         assert_current_path(admin.inventory_skus_path)
         assert(page.has_content?('Success'))
-        refute(page.has_content?('SKU1'))
+        refute_text('SKU1')
       end
 
       def test_editing_a_non_existent_sku

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

@@ -39,7 +39,7 @@ module Workarea
         within('.navigation-builder__actions') { click_link 'Delete' }
 
         assert(page.has_content?('Success'))
-        refute(page.has_content?('Foo'))
+        refute_text('Foo')
       end
 
       def test_managing_content_redirects_back

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

@@ -71,9 +71,9 @@ module Workarea
 
         row = find_all("table tr")[1]
         within(row) do
-          refute(page.has_content?('$11.00'))
-          refute(page.has_content?('$9.99'))
-          refute(page.has_content?('1'))
+          refute_text('$11.00')
+          refute_text('$9.99')
+          refute_text('1')
         end
       end
     end

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

@@ -65,8 +65,8 @@ module Workarea
         assert(page.has_content?('Success'))
 
         click_link 'Recommendations'
-        refute(page.has_selector?("option[value='#{product_2.id}']"))
-        refute(page.has_selector?("option[value='#{product_3.id}']"))
+        refute_selector("option[value='#{product_2.id}']")
+        refute_selector("option[value='#{product_3.id}']")
         assert(page.has_ordered_text?('Custom', 'Similar Products', 'Also Purchased'))
 
         #

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

@@ -49,8 +49,8 @@ module Workarea
           click_link 'Published (1)'
         end
 
-        refute(page.has_content?('Scheduled Release'))
-        refute(page.has_content?('Unscheduled Release'))
+        refute_text('Scheduled Release')
+        refute_text('Unscheduled Release')
         assert(page.has_content?('Published Release'))
       end
 
@@ -124,6 +124,11 @@ module Workarea
         end
 
         visit admin.release_path(Release.first)
+        assert(page.has_content?('2 Products'))
+        assert(page.has_content?('1 Pricing Sku'))
+        assert(page.has_content?('1 Discount'))
+        assert(page.has_content?('1 System Page'))
+
         click_link t('workarea.admin.releases.cards.planned_changes.planned')
         assert(page.has_content?('Test Page'))
         assert(page.has_content?('Foo Bar'))
@@ -228,10 +233,7 @@ module Workarea
 
         visit admin.list_releases_path
         click_link 'Foo Release'
-        click_link t('workarea.admin.releases.cards.undo.title')
-
-        assert(page.has_content?(t('workarea.admin.releases.undo.undoing')))
-        click_link "#{t('workarea.admin.releases.undo.build_an_undo_now')} →"
+        click_link t('workarea.admin.releases.show.build_undo')
 
         fill_in 'release[name]', with: 'Foo Bar Undo'
         click_button t('workarea.admin.create_release_undos.workflow.create_undo')
@@ -240,19 +242,9 @@ module Workarea
 
         click_link "#{t('workarea.admin.create_release_undos.workflow.done')} →"
         assert(page.has_content?('Foo Bar Undo'))
+        assert(page.has_content?('1 Content Page'))
 
-        click_link t('workarea.admin.releases.cards.original.title')
-        assert(page.has_content?('Foo Release'))
-        assert(page.has_content?('Test Page'))
-        assert(page.has_content?('Foo Bar'))
-
-        within('.text.text--large', match: :first) { click_link 'Foo Release' }
-        assert(page.has_content?('Foo Release'))
-        assert(page.has_content?('Test Page'))
-        assert(page.has_content?('Foo Bar'))
-
-        click_link t('workarea.admin.releases.cards.undo.title')
-        assert(page.has_content?('Foo Bar Undo'))
+        click_link t('workarea.admin.releases.cards.planned_changes.planned')
         assert(page.has_content?('Test Page'))
         assert(page.has_content?('Foo Bar'))
       end
@@ -277,7 +269,7 @@ module Workarea
 
         click_link t('workarea.admin.releases.calendar.next_week')
         wait_for_xhr
-        refute(find('.calendar').has_content?('Foo Release'))
+        refute_text('Foo Release')
 
         click_link t('workarea.admin.releases.calendar.previous_week')
         wait_for_xhr
@@ -285,7 +277,7 @@ module Workarea
 
         click_link t('workarea.admin.releases.calendar.next_week')
         wait_for_xhr
-        refute(find('.calendar').has_content?('Foo Release'))
+        refute_text('Foo Release')
 
         click_button t('workarea.admin.releases.calendar.today')
         wait_for_xhr
@@ -321,8 +313,8 @@ module Workarea
 
         visit admin.releases_path
 
-        refute(page.has_content?('Release Five'))
-        refute(page.has_content?('Release Six'))
+        refute_text('Release Five')
+        refute_text('Release Six')
 
         assert(
           page.has_content?(
@@ -341,6 +333,43 @@ module Workarea
           assert(page.has_content?('Release Six'))
         end
       end
+
+      def test_viewing_large_changesets
+        Workarea.config.per_page = 2
+
+        release = create_release
+        product_one = create_product(id: 'PROD1', name: 'Product One')
+        product_two = create_product(id: 'PROD2', name: 'Product Two')
+        content_page = create_page(name: 'Test Page')
+
+        release.as_current do
+          product_one.variants.first.update!(details: { 'Color' => 'Orange' })
+          product_two.update!(name: 'Test Product Changed')
+          content_page.update!(name: 'Test Page Changed')
+        end
+
+        visit admin.release_path(release)
+
+        assert(page.has_content?('2 Products'))
+        assert(page.has_content?('1 Content Page'))
+
+        click_link t('workarea.admin.releases.cards.planned_changes.planned')
+
+        assert(page.has_content?('2 Products'))
+        assert(page.has_content?('1 Content Page'))
+
+        assert(page.has_content?('Test Product Changed'))
+        assert(page.has_content?('Test Page Changed'))
+        assert(page.has_no_content?('Orange'))
+
+        assert(page.has_content?(t('workarea.admin.changesets.recent')))
+        assert(page.has_content?(t('workarea.admin.cards.more', amount: 1)))
+
+        click_link '2 Products'
+
+        assert(page.has_content?('Product One'))
+        assert(page.has_content?('Product Two'))
+      end
     end
   end
 end

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

@@ -74,9 +74,9 @@ module Workarea
           assert(page.has_content?('PA'))
           assert(page.has_content?('19106'))
 
-          assert(page.has_content?('6.0%'))
-          assert(page.has_content?('4.0%'))
-          assert(page.has_content?('2.0%'))
+          assert(page.has_content?('6%'))
+          assert(page.has_content?('4%'))
+          assert(page.has_content?('2%'))
 
           assert(page.has_content?("#{Money.default_currency.symbol}5.00"))
           assert(page.has_content?("#{Money.default_currency.symbol}500.00"))
@@ -91,7 +91,7 @@ module Workarea
           click_link t('workarea.admin.actions.edit')
         end
 
-        fill_in 'rate[country_percentage]', with: 0
+        fill_in 'rate[country_percentage]', with: 0.005
         fill_in 'rate[region_percentage]', with: 10
         fill_in 'rate[postal_code_percentage]', with: 20.5
 
@@ -100,7 +100,8 @@ module Workarea
         assert(page.has_content?('Success'))
 
         within '.index-table__row' do
-          assert(page.has_content?('10.0%'))
+          assert(page.has_content?('0.005%'))
+          assert(page.has_content?('10%'))
           assert(page.has_content?('20.5%'))
         end
 

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

@@ -33,8 +33,8 @@ module Workarea
         click_button 'remove_taxon', match: :first
 
         assert(page.has_content?('Success'))
-        refute(page.has_content?('First Taxon'))
-        refute(page.has_content?('Second Taxon'))
+        refute_text('First Taxon')
+        refute_text('Second Taxon')
       end
     end
   end

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

@@ -20,7 +20,7 @@ module Workarea
         assert(page.has_content?('My Category'))
 
         visit admin.trash_index_path
-        refute(page.has_content?('My Category'))
+        refute_text('My Category')
       end
 
       def test_restore_permission

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

@@ -21,7 +21,7 @@ module Workarea
         )
       end
 
-      def test_options
+      def test_variant_details
         @view_model.variants.build(
           sku: 'SKU1',
           name: 'name',
@@ -40,7 +40,7 @@ module Workarea
 
         assert_equal(
           { 'Color' => ['Red', 'Black', 'White'], 'Size' => ['S', 'M', 'L'] },
-          @view_model.options
+          @view_model.variant_details
         )
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-admin
 version: !ruby/object:Gem::Version
-  version: 3.5.19
+  version: 3.5.25
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-16 00:00:00.000000000 Z
+date: 2020-12-23 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.19
+        version: 3.5.25
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.19
+        version: 3.5.25
 - !ruby/object:Gem::Dependency
   name: workarea-storefront
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.19
+        version: 3.5.25
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.19
+        version: 3.5.25
 description: Provides site administration functionality for the Workarea Commerce
   Platform.
 email:
@@ -551,6 +551,7 @@ files:
 - app/view_models/workarea/admin/bulk_action_sequential_product_edit_view_model.rb
 - app/view_models/workarea/admin/category_view_model.rb
 - app/view_models/workarea/admin/changes_view_model.rb
+- app/view_models/workarea/admin/changeset_summary_view_model.rb
 - app/view_models/workarea/admin/changeset_view_model.rb
 - app/view_models/workarea/admin/code_list_view_model.rb
 - app/view_models/workarea/admin/comment_view_model.rb
@@ -1065,9 +1066,7 @@ files:
 - app/views/workarea/admin/releases/index.html.haml
 - app/views/workarea/admin/releases/list.html.haml
 - app/views/workarea/admin/releases/new.html.haml
-- app/views/workarea/admin/releases/original.html.haml
 - app/views/workarea/admin/releases/show.html.haml
-- app/views/workarea/admin/releases/undo.html.haml
 - app/views/workarea/admin/reports/_export.html.haml
 - app/views/workarea/admin/reports/_group_by_time.html.haml
 - app/views/workarea/admin/reports/average_order_value.html.haml
@@ -1289,6 +1288,7 @@ files:
 - test/dummy/tmp/screenshots/.keep
 - test/helpers/workarea/admin/application_helper_test.rb
 - test/helpers/workarea/admin/buttons_helper_test.rb
+- test/helpers/workarea/admin/changesets_helper_test.rb
 - test/helpers/workarea/admin/content_helper_test.rb
 - test/helpers/workarea/admin/facets_helper_test.rb
 - test/helpers/workarea/admin/icons_helper_test.rb
@@ -1390,6 +1390,7 @@ files:
 - test/javascripts/fixtures/datepicker_fields.html.haml
 - test/javascripts/fixtures/datetimepicker_fields.html.haml
 - test/javascripts/fixtures/direct_upload.html.haml
+- test/javascripts/fixtures/existing_navigation_taxon.html.haml
 - test/javascripts/fixtures/help_lookup_button.haml
 - test/javascripts/fixtures/menu_editor_menu_list_sortable.html.haml
 - test/javascripts/fixtures/new_navigation_taxon.html.haml
@@ -1527,7 +1528,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Admin for the Workarea Commerce Platform

data/app/views/workarea/admin/releases/original.html.haml

@@ -1,50 +0,0 @@
-- @page_title = t('workarea.admin.releases.original.page_title', name: @release.name)
-
-.view
-  .view__header
-    .grid.grid--middle.grid--right
-      .grid__cell.grid__cell--50
-        .view__heading
-          = link_to "↑ #{t('workarea.admin.releases.original.index_link')}", releases_path
-          %h1= link_to @release.name, url_for(@release)
-      .grid__cell.grid__cell--25
-        = render_aux_navigation_for(@release)
-
-  .view__container
-    = render_cards_for(@release, :original)
-
-  .view__container.view__container--narrow
-    .section
-      .grid.grid--center
-        .grid__cell.grid__cell--25
-          %p.text.text--large= t('workarea.admin.releases.original.created_description_html', undo: link_to(@release.name, @release), original: link_to(@release.undoes.name, @release.undoes), at: local_time_ago(@release.created_at))
-        .grid__cell.grid__cell--25.align-center
-          .card{ class: card_classes(:planned_changes) }
-            = link_to @release.undoes, class: 'card__header' do
-              %span.card__header-text= @release.undoes.name
-              = inline_svg 'workarea/admin/icons/planned_changes.svg', class: 'card__icon'
-
-            .card__body
-              - if @release.undoes.changesets_with_releasable.empty?
-                %p.card__empty-note= t('workarea.admin.releases.original.no_changes_for_this_release')
-              - else
-                - @release.undoes.changesets_with_releasable.take(3).each do |changeset|
-                  .activity
-                    .activity__header
-                      .activity__avatar
-                        = changeset_icon changeset, { class: 'svg-icon'}
-                      .activity__name= changeset.release.name
-                      .activity__time
-                        = changeset.publish_humanized
-                        - if changeset.release_date.present?
-                          = local_time(changeset.release_date, :long)
-                    .activity__message
-                      .release-changeset.release-changeset--activity
-                        .release-changeset__body
-                          - changeset.changed_fields.each do |field|
-                            = render_changeset_field(changeset, field)
-
-                = link_to @release.undoes, class: 'card__button' do
-                  %span.button.button--small= t('workarea.admin.releases.original.view_the_original_release')
-
-