solidus_backend 2.2.2 → 2.3.0.beta1

data/app/views/spree/admin/taxons/_form.html.erb

@@ -8,10 +8,12 @@
 
     <%= f.field_container :permalink_part do %>
       <%= label_tag :permalink_part, Spree::Taxon.human_attribute_name(:permalink), class: 'required' %><br />
-      <%= text_field_tag :permalink_part, @permalink_part, class: 'fullwidth' %><br />
-      <span class="info" id="permalink_part_display">
-        <%= @taxon.permalink.split('/')[0...-1].join('/') + '/' %>
-      </span>
+      <div class="input-group">
+        <% if @taxon.parent %>
+          <span class="input-group-addon"><%= @taxon.permalink.split('/')[0...-1].join('/') + '/' %></span>
+        <% end %>
+        <%= text_field_tag :permalink_part, @permalink_part, class: 'fullwidth form-control' %><br />
+      </div>
     <% end %>
 
     <%= f.field_container :icon do %>

data/app/views/spree/admin/taxons/edit.html.erb

@@ -17,18 +17,3 @@
     <%= button_link_to Spree.t('actions.cancel'), edit_admin_taxonomy_url(@taxonomy) %>
   </div>
 <% end %>
-
-<% content_for :head do %>
-  <%= javascript_tag do -%>
-    $(document).ready(function() {
-      var field  = $('#permalink_part'),
-          target = $('#permalink_part_display'),
-          permalink_part_default = target.text().trim();
-
-      target.text(permalink_part_default + field.val());
-      field.on('keyup blur', function () {
-        target.text(permalink_part_default + $(this).val());
-      });
-    });
-  <% end -%>
-<% end %>

data/app/views/spree/admin/taxons/index.html.erb

@@ -1,4 +1,4 @@
-<% admin_breadcrumb(link_to Spree::Product.model_name.human(count: :other), spree.admin_products_path) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Product), spree.admin_products_path) %>
 <% admin_breadcrumb(Spree.t('admin.taxons.display_order')) %>
 
 <% content_for :table_filter_title do %>

data/app/views/spree/admin/variants/_form.html.erb

@@ -17,13 +17,12 @@
       </div>
     </div>
   </fieldset>
-  <% if f.object.new_record? %>
-    <fieldset class="no-border-top no-border-bottom">
-      <div class="row">
+  <fieldset class="no-border-top no-border-bottom">
+    <div class="row">
       <% @product.option_types.each_with_index do |option_type, index| %>
           <div class="col-3">
             <div class="field" data-hook="presentation">
-              <%= label :new_variant, option_type.presentation %>
+              <%= label 'option_value_ids', option_type.presentation %>
               <%= f.collection_select 'option_value_ids',
                                       option_type.option_values,
                                       :id,
@@ -31,14 +30,14 @@
                                       { include_blank: true },
                                       {
                                         name: 'variant[option_value_ids][]',
-                                        class: "select2 fullwidth"
+                                        class: "custom-select fullwidth",
+                                        id: "option_value_ids_#{option_type.presentation}"
                                       } %>
             </div>
           </div>
       <% end %>
-      </div>
-    </fieldset>
-  <% end %>
+    </div>
+  </fieldset>
 </div>
 
 <div data-hook="admin_variant_form_additional_fields">
@@ -92,7 +91,7 @@
                                   :id,
                                   :name,
                                   { include_blank: t('.use_product_tax_category') },
-                                  { class: 'select2 fullwidth' } %>
+                                  { class: 'custom-select fullwidth' } %>
         </div>
       </div>
     </div>

data/app/views/spree/admin/variants/new.js.erb

@@ -1,2 +1 @@
 $(".js-content-below-tabs").html('<%= escape_javascript(render template: 'spree/admin/variants/new', formats: [:html], handlers: [:erb]) %>');
-$(".js-content-below-tabs .select2").select2();

data/config/routes.rb

@@ -45,7 +45,7 @@ Spree::Core::Engine.routes.draw do
         end
       end
       member do
-        get :clone
+        post :clone
       end
       resources :variants do
         collection do

data/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb

@@ -8,7 +8,7 @@ describe Spree::Admin::Orders::CustomerDetailsController, type: :controller do
 
     let(:order) { create(:order, number: "R123456789") }
 
-    before { allow(Spree::Order).to receive(:find_by_number!) { order } }
+    before { allow(Spree::Order).to receive_message_chain(:includes, :find_by!) { order } }
 
     context "#update" do
       it "updates + progresses the order" do

