Skip to content

armgit / spree

Public Imported from GitHub
0

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.

Remove spree_emails dependency from the spree/admin, remove unused taxon params, update orders/users specs (#12291)

Łukasz Adamczyka28581320704
diff --git a/admin/app/controllers/spree/admin/taxons_controller.rb b/admin/app/controllers/spree/admin/taxons_controller.rb
index 728aaf1332..3f8103afad 100644
--- a/admin/app/controllers/spree/admin/taxons_controller.rb
+++ b/admin/app/controllers/spree/admin/taxons_controller.rb
@@ -51,10 +51,6 @@ module Spree
@parent_permalink = @taxon.permalink.split('/')[0...-1].join('/')
end
- def taxon_params
- params.require(:taxon).permit(permitted_taxon_attributes)
- end
-
def set_position
new_position = params[:taxon][:position]
@taxon.child_index = new_position.to_i if new_position
diff --git a/admin/spec/controllers/spree/admin/orders/user_controller_spec.rb b/admin/spec/controllers/spree/admin/orders/user_controller_spec.rb
index b336397d8e..16e8bd4672 100644
--- a/admin/spec/controllers/spree/admin/orders/user_controller_spec.rb
+++ b/admin/spec/controllers/spree/admin/orders/user_controller_spec.rb
@@ -7,6 +7,8 @@ RSpec.describe Spree::Admin::Orders::UserController, type: :controller do
let(:user_params) do
{
+ first_name: 'Test',
+ last_name: 'User',
tag_list: ['tag1', 'tag2']
}
end
@@ -21,6 +23,8 @@ RSpec.describe Spree::Admin::Orders::UserController, type: :controller do
expect(order.reload.user).to eq(existing_user)
expect(order.email).to eq(existing_user.email)
+ expect(existing_user.reload.first_name).to eq(user_params[:first_name])
+ expect(existing_user.last_name).to eq(user_params[:last_name])
expect(existing_user.email).to eq(user_params[:email])
expect(existing_user.tag_list).to eq(user_params[:tag_list])
end
@@ -35,6 +39,8 @@ RSpec.describe Spree::Admin::Orders::UserController, type: :controller do
expect(order.reload.user).to eq(new_user)
expect(order.email).to eq(new_user.email)
+ expect(new_user.reload.first_name).to eq(user_params[:first_name])
+ expect(new_user.last_name).to eq(user_params[:last_name])
expect(new_user.email).to eq(user_params[:email])
expect(new_user.tag_list).to eq(user_params[:tag_list])
end
diff --git a/admin/spree_admin.gemspec b/admin/spree_admin.gemspec
index 8d6e8d5623..8fa97dcdf9 100644
--- a/admin/spree_admin.gemspec
+++ b/admin/spree_admin.gemspec
@@ -28,7 +28,6 @@ Gem::Specification.new do |s|
s.add_dependency 'spree_core', ">= #{s.version}"
s.add_dependency 'spree_api', ">= #{s.version}"
- s.add_dependency 'spree_emails', ">= #{s.version}"
s.add_dependency 'active_link_to'
s.add_dependency 'bootstrap', '~> 4.6', '>= 4.6.2.1'