solidus_backend 2.7.4 → 2.8.0

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/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"

data/spec/features/admin/reimbursements_spec.rb

@@ -11,7 +11,7 @@ describe 'Promotions', type: :feature do
     expect(page).to have_css('table thead tr th', text: 'Product')
     expect(page).to have_css('table thead tr th', text: 'Preferred Reimbursement Type')
     expect(page).to have_css('table thead tr th', text: 'Reimbursement Type Override')
-    expect(page).to have_css('table thead tr th', text: 'Exchange for')
+    expect(page).to have_css('table thead tr th', text: 'Exchange For')
     expect(page).to have_css('table thead tr th', text: 'Amount Before Sales Tax')
     expect(page).to have_css('table thead tr th', text: 'Total')
   end

data/spec/features/admin/store_credits_spec.rb

@@ -56,9 +56,58 @@ describe "Store credits admin" do
     end
   end
 
+  describe "displaying a store credit details page" do
+    before do
+      visit spree.admin_path
+      click_link "Users"
+      click_link store_credit.user.email
+      click_link "Store Credit"
+      page.find(".sc-table td.actions a.fa-edit").click
+    end
+
+    it "shows the store credit's information" do
+      within ".content" do
+        expect(page).to have_content "Credited #{store_credit.display_amount}"
+        expect(page).to have_content "Created By #{store_credit.created_by.email}"
+        expect(page).to have_content "Type #{store_credit.category_name}"
+        expect(page).to have_content 'Store credit history'
+      end
+    end
+
+    it "lets edit store credit's memo", js: true do
+      allow_any_instance_of(Spree::Admin::StoreCreditsController)
+        .to receive(:try_spree_current_user)
+        .and_return(admin_user)
+
+      # When there are no errors
+      within '.store-credit-memo-row' do
+        click_button 'Edit'
+        fill_in 'store_credit_memo', with: 'Lottery Won'
+        click_button 'Save'
+        expect(page).to have_content "Memo Lottery Won"
+      end
+      expect(page).to have_content "Store Credit has been successfully updated!"
+
+      # When there are errors
+      allow_any_instance_of(Spree::StoreCredit).to receive(:save) { false }
+      allow_any_instance_of(Spree::StoreCredit)
+        .to receive_message_chain(:errors, :full_messages)
+        .and_return(["Memo is not valid"])
+
+      within '.store-credit-memo-row' do
+        find(:css, ".edit-memo").click
+        fill_in 'store_credit_memo', with: 'Lottery Won Twice'
+        find(:css, ".save-memo").click
+        expect(page).to have_content "Memo Lottery Won"
+        expect(page).not_to have_content "Memo Lottery Won Twice"
+      end
+      expect(page).to have_content "Unable to update store credit [\"Memo is not valid\"]"
+    end
+  end
+
   describe "updating store credit" do
     let(:updated_amount) { "99.0" }
-    let!(:update_reason) { create(:store_credit_update_reason) }
+    let!(:store_credit_reason) { create(:store_credit_reason) }
 
     before do
       visit spree.admin_path
@@ -74,7 +123,7 @@ describe "Store credits admin" do
       click_link "Change amount"
       expect(page).to have_content 'Editing store credit amount'
       page.fill_in 'store_credit_amount', with: updated_amount
-      page.select update_reason.name, from: 'update_reason_id'
+      page.select store_credit_reason.name, from: 'store_credit_reason_id'
       click_button "Update"
       expect(page.find('#sc-detail-table')).to have_content "$99.00"
       expect(store_credit.reload.amount.to_f).to eq updated_amount.to_f

data/spec/features/admin/taxons_spec.rb

@@ -40,4 +40,39 @@ describe "Taxonomies and taxons", type: :feature do
 
     expect(page).to have_current_path %r{/admin/taxonomies/\d+/taxons/\d+/edit}
   end
