RubyGems - solidus_backend - Versions diffs - 2.10.0.beta1 → 2.10.5 - Mend

solidus_backend 2.10.0.beta1 → 2.10.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of solidus_backend might be problematic. Click here for more details.

Files changed (65) hide show

data/app/views/spree/admin/users/edit.html.erb CHANGED Viewed

@@ -1,6 +1,5 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::LegacyUser), spree.admin_users_path) %>
-<% admin_breadcrumb(@user.email) %>
+<% admin_breadcrumb(@user.valid? ? @user.email : @user.email_was) %>
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :account %>

data/app/views/spree/layouts/admin.html.erb CHANGED Viewed

@@ -3,8 +3,7 @@
   <head data-hook="admin_inside_head">
     <%= render 'spree/admin/shared/head' %>
   </head>
-  <body class="admin">
+  <body class="admin <%= "admin-nav-hidden" if cookies[:admin_nav_hidden] == "true" %>">
     <%= render "spree/admin/shared/navigation" %>
     <%= render "spree/admin/shared/header" %>
     <%= render "spree/admin/shared/flash" %>

data/config/routes.rb CHANGED Viewed

@@ -66,11 +66,7 @@ Spree::Core::Engine.routes.draw do
     delete '/option_values/:id', to: "option_values#destroy", as: :option_value
-    resources :properties do
-      collection do
-        get :filtered
-      end
-    end
+    resources :properties
     delete '/product_properties/:id', to: "product_properties#destroy", as: :product_property
@@ -132,7 +128,9 @@ Spree::Core::Engine.routes.draw do
       collection do
         post :update_positions
       end
-      resources :taxons
+      resources :taxons do
+        resource :attachment, controller: 'taxons/attachment', only: [:destroy]
+      end
     end
     resources :taxons, only: [:index, :show] do

data/lib/spree/backend_configuration.rb CHANGED Viewed

@@ -17,7 +17,8 @@ module Spree
                             :payment_methods, :shipping_methods,
                             :shipping_categories, :stock_locations,
                             :refund_reasons, :reimbursement_types,
-                            :return_reasons, :adjustment_reasons]
+                            :return_reasons, :adjustment_reasons,
+                            :store_credit_reasons]
     PROMOTION_TABS     ||= [:promotions, :promotion_categories]
     STOCK_TABS         ||= [:stock_items]
     USER_TABS          ||= [:users, :store_credits]

data/solidus_backend.gemspec CHANGED Viewed

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
-  s.required_ruby_version = '>= 2.2.2'
+  s.required_ruby_version = '>= 2.4.0'
   s.required_rubygems_version = '>= 1.8.23'
   s.add_dependency 'solidus_api', s.version

data/spec/controllers/spree/admin/resource_controller_spec.rb CHANGED Viewed

@@ -37,6 +37,7 @@ describe Spree::Admin::WidgetsController, type: :controller do
       def check_destroy_constraints
         return unless name == 'undestroyable'
         errors.add :base, "You can't destroy undestroyable things!"
+        errors.add :base, "Terrible things might happen."
         throw(:abort)
       end
     end
@@ -164,7 +165,17 @@ describe Spree::Admin::WidgetsController, type: :controller do
         it 'responds with error message' do
           subject
           expect(response).to be_unprocessable
-          expect(response.body).to eq assigns(:widget).errors.full_messages.join(', ')
+          expect(response.body).to eq assigns(:widget).errors.full_messages.to_sentence
+        end
+      end
+      context 'html format' do
+        subject { delete :destroy, params: params }
+        it 'responds with error message' do
+          subject
+          expect(response).to be_redirect
+          expect(flash[:error]).to eq assigns(:widget).errors.full_messages.to_sentence
         end
       end
     end

data/spec/controllers/spree/admin/users_controller_spec.rb CHANGED Viewed

@@ -202,6 +202,29 @@ describe Spree::Admin::UsersController, type: :controller do
       end
     end
