solidus_backend 2.7.4 → 2.9.2

data/spec/features/admin/orders/return_payment_state_spec.rb

@@ -7,9 +7,12 @@ describe "Return payment state spec" do
 
   before do
     Spree::RefundReason.create!(name: Spree::RefundReason::RETURN_PROCESSING_REASON, mutable: false)
+    allow_any_instance_of(Spree::Admin::ReimbursementsController).to receive(:try_spree_current_user).
+      and_return(user)
   end
 
   let!(:order) { create(:shipped_order) }
+  let(:user) { create(:admin_user) }
 
   # Regression test for https://github.com/spree/spree/issues/6229
   it "refunds and has outstanding_balance of zero", js: true do

data/spec/features/admin/orders/shipments_spec.rb

@@ -58,6 +58,34 @@ describe "Shipments", type: :feature do
     end
   end
 
+  context "destroying a shipment", js: true do
+    before do
+      visit spree.admin_path
+      click_link "Orders"
+      within_row(1) do
+        click_link "R100"
+      end
+    end
+
+    context "when the line item cannot be found" do
+      it "shows the proper error message" do
+        expect(page).to have_selector '.delete-item'
+        order.shipments.first.line_items.each(&:destroy)
+        accept_alert { first('.delete-item').click }
+        expect(page).to have_content 'The resource you were looking for could not be found.'
+      end
+    end
+
+    context "when the shipment has already been shipped" do
+      it "shows the proper error message" do
+        expect(page).to have_selector '.delete-item'
+        order.shipments.first.ship!
+        accept_alert { first('.delete-item').click }
+        expect(page).to have_content 'Cannot remove items from a shipped shipment'
+      end
+    end
+  end
+
   context "moving variants between shipments", js: true do
     let!(:order) { create(:completed_order_with_pending_payment, number: "R100", state: "complete", line_items_count: 5) }
     let!(:la) { create(:stock_location, name: "LA") }

data/spec/features/admin/products/edit/products_spec.rb

@@ -50,6 +50,31 @@ describe 'Product Details', type: :feature do
     end
   end
 
+  context "when default price is deleted" do
+    it "does not show the master price", js: true do
+      product = create(:product, name: 'Bún thịt nướng', sku: 'A100',
+              description: 'lorem ipsum', available_on: '2013-08-14 01:02:03')
+
+      visit spree.admin_path
+      click_nav "Products"
+      within_row(1) { click_icon :edit }
+
+      click_link 'Prices'
+
+      within "#spree_price_#{product.master.default_price.id}" do
+        accept_alert do
+          click_icon :trash
+        end
+      end
+      expect(page).to have_content("Price has been successfully removed")
+
+      click_link 'Product Details'
+
+      expect(page).not_to have_field('product_price')
+      expect(page).to have_content('This Product has no price in the default currency (USD).')
+    end
+  end
+
   # Regression test for https://github.com/spree/spree/issues/3385
   context "deleting a product", js: true do
     it "is still able to find the master variant" do

data/spec/features/admin/products/edit/taxons_spec.rb

@@ -28,7 +28,11 @@ describe "Product Display Order", type: :feature do
       assert_selected_taxons([taxon_1])
 
       select2_search "Clothing", from: "Taxon"
+      assert_selected_taxons([taxon_1, taxon_2])
+
       click_button "Update"
+
+      expect(find(".flash")).to have_text "Product \"#{product.name}\" has been successfully updated!"
       assert_selected_taxons([taxon_1, taxon_2])
     end
 

data/spec/features/admin/products/pricing_spec.rb

@@ -65,18 +65,36 @@ describe 'Pricing' do
     end
 
     context "editing" do
-      let(:variant) { create(:variant, price: 20) }
-      let(:product) { variant.product }
-
-      before do
-        product.master.update(price: 49.99)
-      end
+      let(:product) { create(:product, price: 123.99) }
+      let!(:variant) { product.master }
+      let!(:other_price) { product.master.prices.create(amount: 34.56, currency: "EUR") }
 
       it 'has a working edit page' do
         within "#spree_price_#{product.master.prices.first.id}" do
           click_icon :edit
         end
         expect(page).to have_content("Edit Price")