+
+  context "inside sidebar menu" do
+    def only_one_selected_tab_inside?(sub_tab_selector, tab_name, tab_path)
+      within(sub_tab_selector) do
+        expect(page).to have_selector('.selected', count: 1)
+
+        within('.selected') { expect(page).to have_link(tab_name, href: tab_path) }
+      end
+    end
+
+    context "on display taxonomies page", js: true do
+      it "should be selected only one tab 'Taxonomies' in product sub tabs" do
+        visit spree.admin_taxonomies_path
+        only_one_selected_tab_inside?('[data-hook=admin_product_sub_tabs]', 'Taxonomies', spree.admin_taxonomies_path)
+      end
+    end
+
+    context "on edit taxonomy page", js: true do
+      it "should be selected only one tab 'Taxonomies' in product sub tabs" do
+        taxonomy = create :taxonomy
+
+        visit spree.edit_admin_taxonomy_path(taxonomy)
+        only_one_selected_tab_inside?('[data-hook=admin_product_sub_tabs]', 'Taxonomies', spree.admin_taxonomies_path)
+      end
+    end
+
+    context "on edit taxonomy's taxon page", js: true do
+      it "should be selected only one tab 'Taxonomies' in product sub tabs" do
+        taxonomy = create :taxonomy
+
+        visit spree.edit_admin_taxonomy_taxon_path(taxonomy, taxonomy.root.id)
+        only_one_selected_tab_inside?('[data-hook=admin_product_sub_tabs]', 'Taxonomies', spree.admin_taxonomies_path)
+      end
+    end
+  end
 end

data/spec/features/admin/users_spec.rb

@@ -16,6 +16,7 @@ describe 'Users', type: :feature do
     create(:completed_order_with_totals, user: user_a, number: "R456").tap do |o|
       li = o.line_items.last
       li.update_column(:price, li.price + 10)
+      o.recalculate
     end
   end
 
@@ -37,7 +38,7 @@ describe 'Users', type: :feature do
     end
 
     it 'can go back to the users list' do
-      expect(page).to have_link Spree::LegacyUser.model_name.human(count: :other), href: spree.admin_users_path
+      expect(page).to have_link Spree::LegacyUser.model_name.human(count: Spree::I18N_GENERIC_PLURAL), href: spree.admin_users_path
     end
 
     it 'can navigate to the account page' do
@@ -302,14 +303,24 @@ describe 'Users', type: :feature do
       end
     end
 
-    [:number, :total].each do |attr|
-      context attr do
-        it_behaves_like "a sortable attribute" do
-          let(:text_match_1) { order.send(attr).to_s }
-          let(:text_match_2) { order_2.send(attr).to_s }
-          let(:table_id) { "listing_orders" }
-          let(:sort_link) { "orders_#{attr}_title" }
-        end
+    context :number do
+      it_behaves_like "a sortable attribute" do
+        let(:text_match_1) { order.number }
+        let(:text_match_2) { order_2.number }
+        let(:table_id) { "listing_orders" }
+        let(:sort_link) { "orders_number_title" }
+      end
+    end
+
+    context :total do
+      it_behaves_like "a sortable attribute" do
+        # Since Spree::Money renders each piece of the total in it's own span,
+        # we are just checking the dollar total matches. Mainly due to how
+        # RSpec matcher appear_before works since it can't index the broken up total.
+        let(:text_match_1) { order.total.to_i.to_s }
+        let(:text_match_2) { order_2.total.to_i.to_s }
+        let(:table_id) { "listing_orders" }
+        let(:sort_link) { "orders_total_title" }
       end
     end
 
@@ -359,9 +370,9 @@ describe 'Users', type: :feature do
       within_table('listing_items') do
         items.each do |item|
           expect(page).to have_selector(".item-name", text: item.product.name)
-          expect(page).to have_selector(".item-price", text: item.single_money.to_html)
+          expect(page).to have_selector(".item-price", text: item.single_money.to_html(html_wrap: false))
           expect(page).to have_selector(".item-quantity", text: item.quantity)