data/spec/controllers/spree/admin/orders_controller_spec.rb

@@ -30,7 +30,7 @@ describe Spree::Admin::OrdersController, type: :controller do
     let(:adjustments) { double('adjustments') }
 
     before do
-      allow(Spree::Order).to receive_messages(find_by_number!: order)
+      allow(Spree::Order).to receive_message_chain(:includes, find_by!: order)
       allow(order).to receive_messages(contents: Spree::OrderContents.new(order))
     end
 
@@ -58,6 +58,17 @@ describe Spree::Admin::OrdersController, type: :controller do
       end
     end
 
+    context "#resend" do
+      let(:order) { create(:completed_order_with_totals) }
+      it "resends order email" do
+        mail_message = double "Mail::Message"
+        expect(Spree::OrderMailer).to receive(:confirm_email).with(order, true).and_return mail_message
+        expect(mail_message).to receive :deliver_later
+        post :resend, params: { id: order.number }
+        expect(flash[:success]).to eq Spree.t(:order_email_resent)
+      end
+    end
+
     context "pagination" do
       it "can page through the orders" do
         get :index, params: { page: 2, per_page: 10 }
@@ -96,7 +107,7 @@ describe Spree::Admin::OrdersController, type: :controller do
 
       context "when a user_id is passed as a parameter" do
         let(:user)  { mock_model(Spree.user_class) }
-        before { allow(Spree.user_class).to receive_messages find_by_id: user }
+        before { allow(Spree.user_class).to receive_messages find_by: user }
 
         it "imports a new order and assigns the user to the order" do
           expect(Spree::Core::Importer::Order).to receive(:import)
@@ -113,6 +124,7 @@ describe Spree::Admin::OrdersController, type: :controller do
     end
 
     # Regression test for https://github.com/spree/spree/issues/3684
+    # Rendering a form should under no circumstance mutate the order
     context "#edit" do
       it "does not refresh rates if the order is completed" do
         allow(order).to receive_messages completed?: true
@@ -120,9 +132,9 @@ describe Spree::Admin::OrdersController, type: :controller do
         get :edit, params: { id: order.number }
       end
 
-      it "does refresh the rates if the order is incomplete" do
+      it "does not refresh the rates if the order is incomplete" do
         allow(order).to receive_messages completed?: false
-        expect(order).to receive :refresh_shipment_rates
+        expect(order).not_to receive :refresh_shipment_rates
         get :edit, params: { id: order.number }
       end
 

data/spec/controllers/spree/admin/payment_methods_controller_spec.rb

@@ -28,13 +28,13 @@ module Spree
 
     context "tries to save invalid payment" do
       it "doesn't break, responds nicely" do
-        post :create, params: { payment_method: { name: "", type: "Spree::Gateway::Bogus" } }
+        post :create, params: { payment_method: { name: "", type: "Spree::PaymentMethod::BogusCreditCard" } }
       end
     end
 
     it "can create a payment method of a valid type" do
       expect {
-        post :create, params: { payment_method: { name: "Test Method", type: "Spree::Gateway::Bogus" } }
+        post :create, params: { payment_method: { name: "Test Method", type: "Spree::PaymentMethod::BogusCreditCard" } }
       }.to change(Spree::PaymentMethod, :count).by(1)
 
       expect(response).to be_redirect

data/spec/controllers/spree/admin/payments_controller_spec.rb

@@ -13,7 +13,7 @@ module Spree
       describe '#create' do
         context "with a valid credit card" do
           let(:order) { create(:order_with_line_items, state: "payment") }
