workarea-core 3.4.45 → 3.5.0.beta.1

data/test/integration/workarea/authentication_test.rb

@@ -4,7 +4,10 @@ module Workarea
   class AuthenticationTest < IntegrationTest
     class AuthenticationController < Workarea::ApplicationController
       include Authentication
+      include HttpCaching
+      include Storefront::CurrentCheckout
 
+      before_action :cache_page, only: :cached
       before_action :require_login, only: :logged_in
       before_action :require_logout, only: :logged_out
       before_action :require_password_changes
@@ -30,6 +33,10 @@ module Workarea
       def logged_out
         head :ok
       end
+
+      def cached
+        render plain: 'cached'
+      end
     end
 
     setup do
@@ -39,6 +46,7 @@ module Workarea
         get 'login_required', to: 'workarea/authentication_test/authentication#logged_in'
         get 'logout_required', to: 'workarea/authentication_test/authentication#logged_out'
         get 'foo', to: 'workarea/authentication_test/authentication#foo'
+        get 'cached', to: 'workarea/authentication_test/authentication#cached'
       end
       Rails.application.reload_routes!
 
@@ -134,14 +142,21 @@ module Workarea
     end
 
     def test_turning_off_cache_for_admins
+      Workarea.config.strip_http_caching_in_tests = false
+
+      get '/cached'
+      assert_match(/public/, response.headers['Cache-Control'])
+
       get '/test_login', params: { user_id: @user.id }
-      assert(cookies['cache'].blank?)
+      get '/cached'
+      assert_match(/public/, response.headers['Cache-Control'])
 
       get '/test_logout'
-      @user.update_attributes!(admin: true)
-
+      @user.update!(admin: true)
       get '/test_login', params: { user_id: @user.id }
-      assert_equal(cookies['cache'], 'false')
+
+      get '/cached'
+      assert_match(/private/, response.headers['Cache-Control'])
     end
 
     def test_show_change_password_form_when_password_expires
@@ -162,5 +177,13 @@ module Workarea
 
       assert_response(:unauthorized)
     end
+
+    def test_setting_email_cookie
+      get '/test_login', params: { user_id: @user.id }
+      assert(cookies[:email].present?)
+
+      get '/test_logout'
+      refute(cookies[:email].present?)
+    end
   end
 end

data/test/integration/workarea/authorization_test.rb

@@ -65,6 +65,11 @@ module Workarea
       AuthorizationController.required_permissions(:store)
       @user.update_attributes!(admin: true, store_access: true)
       assert_authorized
+
+      AuthorizationController.reset_permissions!
+      AuthorizationController.required_permissions(:orders_manager)
+      @user.update_attributes!(admin: true, orders_manager: true)
+      assert_authorized
     end
 
     def test_non_admins

data/test/integration/workarea/cache_varies_integration_test.rb

@@ -14,7 +14,7 @@ module Workarea
     end
 
     class CachingController < Workarea::ApplicationController
-      include Storefront::HttpCaching
+      include HttpCaching
       before_action :cache_page, only: :foo
 
       def set_session
@@ -42,39 +42,37 @@ module Workarea
     def app
       @app ||= Rack::Builder.new do
         use AddEnvMiddleware
-        use RackCacheConfigMiddleware
+        use ApplicationMiddleware
         use Rack::Cache, metastore: 'heap:/', entitystore: 'heap:/'
         run Rails.application
       end
     end
 
     def test_varies_on_session
-      Workarea.with_config do |config|
-        config.strip_http_caching_in_tests = false
-        config.cache_varies = [lambda { session[:foo] }]
+      Workarea.config.strip_http_caching_in_tests = false
+      Workarea.config.cache_varies = [lambda { session[:foo] }]
 
-        get '/cache_varies_test_foo'
-        assert_equal('nil', response.body)
-        assert_equal('miss, store', response.headers['X-Rack-Cache'])
+      get '/cache_varies_test_foo'
+      assert_equal('nil', response.body)
+      assert_equal('miss, store', response.headers['X-Rack-Cache'])
 
