solidus_backend 2.7.4 → 2.9.2

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", normalize_ws: true
+      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", normalize_ws: true
+        expect(page).not_to have_content "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
@@ -58,6 +59,7 @@ describe 'Users', type: :feature do
 
     it "can sort asc" do
       within_table(table_id) do
+        expect(page).to have_selector '.sort_link.asc'
         expect(page).to have_text text_match_1
         expect(page).to have_text text_match_2
         expect(text_match_1).to appear_before text_match_2
@@ -68,7 +70,10 @@ describe 'Users', type: :feature do
       within_table(table_id) do
         # Ransack adds a ▲ to the sort link. With exact match Capybara is not able to find that link
         click_link sort_link, exact: false
+      end
 
+      within_table(table_id) do
+        expect(page).to have_selector '.sort_link.desc'
         expect(page).to have_text text_match_1
         expect(page).to have_text text_match_2
         expect(text_match_2).to appear_before text_match_1
@@ -284,6 +289,24 @@ describe 'Users', type: :feature do
     end
   end
 
+  context 'deleting users' do
+    let!(:an_user) { create(:user_with_addresses, email: 'an_user@example.com') }
+    let!(:order) { create(:completed_order_with_totals, user_id: an_user.id) }
+
+    context 'if an user has placed orders' do
+      before do
+        visit spree.admin_path
+        click_link 'Users'
+      end
+
+      it "can't be deleted" do
+        within "#spree_user_#{an_user.id}" do
+          expect(page).not_to have_selector('.fa-trash')
+        end
+      end
+    end
+  end
+
   context 'order history with sorting' do
     before do
       orders
@@ -302,14 +325,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 +392,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'
@@ -46,7 +47,7 @@ Capybara.register_driver :selenium_chrome_headless do |app|
   browser_options = ::Selenium::WebDriver::Chrome::Options.new
   browser_options.args << '--headless'
   browser_options.args << '--disable-gpu'
-  browser_options.args << '--window-size=1440,1080'
+  browser_options.args << '--window-size=1920,1080'
   Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options)
 end
 
@@ -88,7 +89,6 @@ RSpec.configure do |config|
 
   config.before do
     Rails.cache.clear
-    reset_spree_preferences
     if RSpec.current_example.metadata[:js] && page.driver.browser.respond_to?(:url_blacklist)
       page.driver.browser.url_blacklist = ['http://fonts.googleapis.com']
     end

data/spec/support/appear_before_matcher.rb

@@ -5,6 +5,6 @@ require 'rspec/expectations'
 RSpec::Matchers.define :appear_before do |expected|
   match do |actual|
     raise "Page instance required to use the appear_before matcher" unless page
-    page.body.index(actual) <= page.body.index(expected)
+    has_text? /#{actual}.*#{expected}/
   end
 end

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);

data/vendor/assets/stylesheets/solidus_admin/bootstrap/_pagination.scss

@@ -51,6 +51,10 @@
     color: $pagination-active-color;
     background-color: $pagination-active-bg;
     border-color: $pagination-active-border-color;
