workarea-admin 3.4.45 → 3.5.0.beta.1

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

@@ -7,55 +7,31 @@ module Workarea
       setup :set_admin_user
 
       def set_admin_user
-        super_admin = create_user(password: 'W3bl1nc!', super_admin: true)
+        admin_user.update!(password: 'W3bl1nc!')
 
         post storefront.login_path,
-          params: { email: super_admin.email, password: 'W3bl1nc!' }
-      end
-
-      def request_cookies
-        request.cookie_jar.signed
-      end
-
-      def response_cookies
-        ActionDispatch::Cookies::CookieJar
-          .build(request, response.cookies)
-          .signed
+          params: { email: admin_user.email, password: 'W3bl1nc!' }
       end
 
       def test_start_guest_browsing
-        previous_user_id = request_cookies[:user_id]
+        previous_user_id = session[:user_id]
 
         post admin.guest_browsing_path
 
         assert(response.redirect?)
-        assert_nil(response_cookies['user_id'])
-        assert(response_cookies['guest_browsing'].present?)
-        assert_equal(previous_user_id, session['admin_id'].to_s)
-      end
-
-      def test_sets_a_timeout_on_guest_browsing
-        post admin.guest_browsing_path
-
-        cookies = response.to_a[1]['Set-Cookie'].split("\n")
-        user_id_cookie = cookies.detect { |c| c.start_with?('guest_browsing') }
-
-        assert_includes(user_id_cookie, 'expires')
+        assert_nil(session[:user_id])
+        assert_equal(previous_user_id, session[:admin_id])
       end
 
       def test_ending_guest_browsing
-        previous_user_id = request_cookies[:user_id]
+        previous_user_id = session[:user_id]
 
         post admin.guest_browsing_path
-
-        assert(cookies['guest_browsing'].present?)
-
         delete admin.guest_browsing_path
 
         assert(response.redirect?)
-        assert_equal(previous_user_id, response_cookies['user_id'])
-        assert(session['admin_id'].blank?)
-        assert(cookies['guest_browsing'].blank?)
+        assert_equal(previous_user_id, session[:user_id])
+        assert(session[:admin_id].blank?)
       end
     end
   end

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

@@ -5,46 +5,27 @@ module Workarea
     class ImpersonationsIntegrationTest < Workarea::IntegrationTest
       include Admin::IntegrationTest
       setup :set_user
-      setup :set_super_user
+      setup :login_admin_user
 
       def set_user
         @user = create_user
       end
 
-      def set_super_user
-        super_admin = create_user(password: 'W3bl1nc!', super_admin: true)
+      def login_admin_user
+        admin_user.update!(password: 'W3bl1nc!')
 
         post storefront.login_path,
-          params: { email: super_admin.email, password: 'W3bl1nc!' }
-      end
-
-      def request_cookies
-        request.cookie_jar.signed
-      end
-
-      def response_cookies
-        ActionDispatch::Cookies::CookieJar
-          .build(request, response.cookies)
-          .signed
+          params: { email: admin_user.email, password: 'W3bl1nc!' }
       end
 
       def test_can_create_an_impersonation
-        previous_user_id = request_cookies[:user_id]
+        previous_user_id = session[:user_id]
 
         post admin.impersonations_path, params: { user_id: @user.id }
 
         assert(response.redirect?)
-        refute_equal(previous_user_id, response_cookies['user_id'])
-        assert_equal(previous_user_id, session['admin_id'].to_s)
-      end
-
-      def test_sets_a_timeout_on_an_impersonation
-        post admin.impersonations_path, params: { user_id: @user.id }
-
-        cookies = response.to_a[1]['Set-Cookie'].split("\n")
-        user_id_cookie = cookies.detect { |c| c.start_with?('user_id') }
-
-        assert_includes(user_id_cookie, 'expires')
+        assert_equal(@user.id.to_s, session[:user_id])
+        assert_equal(previous_user_id, session[:admin_id])
       end
 
       def test_does_not_allow_impersonating_another_admin