-        post '/cache_varies_test_set_session', params: { foo: 'bar' }
-        get '/cache_varies_test_foo'
-        assert_equal('bar', response.body)
-        assert_equal('miss, store', response.headers['X-Rack-Cache'])
+      post '/cache_varies_test_set_session', params: { foo: 'bar' }
+      get '/cache_varies_test_foo'
+      assert_equal('bar', response.body)
+      assert_equal('miss, store', response.headers['X-Rack-Cache'])
 
-        get '/cache_varies_test_foo'
-        assert_equal('bar', response.body)
-        assert_equal('fresh', response.headers['X-Rack-Cache'])
+      get '/cache_varies_test_foo'
+      assert_equal('bar', response.body)
+      assert_equal('fresh', response.headers['X-Rack-Cache'])
 
-        post '/cache_varies_test_set_session', params: { foo: 'baz' }
-        get '/cache_varies_test_foo'
-        assert_equal('baz', response.body)
-        assert_equal('miss, store', response.headers['X-Rack-Cache'])
+      post '/cache_varies_test_set_session', params: { foo: 'baz' }
+      get '/cache_varies_test_foo'
+      assert_equal('baz', response.body)
+      assert_equal('miss, store', response.headers['X-Rack-Cache'])
 
-        get '/cache_varies_test_foo'
-        assert_equal('baz', response.body)
-        assert_equal('fresh', response.headers['X-Rack-Cache'])
-      end
+      get '/cache_varies_test_foo'
+      assert_equal('baz', response.body)
+      assert_equal('fresh', response.headers['X-Rack-Cache'])
     end
   end
 end

data/test/integration/workarea/monitoring_integration_test.rb

@@ -3,32 +3,27 @@ require 'test_helper'
 module Workarea
   class MonitoringIntegrationTest < Workarea::IntegrationTest
     def test_monitors_the_mongodb_status
-      get workarea.easymon_path + '/mongodb'
+      get workarea.easymon_path('mongodb')
       assert_includes(response.body, 'Up')
     end
 
     def test_monitors_the_redis_status
-      get workarea.easymon_path + '/redis'
+      get workarea.easymon_path('redis')
       assert_includes(response.body, 'Up')
     end
 
     def test_monitors_the_elasticsearch_status
-      get workarea.easymon_path + '/elasticsearch'
+      get workarea.easymon_path('elasticsearch')
       assert_includes(response.body, 'Up')
     end
 
     def test_monitors_the_sidekiq_queue_status
-      get workarea.easymon_path + '/sidekiq-queue'
+      get workarea.easymon_path('sidekiq-queue')
       assert_includes(response.body, 'Low')
     end
 
     def test_monitors_for_load_balancing
-      get workarea.easymon_path + '/load-balancing'
-      assert_includes(response.body, 'Up')
-    end
-
-    def test_critical_endpoint
-      get workarea.easymon_path + "/critical"
+      get workarea.easymon_path('load-balancing')
       assert_includes(response.body, 'Up')
     end
   end

data/test/javascripts/duplicate_id_spec.js

@@ -1,5 +1,4 @@
 //= require workarea/core/modules/environment
-//= require workarea/core/modules/string
 //= require workarea/core/modules/duplicate_id
 
 (function () {
@@ -8,14 +7,9 @@
     describe('WORKAREA.duplicateId', function () {
         describe('init', function () {
             it('throws error on duplicate ids', function () {
-                this.fixtures = fixture.load('duplicate_id_fail.html');
+                this.fixtures = fixture.load('duplicate_id.html');
                 expect(WORKAREA.duplicateId.init).to.throw(Error, /foo|bar/);
             });
-
-            it('should allow for empty ID values', function () {
-                this.fixtures = fixture.load('duplicate_id_pass.html');
-                expect(WORKAREA.duplicateId.init).to.not.throw(Error);
-            });
         });
     });
 }());

