solidus_backend 2.9.5 → 2.10.2

data/spec/spec_helper.rb

@@ -73,6 +73,7 @@ RSpec.configure do |config|
   # examples within a transaction, comment the following line or assign false
   # instead of true.
   config.use_transactional_fixtures = true
+  config.fixture_path = "spec/fixtures"
 
   config.before :suite do
     DatabaseCleaner.clean_with :truncation

data/spec/support/feature/base_feature_helper.rb

@@ -4,7 +4,12 @@ module BaseFeatureHelper
   def click_nav(nav_text, subnav_text = nil)
     primary_nav = find(".admin-nav-menu>ul>li>a", text: /#{nav_text}/i)
     if subnav_text
-      primary_nav.find('+ul>li>a', text: /#{subnav_text}/i).click
+      unless Capybara.current_driver == :rack_test
+        # we need to make the navigation visible with Selenium driver,
+        # and RackTest implementation of `hover`raises NotImplementedError
+        primary_nav.hover
+      end
+      primary_nav.sibling("ul").find("li > a", text: /#{subnav_text}/i).click
     else
       primary_nav.click
     end

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"

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

@@ -834,7 +834,7 @@ $figure-caption-color:              $gray-600 !default;
 // Breadcrumbs
 
 $breadcrumb-padding-y:              .75rem !default;
-$breadcrumb-padding-x:              1rem !default;
+$breadcrumb-padding-x:              3rem !default;
 $breadcrumb-item-padding:           .5rem !default;
 
 $breadcrumb-margin-bottom:          1rem !default;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 2.9.5
+  version: 2.10.2
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-04 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.9.5
+        version: 2.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.9.5
+        version: 2.10.2
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.9.5
+        version: 2.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.9.5
+        version: 2.10.2
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: responders
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +186,7 @@ files:
 - app/assets/javascripts/spree/backend/collections/line_items.js
 - app/assets/javascripts/spree/backend/collections/shipments.js
 - app/assets/javascripts/spree/backend/collections/states.js
+- app/assets/javascripts/spree/backend/components/admin_nav.js
 - app/assets/javascripts/spree/backend/components/editable_table.js
 - app/assets/javascripts/spree/backend/components/number_with_currency.js
 - app/assets/javascripts/spree/backend/components/sortable_table.js
@@ -234,7 +249,6 @@ files:
 - app/assets/javascripts/spree/backend/templates/taxons/_tree.hbs
 - app/assets/javascripts/spree/backend/templates/taxons/tree.hbs
 - app/assets/javascripts/spree/backend/templates/variants/autocomplete.hbs
-- app/assets/javascripts/spree/backend/templates/variants/autocomplete_stock.hbs
 - app/assets/javascripts/spree/backend/templates/variants/line_items_autocomplete_stock.hbs
 - app/assets/javascripts/spree/backend/templates/variants/split.hbs
 - app/assets/javascripts/spree/backend/translation.js
@@ -243,6 +257,7 @@ files:
 - app/assets/javascripts/spree/backend/variant_autocomplete.js
 - app/assets/javascripts/spree/backend/views/calculators/tiered.js
 - app/assets/javascripts/spree/backend/views/cart/add_line_item_button.js
+- app/assets/javascripts/spree/backend/views/cart/empty_cart_button.js
 - app/assets/javascripts/spree/backend/views/cart/line_item_row.js
 - app/assets/javascripts/spree/backend/views/cart/line_item_table.js
 - app/assets/javascripts/spree/backend/views/images/upload_progress.js
@@ -290,7 +305,7 @@ files:
 - 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
+- app/assets/stylesheets/spree/backend/globals/_mixins.scss
 - app/assets/stylesheets/spree/backend/globals/_variables.scss
 - app/assets/stylesheets/spree/backend/globals/_variables_override.scss
 - app/assets/stylesheets/spree/backend/globals/mixins/_caret.scss
@@ -372,6 +387,7 @@ files:
 - app/controllers/spree/admin/tax_categories_controller.rb
 - app/controllers/spree/admin/tax_rates_controller.rb
 - app/controllers/spree/admin/taxonomies_controller.rb
+- app/controllers/spree/admin/taxons/attachment_controller.rb
 - app/controllers/spree/admin/taxons_controller.rb
 - app/controllers/spree/admin/users_controller.rb
 - app/controllers/spree/admin/variant_property_rule_values_controller.rb
@@ -391,7 +407,6 @@ files:
 - app/helpers/spree/admin/stock_movements_helper.rb
 - app/helpers/spree/admin/store_credit_events_helper.rb
 - app/helpers/spree/promotion_rules_helper.rb
-- app/models/spree/backend_configuration.rb
 - app/views/kaminari/solidus_admin/_first_page.html.erb
 - app/views/kaminari/solidus_admin/_gap.html.erb
 - app/views/kaminari/solidus_admin/_last_page.html.erb
@@ -431,7 +446,6 @@ files:
 - app/views/spree/admin/option_types/index.html.erb
 - app/views/spree/admin/option_types/new.html.erb
 - app/views/spree/admin/option_types/new.js.erb
-- app/views/spree/admin/orders/_add_product.html.erb
 - app/views/spree/admin/orders/_adjustments.html.erb
 - app/views/spree/admin/orders/_carton.html.erb
 - app/views/spree/admin/orders/_carton_manifest.html.erb
@@ -676,6 +690,7 @@ files:
 - app/views/spree/admin/taxonomies/index.html.erb
 - app/views/spree/admin/taxonomies/new.html.erb
 - app/views/spree/admin/taxons/_form.html.erb
+- app/views/spree/admin/taxons/attachment_forms/_paperclip.html.erb
 - app/views/spree/admin/taxons/edit.html.erb
 - app/views/spree/admin/taxons/index.html.erb
 - app/views/spree/admin/taxons/search.json.jbuilder
@@ -712,7 +727,9 @@ files:
 - lib/spree/backend.rb
 - lib/spree/backend/action_callbacks.rb
 - lib/spree/backend/callbacks.rb
+- lib/spree/backend/config.rb
 - lib/spree/backend/engine.rb
+- lib/spree/backend_configuration.rb
 - lib/spree_backend.rb
 - script/rails
 - solidus_backend.gemspec
@@ -788,6 +805,8 @@ 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_code_batches_spec.rb
+- spec/features/admin/promotions/promotion_code_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
@@ -797,6 +816,7 @@ files:
 - spec/features/admin/style_guide_spec.rb
 - spec/features/admin/taxons_spec.rb
 - spec/features/admin/users_spec.rb
+- spec/fixtures/files/ror_ringer.jpeg
 - spec/helpers/admin/base_helper_spec.rb
 - spec/helpers/admin/navigation_helper_spec.rb
 - spec/helpers/admin/stock_movements_helper_spec.rb
@@ -811,13 +831,12 @@ 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/lib/spree/backend_configuration/menu_item_spec.rb
+- spec/lib/spree/backend_configuration_spec.rb
 - spec/spec_helper.rb
 - spec/support/appear_before_matcher.rb
 - spec/support/feature/base_feature_helper.rb
 - spec/support/feature/order_feature_helper.rb
-- spec/support/ror_ringer.jpeg
 - spec/teaspoon_env.rb
 - spec/test_views/spree/admin/widgets/edit.html.erb
 - spec/test_views/spree/admin/widgets/new.html.erb
@@ -987,7 +1006,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/app/assets/javascripts/spree/backend/templates/variants/autocomplete_stock.hbs

@@ -1,56 +0,0 @@
-<fieldset class="no-border-bottom">
-  <legend align="center">{{ t "select_stock" }}</legend>
-    <table class="stock-levels" data-hook="stock-levels">
-      <colgroup>
-        <col style="width: 30%;" />
-        <col style="width: 40%;" />
-        <col style="width: 20%;" />
-        <col style="width: 10%;" />
-      </colgroup>
-      <thead>
-        <th>{{ t "location" }}</th>
-        <th>{{ t "count_on_hand" }}</th>
-        <th>{{ t "quantity" }}</th>
-        <th class="actions"></th>
-      </thead>
-      <tbody>
-        {{#each variant.stock_items}}
-          <tr class="vertical-middle">
-            <td>{{this.stock_location_name}}</td>
-            {{#unless ../variant.track_inventory}}
-              <td>
-                It doesn't track inventory
-              </td>
-              <td>
-                <form>
-                  <input class="quantity" id="stock_item_quantity" data-stock-location-id="{{this.stock_location_id}}" type="number" min="1" value="1">
-                </form>
-              </td>
-              <td class="actions">
-                <button class="add_variant no-text fa fa-plus icon_link with-tip" data-stock-location-id="{{this.stock_location_id}}" title="{{ t "add" }}" data-action="add"></button>
-              </td>
-            {{else}}
-              {{#if this.available}}
-                <td>
-                  {{this.count_on_hand}}
-                  {{#if this.backorderable}} ({{ t "backorders_allowed" }}) {{/if}}
-                </td>
-                <td>
-                  <form>
-                    <input class="quantity" id="stock_item_quantity" data-stock-location-id="{{this.stock_location_id}}" type="number" min="1" value="1">
-                  </form>
-                </td>
-                <td class="actions">
-                  <button class="add_variant no-text fa fa-plus icon_link with-tip" data-stock-location-id="{{this.stock_location_id}}" title="{{ t "add" }}" data-action="add"></button>
-                </td>
-              {{else}}
-                <td>{{ t "out_of_stock" }}</td>
-                <td>0</td>
-                <td></td>
-              {{/if}}
-            {{/unless}}
-          </tr>
-        {{/each}}
-      </tbody>
-    </table>
-</fieldset>

data/app/views/spree/admin/orders/_add_product.html.erb

@@ -1,12 +0,0 @@
-<div id="add-line-item" class="js-shipment-add-variant" data-hook>
-  <fieldset class="no-border-bottom">
-    <legend align="center"><%= t('spree.add_product') %></legend>
-
-    <div data-hook="add_product_name" class="field">
-      <%= label_tag :add_variant_id, t('spree.name_or_sku') %>
-      <%= text_field_tag :add_variant_id, "", class: "variant_autocomplete fullwidth" %>
-    </div>
-  </fieldset>
-
-  <div id="stock_details"></div>
-</div>