@@ -56,48 +37,23 @@ module Workarea
       end
 
       def test_logs_the_impersonation_info_with_the_user
-        previous_user_id = request_cookies[:user_id]
+        previous_user_id = session[:user_id]
         post admin.impersonations_path, params: { user_id: @user.id }
         @user.reload
 
-        assert_equal(previous_user_id.to_s, @user.last_impersonated_by_id)
+        assert_equal(previous_user_id, @user.last_impersonated_by_id)
         assert(@user.last_impersonated_at.present?)
       end
 
       def test_can_destroy_an_impersonation
-        previous_user_id = request_cookies[:user_id]
-
-        post admin.impersonations_path, params: { user_id: @user.id }
-        delete admin.impersonations_path
+        previous_user_id = session[:user_id]
 
-        assert_equal(previous_user_id, response_cookies['user_id'])
-        assert(session['admin_id'].blank?)
-
-        post admin.impersonations_path, params: { user_id: @user.id }
-        delete admin.impersonations_path
-
-        assert_equal(previous_user_id, response_cookies['user_id'])
-        assert(session['admin_id'].blank?)
-      end
-
-      def test_redirection_after_destroy
         post admin.impersonations_path, params: { user_id: @user.id }
         delete admin.impersonations_path
-        assert_redirected_to(admin.user_path(@user.id))
 
-        post admin.impersonations_path, params: { user_id: @user.id }
-        delete admin.impersonations_path(return_to: '/foo')
-        assert_redirected_to('/foo')
-
-        post admin.impersonations_path, params: { user_id: @user.id }
-        delete admin.impersonations_path(return_to: '/foo'),
-          headers: { 'HTTP_REFERER' => admin.catalog_products_path }
-        assert_redirected_to('/foo')
-
-        post admin.impersonations_path, params: { user_id: @user.id }
-        delete admin.impersonations_path,
-          headers: { 'HTTP_REFERER' => admin.catalog_products_url(host: 'foo.com') }
-        assert_redirected_to(admin.catalog_products_path)
+        assert(response.redirect?)
+        assert_equal(previous_user_id, session[:user_id])
+        assert(session[:admin_id].blank?)
       end
     end
   end

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

@@ -234,35 +234,6 @@ module Workarea
         results = JSON.parse(response.body)['results']
         assert_equal(0, results.length)
       end
-
-      def test_limiting_results_by_type
-        Workarea.with_config do |config|
-          config.jump_to_type_limit = 2
-          config.jump_to_results_per_type = 2
-
-          5.times { |i| create_product(name: "Test Product #{i}") }
-          5.times { |i| create_category(name: "Test Category #{i}") }
-
-          get admin.jump_to_path(q: 'test')
-          results = JSON.parse(response.body)['results']
-
-          assert_equal(
-            %w(Products Products Categories Categories),
-            results.map { |r| r['type'] }
-          )
-        end
-      end
-
-      def test_sorting_by_recency
-        create_user(email: 'foo-one@workarea.com', updated_at: 1.day.ago)
-        create_user(email: 'foo-two@workarea.com', updated_at: 1.hour.ago)
-        get admin.jump_to_path(q: 'foo')
-
-        results = JSON.parse(response.body)['results']
-        assert_equal(2, results.length)
-        assert_match('foo-two@workarea.com', results.first['label'])
-        assert_match('foo-one@workarea.com', results.second['label'])
-      end
     end
   end
 end

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

@@ -58,6 +58,17 @@ module Workarea
         assert_equal(1, Pricing::Override.count)
         assert_equal(1, order.reload.comments.count)
       end
+
+      def test_not_having_permission
+        admin_user.update(super_admin: false, admin: true, orders_manager: false)
+        get admin.edit_pricing_override_path(order.id)
+
+        assert_redirected_to(admin.root_path)
+        assert_equal(
+          t('workarea.admin.authorization.unauthorized_area'),
+          flash[:error]
+        )
+      end
     end
   end
 end

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

@@ -16,19 +16,6 @@ module Workarea
         assert(product.active)
       end
 
