Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 13 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -185,14 +185,26 @@ jobs:
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2
bundler-cache: true
# For experimental entries, allow bundling to fail without breaking the job.
bundler-cache: false

- name: Bundle install
id: bundle
run: bundle install
continue-on-error: ${{ matrix.experimental }}

- name: Install system deps (docker-compose + ImageMagick)
run: sudo apt-get update && sudo apt-get install -y docker-compose imagemagick

- uses: workarea-commerce/ci/test@v1
if: steps.bundle.outcome == 'success'
with:
command: bundle exec rake test

- name: Warn on experimental bundle failures
if: steps.bundle.outcome != 'success' && matrix.experimental
run: echo "::warning::bundle install failed for Rails ${{ matrix.rails }} (informational — experimental version)"

# Ruby compatibility matrix — tracks Workarea bundling health across Ruby versions.
# Ruby 2.7: legacy baseline (Docker-pinned CI actions run ruby:2.6 internally).
# Ruby 3.2: current stable target — must pass (continue-on-error: false).
Expand Down
10 changes: 5 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ PATH
kaminari-mongoid (~> 1.0)
local_time (~> 2.1)
lodash-rails (~> 4.17)
loofah (~> 2.9.0)
loofah (>= 2.9.0, < 3)
measured (>= 2.0)
minitest (~> 5.14)
money-rails (~> 1.13)
Expand Down Expand Up @@ -379,9 +379,9 @@ GEM
lodash-rails (4.17.21)
railties (>= 3.1)
logger (1.7.0)
loofah (2.9.1)
loofah (2.25.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
nokogiri (>= 1.12.0)
mail (2.9.0)
logger
mini_mime (>= 0.1.1)
Expand Down Expand Up @@ -445,9 +445,9 @@ GEM
net-smtp (0.5.1)
net-protocol
nio4r (2.7.5)
nokogiri (1.15.7-arm64-darwin)
nokogiri (1.19.1-arm64-darwin)
racc (~> 1.4)
nokogiri (1.15.7-x86_64-linux)
nokogiri (1.19.1-x86_64-linux-gnu)
racc (~> 1.4)
normalize-rails (8.0.1)
ostruct (0.6.3)
Expand Down
12 changes: 11 additions & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,17 @@ task :test do
# Override this to print a command that we rerun the test on failure
Rails::TestUnitReporter.class_eval do
def format_rerun_snippet(result)
location, line = result.method(result.name).source_location
location, line =
if result.respond_to?(:source_location)
result.source_location
elsif result.respond_to?(:klass) && result.respond_to?(:name)
result.klass.instance_method(result.name).source_location
else
[nil, nil]
end

return super if location.blank? || line.blank?

rel_path = relative_path_for(location)

GEMS.each do |gem|
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class ActivitiesController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class ApplicationController < Workarea::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class BookmarksController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class BulkActionDeletionsController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class BulkActionProductEditsController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class BulkActionSequentialProductEditsController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class BulkActionsController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
module BulkVariantSaving
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class CatalogCategoriesController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class CatalogProductCopiesController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class CatalogProductImagesController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
class Admin::CatalogProductsController < Admin::ApplicationController
required_permissions :catalog
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
class Admin::CatalogVariantsController < Admin::ApplicationController
required_permissions :catalog
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class CategorizationsController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class ChangesetsController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class CommentsController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class ConfigurationsController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
class Admin::ContentAssetsController < Admin::ApplicationController
required_permissions :store
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class ContentBlockDraftsController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
class Admin::ContentBlocksController < Admin::ApplicationController
required_permissions :store
Expand Down
1 change: 1 addition & 0 deletions admin/app/controllers/workarea/admin/content_controller.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
class Admin::ContentController < Admin::ApplicationController
required_permissions :store
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
class Admin::ContentEmailsController < Admin::ApplicationController
required_permissions :marketing
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class ContentPageCopiesController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
class Admin::ContentPagesController < Admin::ApplicationController
required_permissions :store
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
class Admin::ContentPresetsController < Admin::ApplicationController
required_permissions :store
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class CreateCatalogCategoriesController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class CreateCatalogProductsController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
class Admin::CreateContentPagesController < Admin::ApplicationController
required_permissions :store
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class CreatePricingDiscountsController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class CreateReleaseUndosController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class CreateReleasesController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class CreateSegmentsController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class CreateUsersController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class CustomEventsController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
class Admin::DashboardsController < Admin::ApplicationController
def index
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class DataFileExportsController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class DataFileImportsController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class DataFileTaxImportsController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class DataFilesController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class DirectUploadsController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class EmailSignupsController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class FeaturedProductsController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class FulfillmentSkusController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class FulfillmentTokensController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class FulfillmentsController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class GuestBrowsingsController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class HelpAssetsController < Admin::ApplicationController
Expand Down
1 change: 1 addition & 0 deletions admin/app/controllers/workarea/admin/help_authorization.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
module HelpAuthorization
Expand Down
1 change: 1 addition & 0 deletions admin/app/controllers/workarea/admin/help_controller.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class HelpController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class InvalidImpersonation < StandardError; end
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class InventorySkusController < Admin::ApplicationController
Expand Down
1 change: 1 addition & 0 deletions admin/app/controllers/workarea/admin/jump_to_controller.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class JumpToController < Admin::ApplicationController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Workarea
module Admin
class NavigationMenusController < Admin::ApplicationController
Expand Down
Loading
Loading