solidus_product_assembly 1.1.0 → 1.3.0

data/spec/features/admin/return_items_spec.rb

@@ -23,7 +23,7 @@ describe "Return Items", type: :feature, js: true do
       3.times { order.next }
       create :payment, order: order, amount: order.amount
       order.next
-      order.complete
+      order.complete!
       order.payments.each(&:capture!)
       order.shipments.each { |s| s.update state: :ready }
       order.shipments.each(&:ship!)
@@ -51,7 +51,9 @@ describe "Return Items", type: :feature, js: true do
         click_link 'Customer Returns'
         click_link 'New Customer Return'
         find('#select-all').click
-        page.execute_script %{$('option[value="receive"]').attr('selected', 'selected')}
+        page.execute_script <<~JS
+          $('option[value="receive"]').attr('selected', 'selected');
+        JS
         select Spree::StockLocation.first.name, from: 'Stock Location'
         click_button 'Create'
 
@@ -88,7 +90,9 @@ describe "Return Items", type: :feature, js: true do
         click_link 'Customer Returns'
         click_link 'New Customer Return'
         find('#select-all').click
-        page.execute_script %{$('option[value="receive"]').attr('selected', 'selected')}
+        page.execute_script <<~JS
+          $('option[value="receive"]').attr('selected', 'selected');
+        JS
         select Spree::StockLocation.first.name, from: 'Stock Location'
         click_button 'Create'
 
@@ -106,10 +110,15 @@ describe "Return Items", type: :feature, js: true do
 
   context 'when the product is not a bundle' do
     before do
-      order.reload.create_proposed_shipments
-      order.finalize!
-      order.update state: :complete
-      order.shipments.update_all state: :shipped
+      create :refund_reason, name: Spree::RefundReason::RETURN_PROCESSING_REASON, mutable: false
+      order.line_items.each { |li| li.variant.stock_items.first.set_count_on_hand 4 }
+      3.times { order.next }
+      create :payment, order: order, amount: order.amount
+      order.next
+      order.complete!
+      order.payments.each(&:capture!)
+      order.shipments.each { |s| s.update state: :ready }
+      order.shipments.each(&:ship!)
     end
 
     context 'with a single item cart' do
@@ -125,7 +134,7 @@ describe "Return Items", type: :feature, js: true do
 
         within '.return-items-table tbody' do
           expect(page).to have_selector 'tr', count: 1
-          expect(page).to have_selector '.return-item-pre-tax-refund-amount', text: '$10.00', count: 1
+          expect(page).to have_selector :field, class: 'refund-amount-input', with: '10.0', count: 1
         end
       end
     end
@@ -143,7 +152,7 @@ describe "Return Items", type: :feature, js: true do
 
         within '.return-items-table tbody' do
           expect(page).to have_selector 'tr', count: 2
-          expect(page).to have_selector '.return-item-pre-tax-refund-amount', text: '$10.00', count: 2
+          expect(page).to have_selector :field, class: 'refund-amount-input', with: '10.0', count: 2
         end
       end
     end

data/spec/models/spree/inventory_unit_spec.rb

@@ -29,7 +29,6 @@ module Spree
       before do
         product.parts << parts
         order.create_proposed_shipments
-        order.finalize!
       end
 
       it 'will return the percentage of a line item' do

data/spec/models/spree/line_item_spec.rb

@@ -51,7 +51,6 @@ module Spree
       before do
         product.parts << parts
         order.create_proposed_shipments
-        order.finalize!
       end
 
       it "verifies inventory units via OrderInventoryAssembly" do

data/spec/models/spree/order_inventory_assembly_spec.rb

@@ -17,7 +17,7 @@ module Spree
 
       line_item.update!(quantity: 3)
       order.reload.create_proposed_shipments
-      order.finalize!
+      allow(order).to receive(:completed?).and_return(true)
     end
 
     context "inventory units count" do
@@ -36,7 +36,10 @@ module Spree
         it "inserts new inventory units for every bundle part" do
           expected_units_count = original_units_count + bundle.assemblies_parts.to_a.sum(&:count)
           subject.verify
-          expect(described_class.new(line_item.reload).inventory_units.count).to eql(expected_units_count)
+
+          # needs to reload so that inventory units are fetched from the updated order.shipments
+          updated_units_count = described_class.new(line_item.reload).inventory_units.count
+          expect(updated_units_count).to eql(expected_units_count)
         end
       end
 
@@ -47,7 +50,7 @@ module Spree
           expected_units_count = original_units_count - bundle.assemblies_parts.to_a.sum(&:count)
           subject.verify
 