-          expect(page).to have_selector(".item-total", text: item.money.to_html)
+          expect(page).to have_selector(".item-total", text: item.money.to_html(html_wrap: false))
         end
       end
     end

data/spec/helpers/admin/navigation_helper_spec.rb

@@ -83,8 +83,10 @@ describe Spree::Admin::NavigationHelper, type: :helper do
     # object_url is provided by the ResourceController abstract controller.
     # as we cannot set a custom controller for helper tests, we need to fake it
     before do
-      allow(helper).to receive(:object_url) do |o|
-        "/stock_items/#{o.to_param}"
+      without_partial_double_verification do
+        allow(helper).to receive(:object_url) do |o|
+          "/stock_items/#{o.to_param}"
+        end
       end
     end
 

data/spec/helpers/admin/store_credit_events_helper_spec.rb

@@ -87,10 +87,10 @@ describe Spree::Admin::StoreCreditEventsHelper, type: :helper do
     end
 
     context "originator is not specifically handled" do
-      let(:originator) { create(:store_credit_update_reason) }
+      let(:originator) { create(:store_credit) }
 
       it "raises an error" do
-        expect { subject }.to raise_error(RuntimeError, "Unexpected originator type Spree::StoreCreditUpdateReason")
+        expect { subject }.to raise_error(RuntimeError, "Unexpected originator type Spree::StoreCredit")
       end
     end
   end

data/spec/javascripts/spec_helper.js

@@ -4,6 +4,8 @@
 //= require support/chai-jq-0.0.7
 
 //= require_self
+//= require jquery
+//= require rails-ujs
 //= require spree/backend
 //= require_tree ./support
 

data/spec/models/spree/backend_configuration/menu_item_spec.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Spree::BackendConfiguration::MenuItem do
+  describe '#match_path' do
+    subject do
+      described_class.new([], nil, {
+        match_path: '/stock_items'
+      }).match_path
+    end
+
+    it 'can be read' do
+      is_expected.to eq('/stock_items')
+    end
+  end
+end

data/spec/models/spree/backend_configuration_spec.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Spree::BackendConfiguration do
+  describe '#menu_items' do
+    subject do
+      described_class.new.menu_items
+    end
+
+    describe 'menu tab for stock items' do
+      let(:stock_menu_item) do
+        subject.detect { |item| item.label == :stock }
+      end
+
+      # Regression for https://github.com/solidusio/solidus/issues/2950
+      it 'has match_path set to /stock_items' do
+        expect(stock_menu_item.match_path).to eq('/stock_items')
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -27,6 +27,7 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 require 'database_cleaner'
 require 'with_model'
 
+require 'spree/testing_support/partial_double_verification'
 require 'spree/testing_support/authorization_helpers'
 require 'spree/testing_support/factories'
 require 'spree/testing_support/preferences'

data/spec/support/feature/order_feature_helper.rb

@@ -16,7 +16,7 @@ module OrderFeatureHelper
       destination = destination.name
     end
 
-    select2_no_label(destination, from: 'Choose location')
+    select2_no_label(destination, from: 'Choose Location')
 
     if quantity
       fill_in 'item_quantity', with: quantity

data/spec/views/spree/admin/shared/navigation_footer_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "spree/admin/shared/_navigation_footer", type: :view do
+describe "spree/admin/shared/_navigation_footer", type: :view, partial_double_verification: false do
   let(:user) { FactoryBot.build_stubbed(:admin_user) }
   let(:ability) { Object.new.extend(CanCan::Ability) }
   before do

data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_en-US.js

@@ -0,0 +1,10 @@
+/**
+ * Select2 English US translations
+ */
+(function ($) {
+    "use strict";
+
+    $.fn.select2.locales['en-US'] = {};
+
+    $.extend($.fn.select2.defaults, $.fn.select2.locales['en-US']);
+})(jQuery);