solidus_backend 2.8.1 → 2.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51e908bac71fffa62bee7172a0eb8c636fa2b074a82765443c4c810072b5c50f
-  data.tar.gz: 3b87a9060d1c489de3eecc37ce38ab89c63a857ddeb229a91414667891137f49
+  metadata.gz: e8e4eeb8b6f2823c6e44903bc105cbfe8fb2347e2e80f854441c82163ee6f76b
+  data.tar.gz: 7c3e74b0baf59ef9dc2772b832ac4235f855307b522fe6600848f7b9d7a2771e
 SHA512:
-  metadata.gz: b49f147b84bca2dea2d8b7fd778a84f2b3dd851682c8bb3a5262f649ad832552145ac8f02067ec87d104cd7e22778f421b15e834b87d213ae2a574ac2101478e
-  data.tar.gz: 9b8da34799226ee531ebdfb03353b2401241a5af9e942b60a44b9da06a4aee3f4a9cfbf9e8011514c7dbeae954d9ccaf9ee085320acc1426ec10bf72907c8601
+  metadata.gz: d5f54db33c3330faee68d7e6582056b9da7d15a98550866a3fc2b2b0754a4091c6ec9ec85e36a9009fdcc60821db9f7d4c6f06cda9762b17a3ce250b9239c4aa
+  data.tar.gz: db8770dab6b7c8d19a08e59bb94d5cb9ee73532f5e07f1a5514bb66a42dab8166b338fc876691a82c741a47ab1522054867ef23a1203575eaa3a53d31b43996b

data/app/assets/javascripts/spree/backend/views/stock/edit_stock_item_row.js

@@ -13,7 +13,8 @@ Spree.Views.Stock.EditStockItemRow = Backbone.View.extend({
     "click .submit": "onSubmit",
     "submit form": "onSubmit",
     "click .cancel": "onCancel",
-    'input [name="count_on_hand"]': "countOnHandChanged"
+    'input [name="count_on_hand"]': "countOnHandChanged",
+    'input [name="backorderable"]': "backorderableChanged"
   },
 
   template: HandlebarsTemplates['stock_items/stock_location_stock_item'],
@@ -43,6 +44,20 @@ Spree.Views.Stock.EditStockItemRow = Backbone.View.extend({
     this.render();
   },
 
+  onChange: function() {
+    var count_on_hand_changed = this.previousAttributes.count_on_hand != this.model.attributes.count_on_hand;
+    var backorderable_changed = this.previousAttributes.backorderable != this.model.attributes.backorderable;
+    var changed = count_on_hand_changed || backorderable_changed;
+
+    this.$el.toggleClass('changed', changed);
+  },
+
+  backorderableChanged: function(ev) {
+    this.model.set("backorderable", ev.target.checked);
+
+    this.onChange();
+  },
+
   countOnHandChanged: function(ev) {
     var diff = parseInt(ev.currentTarget.value), newCount;
     if (isNaN(diff)) diff = 0;
@@ -56,7 +71,8 @@ Spree.Views.Stock.EditStockItemRow = Backbone.View.extend({
       this.model.set("count_on_hand", newCount);
       this.$count_on_hand_display.text(newCount);
     }
-    this.$el.toggleClass('changed', diff !== 0);
+
+    this.onChange();
   },
 
   onSuccess: function() {

data/app/assets/stylesheets/spree/backend/globals/_functions.scss

@@ -1,5 +1,5 @@
 // Make color very close to white
-@function very-light($color, $adjust: 3){  
+@function very-light($color, $adjust: 3){
   @if type-of($adjust) == 'number' and $adjust > 0 {
     @for $i from 0 through 100 {
       @if lighten($color, $i) == white and ($i - $adjust) > $adjust {
@@ -10,6 +10,7 @@
   @else {
     @debug "Please correct $adjust value. It should be number and larger then 0. Currently it is '#{type-of($adjust)}' with value '#{$adjust}'"
   }
+  @return $color;
 };
 
 // Quick fix for dynamic variables missing in SASS

data/app/views/spree/admin/products/_form.html.erb

@@ -109,7 +109,7 @@
             <% end %>
           </div>
         </div>
-
+      <% else %>
         <div id="shipping_specs" class="row">
           <% [:height, :width, :depth, :weight].each_with_index do |field, index| %>
             <div id="shipping_specs_<%= field %>_field" class="col-6">

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

@@ -26,9 +26,19 @@ describe "Product Display Order", type: :feature do
       visit spree.edit_admin_product_path(product)
 
       assert_selected_taxons([taxon_1])
-
       select2_search "Clothing", from: "Taxon"
+      assert_selected_taxons([taxon_1, taxon_2])
+
+      # Without this line we have a flaky spec probably due to select2 not
+      # closing its fixed overlay correctly. Clicking anywhere in the page
+      # before submit apparently solves the issue.
+      find('.edit_product', visible: true).click
+
       click_button "Update"
+
+      within('.flash') do
+        expect(page).to have_content(%(Product "#{product.name}" has been successfully updated!))
+      end
       assert_selected_taxons([taxon_1, taxon_2])
     end
 

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

@@ -57,6 +57,15 @@ describe "Product Stock", type: :feature do
       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("tr#spree_variant_#{variant.id}") do
         find(:css, "input[type='number']").set(count_on_hand)
@@ -65,6 +74,14 @@ describe "Product Stock", type: :feature do
       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')
+    end
+
     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)

data/spec/teaspoon_env.rb

@@ -2,27 +2,8 @@
 
 ENV['RAILS_ENV'] = 'test'
 
-# Teaspoon doesn't allow you to pass client driver options to the Selenium WebDriver. This monkey patch
-# is a temporary fix until this PR is merged: https://github.com/jejacks0n/teaspoon/pull/519.
 require 'teaspoon/driver/selenium'
 
-Teaspoon::Driver::Selenium.class_eval do
-  def run_specs(runner, url)
-    driver = ::Selenium::WebDriver.for(driver_options[:client_driver], @options.except(:client_driver) || {})
-    driver.navigate.to(url)
-
-    ::Selenium::WebDriver::Wait.new(driver_options).until do
-      done = driver.execute_script("return window.Teaspoon && window.Teaspoon.finished")
-      driver.execute_script("return window.Teaspoon && window.Teaspoon.getMessages() || []").each do |line|
-        runner.process("#{line}\n")
-      end
-      done
-    end
-  ensure
-    driver.quit if driver
-  end
-end
-
 # Similar to setup described in
 # https://github.com/jejacks0n/teaspoon/wiki/Micro-Applications
 
@@ -38,10 +19,14 @@ if defined?(DummyApp)
     config.fixture_paths = ["spec/javascripts/fixtures"]
 
     config.driver = :selenium
-    capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
-      chromeOptions: { args: %w(headless disable-gpu window-size=1920,1440) }
-    )
-    config.driver_options = { client_driver: :chrome, desired_capabilities: capabilities }
+    config.driver_options = {
+      client_driver: :chrome,
+      selenium_options: {
+        options: Selenium::WebDriver::Chrome::Options.new(
+          args: %w(headless disable-gpu window-size=1920,1440),
+        ),
+      },
+    }
 
     config.suite do |suite|
       suite.use_framework :mocha, "2.3.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.6
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-13 00:00:00.000000000 Z
+date: 2020-07-16 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.1
+        version: 2.8.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 2.8.6
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 2.8.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 2.8.6
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -984,8 +984,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements:
 - none
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Admin interface for the Solidus e-commerce framework.