solidus_backend 2.4.2 → 2.5.0.beta1

data/lib/spree/backend.rb

@@ -1,13 +1,12 @@
 require 'rails/all'
 require 'jquery-rails'
-require 'jquery-ui-rails'
 require 'coffee-rails'
 require 'sass-rails'
-require 'bourbon'
 require 'handlebars_assets'
 require 'font-awesome-rails'
 require 'autoprefixer-rails'
 require 'jbuilder'
+require 'kaminari'
 
 require 'spree_core'
 require 'spree_api'

data/solidus_backend.gemspec

@@ -25,11 +25,9 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'sass-rails'
   s.add_dependency 'coffee-rails'
-  s.add_dependency 'bourbon', '>= 4', '< 6'
   s.add_dependency 'jquery-rails'
-  s.add_dependency 'jquery-ui-rails', '~> 5.0.0'
   s.add_dependency 'font-awesome-rails', '~> 4.0'
-  s.add_dependency 'kaminari', '>= 0.17', '< 2.0'
+  s.add_dependency 'kaminari', '~> 1.1'
   s.add_dependency 'jbuilder', '~> 2.6'
 
   s.add_dependency 'handlebars_assets', '~> 0.23'

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

@@ -33,7 +33,7 @@ describe Spree::Admin::CancellationsController do
 
       it "sets an error message" do
         subject
-        expect(flash[:error]).to eq Spree.t(:no_inventory_selected)
+        expect(flash[:error]).to eq I18n.t('spree.no_inventory_selected')
       end
     end
 
@@ -47,7 +47,7 @@ describe Spree::Admin::CancellationsController do
 
       it "sets an error message" do
         subject
-        expect(flash[:error]).to eq Spree.t(:unable_to_find_all_inventory_units)
+        expect(flash[:error]).to eq I18n.t('spree.unable_to_find_all_inventory_units')
       end
     end
 
@@ -61,7 +61,7 @@ describe Spree::Admin::CancellationsController do
 
       it "sets an success message" do
         subject
-        expect(flash[:success]).to eq Spree.t(:inventory_canceled)
+        expect(flash[:success]).to eq I18n.t('spree.inventory_canceled')
       end
 
       it "creates a unit cancel" do

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

@@ -33,7 +33,7 @@ describe Spree::Admin::OrdersController, type: :controller do
       it "approves an order" do
         expect(order.contents).to receive(:approve).with(user: controller.try_spree_current_user)
         put :approve, params: { id: order.number }
-        expect(flash[:success]).to eq Spree.t(:order_approved)
+        expect(flash[:success]).to eq I18n.t('spree.order_approved')
       end
     end
 
@@ -41,7 +41,7 @@ describe Spree::Admin::OrdersController, type: :controller do
       it "cancels an order" do
         expect(order).to receive(:canceled_by).with(controller.try_spree_current_user)
         put :cancel, params: { id: order.number }
-        expect(flash[:success]).to eq Spree.t(:order_canceled)
+        expect(flash[:success]).to eq I18n.t('spree.order_canceled')
       end
     end
 
@@ -49,7 +49,7 @@ describe Spree::Admin::OrdersController, type: :controller do
       it "resumes an order" do
         expect(order).to receive(:resume!)
         put :resume, params: { id: order.number }
-        expect(flash[:success]).to eq Spree.t(:order_resumed)
+        expect(flash[:success]).to eq I18n.t('spree.order_resumed')
       end
     end
 
@@ -60,7 +60,7 @@ describe Spree::Admin::OrdersController, type: :controller do
         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)
+        expect(flash[:success]).to eq I18n.t('spree.order_email_resent')
       end
     end
 
@@ -68,7 +68,7 @@ describe Spree::Admin::OrdersController, type: :controller do
       it "can page through the orders" do
         get :index, params: { page: 2, per_page: 10 }
         expect(assigns[:orders].offset_value).to eq(10)