-          # needs to reload so that inventory units are fetched from updates order.shipments
+          # needs to reload so that inventory units are fetched from the updated order.shipments
           updated_units_count = described_class.new(line_item.reload).inventory_units.count
           expect(updated_units_count).to eql(expected_units_count)
         end

data/spec/models/spree/product_spec.rb

@@ -8,6 +8,24 @@ describe Spree::Product do
     @master_variant = Spree::Variant.where(is_master: true).find_by(product_id: @product.id)
   end
 
+  describe ".search_can_be_part" do
+    subject { described_class.search_can_be_part("matching") }
+
+    let!(:name_matching_product) { create :product, can_be_part: true, name: "matching" }
+    let!(:sku_matching_product) { create :product, can_be_part: true, master: variant }
+    let(:variant) { create :master_variant, sku: "matching" }
+
+    before do
+      create :product, can_be_part: false, name: "matching"
+      create :product, deleted_at: 1.day.ago, can_be_part: true, name: "matching"
+      create :product, can_be_part: true, name: "Something else"
+    end
+
+    it "returns non-deleted products matching the search that can be parts" do
+      expect(subject).to contain_exactly(name_matching_product, sku_matching_product)
+    end
+  end
+
   describe "Spree::Product Assembly" do
     before do
       @product = create(:product)

data/spec/spec_helper.rb

@@ -1,28 +1,31 @@
 # frozen_string_literal: true
 
 # Configure Rails Environment
-ENV['RAILS_ENV'] ||= 'test'
+ENV['RAILS_ENV'] = 'test'
 
 # Run Coverage report
 require 'solidus_dev_support/rspec/coverage'
 
-require File.expand_path('dummy/config/environment.rb', __dir__)
+# Create the dummy app if it's still missing.
+dummy_env = "#{__dir__}/dummy/config/environment.rb"
+system 'bin/rake extension:test_app' unless File.exist? dummy_env
+require dummy_env
 
 # Requires factories and other useful helpers defined in spree_core.
 require 'solidus_dev_support/rspec/feature_helper'
 
-# This will load Solidus Core factories right before the ones defined in
-# lib/extension_name/testing_support/factories/*_factory.rb or
-# lib/extension_name/testing_support/factories.rb
-SolidusDevSupport::TestingSupport::Factories.load_for(SolidusProductAssembly::Engine)
-
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }
+Dir["#{__dir__}/support/**/*.rb"].sort.each { |f| require f }
+
+# Requires factories defined in lib/solidus_product_assembly/testing_support/factories.rb
+SolidusDevSupport::TestingSupport::Factories.load_for(SolidusProductAssembly::Engine)
 
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
   config.use_transactional_fixtures = false
-end
 
-Capybara.javascript_driver = (ENV['CAPYBARA_DRIVER'] || :selenium_headless).to_sym
+  if Spree.solidus_gem_version < Gem::Version.new('2.11')
+    config.extend Spree::TestingSupport::AuthorizationHelpers::Request, type: :system
+  end
+end

metadata

@@ -1,49 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: solidus_product_assembly
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Roman Smirnov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-19 00:00:00.000000000 Z
+date: 2023-06-15 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: deface
-  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: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: solidus_support
   requirement: !ruby/object:Gem::Requirement
@@ -59,27 +39,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: github_changelog_generator
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: selenium-webdriver
+  name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -90,17 +56,17 @@ dependencies:
   name: solidus_dev_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Adds oportunity to make bundle of products to your Spree store
+        version: '2.5'
+description: Make bundle of products to your Solidus store
 email: roman@railsdog.com
 executables: []
 extensions: []
@@ -110,6 +76,7 @@ files:
 - ".gem_release.yml"
 - ".github/dependabot.yml"
 - ".github/stale.yml"
+- ".github_changelog_generator"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -117,15 +84,13 @@ files:
 - CHANGELOG.md
 - Gemfile
 - LICENSE
+- OLD_CHANGELOG.md
 - README.md
 - Rakefile
 - app/assets/images/spinner.gif
 - app/assets/javascripts/spree/backend/solidus_product_assembly.js
-- app/assets/javascripts/spree/frontend/solidus_product_assembly.js
 - app/assets/stylesheets/spree/backend/solidus_product_assembly.css
-- app/assets/stylesheets/spree/frontend/solidus_product_assembly.css
 - app/controllers/spree/admin/parts_controller.rb
-- app/decorators/controllers/solidus_product_assembly/spree/checkout_controller_decorator.rb
 - app/decorators/helpers/solidus_product_assembly/spree/admin/orders_helper_decorator.rb
 - app/decorators/models/solidus_product_assembly/spree/inventory_unit_decorator.rb
 - app/decorators/models/solidus_product_assembly/spree/line_item_decorator.rb