+    context "allowed to update passwords" do
+      it "can change password of a user" do
+        expect {
+          put :update, params: { id: user.id, user: { password: "diff123", password_confirmation: "diff123" } }
+        }.to_not raise_error
+      end
+    end
+    context "not allowed to update passwords" do
+      stub_authorization! do |_user|
+        can [:admin, :update], Spree.user_class
+      end
+      it "cannot change password of a user" do
+        allow(ActionController::Parameters).
+          to receive(:action_on_unpermitted_parameters).and_return(:raise)
+        expect {
+          put :update, params: { id: user.id, user: { password: "diff123", password_confirmation: "diff123" } }
+        }.to raise_error(ActionController::UnpermittedParameters)
+      end
+    end
     it "can update ship_address attributes" do
       post :update, params: { id: user.id, user: { ship_address_attributes: valid_address_attributes } }
       expect(user.reload.ship_address.city).to eq('New York')

data/spec/features/admin/configuration/payment_methods_spec.rb CHANGED Viewed

@@ -32,8 +32,8 @@ describe "Payment Methods", type: :feature do
     end
   end
-  context "admin creating a new payment method" do
-    it "should be able to create a new payment method" do
+  context "admin creating a new payment method", :js do
+    it "creates a new payment method and disables the form" do
       click_link "Payments"
       expect(page).to have_link 'Payment Methods'
       click_link "admin_new_payment_methods_link"
@@ -43,6 +43,15 @@ describe "Payment Methods", type: :feature do
       select Spree::PaymentMethod::Check.model_name.human, from: "Type"
       click_button "Create"
       expect(page).to have_content("successfully created!")
+      visit spree.new_admin_payment_method_path
+      page.execute_script "$('form').submit(function(e) { e.preventDefault()})"
+      fill_in "payment_method_name", with: "check90"
+      fill_in "payment_method_description", with: "check90 desc"
+      select Spree::PaymentMethod::Check.model_name.human, from: "Type"
+      click_button "Create"
+      expect(page).to have_button("Create", disabled: true)
     end
   end

data/spec/features/admin/configuration/shipping_methods_spec.rb CHANGED Viewed

@@ -25,7 +25,7 @@ describe "Shipping Methods", type: :feature do
   end
   context "create", js: true do
-    it "should be able to create a new shipping method" do
+    it "creates a new shipping method and disables the submit button", :js do
       click_link "New Shipping Method"
       fill_in "shipping_method_name", with: "bullock cart"
@@ -36,6 +36,18 @@ describe "Shipping Methods", type: :feature do
       click_on "Create"
       expect(current_path).to eql(spree.edit_admin_shipping_method_path(Spree::ShippingMethod.last))
+      visit spree.new_admin_shipping_method_path
+      page.execute_script "$('form').submit(function(e) { e.preventDefault()})"
+      fill_in "shipping_method_name", with: "bullock cart"
+      within("#shipping_method_categories_field") do
+        check first("input[type='checkbox']")["name"]
+      end
+      click_on "Create"
+      expect(page).to have_button("Create", disabled: true)
     end
     context 'with shipping method having a calculator with array or hash preference type' do

data/spec/features/admin/configuration/taxonomies_spec.rb CHANGED Viewed

@@ -38,6 +38,13 @@ describe "Taxonomies", type: :feature do
       click_button "Create"
       expect(page).to have_content("can't be blank")
     end
+    it "disables the button at submit", :js do
+      page.execute_script "$('form').submit(function(e) { e.preventDefault()})"
+      fill_in "taxonomy_name", with: "sports"
+      click_button "Create"
+      expect(page).to have_button("Create", disabled: true)
+    end
   end
   context "edit" do

data/spec/features/admin/orders/customer_returns_spec.rb CHANGED Viewed

@@ -8,21 +8,34 @@ describe 'Customer returns', type: :feature do
   context 'when the order has more than one line item' do
     let(:order) { create :shipped_order, line_items_count: 2 }
+    def create_customer_return
+      find('#select-all').click
+      page.execute_script "$('select.add-item').val('receive')"
+      select 'NY Warehouse', from: 'Stock Location'
+      click_button 'Create'
+    end
+    before do
+      visit spree.new_admin_order_customer_return_path(order)
+    end
     context 'when creating a return with state "Received"' do
       it 'marks the order as returned', :js do
