Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Fixed VER-46 Use ResourceController as the basis for Translations/Met… (#13218)
Damian Legawiecd81dae46d384
diff --git a/admin/app/controllers/spree/admin/json_previews_controller.rb b/admin/app/controllers/spree/admin/json_previews_controller.rbindex 3e3414f128..2454dfa8ac 100644--- a/admin/app/controllers/spree/admin/json_previews_controller.rb+++ b/admin/app/controllers/spree/admin/json_previews_controller.rb@@ -1,36 +1,22 @@module Spreemodule Admin- class JsonPreviewsController < BaseController- before_action :load_resource-- def show- @api_type = params[:api_type].presence&.to_sym || :storefront- end-+ class JsonPreviewsController < ResourceControllerprivate- def load_resource- raise ActiveRecord::RecordNotFound if params[:resource_type].blank?- raise ActiveRecord::RecordNotFound if resource_type.blank?-- @resource = if resource_type.respond_to?(:friendly)- resource_type.friendly.accessible_by(current_ability, :read).find(params[:id])- else- resource_type.accessible_by(current_ability, :read).find(params[:id])- end- end-- def resource_type- @resource_type ||= begin+ def model_class+ @model_class ||= beginklass_name = params[:resource_type]# Ensure all Spree models are loaded so that descendants is completeRails.application.eager_load! unless Rails.application.config.eager_loadklass = Spree.base_class.descendants.find { |spree_klass| spree_klass.name.to_s == klass_name }klass ||= Spree.user_class if klass_name == Spree.user_class.to_sklass ||= Spree.admin_user_class if klass_name == Spree.admin_user_class.to_s++ raise ActiveRecord::RecordNotFound if klass.blank?+klassrescue NameError- nil+ raise ActiveRecord::RecordNotFoundendendenddiff --git a/admin/app/controllers/spree/admin/metafields_controller.rb b/admin/app/controllers/spree/admin/metafields_controller.rbindex e41623e9f4..9b350d6128 100644--- a/admin/app/controllers/spree/admin/metafields_controller.rb+++ b/admin/app/controllers/spree/admin/metafields_controller.rb@@ -1,51 +1,38 @@module Spreemodule Admin- class MetafieldsController < BaseController- before_action :load_resource+ class MetafieldsController < ResourceController+ edit_action.before :build_metafields- # GET /admin/<resource_name_plural>/<id>/edit- def edit- @metafields = @resource.metafields- @metafield_definitions = Spree::MetafieldDefinition.where(resource_type: @resource.class.name)+ def build_metafields+ @metafields = @object.metafields+ @metafield_definitions = Spree::MetafieldDefinition.where(resource_type: model_class.name)@metafield_definitions.each do |metafield_definition|- @resource.metafields.build(type: metafield_definition.metafield_type, metafield_definition: metafield_definition) unless @resource.has_metafield?(metafield_definition)- end- end-- # PUT /admin/<resource_name_plural>/<id>- def update- if @resource.update(permitted_metafields_params)- flash.now[:success] = flash_message_for(@resource, :successfully_updated)- else- flash.now[:error] = @resource.errors.full_messages.to_sentence+ @object.metafields.build(type: metafield_definition.metafield_type, metafield_definition: metafield_definition) unless @object.has_metafield?(metafield_definition)endendprivate- def permitted_metafields_params- params.require(resource_type.model_name.param_key).permit(metafields_attributes: permitted_metafield_attributes)+ def permitted_resource_params+ params.require(@object.model_name.param_key).permit(metafields_attributes: permitted_metafield_attributes)end# eg. Spree::Product- def resource_type- @resource_type ||= allowed_resource_types.find { |type| type.name == params[:resource_type] }+ def model_class+ @model_class ||= begin+ klass = params[:resource_type]+ allowed_model_classes.find { |allowed_class| allowed_class.to_s == klass } ||+ raise(ActiveRecord::RecordNotFound, "Resource type not found")+ endend- def load_resource- raise ActiveRecord::RecordNotFound if params[:resource_type].blank?- raise ActiveRecord::RecordNotFound if resource_type.blank?-- @resource = if resource_type.respond_to?(:friendly)- resource_type.friendly.accessible_by(current_ability, :update).find(params[:id])- else- resource_type.accessible_by(current_ability, :update).find(params[:id])- end+ def allowed_model_classes+ @allowed_model_classes ||= Rails.application.config.spree.metafield_enabled_resourcesend- def allowed_resource_types- @allowed_resource_types ||= Rails.application.config.spree.metafield_enabled_resources+ def update_turbo_stream_enabled?+ trueendendenddiff --git a/admin/app/controllers/spree/admin/translations_controller.rb b/admin/app/controllers/spree/admin/translations_controller.rbindex 6fb49747e4..0f67617abf 100644--- a/admin/app/controllers/spree/admin/translations_controller.rb+++ b/admin/app/controllers/spree/admin/translations_controller.rb@@ -1,41 +1,24 @@module Spreemodule Admin- class TranslationsController < Spree::Admin::BaseController+ class TranslationsController < ResourceController# Set the resource being translated and any related data- before_action :load_resource, only: [:edit, :update]- before_action :load_data, only: [:edit, :update]- before_action :set_translation_locale, only: [:edit, :update]+ before_action :load_data+ before_action :set_translation_localehelper_method :normalized_locale- helper_method :resource_class-- # GET /admin/translations/:id/edit- # Renders the edit translation page for the resource- def edit; end# Normalizes a locale string by replacing '-' with '_' and downcasingdef normalized_locale(locale)locale.to_s.downcase.tr('-', '_')end- # PUT /admin/translations/:id- # Updates the translations for the resource- # Sets flash messages for success or failure- def update- if @resource.update(permitted_translation_params)- flash.now[:success] = flash_message_for(@resource, :successfully_updated)- else- flash.now[:error] = @resource.errors.full_messages.to_sentence- end- end-private- def permitted_translation_params- params.require(@resource.model_name.param_key).permit(translation_fields(resource_class), **nested_params)+ def permitted_resource_params+ params.require(@object.model_name.param_key).permit(translation_fields(model_class), **nested_params)enddef nested_params- case resource_class.to_s+ case model_class.to_swhen 'Spree::OptionType'{ option_values_attributes: [ :id, *translation_fields(Spree::OptionValue)] }else@@ -49,28 +32,19 @@ module Spreeend# Determine the class of the resource- def resource_class- @resource_class ||= begin+ def model_class+ @model_class ||= beginklass = params[:resource_type]- allowed_resource_class.find { |allowed_class| allowed_class.to_s == klass } ||+ allowed_model_classes.find { |allowed_class| allowed_class.to_s == klass } ||raise(ActiveRecord::RecordNotFound, "Resource type not found")endend# Allowed translatable resources configured in Spree- def allowed_resource_class+ def allowed_model_classesRails.application.config.spree.translatable_resourcesend- # Set the resource object using friendly find if available- def load_resource- @resource = if resource_class.respond_to?(:friendly)- resource_class.friendly.accessible_by(current_ability, :update).find(params[:id])- else- resource_class.accessible_by(current_ability, :update).find(params[:id])- end- end-# Determine the translation locale to usedef set_translation_localeraw_locale = params[:translation_locale].presence ||@@ -85,6 +59,10 @@ module Spreedef load_data@locales = (current_store.supported_locales_list - [@default_locale]).sortend++ def update_turbo_stream_enabled?+ true+ endendendenddiff --git a/admin/app/helpers/spree/admin/json_preview_helper.rb b/admin/app/helpers/spree/admin/json_preview_helper.rbindex 290bc30f8b..dec7baaaae 100644--- a/admin/app/helpers/spree/admin/json_preview_helper.rb+++ b/admin/app/helpers/spree/admin/json_preview_helper.rb@@ -12,7 +12,7 @@ module Spreelink_to_with_icon('code',Spree.t('admin.show_json'),- spree.admin_json_preview_resource_path(record, resource_type: record.class.to_s),+ spree.admin_json_preview_resource_path(record.id, resource_type: record.class.to_s),options)end@@ -67,6 +67,7 @@ module Spreeparams = {}params[:store] = current_store if defined?(current_store) && current_store.present?params[:currency] = current_currency if defined?(current_currency) && current_currency.present?+ params[:locale] = current_locale if defined?(current_locale) && current_locale.present?paramsendenddiff --git a/admin/app/helpers/spree/admin/metafields_helper.rb b/admin/app/helpers/spree/admin/metafields_helper.rbindex f6fefb88b7..d08066d4f6 100644--- a/admin/app/helpers/spree/admin/metafields_helper.rb+++ b/admin/app/helpers/spree/admin/metafields_helper.rb@@ -10,7 +10,7 @@ module Spreeoptions[:class] ||= 'dropdown-item'options[:data] ||= { action: 'drawer#open', turbo_frame: :drawer }- link_to_with_icon 'edit', Spree.t(:metafields), spree.edit_admin_metafield_path(record, resource_type: record.class.name), options+ link_to_with_icon 'edit', Spree.t(:metafields), spree.edit_admin_metafield_path(record.id, resource_type: record.class.name), optionsenddef metafield_definition_resource_typesdiff --git a/admin/app/helpers/spree/admin/translations_helper.rb b/admin/app/helpers/spree/admin/translations_helper.rbindex 484dbaf303..dcc653f10d 100644--- a/admin/app/helpers/spree/admin/translations_helper.rb+++ b/admin/app/helpers/spree/admin/translations_helper.rb@@ -12,7 +12,7 @@ module Spreelink_to_with_icon('language',Spree.t(:translations),- spree.edit_admin_translation_path(resource, resource_type: resource.class.to_s),+ spree.edit_admin_translation_path(resource.id, resource_type: resource.class.to_s),options)enddiff --git a/admin/app/views/spree/admin/import_rows/show.html.erb b/admin/app/views/spree/admin/import_rows/show.html.erbindex 1b7efcfadf..5e7304bbb0 100644--- a/admin/app/views/spree/admin/import_rows/show.html.erb+++ b/admin/app/views/spree/admin/import_rows/show.html.erb@@ -14,7 +14,7 @@<div data-tabs-target="panel" class="animate__animated animate__fadeIn"><pre class="m-0"><code data-highlight-target="code" class="language-json d-block overflow-auto" style="height: calc(100dvh - 11rem);"><%= JSON.pretty_generate(@import_row.data_json) %></code></pre></div>- <div data-tabs-target="panel" class="animate__animated animate__fadeIn" hidden>+ <div data-tabs-target="panel" hidden class="animate__animated animate__fadeIn"><dl class="row rounded border p-2 overflow-auto" style="height: calc(100dvh - 11rem);"><% @import_row.to_schema_hash.each do |field_name, value| %><dt class="col-sm-3"><%= field_name.humanize %></dt>diff --git a/admin/app/views/spree/admin/json_previews/show.html.erb b/admin/app/views/spree/admin/json_previews/show.html.erbindex 508b2b3095..0c691b9ae9 100644--- a/admin/app/views/spree/admin/json_previews/show.html.erb+++ b/admin/app/views/spree/admin/json_previews/show.html.erb@@ -1,29 +1,37 @@<%= turbo_frame_tag :drawer do %><%= drawer_header(Spree.t('admin.show_json')) %>- <div class="drawer-body">- <ul class="nav nav-pills">- <%= nav_item(- Spree.t('apis.storefront'),- spree.admin_json_preview_resource_path(@resource, resource_type: @resource.class.to_s, api_type: :storefront),- active: (@api_type == :storefront)- ) %>- <%= nav_item(- Spree.t('apis.platform'),- spree.admin_json_preview_resource_path(@resource, resource_type: @resource.class.to_s, api_type: :platform),- active: (@api_type == :platform)- ) %>+ <div class="drawer-body" data-controller="highlight tabs">+ <ul class="nav nav-pills mb-3">+ <li class="nav-item">+ <a class="nav-link active" data-tabs-target="tab" data-action="click->tabs#select"><%= Spree.t('apis.storefront') %></a>+ </li>+ <li class="nav-item">+ <a class="nav-link" data-tabs-target="tab" data-action="click->tabs#select"><%= Spree.t('apis.platform') %></a>+ </li></ul>- </div>- <div class="drawer-body pt-0" data-controller="highlight">- <% if @api_type == :storefront && storefront_serializer_exists?(@resource) || @api_type == :platform && platform_serializer_exists?(@resource) %>- <pre class="m-0"><code data-highlight-target="code" class="language-json d-block overflow-auto" style="height: calc(100dvh - 11rem);"><%= serialize_to_json(@resource, api_type: @api_type) %></code></pre>- <% else %>- <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center flex-column">- <%= icon 'map-search', class: 'mb-3 opacity-50', style: 'font-size: 2rem;' %>- <p>- <%= Spree.t('admin.json_preview.no_api_response') %>- </p>- </div>- <% end %>+ <div data-tabs-target="panel" class="animate__animated">+ <% if storefront_serializer_exists?(@object) %>+ <pre class="m-0"><code data-highlight-target="code" class="language-json d-block overflow-auto" style="height: calc(100dvh - 11rem);"><%= serialize_to_json(@object, api_type: :storefront) %></code></pre>+ <% else %>+ <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center flex-column">+ <%= icon 'map-search', class: 'mb-3 opacity-50', style: 'font-size: 2rem;' %>+ <p>+ <%= Spree.t('admin.json_preview.no_api_response') %>+ </p>+ </div>+ <% end %>+ </div>+ <div data-tabs-target="panel" class="animate__animated" hidden>+ <% if platform_serializer_exists?(@object) %>+ <pre class="m-0"><code data-highlight-target="code" class="language-json d-block overflow-auto" style="height: calc(100dvh - 11rem);"><%= serialize_to_json(@object, api_type: :platform) %></code></pre>+ <% else %>+ <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center flex-column">+ <%= icon 'map-search', class: 'mb-3 opacity-50', style: 'font-size: 2rem;' %>+ <p>+ <%= Spree.t('admin.json_preview.no_api_response') %>+ </p>+ </div>+ <% end %>+ </div></div><% end %>diff --git a/admin/app/views/spree/admin/metafields/edit.html.erb b/admin/app/views/spree/admin/metafields/edit.html.erbindex d53e15d3a4..c420831738 100644--- a/admin/app/views/spree/admin/metafields/edit.html.erb+++ b/admin/app/views/spree/admin/metafields/edit.html.erb@@ -1,7 +1,7 @@<%= turbo_frame_tag :drawer do %><%= drawer_header(Spree.t(:metafields)) %><% if @metafields.present? %>- <%= form_for [:admin, @resource], url: spree.admin_metafield_path(@resource, resource_type: @resource.class.to_s), method: :put do |f| %>+ <%= form_for @object, url: spree.admin_metafield_path(@object.id, resource_type: model_class.to_s), method: :put do |f| %><div class="drawer-body"><%= f.fields_for :metafields, @metafields do |metafield_form| %><%= metafield_form.hidden_field :id %>@@ -34,9 +34,9 @@<% else %><div class="drawer-body"><div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center flex-column">- <%= icon 'map-search', class: 'mb-3 opacity-50', style: 'font-size: 2rem;' %>- <p>No metafield definitions configured for <%= @resource.class.name.demodulize.titleize.pluralize %>.</p>- <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_metafield_definition_path(resource_type: @resource.class.to_s), class: 'btn btn-primary ml-3', data: { 'turbo-frame': '_top' } if can?(:create, Spree::MetafieldDefinition) %>+ <%= icon 'map-search', class: 'mb-3', style: 'font-size: 2rem;' %>+ <p>No metafield definitions configured for <%= model_class.name.demodulize.titleize.pluralize %>.</p>+ <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_metafield_definition_path(resource_type: model_class.to_s), class: 'btn btn-primary ml-3', data: { 'turbo-frame': '_top' } if can?(:create, Spree::MetafieldDefinition) %></div></div><% end %>diff --git a/admin/app/views/spree/admin/translations/edit.html.erb b/admin/app/views/spree/admin/translations/edit.html.erbindex 3903239c89..b6bc647482 100644--- a/admin/app/views/spree/admin/translations/edit.html.erb+++ b/admin/app/views/spree/admin/translations/edit.html.erb@@ -1,14 +1,14 @@<%= turbo_frame_tag :drawer do %><%= drawer_header(Spree.t(:translations)) %><% if @locales.any? %>- <%= form_for @resource, url: spree.admin_translation_path(@resource, resource_type: resource_class.to_s), method: :put do |f| %>+ <%= form_for @object, url: spree.admin_translation_path(@object.id, resource_type: model_class.to_s), method: :put do |f| %><div class="drawer-body"><ul class="nav nav-pills mb-3"><% @locales.each do |locale| %><% normalized = normalized_locale(locale) %><%= nav_item(Spree.t('i18n.this_file_language', locale: locale),- spree.edit_admin_translation_path(@resource, resource_type: resource_class.to_s, translation_locale: locale),+ spree.edit_admin_translation_path(@object, resource_type: model_class.to_s, translation_locale: locale),active: (normalized == @selected_translation_locale)) %>@@ -16,9 +16,9 @@</ul><%= hidden_field_tag :translation_locale, @selected_translation_locale %>- <% options = { f: f, resource: @resource, locale: @selected_translation_locale } %>+ <% options = { f: f, resource: @object, locale: @selected_translation_locale } %>- <%= render "spree/admin/translations/#{resource_class.name.demodulize.underscore.pluralize}/form", options %>+ <%= render "spree/admin/translations/#{model_class.name.demodulize.underscore.pluralize}/form", options %></div><div class="drawer-footer"><%= turbo_save_button_tag %>diff --git a/admin/spec/controllers/spree/admin/json_previews_controller_spec.rb b/admin/spec/controllers/spree/admin/json_previews_controller_spec.rbindex 5a602d857f..736b74e445 100644--- a/admin/spec/controllers/spree/admin/json_previews_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/json_previews_controller_spec.rb@@ -8,24 +8,16 @@ RSpec.describe Spree::Admin::JsonPreviewsController, type: :controller dolet(:resource_type) { 'Spree::Product' }describe 'GET #show' do- it 'assigns @resource and renders the show template' do- get :show, params: { resource_type: resource_type, id: product.slug }+ it 'assigns @object and renders the show template' do+ get :show, params: { resource_type: resource_type, id: product.id }expect(response).to render_template(:show)- expect(assigns(:resource)).to eq(product)- expect(assigns(:api_type)).to eq(:storefront)- end-- context 'with api_type param' do- it 'assigns @api_type as symbol' do- get :show, params: { resource_type: resource_type, id: product.slug, api_type: 'platform' }- expect(assigns(:api_type)).to eq(:platform)- end+ expect(assigns(:object)).to eq(product)endcontext 'when resource_type is missing' doit 'raises ActiveRecord::RecordNotFound' doexpect {- get :show, params: { id: product.slug, resource_type: '' }+ get :show, params: { id: product.id, resource_type: '' }}.to raise_error(ActiveRecord::RecordNotFound)endend@@ -33,7 +25,7 @@ RSpec.describe Spree::Admin::JsonPreviewsController, type: :controller docontext 'when resource_type is invalid' doit 'raises ActiveRecord::RecordNotFound' doexpect {- get :show, params: { resource_type: 'InvalidType', id: product.slug }+ get :show, params: { resource_type: 'InvalidType', id: product.id }}.to raise_error(ActiveRecord::RecordNotFound)endenddiff --git a/admin/spec/controllers/spree/admin/metafields_controller_spec.rb b/admin/spec/controllers/spree/admin/metafields_controller_spec.rbindex bc4762c015..c6c3b4a835 100644--- a/admin/spec/controllers/spree/admin/metafields_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/metafields_controller_spec.rb@@ -9,10 +9,10 @@ RSpec.describe Spree::Admin::MetafieldsController, type: :controller dolet(:resource_type) { 'Spree::Product' }describe 'GET #edit' do- it 'assigns @resource and @metafields and renders the edit template' do- get :edit, params: { resource_type: resource_type, id: product.slug }+ it 'assigns @object and @metafields and renders the edit template' do+ get :edit, params: { resource_type: resource_type, id: product.id }expect(response).to render_template(:edit)- expect(assigns(:resource)).to eq(product)+ expect(assigns(:object)).to eq(product)expect(assigns(:metafields)).to be_presentexpect(assigns(:metafields).map(&:metafield_definition)).to include(metafield_definition)expect(assigns(:metafields).first.value).to be_blank@@ -27,9 +27,9 @@ RSpec.describe Spree::Admin::MetafieldsController, type: :controller dolet!(:metafield) { create(:metafield, resource: product, metafield_definition: metafield_definition) }it 'assigns @resource and @metafields and renders the edit template' do- get :edit, params: { resource_type: resource_type, id: product.slug }+ get :edit, params: { resource_type: resource_type, id: product.id }expect(response).to render_template(:edit)- expect(assigns(:resource)).to eq(product)+ expect(assigns(:object)).to eq(product)expect(assigns(:metafields)).to be_presentexpect(assigns(:metafields).map(&:metafield_definition)).to contain_exactly(metafield_definition, metafield_definition_2)expect(assigns(:metafields).map(&:value)).to contain_exactly(metafield.value, nil)@@ -42,7 +42,7 @@ RSpec.describe Spree::Admin::MetafieldsController, type: :controller docontext 'when resource_type is missing' doit 'raises ActiveRecord::RecordNotFound' doexpect {- get :edit, params: { id: product.slug, resource_type: '' }+ get :edit, params: { id: product.id, resource_type: '' }}.to raise_error(ActiveRecord::RecordNotFound)endend@@ -50,7 +50,7 @@ RSpec.describe Spree::Admin::MetafieldsController, type: :controller docontext 'when resource_type is invalid' doit 'raises ActiveRecord::RecordNotFound' doexpect {- get :edit, params: { resource_type: 'InvalidType', id: product.slug }+ get :edit, params: { resource_type: 'InvalidType', id: product.id }}.to raise_error(ActiveRecord::RecordNotFound)endend@@ -89,7 +89,7 @@ RSpec.describe Spree::Admin::MetafieldsController, type: :controller doit 'updates metafields and sets flash success' doput :update, format: :turbo_stream, params: {resource_type: resource_type,- id: product.slug,+ id: product.id,product: metafield_attributes}expect(response).to have_http_status(:ok)@@ -110,7 +110,7 @@ RSpec.describe Spree::Admin::MetafieldsController, type: :controller docontext 'when resource_type is missing' doit 'raises ActiveRecord::RecordNotFound' doexpect {- put :update, format: :turbo_stream, params: { id: product.slug, resource_type: '', product: metafield_attributes }+ put :update, format: :turbo_stream, params: { id: product.id, resource_type: '', product: metafield_attributes }}.to raise_error(ActiveRecord::RecordNotFound)endend@@ -118,7 +118,7 @@ RSpec.describe Spree::Admin::MetafieldsController, type: :controller docontext 'when resource_type is invalid' doit 'raises ActiveRecord::RecordNotFound' doexpect {- put :update, format: :turbo_stream, params: { resource_type: 'InvalidType', id: product.slug, product: metafield_attributes }+ put :update, format: :turbo_stream, params: { resource_type: 'InvalidType', id: product.id, product: metafield_attributes }}.to raise_error(ActiveRecord::RecordNotFound)endenddiff --git a/admin/spec/controllers/spree/admin/translations_controller_spec.rb b/admin/spec/controllers/spree/admin/translations_controller_spec.rbindex 970c6168dc..3d1f98848a 100644--- a/admin/spec/controllers/spree/admin/translations_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/translations_controller_spec.rb@@ -15,10 +15,10 @@ RSpec.describe Spree::Admin::TranslationsController, type: :controller doenddescribe 'GET #edit' do- it 'assigns @resource and renders the edit template' do- get :edit, params: { resource_type: resource_type, id: product.slug, translation_locale: translation_locale }+ it 'assigns @object and renders the edit template' do+ get :edit, params: { resource_type: resource_type, id: product.id, translation_locale: translation_locale }expect(response).to render_template(:edit)- expect(assigns(:resource)).to eq(product)+ expect(assigns(:object)).to eq(product)expect(assigns(:locales)).to include('fr')expect(assigns(:locales)).not_to include('en')end@@ -26,7 +26,7 @@ RSpec.describe Spree::Admin::TranslationsController, type: :controller docontext 'when resource_type is missing' doit 'raises ActiveRecord::RecordNotFound' doexpect {- get :edit, params: { id: product.slug, resource_type: '', translation_locale: translation_locale }+ get :edit, params: { id: product.id, resource_type: '', translation_locale: translation_locale }}.to raise_error(ActiveRecord::RecordNotFound)endend@@ -34,7 +34,7 @@ RSpec.describe Spree::Admin::TranslationsController, type: :controller docontext 'when resource_type is invalid' doit 'raises ActiveRecord::RecordNotFound' doexpect {- get :edit, params: { resource_type: 'InvalidType', id: product.slug, translation_locale: translation_locale }+ get :edit, params: { resource_type: 'InvalidType', id: product.id, translation_locale: translation_locale }}.to raise_error(ActiveRecord::RecordNotFound)endend@@ -50,7 +50,7 @@ RSpec.describe Spree::Admin::TranslationsController, type: :controller doit 'updates the translation and sets flash success' doput :update, format: :turbo_stream, params: {resource_type: resource_type,- id: product.slug,+ id: product.id,translation_locale: translation_locale,product: product_params}@@ -64,7 +64,7 @@ RSpec.describe Spree::Admin::TranslationsController, type: :controller doit 'raises ActiveRecord::RecordNotFound' doexpect {put :update, format: :turbo_stream, params: {- id: product.slug,+ id: product.id,resource_type: '',translation_locale: translation_locale,product: product_params@@ -78,7 +78,7 @@ RSpec.describe Spree::Admin::TranslationsController, type: :controller doexpect {put :update, format: :turbo_stream, params: {resource_type: 'InvalidType',- id: product.slug,+ id: product.id,translation_locale: translation_locale,product: product_params}