-        expect(assigns[:orders].limit_value).to eq(10)
+        expect(assigns[:orders].current_per_page).to eq(10)
       end
     end
 
@@ -174,7 +174,7 @@ describe Spree::Admin::OrdersController, type: :controller do
 
           it 'messages and redirects' do
             subject
-            expect(flash[:success]).to eq Spree.t('order_ready_for_confirm')
+            expect(flash[:success]).to eq I18n.t('spree.order_ready_for_confirm')
             expect(response).to redirect_to(spree.confirm_admin_order_path(order))
           end
         end
@@ -198,7 +198,7 @@ describe Spree::Admin::OrdersController, type: :controller do
 
         it 'messages and redirects' do
           subject
-          expect(flash[:notice]).to eq Spree.t('order_already_completed')
+          expect(flash[:notice]).to eq I18n.t('spree.order_already_completed')
           expect(response).to redirect_to(spree.edit_admin_order_path(order))
         end
       end
@@ -254,7 +254,7 @@ describe Spree::Admin::OrdersController, type: :controller do
 
         it 'messages and redirects' do
           subject
-          expect(flash[:success]).to eq Spree.t(:order_completed)
+          expect(flash[:success]).to eq I18n.t('spree.order_completed')
           expect(response).to redirect_to(spree.edit_admin_order_path(order))
         end
       end
@@ -277,7 +277,7 @@ describe Spree::Admin::OrdersController, type: :controller do
         it 'messages and redirects' do
           subject
           expect(response).to redirect_to(spree.cart_admin_order_path(order))
-          expect(flash[:error].to_s).to eq Spree.t(:insufficient_stock_for_order)
+          expect(flash[:error].to_s).to eq I18n.t('spree.insufficient_stock_for_order')
         end
       end
     end

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

@@ -60,7 +60,7 @@ module Spree
         second_method.move_to_top
       end
 
-      it { is_expected.to be_success }
+      it { is_expected.to be_successful }
       it { is_expected.to render_template "index"  }
 
       it "respects the order of payment methods by position" do

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

@@ -11,7 +11,7 @@ describe Spree::Admin::PricesController do
 
       subject { get :index, params: { product_id: product.slug } }
 
-      it { is_expected.to be_success }
+      it { is_expected.to be_successful }
 
       it 'assigns usable instance variables' do
         subject
@@ -28,7 +28,7 @@ describe Spree::Admin::PricesController do
 
       subject { get :index, params: { product_id: product.slug, variant_id: variant.id } }
 
-      it { is_expected.to be_success }
+      it { is_expected.to be_successful }
 
       it 'assigns usable instance variables' do
         subject

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

@@ -16,7 +16,8 @@ describe Spree::Admin::ProductsController, type: :controller do
 
     # 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 }
+      let!(:soft_deleted_product) { create(:product, sku: "ABC123") }
+      before { soft_deleted_product.discard }
 
       context 'when params[:q][:with_deleted] is not set' do
         let(:params) { { q: {} } }

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

@@ -11,7 +11,7 @@ describe Spree::Admin::PromotionCodesController do
 
   it "can create a promotion rule of a valid type" do
     get :index, params: { promotion_id: promotion.id, format: 'csv' }
-    expect(response).to be_success
+    expect(response).to be_successful
     parsed = CSV.parse(response.body, headers: true)
     expect(parsed.entries.map(&:to_h)).to eq([{ "Code" => code1.value }, { "Code" => code2.value }, { "Code" => code3.value }])
   end

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

@@ -7,6 +7,13 @@ describe Spree::Admin::PromotionsController, type: :controller do
   let!(:promotion2) { create(:promotion, name: "name2", code: "code2", path: "path2") }
   let!(:category) { create :promotion_category }
 
+  describe "#show" do
+    it "redirects to edit" do
+      expect(get(:show, params: { id: promotion1.id }))
+        .to redirect_to(action: :edit, id: promotion1.id )
+    end
+  end
+
   describe "#index" do
     it "succeeds" do
       get :index

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

