Skip to content

Commit

Permalink
Fix Turbo frame tags for Turbo 1.5
Browse files Browse the repository at this point in the history
The behaviour of the turbo_frame_tag helper changed in Turbo 1.5 and now
does not support passing multiple models. These changes account for the
change in output and behaviour.

See hotwired/turbo-rails#476
  • Loading branch information
mamhoff committed Oct 12, 2023
1 parent 2643325 commit 4f51e17
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<%= turbo_frame_tag @promotion, promotion_action do %>
<%= turbo_frame_tag @promotion, dom_id(promotion_action) do %>
<div class="promotion_action promotion-block">
<h6 class='promotion-title'> <%= promotion_action.model_name.human %></h6>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<%= turbo_frame_tag @promotion, @promotion_action do %>
<%= turbo_frame_tag @promotion, dom_id(@promotion_action) do %>
<div class="promotion_action promotion-block">
<h6 class='promotion-title'> <%= @promotion_action.class.human_attribute_name(:description) %></h6>
<%= link_to_with_icon 'trash', '', solidus_friendly_promotions.admin_promotion_promotion_action_path(@promotion, @promotion_action), method: :delete, class: 'delete' %>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
click_button("Create")
expect(page).to have_content("March 2023 Giveaway")
promotion = SolidusFriendlyPromotions::Promotion.first
within("#promotion_#{promotion.id}_new_order_promotion_rule") do
within("#new_order_promotion_rule_promotion_#{promotion.id}") do
click_link("New Rule")
select("First Order", from: "Type")
click_button("Add")
Expand All @@ -103,7 +103,7 @@
expect(page).not_to have_content("Must be the customer's first order")
expect(promotion.rules).to be_empty

within("#promotion_#{promotion.id}_new_order_promotion_rule") do
within("#new_order_promotion_rule_promotion_#{promotion.id}") do
click_link("New Rule")
select("Item Total", from: "Type")
fill_in("promotion_rule_preferred_amount", with: 200)
Expand All @@ -120,7 +120,7 @@
expect(find("#promotion_rule_preferred_amount").value).to eq("300.00")
end

within("#promotion_#{promotion.id}_new_promotion_action") do
within("#new_promotion_action_promotion_#{promotion.id}") do
click_link("New Action")
select("Discount matching line items", from: "Type")
select("Flat Rate", from: "Calculator type")
Expand All @@ -130,13 +130,13 @@
expect(page).to have_selector("h6", text: "Discount matching line items")
action = promotion.actions.first

within("#promotion_#{promotion.id}_actions_adjust_line_item_#{action.id}") do
within("#actions_adjust_line_item_#{action.id}_promotion_#{promotion.id}") do
fill_in("promotion_action_calculator_attributes_preferred_amount", with: 30)
click_button("Update")
end
expect(action.reload.calculator.preferred_amount).to eq(30)

within("#promotion_#{promotion.id}_actions_adjust_line_item_#{action.id}") do
within("#actions_adjust_line_item_#{action.id}_promotion_#{promotion.id}") do
find(".delete").click
end
expect(page).to have_content("Promotion action has been successfully removed!")
Expand Down

0 comments on commit 4f51e17

Please sign in to comment.