solidusio · fthobe · Nov 12, 2024 · Nov 12, 2024 · Nov 13, 2024 · Nov 14, 2024
@@ -232,27 +232,6 @@ commands:
             bundle exec rake -rrails -rspree/testing_support/extension_rake -e'Rake::Task["extension:test_app"].invoke'
 
 jobs:
-  lint_code:
-    docker:
-      - image: cimg/ruby:3.2-node
-        environment:
-          BUNDLE_ONLY: "lint"
-          ESLINT_USE_FLAT_CONFIG: false
-    steps:
-      - checkout
-      - run: "bundle install"
-      - run:
-          name: Check Ruby
-          command: "bin/rake lint:rb"
-      - run:
-          name: Check ERB
-          command: "bin/rake lint:erb"
-      - run:
-          name: Check JavaScript
-          command: "bin/rake lint:js"
-      - store_test_results:
-          path: test-results
-
   solidus_installer:
     executor:
       name: sqlite
@@ -362,7 +341,6 @@ jobs:
 workflows:
   build:
     jobs:
-      - lint_code
       - solidus_installer
       - test_solidus_with_coverage # Only test with coverage support with the default versions
 

@@ -0,0 +1,62 @@
+name: Lint
+
+on: [pull_request]
+
+concurrency:
+  group: lint-${{ github.ref_name }}
+  cancel-in-progress: ${{ github.ref_name != 'main' }}
+
+permissions:
+  contents: read
+
+env:
+  BUNDLE_ONLY: "lint"
+
+jobs:
+  ruby:
+    name: Check Ruby
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Install Ruby and gems
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.2"
+          bundler-cache: true
+      - name: Lint Ruby files
+        run: bin/rake lint:rb
+      - name: Store test results
+        uses: actions/upload-artifact@v4
+        with:
+          name: rubocop-results
+          path: test-results
+
+  erb:
+    name: Check ERB
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Install Ruby and gems
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.2"
+          bundler-cache: true
+      - name: Lint ERB files
+        run: bin/rake lint:erb
+
+  javascript:
+    name: Check JavaScript
+    runs-on: ubuntu-22.04
+    env:
+      ESLINT_USE_FLAT_CONFIG: false
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install Ruby and gems
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.2"
+          bundler-cache: true
+      - name: Lint JS files
+        run: bin/rake lint:js
@@ -1,3 +1,68 @@
+## Solidus v4.4.2 (2024-12-09)
+
+<!-- Please, don't edit manually. The content is automatically generated. -->
+
+## Solidus Core
+
+* [v4.4] [FIX] Remove spacing at top of OrderShipping#ship method by @github-actions[bot] in https://github.com/solidusio/solidus/pull/5974
+* [v4.4] Backend: Add missing error translation by @github-actions[bot] in https://github.com/solidusio/solidus/pull/5986
+* [v4.4] Test app task: Allow passing in user class by @github-actions[bot] in https://github.com/solidusio/solidus/pull/5961
+* [v4.4] Add show all results to en.yml by @github-actions[bot] in https://github.com/solidusio/solidus/pull/5996
+* [v4.4] Do not constantize Spree.user_class in UserClassHandle by @github-actions[bot] in https://github.com/solidusio/solidus/pull/6004
+
+## Solidus Admin
+
+* [v4.4] test: Wait for modal to open before testing its content by @github-actions[bot] in https://github.com/solidusio/solidus/pull/5994
+* [v4.4] [specs] Wait for modal before testing its content by @github-actions[bot] in https://github.com/solidusio/solidus/pull/6005
+* [v4.4] Use Order#email to show the order&#x27;s email in new admin by @github-actions[bot] in https://github.com/solidusio/solidus/pull/6006
+* [v4.4] tests: Give even more dialogs more time to open in tests by @github-actions[bot] in https://github.com/solidusio/solidus/pull/6018
+
+## Solidus Backend
+
+* [v4.4] Backend: Add missing error translation by @github-actions[bot] in https://github.com/solidusio/solidus/pull/5986
+
+## Solidus Promotions
+
+* [v4.4] test: Wait for modal to open before testing its content by @github-actions[bot] in https://github.com/solidusio/solidus/pull/5994
+* [v4.4] [FIX] A few small tweaks for the new promotion admin by @github-actions[bot] in https://github.com/solidusio/solidus/pull/6021
+* [v4.4] Fix(promotions): Validate benefits on save by @github-actions[bot] in https://github.com/solidusio/solidus/pull/6023
+* [v4.4] Add can apply to promotions by @github-actions[bot] in https://github.com/solidusio/solidus/pull/6024
+* [v4.4] Fix admin promotions controller by @github-actions[bot] in https://github.com/solidusio/solidus/pull/6020
+
+**Full Changelog**: https://github.com/solidusio/solidus/compare/v4.4.1...v4.4.2
+
+
+## Solidus v4.4.1 (2024-11-18)
+
+<!-- Please, don't edit manually. The content is automatically generated. -->
+
+## Solidus Core
+
+* [v4.4] Move Line Item Actions to solidus_legacy_promotions by @github-actions[bot] in https://github.com/solidusio/solidus/pull/5919
+* [v4.4] Remove rails binstubs from built gems by @github-actions[bot] in https://github.com/solidusio/solidus/pull/5922
+
+## Solidus Admin
+
+* [v4.4] Remove rails binstubs from built gems by @github-actions[bot] in https://github.com/solidusio/solidus/pull/5922
+* [v4.4] Fix component translation scopes by @github-actions[bot] in https://github.com/solidusio/solidus/pull/5930
+* [v4.4] Feat(Admin): Dynamic routing proxies by @github-actions[bot] in https://github.com/solidusio/solidus/pull/5937
+
+## Solidus Backend
+
+* [v4.4] Remove rails binstubs from built gems by @github-actions[bot] in https://github.com/solidusio/solidus/pull/5922
+
+## Solidus API
+
+* [v4.4] Remove rails binstubs from built gems by @github-actions[bot] in https://github.com/solidusio/solidus/pull/5922
+
+## Solidus Promotions
+
+* [v4.4] Fix component translation scopes by @github-actions[bot] in https://github.com/solidusio/solidus/pull/5930
+* [v4.4] Better promotion menus by @tvdeyen in https://github.com/solidusio/solidus/pull/5938
+
+**Full Changelog**: https://github.com/solidusio/solidus/compare/v4.4.0...v4.4.1
+
+
 ## Solidus v4.4.0 (2024-11-12)
 
 <!-- Please, don't edit manually. The content is automatically generated. -->