data/test/javascripts/fixtures/{duplicate_id_fail.html.haml → duplicate_id.html.haml}

@@ -4,4 +4,3 @@
   #bar
   #foo
 #baz
-

data/test/javascripts/form_submitting_controls_spec.js

@@ -1,4 +1,3 @@
-//= require workarea/core/modules/environment
 //= require workarea/core/modules/url
 //= require workarea/core/modules/form_submitting_controls
 

data/test/lib/workarea/asset_endpoints/favicons_test.rb

@@ -4,24 +4,22 @@ module Workarea
   module AssetEndpoints
     class FaviconsTest < TestCase
       def test_result
-        Workarea.with_config do |config|
-          config.favicon_allowed_sizes = %w(32x32 16x16)
+        Workarea.config.favicon_allowed_sizes = %w(32x32 16x16)
 
-          endpoint = Favicons.new({ size: '32x32' }, nil, {})
-          assert_includes(endpoint.result.url, config.favicon_placeholder_image_name)
+        endpoint = Favicons.new({ size: '32x32' }, nil, {})
+        assert_includes(endpoint.result.url, Workarea.config.favicon_placeholder_image_name)
 
-          default_asset = create_asset(tag_list: 'favicon')
-          assert_equal(default_asset.favicon('32x32').url, endpoint.result.url)
+        default_asset = create_asset(tag_list: 'favicon')
+        assert_equal(default_asset.favicon('32x32').url, endpoint.result.url)
 
-          asset_32 = create_asset(tag_list: 'favicon-32x32')
-          assert_equal(asset_32.favicon('32x32').url, endpoint.result.url)
+        asset_32 = create_asset(tag_list: 'favicon-32x32')
+        assert_equal(asset_32.favicon('32x32').url, endpoint.result.url)
 
-          endpoint = Favicons.new({ size: '16x16' }, nil, {})
-          assert_equal(default_asset.favicon('16x16').url, endpoint.result.url)
+        endpoint = Favicons.new({ size: '16x16' }, nil, {})
+        assert_equal(default_asset.favicon('16x16').url, endpoint.result.url)
 
-          endpoint = Favicons.new({ size: '64x64' }, nil, {})
-          assert_nil(endpoint.result)
-        end
+        endpoint = Favicons.new({ size: '64x64' }, nil, {})
+        assert_nil(endpoint.result)
       end
 
       def test_ico

data/test/lib/workarea/configuration/administrable/definition_test.rb

@@ -0,0 +1,71 @@
+require 'test_helper'
+
+module Workarea
+  module Configuration
+    module Administrable
+      class DefinitionTest < TestCase
+        def test_fieldset
+          definition = Definition.new
+
+          assert_equal(1, definition.fieldsets.size)
+
+          fieldset = definition.fieldsets.first
+          assert_equal(:application, fieldset.id)
+          assert_equal(0, fieldset.fields.size)
+
+          definition.fieldset('Foo Bar') do
+            field 'Baz', type: :string
+          end
+
+          assert_equal(2, definition.fieldsets.size)
+
+          fieldset = definition.fieldsets.last
+          assert_equal(:foo_bar, fieldset.id)
+          assert_equal(1, fieldset.fields.size)
+          assert_equal(:baz, fieldset.fields.first.id)
+          assert_equal(:string, fieldset.fields.first.type)
+
+          definition.fieldset('Foo Bar') do
+            field 'qux', type: :array, default: []
+          end
+
+          assert_equal(2, definition.fieldsets.size)
+
+          fieldset = definition.fieldsets.last
+          assert_equal(:foo_bar, fieldset.id)
+          assert_equal(2, fieldset.fields.size)
+          assert_equal(:qux, fieldset.fields.last.id)
+          assert_equal(:array, fieldset.fields.last.type)
+          assert_equal([], fieldset.fields.last.default)
+
+          definition.fieldset('Foo Bar', override: true) do
+            field 'boo', type: :integer, default: 888
+          end
+
+          fieldset = definition.fieldsets.last
+          assert_equal(:foo_bar, fieldset.id)
+          assert_equal(1, fieldset.fields.size)
+          assert_equal(:boo, fieldset.fields.first.id)
+          assert_equal(:integer, fieldset.fields.first.type)
+          assert_equal(888, fieldset.fields.first.default)
+        end
+
+        def test_find_fieldset
+          definition = Definition.new
+
+          assert_equal(:application, definition.find_fieldset('application').id)
+          assert_equal(:application, definition.find_fieldset(:application).id)
+
+          definition.fieldset('Foo Bar') do
+            field 'Baz', type: :string
+          end
+
+          assert_equal(:foo_bar, definition.find_fieldset('foo_bar').id)
+          assert_equal(:foo_bar, definition.find_fieldset(:foo_bar).id)
+
+          assert_nil(definition.find_fieldset('baz'))
+        end
+      end
+    end
+  end
+end