-      def test_updating_hash_fields_in_locales
-        set_locales(available: [:en, :es], default: :en, current: :en)
-        product = create_product(filters_translations: { 'en' => { 'Size' => ['Large'] } })
-
-        patch admin.catalog_product_path(product, locale: 'es'),
-          params: { new_filters: %w(Color Roja) }
-
-        assert_equal(
-          { 'en' => { 'Size' => ['Large'] }, 'es' => { 'Color' => ['Roja'] } },
-          product.reload.filters_translations
-        )
-      end
-
       def test_returns_a_list_of_filters
         create_product(filters:  { 'Color' => 'Blue' })
 

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

@@ -5,18 +5,6 @@ module Workarea
     class ReleasesIntegrationTest < Workarea::IntegrationTest
       include Admin::IntegrationTest
 
-      setup :save_timezone
-      teardown :reset_timezone
-
-      def save_timezone
-        @time_zone = Time.zone
-        Time.zone = ActiveSupport::TimeZone['UTC']
-      end
-
-      def reset_timezone
-        Time.zone = @time_zone
-      end
-
       def test_creates_releases
         post admin.releases_path, params: { release: { name: 'foo bar' } }
         assert_equal(1, Release.count)
@@ -48,11 +36,7 @@ module Workarea
 
       def test_calendar_feed
         user = create_user(admin: true)
-        create_release(
-          name: 'foobar',
-          publish_at: 1.week.from_now,
-          undo_at: 1.month.from_now
-        )
+        create_release(name: 'foobar', publish_at: 1.week.from_now)
 
         get admin.calendar_feed_releases_path(token: user.token)
         assert_response :unauthorized
@@ -86,86 +70,86 @@ module Workarea
         assert_response :ok
       end
 
-      def test_calendar_feed_timezones
-        user = create_user(admin: true, releases_access: true)
-
-        Time.zone = ActiveSupport::TimeZone['Pacific/Midway'] # UTC-11
-
-        publish_at = 1.week.from_now
-        create_release(name: 'foobar', publish_at: publish_at)
-
-        get admin.calendar_feed_releases_path(token: user.token)
-
-        assert_includes(response.body, 'BEGIN:VTIMEZONE')
-        assert_includes(response.body, 'TZID:Pacific/Midway')
-        assert_includes(response.body, 'TZOFFSETTO:-1100')
-        assert_includes(response.body, "X-WR-CALNAME:#{t('workarea.admin.releases.feed.name', site_name: Workarea.config.site_name)}")
-      end
+      def test_single_release
+        current_time_zone = Time.zone
+        Time.zone = ActiveSupport::TimeZone['UTC']
 
-      def test_single_day_events
         user = create_user(admin: true, releases_access: true)
-
-        publish_at = 1.hour.from_now
-        undo_at = 2.hours.from_now
-        create_release(
-          name: 'Single-Day',
-          publish_at: publish_at,
-          undo_at: undo_at
-        )
+        release = create_release(publish_at: 1.hour.from_now)
 
         get admin.calendar_feed_releases_path(token: user.token)
 
-        assert_includes(response.body, "DTSTART;TZID=Etc/UTC:#{publish_at.strftime('%Y%m%dT%H%M%S')}\r\n")
-        assert_includes(response.body, "DTEND;TZID=Etc/UTC:#{undo_at.strftime('%Y%m%dT%H%M%S')}\r\n")
-      end
-
-      def test_overnight
-        user = create_user(admin: true, releases_access: true)
-
-        publish_at = 1.hour.from_now
-        undo_at = 24.hours.from_now
-        create_release(
-          name: 'Single-Day',
-          publish_at: publish_at,
-          undo_at: undo_at
-        )
-
-        get admin.calendar_feed_releases_path(token: user.token)
+        assert_includes(response.body, "DTSTART;TZID=Etc/UTC:#{release.publish_at.strftime('%Y%m%dT%H%M%S')}\r\n")
+        assert_match(/DTEND;TZID=Etc\/UTC:\d{8}T\d{6}/, response.body)
 