+
+        within("#price_price_field") do
+          expect(page).to have_field('price_price', with: '123.99')
+        end
+
+        fill_in "price_price", with: 999.99
+        click_button "Update"
+        expect(page).to have_content("Price has been successfully updated!")
+        expect(page).to have_content("$999.99")
+        expect(page).to have_content("€34.56")
+      end
+
+      it "will not reset the currency to default" do
+        within "#spree_price_#{other_price.id}" do
+          click_icon :edit
+        end
+        expect(page).to have_content("Edit Price")
+        expect(page).to_not have_field('price_currency', with: 'USD')
+        within("#price_price_field") do
+          expect(page).to have_css('.number-with-currency-addon', text: 'EUR')
+        end
       end
     end
 

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

@@ -54,7 +54,7 @@ describe "Products", type: :feature do
       context "currency displaying" do
         context "using Russian Rubles" do
           before do
-            Spree::Config[:currency] = "RUB"
+            stub_spree_preferences(currency: "RUB")
           end
 
           let!(:product) do
@@ -72,7 +72,7 @@ describe "Products", type: :feature do
       end
       context "when none of the product prices are in the same currency as the default in the store" do
         before do
-          Spree::Config[:currency] = "MXN"
+          stub_spree_preferences(currency: "MXN")
         end
 
         let!(:product) do
@@ -80,7 +80,7 @@ describe "Products", type: :feature do
         end
 
         it 'defaults it to Spree::Config.currency and sets the price as blank' do
-          Spree::Config[:currency] = "USD"
+          stub_spree_preferences(currency: "USD")
           visit spree.admin_product_path(product)
           within("#product_price_field") do
             expect(page).to have_content("USD")
@@ -289,7 +289,7 @@ describe "Products", type: :feature do
         check "Show Deleted"
         click_button "Search"
         click_link product.name
-        expect(page).to have_field('Master Price', with: product.price.to_f)
+        expect(page).to_not have_field('Master Price')
         expect(page).to_not have_content('Images')
         expect(page).to_not have_content('Prices')
         expect(page).to_not have_content('Product Properties')
@@ -299,7 +299,7 @@ describe "Products", type: :feature do
 
   context 'with only product permissions' do
     before do
-      allow_any_instance_of(Spree::Admin::BaseController).to receive(:spree_current_user).and_return(nil)
+      allow_any_instance_of(Spree::Admin::BaseController).to receive(:try_spree_current_user).and_return(nil)
     end
 
     custom_authorization! do |_user|

data/spec/features/admin/products/stock_management_spec.rb

@@ -44,31 +44,45 @@ describe "Product Stock", type: :feature do
     it "can create a positive stock adjustment", js: true do
       adjust_count_on_hand('14')
       stock_item.reload
-      expect(stock_item.count_on_hand).to eq 14
+      expect(stock_item.count_on_hand).to eq 24
       expect(stock_item.stock_movements.count).to eq 1
-      expect(stock_item.stock_movements.first.quantity).to eq 4
+      expect(stock_item.stock_movements.first.quantity).to eq 14
     end
 
     it "can create a negative stock adjustment", js: true do
-      adjust_count_on_hand('4')
+      adjust_count_on_hand('-4')
       stock_item.reload
-      expect(stock_item.count_on_hand).to eq 4
+      expect(stock_item.count_on_hand).to eq 6
       expect(stock_item.stock_movements.count).to eq 1
-      expect(stock_item.stock_movements.first.quantity).to eq(-6)
+      expect(stock_item.stock_movements.first.quantity).to eq(-4)
+    end
+
+    it "can toggle backorderable", js: true do
+      toggle_backorderable(value: false)
+
+      click_link "Product Stock"
+      within("tr#spree_variant_#{variant.id}") do
+        expect(find(:css, "input[type='checkbox']")).not_to be_checked
+      end
     end
 
     def adjust_count_on_hand(count_on_hand)
-      within('.variant-stock-items', text: variant.sku) do
-        within('tr', text: stock_item.stock_location.name) do
-          click_icon :edit
-          find(:css, "input[type='number']").set(count_on_hand)
-          click_icon :check
-        end
+      within("tr#spree_variant_#{variant.id}") do
+        find(:css, "input[type='number']").set(count_on_hand)
+        click_icon :check
+      end
+      expect(page).to have_content('Updated Successfully')
+    end
+
+    def toggle_backorderable(value: true)
+      within("tr#spree_variant_#{variant.id}") do
+        find(:css, "input[type='checkbox']").set(value)
+        click_icon :check
       end
-      expect(page).to have_content('Updated successfully')
+      expect(page).to have_content('Updated Successfully')
     end
 