@@ -133,6 +98,7 @@ files:
 - app/decorators/models/solidus_product_assembly/spree/return_item_decorator.rb
 - app/decorators/models/solidus_product_assembly/spree/shipment_decorator.rb
 - app/decorators/models/solidus_product_assembly/spree/stock/availability_validator_decorator.rb
+- app/decorators/models/solidus_product_assembly/spree/stock/differentiator_decorator.rb
 - app/decorators/models/solidus_product_assembly/spree/stock/inventory_unit_builder_decorator.rb
 - app/decorators/models/solidus_product_assembly/spree/stock/inventory_units_finalizer_decorator.rb
 - app/decorators/models/solidus_product_assembly/spree/stock/inventory_validator_decorator.rb
@@ -169,6 +135,10 @@ files:
 - app/views/spree/orders/_cart_description.html.erb
 - bin/console
 - bin/rails
+- bin/rails-engine
+- bin/rails-sandbox
+- bin/rake
+- bin/sandbox
 - bin/setup
 - config/locales/en.yml
 - config/locales/fr.yml
@@ -180,7 +150,9 @@ files:
 - db/migrate/20120316141830_namespace_product_assembly_for_spree_one.rb
 - db/migrate/20140620223938_add_id_to_spree_assemblies_parts.rb
 - lib/generators/solidus_product_assembly/install/install_generator.rb
+- lib/generators/solidus_product_assembly/install/templates/initializer.rb
 - lib/solidus_product_assembly.rb
+- lib/solidus_product_assembly/configuration.rb
 - lib/solidus_product_assembly/engine.rb
 - lib/solidus_product_assembly/testing_support/factories.rb
 - lib/solidus_product_assembly/version.rb
@@ -204,12 +176,13 @@ files:
 - spec/models/spree/variant_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_contexts/order_with_bundle.rb
-homepage: https://solidus.io
+homepage: https://github.com/solidusio-contrib/solidus_product_assembly
 licenses:
 - BSD-3-Clause
 metadata:
-  homepage_uri: https://solidus.io
+  homepage_uri: https://github.com/solidusio-contrib/solidus_product_assembly
   source_code_uri: https://github.com/solidusio-contrib/solidus_product_assembly
+  changelog_uri: https://github.com/solidusio-contrib/solidus_product_assembly/releases
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -218,33 +191,36 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.20
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
-summary: Adds oportunity to make bundle of products to your Spree store
+summary: Make bundle of products to your Solidus store
 test_files:
-- spec/spec_helper.rb
-- spec/features/admin/return_items_spec.rb
-- spec/features/admin/parts_spec.rb
 - spec/features/admin/orders_spec.rb
+- spec/features/admin/parts_spec.rb
+- spec/features/admin/return_items_spec.rb
 - spec/features/checkout_spec.rb
-- spec/models/spree/shipment_spec.rb
-- spec/models/spree/product_spec.rb
-- spec/models/spree/variant_spec.rb
-- spec/models/spree/order_inventory_assembly_spec.rb
-- spec/models/spree/order_contents_spec.rb
-- spec/models/spree/line_item_spec.rb
+- spec/models/spree/assemblies_part_spec.rb
 - spec/models/spree/inventory_unit_spec.rb
-- spec/models/spree/stock/coordinator_spec.rb
+- spec/models/spree/line_item_spec.rb
+- spec/models/spree/order_contents_spec.rb
+- spec/models/spree/order_inventory_assembly_spec.rb
+- spec/models/spree/order_inventory_spec.rb
+- spec/models/spree/product_spec.rb
+- spec/models/spree/shipment_spec.rb
 - spec/models/spree/stock/availability_validator_spec.rb
+- spec/models/spree/stock/coordinator_spec.rb
 - spec/models/spree/stock/inventory_unit_builder_spec.rb
-- spec/models/spree/order_inventory_spec.rb
-- spec/models/spree/assemblies_part_spec.rb
+- spec/models/spree/variant_spec.rb
+- spec/spec_helper.rb
 - spec/support/shared_contexts/order_with_bundle.rb

data/app/assets/javascripts/spree/frontend/solidus_product_assembly.js

@@ -1 +0,0 @@
-//= require spree/frontend

data/app/assets/stylesheets/spree/frontend/solidus_product_assembly.css

@@ -1,3 +0,0 @@
-/*
- *= require spree/frontend
-*/

data/app/decorators/controllers/solidus_product_assembly/spree/checkout_controller_decorator.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module SolidusProductAssembly
-  module Spree
-    module CheckoutControllerDecorator
-      def before_payment; end
-
-      if defined?(::Spree::CheckoutController)
-        ::Spree::CheckoutController.prepend self
-      end
-    end
-  end
-end