-        assert_includes(response.body, "DTSTART;TZID=Etc/UTC:#{publish_at.strftime('%Y%m%dT%H%M%S')}\r\n")
-        assert_includes(response.body, "DTEND;TZID=Etc/UTC:#{undo_at.strftime('%Y%m%dT%H%M%S')}\r\n")
+      ensure
+        Time.zone = current_time_zone
       end
 
-      def test_multi_day_events
-        user = create_user(admin: true, releases_access: true)
-
-        publish_at = 1.week.from_now
-        undo_at = 2.weeks.from_now
-        create_release(
-          name: 'Multi-Day',
-          publish_at: publish_at,
-          undo_at: undo_at
-        )
-
-        get admin.calendar_feed_releases_path(token: user.token)
-
-        assert_includes(response.body, "DTSTART;TZID=Etc/UTC;VALUE=DATE:#{publish_at.strftime('%Y%m%d')}\r\n")
-        assert_includes(response.body, "DTEND;TZID=Etc/UTC;VALUE=DATE:#{undo_at.strftime('%Y%m%d')}\r\n")
+      def test_saving_release_during_time_based_previewing
+        first = create_release(publish_at: 1.day.from_now)
+        second = create_release(publish_at: 2.days.from_now)
+
+        product = create_product(name: 'Foo', description: 'One')
+        first.as_current { product.update_attributes!(name: 'Bar', description: 'Two') }
+        second.as_current { product.update_attributes!(name: 'Baz') }
+
+        post admin.release_session_path, params: { release_id: second.id }
+        patch admin.catalog_product_path(product), params: { product: { name: 'Qux' } }
+
+        second.reload
+        assert_equal(1, second.changesets.size)
+        assert_equal(1, second.changesets.first.changeset.size)
+        assert_equal(['name'], second.changesets.first.changeset.keys)
+        assert_equal('Qux', second.changesets.first.changeset['name'][I18n.locale.to_s])
+
+        third = create_release(publish_at: 3.days.from_now)
+        post admin.release_session_path, params: { release_id: third.id }
+        patch admin.catalog_product_path(product),
+          params: { product: { name: 'Qoo', description: 'Two' } }
+
+        third.reload
+        assert_equal(1, third.changesets.size)
+        assert_equal(1, third.changesets.first.changeset.size)
+        assert_equal(['name'], third.changesets.first.changeset.keys)
+        assert_equal('Qoo', third.changesets.first.changeset['name'][I18n.locale.to_s])
+
+        patch admin.catalog_product_path(product),
+          params: { product: { name: 'Quo', description: 'Three' } }
+
+        third.reload
+        assert_equal(1, third.changesets.size)
+        assert_equal(2, third.changesets.first.changeset.size)
+        assert_includes(third.changesets.first.changeset.keys, 'name')
+        assert_includes(third.changesets.first.changeset.keys, 'description')
+        assert_equal('Quo', third.changesets.first.changeset['name'][I18n.locale.to_s])
+        assert_equal('Three', third.changesets.first.changeset['description'][I18n.locale.to_s])
       end
 