-        visit spree.new_admin_order_customer_return_path(order)
-        find('#select-all').click
-        page.execute_script "$('select.add-item').val('receive')"
-        select 'NY Warehouse', from: 'Stock Location'
-        click_button 'Create'
+        create_customer_return
         expect(page).to have_content 'Customer Return has been successfully created'
         within 'dd.order-state' do
           expect(page).to have_content 'Returned'
         end
       end
     end
+    it 'disables the button at submit', :js do
+      page.execute_script "$('form').submit(function(e) { e.preventDefault()})"
+      create_customer_return
+      expect(page).to have_button("Create", disabled: true)
+    end
   end
 end

data/spec/features/admin/orders/new_order_spec.rb CHANGED Viewed

@@ -169,6 +169,54 @@ describe "New Order", type: :feature do
     end
   end
+  context "when changing customer", :js do
+    let!(:other_user) { create :user, bill_address: bill_address }
+    context "when one customer address have only textual state" do
+      let(:country) { create :country, iso: "IT" }
+      let(:bill_address) { create :address, country: country, state: nil, state_name: "Veneto" }
+      it "changes the bill address state accordingly" do
+        click_on "Customer"
+        within "#select-customer" do
+          targetted_select2_search user.email, from: "#s2id_customer_search"
+        end
+        expect(find("select#order_bill_address_attributes_state_id").value).to eq user.bill_address.state_id.to_s
+        within "#select-customer" do
+          targetted_select2_search other_user.email, from: "#s2id_customer_search"
+        end
+        expect(find("select#order_bill_address_attributes_state_id", visible: false).value).to eq ""
+        expect(find("#order_bill_address_attributes_state_name").value).to eq other_user.bill_address.state_name
+      end
+    end
+    context "when customers have same country but different state" do
+      let(:different_state) { Spree::State.where.not(id: user.bill_address.state_id).first }
+      let(:bill_address) { create :address, country: user.bill_address.country, state: different_state }
+      it "changes the bill address state accordingly" do
+        click_on "Customer"
+        within "#select-customer" do
+          targetted_select2_search user.email, from: "#s2id_customer_search"
+        end
+        expect(find('#order_bill_address_attributes_state_id').value).to eq user.bill_address.state_id.to_s
+        within "#select-customer" do
+          targetted_select2_search other_user.email, from: "#s2id_customer_search"
+        end
+        expect(find('#order_bill_address_attributes_state_id').value).to eq other_user.bill_address.state_id.to_s
+      end
+    end
+  end
   # Regression test for https://github.com/spree/spree/issues/5327
   context "customer with default credit card", js: true do
     let!(:credit_card) { create(:credit_card, user: user) }

data/spec/features/admin/orders/return_authorizations_spec.rb CHANGED Viewed

@@ -8,20 +8,49 @@ describe "ReturnAuthorizations", type: :feature do
   stub_authorization!
   let!(:order) { create(:shipped_order) }
-  let!(:return_authorization) { create(:return_authorization, order: order) }
-  it "can visit the return authorizations list page" do
-    visit spree.admin_order_return_authorizations_path(order)
+  describe "create" do
+    def create_return_authorization
+      find("#select-all").click
+      select "NY Warehouse", from: "Stock Location"
+      click_button "Create"
+    end
+    before do
+      visit spree.new_admin_order_return_authorization_path(order)
+    end
+    it "creates a return authorization" do
+      create_return_authorization
+      expect(page).to have_content "Return Authorization has been successfully created!"
+    end
+    it "disables the button at submit", :js do
+      page.execute_script "$('form').submit(function(e) { e.preventDefault()})"
+      create_return_authorization
+      expect(page).to have_button("Create", disabled: true)
+    end
   end
-  describe "edit" do
-    it "can visit the return authorizations edit page" do
-      visit spree.edit_admin_order_return_authorization_path(order, return_authorization)
+  describe "when a return authorization exists" do
+    let!(:return_authorization) { create(:return_authorization, order: order) }
+    it "can visit the return authorizations list page" do
+      visit spree.admin_order_return_authorizations_path(order)
     end