data/test/lib/workarea/configuration/administrable/field_test.rb

@@ -0,0 +1,128 @@
+require 'test_helper'
+
+module Workarea
+  module Configuration
+    module Administrable
+      class FieldTest < TestCase
+        def test_id
+          assert_equal(:foo_bar, Field.new('Foo Bar', type: :string).id)
+          assert_equal(:_billz, Field.new('$billz', type: :string).id)
+        end
+
+        def test_initialize
+          field = Field.new(
+            'Bar',
+            type: :string,
+            default: 'baz',
+            values: %w(bax qux),
+            description: 'this is a test field'
+          )
+
+          assert_equal('Bar', field.name)
+          assert_equal(:bar, field.id)
+          assert_equal(:string, field.type)
+          assert_equal('baz', field.default)
+          assert_equal(%w(bax qux), field.values)
+          assert_equal('this is a test field', field.description)
+
+          field = Field.new('Bar', id: 'foobar', type: :string)
+
+          assert_equal('Bar', field.name)
+          assert_equal(:foobar, field.id)
+        end
+
+        def test_validate!
+          field = Field.new('Bar', id: 'foobar', type: :string)
+          assert(field.validate!)
+
+          assert_raise(Field::Invalid) do
+            Field.new('Qux', type: :fake).validate!
+          end
+
+          assert_raise(Field::Invalid) do
+            Field.new('Dolla Billz', type: :string, id: '$billz').validate!
+          end
+        end
+
+        def test_values
+          field = Field.new('Foo', type: :string, values: %w(bar baz))
+          assert_equal(%w(bar baz), field.values)
+
+          field = Field.new('Foo', type: :string, values: -> { %w(bar baz) })
+          assert_equal(%w(bar baz), field.values)
+        end
+
+        def test_values_type_class
+          field = Field.new(
+            'Bar',
+            type: :string,
+            values_type: :integer
+          )
+
+          assert_nil(field.values_type_class)
+
+          field = Field.new(
+            'Bar',
+            type: :hash,
+            values_type: :integer
+          )
+
+          assert_equal(Integer, field.values_type_class)
+        end
+
+        def test_overridden?
+          field = Field.new('Foo', type: :string)
+          refute(field.overridden?)
+
+          Workarea.config.foo = 'bar'
+          assert(field.overridden?)
+
+          Workarea.config.foo = ''
+          assert(field.overridden?)
+
+          Workarea.config.delete(:foo)
+          refute(field.overridden?)
+
+          fieldset = Fieldset.new('Foo')
+          field = Field.new('Bar', type: :string, fieldset: fieldset)
+          refute(field.overridden?)
+
+          Workarea.config.foo_bar = 'baz'
+          assert(field.overridden?)
+
+          Workarea.config.foo_bar = ''
+          assert(field.overridden?)
+
+          Workarea.config.delete(:foo_bar)
+          refute(field.overridden?)
+
+          Workarea.config.bar = 'baz'
+          refute(field.overridden?)
+
+          Workarea.config.delete(:bar)
+
+          fieldset = Fieldset.new('Foo', namespaced: false)
+          field = Field.new('Bar', type: :string, fieldset: fieldset)
+          refute(field.overridden?)
+
+          Workarea.config.foo_bar = 'baz'
+          refute(field.overridden?)
+
+          Workarea.config.bar = 'baz'
+          assert(field.overridden?)
+        end
+
+        def test_allow_blank?
+          field = Field.new('Foo', type: :string)
+          refute(field.allow_blank?)
+
+          field = Field.new('Foo', type: :string, allow_blank: false)
+          refute(field.allow_blank?)
+
+          field = Field.new('Foo', type: :string, allow_blank: true)
+          assert(field.allow_blank?)
+        end
+      end
+    end
+  end
+end