@@ -25,6 +25,10 @@ def missing_translation(key, options)
       end
     end
 
+    def self.i18n_scope
+      @i18n_scope ||= name.underscore.tr("/", ".")
+    end
+
     def self.stimulus_id
       @stimulus_id ||= name.underscore
         .sub(/^solidus_admin\/(.*)\/component$/, '\1')
@@ -34,12 +38,22 @@ def self.stimulus_id
 
     delegate :stimulus_id, to: :class
 
-    def spree
-      @spree ||= Spree::Core::Engine.routes.url_helpers
+    class << self
+      private
+
+      def engines_with_routes
+        Rails::Engine.subclasses.map(&:instance).reject do |engine|
+          engine.routes.empty?
+        end
+      end
     end
 
-    def solidus_admin
-      @solidus_admin ||= SolidusAdmin::Engine.routes.url_helpers
+    # For each engine with routes, define a method that returns the routes proxy.
+    # This allows us to use the routes in the context of a component class.
+    engines_with_routes.each do |engine|
+      define_method(engine.engine_name) do
+        engine.routes.url_helpers
+      end
     end
   end
 end
@@ -1,7 +1,7 @@
 <li class="group <%= "active" if active? %>">
   <a
     href="<%= path %>"
-    aria-current="<%= @item.current?(@url_helpers, @fullpath) ? "page" : "false" %>"
+    aria-current="<%= @item.current?(self, @fullpath) ? "page" : "false" %>"
     class="
       flex gap-3 items-center
       py-1 px-3 rounded
@@ -20,7 +20,7 @@
 
   <% if @item.children? %>
     <ul class="flex flex-col gap-0.5 pt-0.5 <%= "hidden" unless active? %>">
-      <%= render self.class.with_collection(@item.children, url_helpers: @url_helpers, fullpath: @fullpath) %>
+      <%= render self.class.with_collection(@item.children, fullpath: @fullpath) %>
     </ul>
   <% end %>
 </li>
@@ -6,22 +6,19 @@ class SolidusAdmin::Layout::Navigation::Item::Component < SolidusAdmin::BaseComp
 
   # @param item [SolidusAdmin::MenuItem]
   # @param fullpath [String] the current path
-  # @param url_helpers [#solidus_admin, #spree] context for generating paths
   def initialize(
     item:,
-    fullpath: "#",
-    url_helpers: Struct.new(:spree, :solidus_admin).new(spree, solidus_admin)
+    fullpath: "#"
   )
     @item = item
-    @url_helpers = url_helpers
     @fullpath = fullpath
   end
 
   def path
-    @item.path(@url_helpers)
+    @item.path(self)
   end
 
   def active?
-    @item.active?(@url_helpers, @fullpath)
+    @item.active?(self, @fullpath)
   end
 end
@@ -143,7 +143,7 @@ def customer_column
       col: { class: "w-[400px]" },
       header: :customer,
       data: ->(order) do
-        customer_email = order.user&.email
+        customer_email = order.email
         content_tag :div, String(customer_email)
       end
     }

@@ -12,15 +12,9 @@ module ComponentHelpers
       #      "Rendered"
       #    end
       #  end