-      def test_release_without_undo
-        user = create_user(admin: true, releases_access: true)
-
-        publish_at = 1.hour.from_now
-        create_release(
-          name: 'No Undo',
-          publish_at: publish_at
-        )
-
-        get admin.calendar_feed_releases_path(token: user.token)
-
-        assert_includes(response.body, "DTSTART;TZID=Etc/UTC:#{publish_at.strftime('%Y%m%dT%H%M%S')}\r\n")
-        assert_includes(response.body, t('workarea.admin.releases.feed.no_undo_date'))
+      def test_working_on_releases_that_publish_at_the_same_time
+        publish_at = 1.week.from_now
+        first = create_release(publish_at: publish_at)
+        second = create_release(publish_at: publish_at)
+
+        product = create_product(name: 'Foo', description: 'One')
+        first.as_current { product.update_attributes!(name: 'Bar', description: 'Two') }
+        second.as_current { product.update_attributes!(name: 'Baz') }
+
+        post admin.release_session_path, params: { release_id: second.id }
+        patch admin.catalog_product_path(product), params: { product: { name: 'Qux' } }
+
+        first.reload
+        assert_equal(1, first.changesets.size)
+        assert_equal(2, first.changesets.first.changeset.size)
+        assert_equal(%w(name description), first.changesets.first.changeset.keys)
+        assert_equal('Bar', first.changesets.first.changeset['name'][I18n.locale.to_s])
+        assert_equal('Two', first.changesets.first.changeset['description'][I18n.locale.to_s])
+
+        second.reload
+        assert_equal(1, second.changesets.size)
+        assert_equal(1, second.changesets.first.changeset.size)
+        assert_equal(['name'], second.changesets.first.changeset.keys)
+        assert_equal('Qux', second.changesets.first.changeset['name'][I18n.locale.to_s])
       end
     end
   end

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

@@ -0,0 +1,28 @@
+require 'test_helper'
+
+module Workarea
+  module Admin
+    class SegmentOverridesIntegrationTest < Workarea::IntegrationTest
+      include Admin::IntegrationTest
+
+      def test_creates_segment_overrides
+        segment_one = create_segment
+        segment_two = create_segment
+        post admin.segment_override_path,
+          params: {
+            segment_ids: { segment_one.id => 'true', segment_two.id => 'false' },
+            return_to: '/foo'
+          }
+        assert_equal([segment_one.id], session[:segment_ids])
+        assert_redirected_to('/foo')
+
+        post admin.segment_override_path,
+          params: {
+            segment_ids: { segment_one.id => 'false', segment_two.id => 'false' }
+          }
+        assert_nil(session[:segment_ids])
+        assert_redirected_to(storefront.root_path)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+require 'test_helper'
+
+module Workarea
+  module Admin
+    class SegmentRulesIntegrationTest < Workarea::IntegrationTest
+      include Admin::IntegrationTest
+
+      setup :setup_segment
+
+      def setup_segment
+        @segment = create_segment(rules: [])
+      end
+
+      def test_create
+        post admin.segment_rules_path(@segment),
+          params: { rule_type: 'orders', rule: { minimum: '', maximum: 5 } }
+
+        assert_equal(1, @segment.reload.rules.size)
+        assert_equal(Segment::Rules::Orders, @segment.rules.first.class)
+        assert_nil(@segment.rules.first.minimum)
+        assert_equal(5, @segment.rules.first.maximum)
+      end
+
+      def test_update
+        rule = @segment.rules.create!({ maximum: 5 }, Segment::Rules::Orders)
+
+        patch admin.segment_rule_path(@segment, rule),
+          params: { rule: { minimum: 1, maximum: 5 } }
+
+        assert_equal(1, @segment.reload.rules.size)
+        assert_equal(Segment::Rules::Orders, @segment.rules.first.class)
+        assert_equal(1, @segment.rules.first.minimum)
+        assert_equal(5, @segment.rules.first.maximum)
+      end
+
+      def test_destroy
+        rule = @segment.rules.create!({ maximum: 5 }, Segment::Rules::Orders)
+        delete admin.segment_rule_path(@segment, rule)
+        assert_equal(0, @segment.reload.rules.size)
+      end
+
+      def test_geolocation_options
+        get admin.geolocation_options_segment_rules_path(q: 'penn', format: 'json')
+        results = JSON.parse(response.body)['results']
+        assert_equal([{ 'label' => 'Pennsylvania, US', 'value' => 'US-PA' }], results)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+require 'test_helper'
+
+module Workarea
+  module Admin
+    class SegmentsIntegrationTest < Workarea::IntegrationTest
+      include Admin::IntegrationTest
+
+      def test_update
+        segment = create_segment(name: 'Custom Segment')
+        patch admin.segment_path(segment), params: { segment: { name: 'foo bar' } }
+
+        assert_equal(1, Segment.count)
+        assert_equal('foo bar', Segment.first.name)
+      end
+
+      def test_destroy
+        segment = create_segment(name: 'Custom Segment')
+        delete admin.segment_path(segment)
+        assert_equal(0, Segment.count)
+
+        create_life_cycle_segments
+        life_cycle = Segment::LoyalCustomer.first
+
+        assert_no_difference 'Segment.count' do
+          delete admin.segment_path(life_cycle)
+          assert_equal(204, response.status)
+        end
+      end
+    end
+  end
+end

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