data/test/lib/workarea/configuration/administrable/fieldset_test.rb

@@ -0,0 +1,78 @@
+require 'test_helper'
+
+module Workarea
+  module Configuration
+    module Administrable
+      class FieldsetTest < TestCase
+        def test_id
+          assert_equal(:foo_bar, Fieldset.new('Foo Bar').id)
+          assert_equal(:_billz, Fieldset.new('$billz').id)
+        end
+
+        def test_field
+          fieldset = Fieldset.new('Foo')
+
+          fieldset.field 'Bar',
+            type: :string,
+            default: 'baz',
+            values: %w(bax qux),
+            description: 'this is a test field'
+
+          assert_equal(1, fieldset.fields.size)
+
+          field = fieldset.fields.first
+          assert_equal('Bar', field.name)
+          assert_equal(:bar, field.id)
+          assert_equal(:string, field.type)
+          assert_equal('baz', field.default)
+          assert_equal(%w(bax qux), field.values)
+          assert_equal('this is a test field', field.description)
+
+          fieldset.field 'Bar', override: true, type: :symbol, default: :baz
+
+          assert_equal(1, fieldset.fields.size)
+
+          field = fieldset.fields.first
+          assert_equal('Bar', field.name)
+          assert_equal(:bar, field.id)
+          assert_equal(:symbol, field.type)
+          assert_equal(:baz, field.default)
+          assert_nil(field.values)
+          assert_nil(field.description)
+
+          fieldset.field 'Bar', values: %i(baz qux), default: :qux
+
+          assert_equal(1, fieldset.fields.size)
+
+          field = fieldset.fields.first
+          assert_equal('Bar', field.name)
+          assert_equal(:bar, field.id)
+          assert_equal(:symbol, field.type)
+          assert_equal(:qux, field.default)
+          assert_equal(%i(baz qux), field.values)
+          assert_nil(field.description)
+
+          fieldset.field 'Bar', encrypted: true
+          assert(Rails.application.config.filter_parameters.include?(:foo_bar))
+
+          assert_raise(Field::Invalid) do
+            fieldset.field 'Qux', type: :fake
+          end
+
+          assert_raise(Field::Invalid) do
+            fieldset.field 'Dolla Billz', type: :string, id: '$billz'
+          end
+        end
+
+        def test_find_field
+          fieldset = Fieldset.new('Foo')
+          fieldset.field 'Bar', type: :string
+
+          assert_equal(:bar, fieldset.find_field('bar').id)
+          assert_equal(:bar, fieldset.find_field(:bar).id)
+          assert_nil(fieldset.find_field(:baz))
+        end
+      end
+    end
+  end
+end

data/test/lib/workarea/configuration/configuration_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+
+module Workarea
+  module Configuration
+    class AdministrableOptionsTest < TestCase
+      def test_method_missing
+        instance = Admin.instance
+        config = AdministrableOptions.new
+
+        instance.update(email_to: 'test@workarea.com')
+        assert_equal('test@workarea.com', config.email_to)
+
+        config.email_to = 'other@workarea.com'
+        assert_equal('other@workarea.com', config.email_to)
+
+        assert_nil(config.fake_key)
+      end
+    end
+  end
+end