@@ -48,7 +48,7 @@ describe Spree::Admin::ReportsController, type: :controller do
 
     shared_examples 'sales total report' do
       it 'should respond with success' do
-        expect(response).to be_success
+        expect(response).to be_successful
       end
 
       it 'should set search to be a ransack search' do

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

@@ -50,7 +50,7 @@ describe Spree::Admin::WidgetsController, type: :controller do
 
     it 'succeeds' do
       subject
-      expect(response).to be_success
+      expect(response).to be_successful
     end
   end
 
@@ -63,7 +63,7 @@ describe Spree::Admin::WidgetsController, type: :controller do
 
     it 'succeeds' do
       subject
-      expect(response).to be_success
+      expect(response).to be_successful
     end
   end
 

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

@@ -71,7 +71,7 @@ describe Spree::Admin::SearchController, type: :controller do
     shared_examples_for 'product search' do
       it 'should respond with http success' do
         subject
-        expect(response).to be_success
+        expect(response).to be_successful
       end
 
       it 'should set the Surrogate-Control header' do

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

@@ -9,7 +9,7 @@ module Spree
       context "with no countries present" do
         it "cannot create a new stock location" do
           get :new
-          expect(flash[:error]).to eq(Spree.t(:stock_locations_need_a_default_country))
+          expect(flash[:error]).to eq(I18n.t('spree.stock_locations_need_a_default_country'))
           expect(response).to redirect_to(spree.admin_stock_locations_path)
         end
       end
@@ -23,18 +23,18 @@ module Spree
 
         it "can create a new stock location" do
           get :new
-          expect(response).to be_success
+          expect(response).to be_successful
         end
       end
 
       context "with a country with the ISO code of 'US' existing" do
         before do
-          FactoryGirl.create(:country, iso: 'US')
+          FactoryBot.create(:country, iso: 'US')
         end
 
         it "can create a new stock location" do
           get :new
-          expect(response).to be_success
+          expect(response).to be_successful
         end
       end
     end

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

@@ -37,7 +37,7 @@ describe Spree::Admin::UsersController, type: :controller do
 
       it 'can visit index' do
         post :index
-        expect(response).to be_success
+        expect(response).to be_successful
       end
 
       it "allows admins to update a user's API key" do

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

@@ -18,7 +18,7 @@ module Spree
           end
 
           context "with a deleted product" do
-            before { product.destroy! }
+            before { product.discard }
 
             it "is the product" do
               subject
@@ -31,8 +31,8 @@ module Spree
           let!(:variant) { create(:variant, product: product) }
           let!(:deleted_variant) { create(:variant, product: product) }
 
-          context "with deleted variants" do
-            before { deleted_variant.destroy }
+          context "with soft-deleted variants" do
+            before { deleted_variant.discard }
 
             context "when deleted is not requested" do
               it "excludes deleted variants" do
@@ -54,6 +54,16 @@ module Spree
           end
         end
       end
+
+      describe "#delete" do
+        let!(:variant) { create(:variant) }
+        let(:product) { variant.product }
+
+        it "can be deleted" do
+          delete :destroy, params: { product_id: product.to_param, id: variant.to_param }
+          expect(variant.reload).to be_discarded
+        end
+      end
     end
   end
 end

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

@@ -6,14 +6,16 @@ describe "Payment Methods", type: :feature do
   before(:each) do
     visit spree.admin_path
     click_link "Settings"
-    click_link "Payments"
   end
 
   context "admin visiting payment methods listing page" do
-    it "should display existing payment methods" do
+    before do
       create(:check_payment_method)
-      click_link "Payment Methods"
+    end
 
+    it "should display existing payment methods" do
+      click_link "Payments"
+      expect(page).to have_link 'Payment Methods'
       within("table#listing_payment_methods") do
         expect(all("th")[1].text).to eq("Name")
         expect(all("th")[2].text).to eq("Type")