-          let(:payment_method) { create(:credit_card_payment_method, available_to_admin: true, available_to_users: false) }
+          let(:payment_method) { create(:credit_card_payment_method, available_to_admin: true) }
           let(:attributes) do
             {
               order_id: order.number,

data/spec/controllers/spree/admin/products_controller_spec.rb

@@ -13,6 +13,29 @@ describe Spree::Admin::ProductsController, type: :controller do
       expect(assigns[:collection]).not_to be_empty
       expect(assigns[:collection]).to include(product)
     end
+
+    # Regression test for https://github.com/spree/spree/issues/1903
+    context 'when soft deleted products exist' do
+      let!(:soft_deleted_product) { create(:product, sku: "ABC123").destroy }
+
+      context 'when params[:q][:with_deleted] is not set' do
+        let(:params) { { q: {} } }
+
+        it 'filters out soft-deleted products by default' do
+          get :index, params: params
+          expect(assigns[:collection]).to_not include(soft_deleted_product)
+        end
+      end
+
+      context 'when params[:q][:with_deleted] is set to "true"' do
+        let(:params) { { q: { with_deleted: 'true' } } }
+
+        it 'includes soft-deleted products' do
+          get :index, params: params
+          expect(assigns[:collection]).to include(soft_deleted_product)
+        end
+      end
+    end
   end
 
   # regression test for https://github.com/spree/spree/issues/1370
@@ -143,6 +166,16 @@ describe Spree::Admin::ProductsController, type: :controller do
     end
   end
 
+  context "cloning a product" do
+    let!(:product) { create(:product) }
+
+    it "duplicates the product" do
+      expect do
+        post :clone, params: { id: product.id }
+      end.to change { Spree::Product.count }.by(1)
+    end
+  end
+
   # regression test for https://github.com/spree/spree/issues/801
   context "destroying a product" do
     let(:product) do

data/spec/controllers/spree/admin/variants_controller_spec.rb

@@ -7,24 +7,50 @@ module Spree
 
       describe "#index" do
         let(:product) { create(:product) }
-        let!(:variant_1) { create(:variant, product: product) }
-        let!(:variant_2) { create(:variant, product: product) }
+        let(:params) { { product_id: product.slug } }
 
-        before { variant_2.destroy }
+        subject { get :index, params: params }
 
-        context "deleted is not requested" do
-          it "does not assign deleted variants for a requested product" do
-            get :index, params: { product_id: product.slug }
-            expect(assigns(:collection)).to include variant_1
-            expect(assigns(:collection)).not_to include variant_2
+        context "the value of @parent" do
+          it "is the product" do
+            subject
+            expect(assigns(:parent)).to eq product
+          end
+
+          context "with a deleted product" do
+            before { product.destroy! }
+
+            it "is the product" do
+              subject
+              expect(assigns(:parent)).to eq product
+            end
           end
         end
 
-        context "deleted is requested" do
-          it "assigns deleted along with non-deleted variants for a requested product" do
-            get :index, params: { product_id: product.slug, deleted: "on" }
-            expect(assigns(:collection)).to include variant_1
-            expect(assigns(:collection)).to include variant_2
+        context "the value of @collection" do
+          let!(:variant) { create(:variant, product: product) }
+          let!(:deleted_variant) { create(:variant, product: product) }
+
+          context "with deleted variants" do
+            before { deleted_variant.destroy }
+
+            context "when deleted is not requested" do
+              it "excludes deleted variants" do
+                subject
+                expect(assigns(:collection)).to include variant
+                expect(assigns(:collection)).not_to include deleted_variant
+              end
+            end
+
+            context "when deleted is requested" do
+              let(:params) { { product_id: product.slug, deleted: "on" } }
+
+              it "includes deleted variants" do
+                subject
+                expect(assigns(:collection)).to include variant
+                expect(assigns(:collection)).to include deleted_variant
+              end
+            end
           end
         end
       end

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

@@ -16,7 +16,7 @@ describe "Payment Methods", type: :feature do
 
       within("table#listing_payment_methods") do
         expect(all("th")[1].text).to eq("Name")
-        expect(all("th")[2].text).to eq("Provider")
+        expect(all("th")[2].text).to eq("Type")
         expect(all("th")[3].text).to eq("Available to users")
         expect(all("th")[4].text).to eq("Available to admin")
         expect(all("th")[5].text).to eq("Active")
@@ -35,7 +35,7 @@ describe "Payment Methods", type: :feature do
       expect(page).to have_content("New Payment Method")
       fill_in "payment_method_name", with: "check90"
       fill_in "payment_method_description", with: "check90 desc"
-      select "Spree::PaymentMethod::Check", from: "gtwy-type"
+      select "Spree::PaymentMethod::Check", from: "Type"
       click_button "Create"
       expect(page).to have_content("successfully created!")
     end
@@ -67,7 +67,7 @@ describe "Payment Methods", type: :feature do
   context "changing type and payment_source", js: true do
     after do
       # cleanup
-      Spree::Config.static_model_preferences.for_class(Spree::Gateway::Bogus).clear
+      Spree::Config.static_model_preferences.for_class(Spree::PaymentMethod::BogusCreditCard).clear
     end
 
     it "displays message when changing type" do
@@ -76,48 +76,48 @@ describe "Payment Methods", type: :feature do
       click_icon :edit
       expect(page).to have_content('Test Mode')
 
-      select2_search 'Spree::PaymentMethod::Check', from: 'Provider'
+      select 'Spree::PaymentMethod::Check', from: 'Type'
       expect(page).to have_content('you must save first')
       expect(page).to have_no_content('Test Mode')
 
       # change back
-      select2_search 'Spree::Gateway::Bogus', from: 'Provider'
+      select 'Spree::PaymentMethod::BogusCreditCard', from: 'Type'
       expect(page).to have_no_content('you must save first')
       expect(page).to have_content('Test Mode')
     end
 
     it "displays message when changing preference source" do
-      Spree::Config.static_model_preferences.add(Spree::Gateway::Bogus, 'my_prefs', {})
+      Spree::Config.static_model_preferences.add(Spree::PaymentMethod::BogusCreditCard, 'my_prefs', {})
 
       create(:credit_card_payment_method)
       click_link "Payment Methods"
       click_icon :edit
       expect(page).to have_content('Test Mode')
 
-      select2_search 'my_prefs', from: 'Preference Source'
+      select 'my_prefs', from: 'Preference Source'
       expect(page).to have_content('you must save first')
       expect(page).to have_no_content('Test Mode')
 
       # change back
-      select2_search 'Custom', from: 'Preference Source'
+      select '(custom)', from: 'Preference Source'
       expect(page).to have_no_content('you must save first')
       expect(page).to have_content('Test Mode')
     end
 
     it "updates successfully and keeps secrets" do
-      Spree::Config.static_model_preferences.add(Spree::Gateway::Bogus, 'my_prefs', { server: 'secret' })
+      Spree::Config.static_model_preferences.add(Spree::PaymentMethod::BogusCreditCard, 'my_prefs', { server: 'secret' })
 
       create(:credit_card_payment_method)
       click_link "Payment Methods"
       click_icon :edit
 
-      select2_search 'my_prefs', from: 'Preference Source'
+      select 'my_prefs', from: 'Preference Source'
       click_on 'Update'
       expect(page).to have_content('Using static preferences')
       expect(page).to have_no_content('secret')
 
       # change back
-      select2_search 'Custom', from: 'Preference Source'
+      select '(custom)', from: 'Preference Source'
       click_on 'Update'
       expect(page).to have_content('Test Mode')
       expect(page).to have_no_content('secret')

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

@@ -57,7 +57,7 @@ describe "Shipping Methods", type: :feature do
         click_icon :edit
       end
 
-      select2_search('Flexible Rate', from: 'Calculator')
+      select 'Flexible Rate per package item', from: 'Base Calculator'
 
       fill_in 'First Item', with: 10
       fill_in 'Additional Item', with: 20

data/spec/features/admin/configuration/states_spec.rb

@@ -26,7 +26,7 @@ describe "States", type: :feature do
   context "creating and editing states" do
     it "should allow an admin to edit existing states", js: true do
       go_to_states_page
-      select2 country.name, from: 'Country'
+      select country.name, from: 'Country'
 
       click_link "new_state_link"
       fill_in "state_name", with: "Calgary"
@@ -38,7 +38,7 @@ describe "States", type: :feature do
 
     it "should allow an admin to create states for non default countries", js: true do
       go_to_states_page
-      select2 hungary.name, from: 'Country'
+      select "Hungary", from: 'Country'
 
       click_link "new_state_link"
       fill_in "state_name", with: "Pest megye"
@@ -46,12 +46,12 @@ describe "States", type: :feature do
       click_button "Create"
       expect(page).to have_content("successfully created!")
       expect(page).to have_content("Pest megye")
-      expect(find("#s2id_country")).to have_content("Hungary")
+      expect(page).to have_select('Country', selected: "Hungary")
     end
 
     it "should show validation errors", js: true do
       go_to_states_page
-      select2 country.name, from: 'Country'
+      select country.name, from: 'Country'
 
       click_link "new_state_link"
 

data/spec/features/admin/configuration/store_spec.rb

@@ -38,13 +38,13 @@ describe "Store", type: :feature, js: true do
     end
 
     it "should be able to update the default cart tax country" do
-      expect(page).to have_select('Tax Country for Empty Carts', selected: 'No taxes on carts without address', visible: false)
+      expect(page).to have_select('Tax Country for Empty Carts', selected: 'No taxes on carts without address')
 
-      select "Germany", from: "Tax Country for Empty Carts", visible: false
+      select "Germany", from: "Tax Country for Empty Carts"
       click_button "Update"
 
       expect(page).to have_content("has been successfully updated")
-      expect(page).to have_select("Tax Country for Empty Carts", selected: "Germany", visible: false)
+      expect(page).to have_select("Tax Country for Empty Carts", selected: "Germany")
     end
   end