Skip to content

Commit 0256e38

Browse files
authored
Merge pull request #96 from AlchemyCMS/fix-ingredient-page-serializer
fix(ingredient/page_serializer): Wrap page in decorator
2 parents 8e48b64 + 22d1dc1 commit 0256e38

4 files changed

Lines changed: 8 additions & 6 deletions

File tree

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
Standard:
1111
runs-on: ubuntu-latest
1212
env:
13-
ALCHEMY_BRANCH: 7.3-stable
13+
ALCHEMY_BRANCH: 7.4-stable
1414
steps:
1515
- name: Checkout code
1616
uses: actions/checkout@v4

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ gem "sqlite3", "~> 2.2"
1919

2020
alchemy_branch = ENV.fetch("ALCHEMY_BRANCH", "7.4-stable")
2121
gem "alchemy_cms", github: "AlchemyCMS/alchemy_cms", branch: alchemy_branch
22-
gem "alchemy-devise", github: "AlchemyCMS/alchemy-devise", branch: "main"
22+
gem "alchemy-devise", github: "AlchemyCMS/alchemy-devise", branch: "7.4-stable"
2323

2424
gem "rubocop", require: false
2525
gem "standard", "~> 1.25", require: false

app/serializers/alchemy/json_api/ingredient_page_serializer.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ class IngredientPageSerializer < BaseSerializer
1919
ingredient.page&.url_path
2020
end
2121

22-
has_one :page, record_type: :page, serializer: ::Alchemy::JsonApi::PageSerializer
22+
has_one :page, record_type: :page, serializer: PageSerializer do |ingredient|
23+
ingredient.page&.tap { Page.new(_1) }
24+
end
2325
end
2426
end
2527
end

spec/serializers/alchemy/json_api/ingredient_page_serializer_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
require "rails_helper"
44

55
RSpec.describe Alchemy::JsonApi::IngredientPageSerializer do
6-
let(:ingredient) { FactoryBot.build_stubbed(:alchemy_ingredient_page, page: page) }
7-
let(:page) { FactoryBot.build_stubbed(:alchemy_page) }
6+
let(:ingredient) { FactoryBot.create(:alchemy_ingredient_page, page: page) }
7+
let(:page) { FactoryBot.create(:alchemy_page) }
88

99
let(:serializer) { described_class.new(ingredient) }
1010

@@ -38,7 +38,7 @@
3838
let(:page) { nil }
3939

4040
describe "attributes" do
41-
it "has no ingredient" do
41+
it "has no value" do
4242
expect(subject[:value]).to be_nil
4343
end
4444

0 commit comments

Comments
 (0)