-    context "with multiple stock locations" do
+    context "with stock locations that don't have stock items for variant yet" do
       before do
         create(:stock_location, name: 'Other location', propagate_all_variants: false)
       end

data/spec/features/admin/products/variant_spec.rb

@@ -32,7 +32,7 @@ describe "Variants", type: :feature do
     context "currency displaying" do
       context "using Russian Rubles" do
         before do
-          Spree::Config[:currency] = "RUB"
+          stub_spree_preferences(currency: "RUB")
         end
 
         let!(:variant) do

data/spec/features/admin/promotion_adjustments_spec.rb

@@ -18,13 +18,13 @@ describe "Promotion Adjustments", type: :feature, js: true do
       click_button "Create"
       expect(page).to have_title("SAVE SAVE SAVE - Promotions")
 
-      select "Item total", from: "Add rule of type"
+      select "Item Total", from: "Discount Rules"
       within('#rule_fields') { click_button "Add" }
 
       find('[id$=_preferred_amount]').set(30)
       within('#rule_fields') { click_button "Update" }
 
-      select "Create whole-order adjustment", from: "Add action of type"
+      select "Create whole-order adjustment", from: "Adjustment type"
       within('#action_fields') do
         click_button "Add"
         select "Flat Rate", from: I18n.t('spree.admin.promotions.actions.calculator_label')
@@ -55,7 +55,7 @@ describe "Promotion Adjustments", type: :feature, js: true do
       click_button "Create"
       expect(page).to have_title("SAVE SAVE SAVE - Promotions")
 
-      select "Create whole-order adjustment", from: "Add action of type"
+      select "Create whole-order adjustment", from: "Adjustment type"
       within('#action_fields') do
         click_button "Add"
         select "Flat Rate", from: I18n.t('spree.admin.promotions.actions.calculator_label')
@@ -81,13 +81,13 @@ describe "Promotion Adjustments", type: :feature, js: true do
       click_button "Create"
       expect(page).to have_title("SAVE SAVE SAVE - Promotions")
 
-      select "Item total", from: "Add rule of type"
+      select "Item Total", from: "Discount Rules"
       within('#rule_fields') { click_button "Add" }
 
       find('[id$=_preferred_amount]').set(30)
       within('#rule_fields') { click_button "Update" }
 
-      select "Create whole-order adjustment", from: "Add action of type"
+      select "Create whole-order adjustment", from: "Adjustment type"
       within('#action_fields') do
         click_button "Add"
         select "Flat Percent", from: I18n.t('spree.admin.promotions.actions.calculator_label')
@@ -118,12 +118,12 @@ describe "Promotion Adjustments", type: :feature, js: true do
       click_button "Create"
       expect(page).to have_title("SAVE SAVE SAVE - Promotions")
 
-      select "Product(s)", from: "Add rule of type"
+      select "Product(s)", from: "Discount Rules"
       within("#rule_fields") { click_button "Add" }
       select2_search "RoR Mug", from: "Choose products"
       within('#rule_fields') { click_button "Update" }
 
-      select "Create per-line-item adjustment", from: "Add action of type"
+      select "Create per-line-item adjustment", from: "Adjustment type"
       within('#action_fields') do
         click_button "Add"
         select "Percent Per Item", from: I18n.t('spree.admin.promotions.actions.calculator_label')
@@ -152,12 +152,12 @@ describe "Promotion Adjustments", type: :feature, js: true do
       click_button "Create"
       expect(page).to have_title("SAVE SAVE SAVE - Promotions")
 
-      select "Item total", from: "Add rule of type"
+      select "Item Total", from: "Discount Rules"
       within('#rule_fields') { click_button "Add" }
       find('[id$=_preferred_amount]').set(30)
       within('#rule_fields') { click_button "Update" }
 
-      select "Free shipping", from: "Add action of type"
+      select "Free Shipping", from: "Adjustment type"
       within('#action_fields') { click_button "Add" }
       expect(page).to have_content('Makes all shipments for the order free')
 
@@ -205,12 +205,12 @@ describe "Promotion Adjustments", type: :feature, js: true do
       click_button "Create"
       expect(page).to have_title("SAVE SAVE SAVE - Promotions")
 
-      select "Item total", from: "Add rule of type"
+      select "Item Total", from: "Discount Rules"
       within('#rule_fields') { click_button "Add" }
       find('[id$=_preferred_amount]').set(50)
       within('#rule_fields') { click_button "Update" }
 