@@ -30,7 +32,8 @@ describe "Payment Methods", type: :feature do
 
   context "admin creating a new payment method" do
     it "should be able to create a new payment method" do
-      click_link "Payment Methods"
+      click_link "Payments"
+      expect(page).to have_link 'Payment Methods'
       click_link "admin_new_payment_methods_link"
       expect(page).to have_content("New Payment Method")
       fill_in "payment_method_name", with: "check90"
@@ -42,9 +45,11 @@ describe "Payment Methods", type: :feature do
   end
 
   context "admin editing a payment method" do
-    before(:each) do
-      create(:check_payment_method)
-      click_link "Payment Methods"
+    let!(:payment_method) { create(:check_payment_method) }
+
+    before do
+      click_link "Payments"
+      expect(page).to have_link 'Payment Methods'
       within("table#listing_payment_methods") do
         click_icon(:edit)
       end
@@ -57,22 +62,51 @@ describe "Payment Methods", type: :feature do
       expect(page).to have_field("payment_method_name", with: "Payment 99")
     end
 
+    context "with multiple stores available" do
+      before do
+        create(:store, name: "Default Store", url: "spreestore.example.com")
+        visit current_path
+      end
+
+      it "should be able to change the associated stores" do
+        select "Default Store", from: "Stores"
+        click_button "Update"
+        expect(page).to have_content("successfully updated!")
+        expect(page).to have_select("payment_method_store_ids", selected: "Default Store")
+      end
+    end
+
     it "should display validation errors" do
       fill_in "payment_method_name", with: ""
       click_button "Update"
       expect(page).to have_content("Name can't be blank")
     end
+
+    context 'with payment method having hash and array as preference' do
+      class ComplexPayments < Spree::PaymentMethod
+        preference :name, :string
+        preference :mapping, :hash
+        preference :recipients, :array
+      end
+
+      let!(:payment_method) { ComplexPayments.create!(name: 'Complex Payments') }
+
+      it "does not display preference fields that are hash or array" do
+        expect(page).to have_field("Name")
+        expect(page).to_not have_field("Mapping")
+        expect(page).to_not have_field("Recipients")
+      end
+    end
   end
 
   context "changing type and payment_source", js: true do
-    after do
-      # cleanup
-      Spree::Config.static_model_preferences.for_class(Spree::PaymentMethod::BogusCreditCard).clear
+    before do
+      create(:credit_card_payment_method)
     end
 
     it "displays message when changing type" do
-      create(:credit_card_payment_method)
-      click_link "Payment Methods"
+      click_link "Payments"
+      expect(page).to have_link 'Payment Methods'
       click_icon :edit
       expect(page).to have_content('Test Mode')
 
@@ -89,8 +123,8 @@ describe "Payment Methods", type: :feature do
     it "displays message when changing preference source" do
       Spree::Config.static_model_preferences.add(Spree::PaymentMethod::BogusCreditCard, 'my_prefs', {})
 
-      create(:credit_card_payment_method)
-      click_link "Payment Methods"
+      click_link "Payments"
+      expect(page).to have_link 'Payment Methods'
       click_icon :edit
       expect(page).to have_content('Test Mode')
 
@@ -107,8 +141,8 @@ describe "Payment Methods", type: :feature do
     it "updates successfully and keeps secrets" do
       Spree::Config.static_model_preferences.add(Spree::PaymentMethod::BogusCreditCard, 'my_prefs', { server: 'secret' })
 
-      create(:credit_card_payment_method)
-      click_link "Payment Methods"
+      click_link "Payments"
+      expect(page).to have_link 'Payment Methods'
       click_icon :edit
 
       select 'my_prefs', from: 'Preference Source'
@@ -122,5 +156,10 @@ describe "Payment Methods", type: :feature do
       expect(page).to have_content('Test Mode')
       expect(page).to have_no_content('secret')
     end
+
+    after do
+      # cleanup
+      Spree::Config.static_model_preferences.for_class(Spree::PaymentMethod::BogusCreditCard).clear
+    end
   end
 end