@@ -9,8 +9,7 @@ module Workarea
         shipping_service = {
           name:         'Shipping Service',
           tax_code:     '001',
-          country:      'US',
-          service_code: 'FED'
+          country:      'US'
         }
         post admin.shipping_services_path,
           params: { service: shipping_service, new_rates: [{ price: '7.00' }] }
@@ -21,7 +20,6 @@ module Workarea
         assert_equal('Shipping Service', service.name)
         assert_equal('001', service.tax_code)
         assert_equal(Country['US'], service.country)
-        assert_equal('FED', service.service_code)
       end
 
       def test_update

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

@@ -16,7 +16,7 @@ module Workarea
 
       def test_creates_a_new_tax_category
         post admin.tax_categories_path,
-          params: { category: @tax_category, new_rates: [{ percentage: 0.07 }] }
+          params: { category: @tax_category }
 
         assert_equal(1, Tax::Category.count)
 

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

@@ -0,0 +1,32 @@
+require 'test_helper'
+
+module Workarea
+  module Admin
+    class UnsubscribesIntegrationTest < Workarea::IntegrationTest
+      def test_unsubscribing_from_status_report
+        user = create_user(status_email_recipient: true)
+
+        get admin.status_report_unsubscribe_path(user.token)
+
+        assert_redirected_to(storefront.root_path)
+        assert(flash[:success].present?)
+
+        user.reload
+        refute(user.status_email_recipient)
+      end
+
+      def test_unsubscribing_from_commentable
+        user = create_user(admin: true)
+        commentable = create_release(subscribed_user_ids: [user.id])
+
+        get admin.commentable_unsubscribe_url(
+          user.token,
+          commentable_id: commentable.to_global_id
+        )
+
+        commentable.reload
+        assert_equal([], commentable.subscribed_user_ids)
+      end
+    end
+  end
+end

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

@@ -148,6 +148,38 @@ module Workarea
         assert(flash[:success].present?)
         refute(Email.signed_up?(user.email))
       end
+
+      def test_password_reset
+        user = create_user
+
+        post admin.send_password_reset_user_path(user)
+
+        assert_redirected_to(admin.user_path(user))
+        assert(flash[:success].present?)
+
+        assert_equal(1, User::PasswordReset.count)
+
+        reset = User::PasswordReset.first
+        assert_equal(user.id, reset.user_id)
+
+        delivery = ActionMailer::Base.deliveries.last
+        assert_includes(delivery.subject, t('workarea.storefront.email.password_reset.subject'))
+        assert_includes(delivery.to, user.email)
+        assert_includes(delivery.html_part.body, reset.token)
+      end
+
+      def test_unlock_user
+        user = create_user(
+          failed_login_count: Workarea.config.allowed_login_attempts + 1,
+          last_login_attempt_at: Time.current
+        )
+
+        patch admin.unlock_user_path(user)
+
+        assert_redirected_to(admin.user_path(user))
+        assert(flash[:success].present?)
+        refute(user.reload.login_locked?)
+      end
     end
   end
 end

data/test/javascripts/fixtures/release_reminder.html.haml

@@ -1,6 +1,6 @@
 .release-select--emphasize
   .release-select__container
 
-#release-select-reminder
-  %a{ href: '#', data: { release_reminder_yes: '' } } Yes
-  %a{ href: '#', data: { release_reminder_no: '' } } No
+  #release-select-reminder.tooltip-content
+    %a{ href: '#', data: { release_reminder_yes: '' } } Yes
+    %a{ href: '#', data: { release_reminder_no: '' } } No