-      def mock_component(&definition)
-        location = caller(1, 1).first
-        component_class = Class.new(SolidusAdmin::BaseComponent)
-        # ViewComponent will complain if we don't fake a class name:
-        # @see https://github.com/ViewComponent/view_component/blob/5decd07842c48cbad82527daefa3fe9c65a4226a/lib/view_component/base.rb#L371
-        component_class.define_singleton_method(:name) { "Foo" }
-        component_class.define_singleton_method(:to_s) { "#{name} (#{location})" }
-        component_class.class_eval(&definition) if definition
-        component_class
+      def mock_component(class_name = "Foo::Component", &definition)
+        component_class = stub_const(class_name, Class.new(described_class, &definition))
+        component_class.new
       end
     end
   end

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.metadata["changelog_uri"] = "https://github.com/solidusio/solidus/releases?q=%22solidus_admin%2Fv0%22&expanded=true"
 
   s.files = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(spec|script)/})
+    f.match(%r{^(spec|bin)/})
   end + ["app/assets/builds/solidus_admin/tailwind.css"]
 
   s.required_ruby_version = '>= 3.1.0'

@@ -9,7 +9,7 @@
         def call
           icon_tag("user-line")
         end
-      end.new
+      end
 
       render_inline(component)
 
@@ -42,7 +42,7 @@ def call
 
   describe ".stimulus_id" do
     it "returns the stimulus id for the component" do
-      stub_const("SolidusAdmin::Foo::Bar::Component", Class.new(described_class))
+      mock_component("SolidusAdmin::Foo::Bar::Component") { erb_template "" }
 
       expect(SolidusAdmin::Foo::Bar::Component.stimulus_id).to eq("foo--bar")
       expect(SolidusAdmin::Foo::Bar::Component.new.stimulus_id).to eq("foo--bar")
@@ -55,8 +55,7 @@ def call
 
       allow(Rails.logger).to receive(:debug) { debug_logs << _1 }
 
-      component_class = stub_const("Foo::Component", Class.new(described_class){ erb_template "" })
-      component = component_class.new
+      component = mock_component { erb_template "" }
       render_inline(component)
       translation = component.translate("foo.bar.baz")
 

@@ -26,14 +26,14 @@
     before do
       visit "/admin/adjustment_reasons#{query}"
       click_on "Add new"
+      expect(page).to have_selector("dialog", wait: 5)
       expect(page).to have_content("New Adjustment Reason")
       expect(page).to be_axe_clean
     end
 
-    it "opens a modal" do
-      expect(page).to have_selector("dialog")
+    it "closing the modal keeps query params" do
       within("dialog") { click_on "Cancel" }
-      expect(page).not_to have_selector("dialog")
+      expect(page).not_to have_selector("dialog", wait: 5)
       expect(page.current_url).to include(query)
     end
 
@@ -69,14 +69,14 @@
       Spree::AdjustmentReason.create(name: "Good Reason", code: 5999)
       visit "/admin/adjustment_reasons#{query}"
       find_row("Good Reason").click
+      expect(page).to have_selector("dialog", wait: 5)
       expect(page).to have_content("Edit Adjustment Reason")
       expect(page).to be_axe_clean
     end
 
-    it "opens a modal" do
-      expect(page).to have_selector("dialog")
+    it "closing the modal keeps query params" do
       within("dialog") { click_on "Cancel" }
-      expect(page).not_to have_selector("dialog")
+      expect(page).not_to have_selector("dialog", wait: 5)
       expect(page.current_url).to include(query)
     end
 

@@ -11,6 +11,7 @@
     visit "/admin/orders"
     click_on "In Progress"
 
+    expect(page).to have_content("admin@example.com")
     expect(page).to have_content("R123456789")
     expect(page).to have_content("$19.99")
     expect(page).to be_axe_clean

@@ -48,7 +48,7 @@
     expect(page).to have_content("Order R123456789")
     open_customer_menu
     click_on "Edit billing address"
-    expect(page).to have_css("dialog", wait: 30)
+    expect(page).to have_css("dialog", wait: 5)
 
     within("dialog") do
       fill_in "Name", with: "John Doe"
@@ -74,7 +74,7 @@
 
     open_customer_menu
     click_on "Edit shipping address"
-    expect(page).to have_css("dialog", wait: 30)
+    expect(page).to have_css("dialog", wait: 5)
 
     within("dialog") do
       fill_in "Name", with: "Jane Doe"
@@ -119,18 +119,18 @@
       expect(Spree::Order.last.line_items.count).to eq(0)
 
       find("[aria-selected]", text: "Just another product").click
-      expect(page).to have_content("Variant added to cart successfully", wait: 30)
+      expect(page).to have_content("Variant added to cart successfully", wait: 5)
 
       expect(Spree::Order.last.line_items.count).to eq(1)
       expect(Spree::Order.last.line_items.last.quantity).to eq(1)
 
       fill_in "line_item[quantity]", with: 4
-      expect(page).to have_content("Quantity updated successfully", wait: 30)
+      expect(page).to have_content("Quantity updated successfully", wait: 5)
 
       expect(Spree::Order.last.line_items.last.quantity).to eq(4)
 
       accept_confirm("Are you sure?") { click_on "Delete" }
-      expect(page).to have_content("Line item removed successfully", wait: 30)
+      expect(page).to have_content("Line item removed successfully", wait: 5)
 
       expect(Spree::Order.last.line_items.count).to eq(0)
       expect(page).to be_axe_clean