data/test/lib/workarea/elasticsearch/document_test.rb

@@ -67,26 +67,6 @@ module Workarea
         assert_equal({ 'id' => '1' }, results.first['_source'])
       end
 
-      def test_bulk_with_block
-        set_locales(available: [:en, :es], default: :en, current: :en)
-        Foo.bulk { { id: I18n.locale.to_s, bulk_action: 'index' } }
-
-        find_results = -> do
-          Foo
-            .current_index
-            .search({ query: { match_all: {} } }, type: 'foo')
-            .dig('hits', 'hits')
-        end
-
-        I18n.locale = :en
-        assert(1, Foo.count)
-        assert_equal({ 'id' => 'en' }, find_results.call.first['_source'])
-
-        I18n.locale = :es
-        assert(1, Foo.count)
-        assert_equal({ 'id' => 'es' }, find_results.call.first['_source'])
-      end
-
       def test_update
         Foo.save(id: '1')
         Foo.update(id: '1', foo: 'bar')

data/test/lib/workarea/elasticsearch/query_cache_test.rb

@@ -40,7 +40,7 @@ module Workarea
       end
 
       def test_when_query_cache_is_disabled
-        Workarea::Search::Storefront::Product.find_categories(product)
+        Search::Storefront::CategoryQuery.find_by_product(product)
 
         assert_requested :get, "#{Workarea::Search::Storefront.current_index.url}/_search"
       end
@@ -48,11 +48,11 @@ module Workarea
       def test_when_query_cache_is_enabled
         Workarea::Elasticsearch::QueryCache.enabled = true
 
-        Workarea::Search::Storefront::Product.find_categories(product)
+        Search::Storefront::CategoryQuery.find_by_product(product)
 
         WebMock.reset!
 
-        Workarea::Search::Storefront::Product.find_categories(product)
+        Search::Storefront::CategoryQuery.find_by_product(product)
 
         assert_not_requested :get, "#{Workarea::Search::Storefront.current_index.url}/_search"
       end
@@ -60,13 +60,13 @@ module Workarea
       def test_reset_when_updating_a_document
         Workarea::Elasticsearch::QueryCache.enabled = true
 
-        Workarea::Search::Storefront::Product.find_categories(product)
+        Search::Storefront::CategoryQuery.find_by_product(product)
 
         product.update_attributes(name: 'New Name')
 
         WebMock.reset!
 
-        Workarea::Search::Storefront::Product.find_categories(product)
+        Search::Storefront::CategoryQuery.find_by_product(product)
 
         assert_requested :get, "#{Workarea::Search::Storefront.current_index.url}/_search"
       end
@@ -74,7 +74,7 @@ module Workarea
       def test_reset_when_deleting_a_document
         Workarea::Elasticsearch::QueryCache.enabled = true
 
-        Workarea::Search::Storefront::Product.find_categories(product)
+        Search::Storefront::CategoryQuery.find_by_product(product)
 
         product.update_attributes(name: 'New Name')
 
@@ -84,7 +84,7 @@ module Workarea
 
         WebMock.reset!
 
-        Workarea::Search::Storefront::Product.find_categories(product)
+        Search::Storefront::CategoryQuery.find_by_product(product)
 
         assert_requested :get, "#{Workarea::Search::Storefront.current_index.url}/_search"
       end

data/test/lib/workarea/ext/freedom_patches/money_test.rb

@@ -0,0 +1,11 @@
+require 'test_helper'
+
+module Workarea
+  class MoneyTest < TestCase
+    def test_mongoize_returns_nil_for_blank_values
+      assert_nil(Money.mongoize(''))
+      assert_nil(Money.mongoize(' '))
+      assert_nil(Money.mongoize(nil))
+    end
+  end
+end