-      select "Create whole-order adjustment", from: "Add action of type"
+      select "Create whole-order adjustment", from: "Adjustment type"
       within('#action_fields') do
         click_button "Add"
         select "Flat Rate", from: I18n.t('spree.admin.promotions.actions.calculator_label')
@@ -257,7 +257,7 @@ describe "Promotion Adjustments", type: :feature, js: true do
         click_button "Create"
         expect(page).to have_title("SAVE SAVE SAVE - Promotions")
 
-        select "Create per-line-item adjustment", from: "Add action of type"
+        select "Create per-line-item adjustment", from: "Adjustment type"
         within('#action_fields') do
           click_button "Add"
           select "Complex Calculator", from: I18n.t('spree.admin.promotions.actions.calculator_label')

data/spec/features/admin/promotions/option_value_rule_spec.rb

@@ -16,7 +16,7 @@ feature 'Promotion with option value rule' do
   end
 
   scenario "adding an option value rule", js: true do
-    select "Option Value(s)", from: "Add rule of type"
+    select "Option Value(s)", from: "Discount Rules"
     within("#rules_container") { click_button "Add" }
 
     within("#rules_container .promotion-block") do
@@ -46,7 +46,7 @@ feature 'Promotion with option value rule' do
       option_value.update!(name: xss_string)
     end
     scenario "adding an option value rule", js: true do
-      select "Option Value(s)", from: "Add rule of type"
+      select "Option Value(s)", from: "Discount Rules"
       within("#rules_container") { click_button "Add" }
 
       within("#rules_container .promotion-block") do

data/spec/features/admin/promotions/product_rule_spec.rb

@@ -12,7 +12,7 @@ feature 'Promotion with product rule', js: true do
   given(:promotion) { create :promotion }
 
   def add_promotion_rule_of_type(type)
-    select type, from: "Add rule of type"
+    select type, from: "Discount Rules"
     within("#rules_container") { click_button "Add" }
   end
 

data/spec/features/admin/promotions/promotion_spec.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+feature 'Promotions' do
+  stub_authorization!
+
+  context 'index' do
+    context 'when no promotions' do
+      scenario 'shows no promotions found message' do
+        visit spree.admin_promotions_path
+        expect(page).to have_content('No Promotions found.')
+      end
+    end
+
+    context 'when promotion is active' do
+      given!(:promotion) { create :promotion }
+
+      scenario 'promotion status is active' do
+        visit spree.admin_promotions_path
+
+        within_row(1) do
+          expect(column_text(3)).to eq("Active")
+        end
+      end
+    end
+
+    context 'when promotion is in the future' do
+      given!(:promotion) { create :promotion, starts_at: 1.day.after }
+
+      scenario 'promotion status is not started' do
+        visit spree.admin_promotions_path
+
+        within_row(1) do
+          expect(column_text(3)).to eq("Not started")
+        end
+      end
+    end
+
+    context 'when promotion is in the past' do
+      given!(:promotion) { create :promotion, expires_at: 1.day.ago }
+
+      scenario 'promotion status is expired' do
+        visit spree.admin_promotions_path
+
+        within_row(1) do
+          expect(column_text(3)).to eq("Expired")
+        end
+      end
+    end
+  end
+end

data/spec/features/admin/promotions/tiered_calculator_spec.rb

@@ -12,7 +12,7 @@ feature "Tiered Calculator Promotions" do
   end
 
   scenario "adding a tiered percent calculator", js: true do
-    select "Create whole-order adjustment", from: "Add action of type"
+    select "Create whole-order adjustment", from: "Adjustment type"
     within('#action_fields') { click_button "Add" }
 
     select "Tiered Percent", from: I18n.t('spree.admin.promotions.actions.calculator_label')

data/spec/features/admin/promotions/user_rule_spec.rb

@@ -16,7 +16,7 @@ feature 'Promotion with user rule', js: true do
     let!(:other_user) { create(:user, email: 'bar@example.com') }
 
     scenario "searching a user" do
-      select "User", from: "Add rule of type"
+      select "User", from: "Discount Rules"
       within("#rules_container") { click_button "Add" }
 
       select2_search "foo", from: "Choose users", select: false
@@ -31,7 +31,7 @@ feature 'Promotion with user rule', js: true do
     given!(:user) { create(:user, email: xss_string) }
 
     scenario "adding an option value rule" do
-      select "User", from: "Add rule of type"
+      select "User", from: "Discount Rules"
       within("#rules_container") { click_button "Add" }
 
       select2_search "<script>", from: "Choose users"