+    
+    &:hover {
+      color: $pagination-active-color;
+    }
   }
 
   &.disabled .page-link {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 2.7.4
+  version: 2.9.2
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-23 00:00:00.000000000 Z
+date: 2019-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.7.4
+        version: 2.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.7.4
+        version: 2.9.2
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.7.4
+        version: 2.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.7.4
+        version: 2.9.2
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,33 +123,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: autoprefixer-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.2
-- !ruby/object:Gem::Dependency
-  name: autoprefixer-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: handlebars_assets
   requirement: !ruby/object:Gem::Requirement
@@ -170,10 +156,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".eslintrc"
 - README.md
 - Rakefile
 - app/assets/config/solidus_backend_manifest.js
+- app/assets/images/favicon.ico
 - app/assets/images/solidus-style-guide-logo.png
 - app/assets/javascripts/spree/backend.js
 - app/assets/javascripts/spree/backend/addresses.js
@@ -286,6 +272,7 @@ files:
 - app/assets/stylesheets/spree/backend/_bootstrap_custom.scss
 - app/assets/stylesheets/spree/backend/components/_actions.scss
 - app/assets/stylesheets/spree/backend/components/_breadcrumb.scss
+- app/assets/stylesheets/spree/backend/components/_buttons.scss
 - app/assets/stylesheets/spree/backend/components/_editable_table.scss
 - app/assets/stylesheets/spree/backend/components/_hint.scss
 - app/assets/stylesheets/spree/backend/components/_image_placeholder.scss
@@ -300,6 +287,7 @@ files:
 - app/assets/stylesheets/spree/backend/components/_stock_table.scss
 - app/assets/stylesheets/spree/backend/components/_table-filter.scss
 - app/assets/stylesheets/spree/backend/components/_tabs.scss
+- app/assets/stylesheets/spree/backend/globals/_deprecated_variables.scss
 - app/assets/stylesheets/spree/backend/globals/_deprecation.scss
 - app/assets/stylesheets/spree/backend/globals/_functions.scss
 - app/assets/stylesheets/spree/backend/globals/_mixins.css
@@ -325,6 +313,7 @@ files:
 - app/assets/stylesheets/spree/backend/sections/_taxons.scss
 - app/assets/stylesheets/spree/backend/sections/_users.scss
 - app/assets/stylesheets/spree/backend/sections/_variants.scss
+- app/assets/stylesheets/spree/backend/shared/_fonts.scss
 - app/assets/stylesheets/spree/backend/shared/_forms.scss
 - app/assets/stylesheets/spree/backend/shared/_header.scss
 - app/assets/stylesheets/spree/backend/shared/_icons.scss
@@ -365,7 +354,6 @@ files:
 - app/controllers/spree/admin/refunds_controller.rb
 - app/controllers/spree/admin/reimbursement_types_controller.rb
 - app/controllers/spree/admin/reimbursements_controller.rb
-- app/controllers/spree/admin/reports_controller.rb
 - app/controllers/spree/admin/resource_controller.rb
 - app/controllers/spree/admin/return_authorizations_controller.rb
 - app/controllers/spree/admin/return_items_controller.rb
@@ -377,6 +365,7 @@ files:
 - app/controllers/spree/admin/stock_items_controller.rb
 - app/controllers/spree/admin/stock_locations_controller.rb
 - app/controllers/spree/admin/stock_movements_controller.rb
+- app/controllers/spree/admin/store_credit_reasons_controller.rb
 - app/controllers/spree/admin/store_credits_controller.rb
 - app/controllers/spree/admin/stores_controller.rb
 - app/controllers/spree/admin/style_guide_controller.rb
@@ -396,6 +385,7 @@ files:
 - app/helpers/spree/admin/orders_helper.rb
 - app/helpers/spree/admin/payments_helper.rb
 - app/helpers/spree/admin/products_helper.rb
+- app/helpers/spree/admin/promotions_helper.rb
 - app/helpers/spree/admin/reimbursement_type_helper.rb
 - app/helpers/spree/admin/stock_locations_helper.rb
 - app/helpers/spree/admin/stock_movements_helper.rb
@@ -472,16 +462,17 @@ files:
 - app/views/spree/admin/payments/_capture_events.html.erb
 - app/views/spree/admin/payments/_form.html.erb
 - app/views/spree/admin/payments/_list.html.erb
+- app/views/spree/admin/payments/_log_entries.html.erb
 - app/views/spree/admin/payments/credit.html.erb
 - app/views/spree/admin/payments/index.html.erb
 - app/views/spree/admin/payments/new.html.erb
 - app/views/spree/admin/payments/show.html.erb
 - app/views/spree/admin/payments/source_forms/_check.html.erb
 - app/views/spree/admin/payments/source_forms/_gateway.html.erb
-- app/views/spree/admin/payments/source_forms/_storecredit.html.erb
+- app/views/spree/admin/payments/source_forms/_store_credit.html.erb
 - app/views/spree/admin/payments/source_views/_check.html.erb
 - app/views/spree/admin/payments/source_views/_gateway.html.erb
-- app/views/spree/admin/payments/source_views/_storecredit.html.erb
+- app/views/spree/admin/payments/source_views/_store_credit.html.erb
 - app/views/spree/admin/prices/_form.html.erb
 - app/views/spree/admin/prices/_master_variant_table.html.erb
 - app/views/spree/admin/prices/_table.html.erb
@@ -505,6 +496,7 @@ files:
 - app/views/spree/admin/promotion_code_batches/new.html.erb
 - app/views/spree/admin/promotion_codes/index.csv.ruby
 - app/views/spree/admin/promotion_codes/index.html.erb
+- app/views/spree/admin/promotion_codes/new.html.erb
 - app/views/spree/admin/promotion_rules/create.js.erb
 - app/views/spree/admin/promotion_rules/destroy.js.erb
 - app/views/spree/admin/promotions/_actions.html.erb
@@ -555,8 +547,6 @@ files:
 - app/views/spree/admin/reimbursements/edit.html.erb
 - app/views/spree/admin/reimbursements/index.html.erb
 - app/views/spree/admin/reimbursements/show.html.erb
-- app/views/spree/admin/reports/index.html.erb
-- app/views/spree/admin/reports/sales_total.html.erb
 - app/views/spree/admin/return_authorizations/_form.html.erb
 - app/views/spree/admin/return_authorizations/edit.html.erb
 - app/views/spree/admin/return_authorizations/index.html.erb
@@ -597,7 +587,6 @@ files:
 - app/views/spree/admin/shared/_promotion_sub_menu.html.erb
 - app/views/spree/admin/shared/_rebuild_vat_prices_checkbox.html.erb
 - app/views/spree/admin/shared/_refunds.html.erb
-- app/views/spree/admin/shared/_report_order_criteria.html.erb
 - app/views/spree/admin/shared/_settings_checkout_tabs.html.erb
 - app/views/spree/admin/shared/_settings_sub_menu.html.erb
 - app/views/spree/admin/shared/_shipping_tabs.html.erb
@@ -633,8 +622,12 @@ files:
 - app/views/spree/admin/stock_locations/index.html.erb
 - app/views/spree/admin/stock_locations/new.html.erb
 - app/views/spree/admin/stock_movements/index.html.erb
+- app/views/spree/admin/store_credit_reasons/edit.html.erb
+- app/views/spree/admin/store_credit_reasons/index.html.erb
+- app/views/spree/admin/store_credit_reasons/new.html.erb
+- app/views/spree/admin/store_credit_reasons/shared/_form.html.erb
 - app/views/spree/admin/store_credits/_form.html.erb
-- app/views/spree/admin/store_credits/_update_reason_field.html.erb
+- app/views/spree/admin/store_credits/_store_credit_reason_field.html.erb
 - app/views/spree/admin/store_credits/edit_amount.html.erb
 - app/views/spree/admin/store_credits/edit_validity.html.erb
 - app/views/spree/admin/store_credits/index.html.erb
@@ -726,6 +719,7 @@ files:
 - spec/controllers/spree/admin/base_controller_spec.rb
 - spec/controllers/spree/admin/cancellations_controller_spec.rb
 - spec/controllers/spree/admin/customer_returns_controller_spec.rb
+- spec/controllers/spree/admin/locale_controller_spec.rb
 - spec/controllers/spree/admin/missing_products_controller_spec.rb
 - spec/controllers/spree/admin/orders/customer_details_controller_spec.rb
 - spec/controllers/spree/admin/orders_controller_spec.rb
@@ -740,7 +734,6 @@ files:
 - spec/controllers/spree/admin/promotions_controller_spec.rb
 - spec/controllers/spree/admin/refunds_controller_spec.rb
 - spec/controllers/spree/admin/reimbursements_controller_spec.rb
-- spec/controllers/spree/admin/reports_controller_spec.rb
 - spec/controllers/spree/admin/resource_controller_spec.rb
 - spec/controllers/spree/admin/return_authorizations_controller_spec.rb
 - spec/controllers/spree/admin/return_items_controller_spec.rb
@@ -768,10 +761,12 @@ files:
 - spec/features/admin/orders/cancelling_and_resuming_spec.rb
 - spec/features/admin/orders/cancelling_inventory_spec.rb
 - spec/features/admin/orders/customer_details_spec.rb
+- spec/features/admin/orders/customer_returns_spec.rb
 - spec/features/admin/orders/line_items_spec.rb
 - spec/features/admin/orders/listing_spec.rb
 - spec/features/admin/orders/log_entries_spec.rb
 - spec/features/admin/orders/new_order_spec.rb
+- spec/features/admin/orders/new_refund_spec.rb
 - spec/features/admin/orders/order_details_spec.rb
 - spec/features/admin/orders/payments_spec.rb
 - spec/features/admin/orders/return_authorizations_spec.rb
@@ -793,10 +788,10 @@ files:
 - spec/features/admin/promotions/option_value_rule_spec.rb
 - spec/features/admin/promotions/product_rule_spec.rb
 - spec/features/admin/promotions/promotion_categories_spec.rb
+- spec/features/admin/promotions/promotion_spec.rb
 - spec/features/admin/promotions/tiered_calculator_spec.rb
 - spec/features/admin/promotions/user_rule_spec.rb
 - spec/features/admin/reimbursements_spec.rb
-- spec/features/admin/reports_spec.rb
 - spec/features/admin/store_credits_spec.rb
 - spec/features/admin/stores_spec.rb
 - spec/features/admin/style_guide_spec.rb
@@ -816,6 +811,8 @@ files:
 - spec/javascripts/support/with_translations.js
 - spec/javascripts/translation_spec.js
 - spec/javascripts/views/number_with_currency_spec.js
+- spec/models/spree/backend_configuration/menu_item_spec.rb
+- spec/models/spree/backend_configuration_spec.rb
 - spec/spec_helper.rb
 - spec/support/appear_before_matcher.rb
 - spec/support/feature/base_feature_helper.rb
@@ -825,6 +822,10 @@ files:
 - spec/test_views/spree/admin/widgets/edit.html.erb
 - spec/test_views/spree/admin/widgets/new.html.erb
 - spec/views/spree/admin/shared/navigation_footer_spec.rb
+- vendor/assets/fonts/inter/Inter-Regular.woff
+- vendor/assets/fonts/inter/Inter-Regular.woff2
+- vendor/assets/fonts/inter/Inter-SemiBold.woff
+- vendor/assets/fonts/inter/Inter-SemiBold.woff2
 - vendor/assets/images/solidus_admin/select2-spinner.gif
 - vendor/assets/images/solidus_admin/select2.png
 - vendor/assets/images/solidus_admin/select2x2.png
@@ -848,6 +849,7 @@ files:
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_da.js
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_de.js
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_el.js
+- vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_en-US.js
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_es-MX.js
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_es.js
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_et.js