solidus_backend 2.8.5 → 2.9.2

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

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/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/store_credits_spec.rb

@@ -84,7 +84,7 @@ describe "Store credits admin" do
         click_button 'Edit'
         fill_in 'store_credit_memo', with: 'Lottery Won'
         click_button 'Save'
-        expect(page).to have_content "Memo Lottery Won"
+        expect(page).to have_content "Memo Lottery Won", normalize_ws: true
       end
       expect(page).to have_content "Store Credit has been successfully updated!"
 
@@ -98,8 +98,8 @@ describe "Store credits admin" 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"
+        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

data/spec/features/admin/users_spec.rb

@@ -59,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
@@ -69,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
@@ -285,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

data/spec/spec_helper.rb

@@ -47,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
 
@@ -89,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/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.8.5
+  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.8.5
+        version: 2.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.5
+        version: 2.9.2
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.5
+        version: 2.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.5
+        version: 2.9.2
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -156,7 +156,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".eslintrc"
 - README.md
 - Rakefile
 - app/assets/config/solidus_backend_manifest.js
@@ -273,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
@@ -287,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
@@ -312,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
@@ -383,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
@@ -459,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
@@ -715,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
@@ -756,6 +761,7 @@ 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
@@ -782,6 +788,7 @@ 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
@@ -815,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

data/.eslintrc

@@ -1,21 +0,0 @@
-{
-  "rules": {
-    "no-unused-vars": ["error", { "vars": "all", "args": "none" }],
-    "linebreak-style": ["error", "unix"]
-  },
-  "env": {
-    "es6": false,
-    "browser": true,
-    "jquery": true
-  },
-  "globals": {
-    "Spree": true,
-    "Backbone": true,
-    "HandlebarsTemplates": true,
-    "_": true,
-    "Select2": true,
-    "show_flash": true,
-    "update_state": true,
-  },
-  "extends": "eslint:recommended"
-}