-    it "return authorizations edit page has a data hook for extensions to add content above, below or within the RA form" do
-      visit spree.edit_admin_order_return_authorization_path(order, return_authorization)
-      expect(page).to have_selector("[data-hook=return-authorization-form-wrapper]")
+    describe "edit" do
+      it "can visit the return authorizations edit page" do
+        visit spree.edit_admin_order_return_authorization_path(order, return_authorization)
+      end
+      it "return authorizations edit page has a data hook for extensions to add content above, below or within the RA form" do
+        visit spree.edit_admin_order_return_authorization_path(order, return_authorization)
+        expect(page).to have_selector("[data-hook=return-authorization-form-wrapper]")
+      end
     end
   end
 end

data/spec/features/admin/products/edit/images_spec.rb CHANGED Viewed

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe "Product Images", type: :feature do
   stub_authorization!
-  let(:file_path) { Rails.root + "../../spec/support/ror_ringer.jpeg" }
+  let(:file_path) { file_fixture("ror_ringer.jpeg") }
   let(:product)   { create(:product) }
   before do

data/spec/features/admin/products/products_spec.rb CHANGED Viewed

@@ -172,6 +172,18 @@ describe "Products", type: :feature do
         expect(page).to have_content("successfully updated!")
       end
+      it "disables the button at submit", :js do
+        page.execute_script "$('form').submit(function(e) { e.preventDefault()})"
+        fill_in "product_name", with: "Baseball Cap"
+        fill_in "product_sku", with: "B100"
+        fill_in "product_price", with: "100"
+        fill_in "product_available_on", with: "2012/01/24"
+        select @shipping_category.name, from: "product_shipping_category_id"
+        click_button "Create"
+        expect(page).to have_button("Create", disabled: true)
+      end
       it "should show validation errors", js: false do
         fill_in "product_name", with: "Baseball Cap"
         fill_in "product_sku", with: "B100"

data/spec/features/admin/promotion_adjustments_spec.rb CHANGED Viewed

@@ -167,6 +167,15 @@ describe "Promotion Adjustments", type: :feature, js: true do
       expect(promotion.actions.first).to be_a(Spree::Promotion::Actions::FreeShipping)
     end
+    it "disables the button at submit", :js do
+      page.execute_script "$('form').submit(function(e) { e.preventDefault()})"
+      fill_in "Name", with: "SAVE SAVE SAVE"
+      choose "Apply to all orders"
+      click_button "Create"
+      expect(page).to have_button("Create", disabled: true)
+    end
     it "should allow an admin to create an automatic promotion" do
       fill_in "Name", with: "SAVE SAVE SAVE"
       choose "Apply to all orders"

data/spec/features/admin/promotions/promotion_code_batches_spec.rb ADDED Viewed

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+require "spec_helper"
+feature "Promotion Code Batches", partial_double_verification: false do
+  stub_authorization!
+  describe "create" do
+    let(:promotion) { create :promotion }
+    before do
+      user = double.as_null_object
+      allow_any_instance_of(ActionView::Base).to receive(:spree_current_user) { user }
+      visit spree.new_admin_promotion_promotion_code_batch_path(promotion)
+    end
+    def create_code_batch
+      fill_in "Base code", with: "base"
+      fill_in "Number of codes", with: 3
+      click_button "Create"
+    end
+    it "creates a new promotion code batch and disables the submit button", :js do
+      create_code_batch
+      expect(page).to have_content "Promotion Code Batch has been successfully created!"
+      visit spree.new_admin_promotion_promotion_code_batch_path(promotion)
+      page.execute_script "$('form').submit(function(e) { e.preventDefault()})"
+      create_code_batch
+      expect(page).to have_button("Create", disabled: true)
+    end
+  end
+end

data/spec/features/admin/promotions/promotion_code_spec.rb ADDED Viewed

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+require "spec_helper"
+feature "Promotion Codes" do
+  stub_authorization!
+  describe "create" do
+    let(:promotion) { create :promotion }
+    before do
+      visit spree.new_admin_promotion_promotion_code_path(promotion)
+    end
+    it "creates a new promotion code" do
+      fill_in "Value", with: "XYZ"
+      click_button "Create"
+      expect(page).to have_content "Promotion Code has been successfully created!"
+    end
+    it "disables the button at submit", :js do
+      page.execute_script "$('form').submit(function(e) { e.preventDefault()})"
+      fill_in "Value", with: "XYZ"
+      click_button "Create"
+      expect(page).to have_button("Create", disabled: true)
+    end
+  end
+end