solidus_volume_pricing 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08283fd45b610c42b6d37427a84de81b106b0a2dab729a45b3e8305148019c5f'
-  data.tar.gz: 137f128fb1d1e761b371bab30b4a3277311d4d97b201f313197ed7f1775ead8e
+  metadata.gz: 98bbc2761ea5f9a04ec275d189fc8ef633a9a23a174b0fb0fe7183db0e51ac90
+  data.tar.gz: 966b8ca6e650a96310cd69d8c216fed8dff2705f2e35f4722bdf29ef9fe4b747
 SHA512:
-  metadata.gz: bf43af51a07a4fcd12129e241c9b512472725dc884ea3d487f23152e8df135dcf82bff22753116fe45df983a231667feab640db82929b260058e55857ed71af5
-  data.tar.gz: e2f055f385c8869c4e0407da0bc3f01946c1eb210c124704a49627b34b6b1762e5f0d9d5be244509385269dc0118fcbe7a35307b26580a36b8d6d948aeb9b9dc
+  metadata.gz: ea5dec857a30471edb436aadd74bdfd21f553e1320fc29fd787619b73eb74cfeddfea8699fc8c3c960e9a7630d4032591ba4c2fd2fba2527edc0ca0e6e1fb7a4
+  data.tar.gz: cf4b9beecf2f6cb70d05b4e1018ec910eff96a24c09535b350beb2de2bfa2b802a9e333a19f5242a9888a12347bfda8ad7236731f27bd3e8b9b8c1f63865a1a3

data/.gem_release.yml

@@ -0,0 +1,5 @@
+bump:
+  recurse: false
+  file: 'lib/solidus_volume_pricing/version.rb'
+  message: Bump SolidusVolumePricing to %{version}
+  tag: true

data/.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10

data/.github/stale.yml

@@ -0,0 +1,17 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

data/.gitignore

@@ -1,14 +1,18 @@
 *.gem
-*.swp
-.bundle
-.idea
+\#*
+*~
+.#*
 .DS_Store
-Gemfile.lock
-pkg/*
-spec/dummy
+.idea
+.project
+.sass-cache
 coverage
-.rvmrc
-.ruby-version
-.ruby-gemset
+Gemfile.lock
 tmp
+nbproject
+pkg
+*.swp
+spec/dummy
 spec/examples.txt
+.byebug*
+Gemfile-local

data/.rspec

@@ -1,3 +1,3 @@
 --color
--f documentation
--r spec_helper
+--format documentation
+--require spec_helper

data/.rubocop.yml

@@ -1,12 +1,4 @@
-inherit_from: .rubocop_todo.yml
-
 require:
-  - solidus_extension_dev_tools/rubocop
+  - solidus_dev_support/rubocop
 
-inherit_gem:
-  solidus_extension_dev_tools: .rubocop.extension.yml
-
-AllCops:
-  Exclude:
-    - spec/dummy/**/*
-    - vendor/**/*
+inherit_from: .rubocop_todo.yml

data/CHANGELOG.md

@@ -1,5 +1,42 @@
 # Changelog
 
+## [v1.1.0](https://github.com/solidusio-contrib/solidus_volume_pricing/tree/v1.1.0) (2023-02-09)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_volume_pricing/compare/v1.0.0...v1.1.0)
+
+**Closed issues:**
+
+- Dependabot can't resolve your Ruby dependency files [\#57](https://github.com/solidusio-contrib/solidus_volume_pricing/issues/57)
+- Prepare Solidus Volume Pricing for Solidus 3.0 [\#53](https://github.com/solidusio-contrib/solidus_volume_pricing/issues/53)
+- Dependabot can't resolve your Ruby dependency files [\#52](https://github.com/solidusio-contrib/solidus_volume_pricing/issues/52)
+- Dependabot can't resolve your Ruby dependency files [\#51](https://github.com/solidusio-contrib/solidus_volume_pricing/issues/51)
+- Role base volume pricing not working [\#47](https://github.com/solidusio-contrib/solidus_volume_pricing/issues/47)
+- Dependabot couldn't find a Gemfile-local for this project [\#44](https://github.com/solidusio-contrib/solidus_volume_pricing/issues/44)
+- Dependabot can't resolve your Ruby dependency files [\#42](https://github.com/solidusio-contrib/solidus_volume_pricing/issues/42)
+- Dependabot can't resolve your Ruby dependency files [\#41](https://github.com/solidusio-contrib/solidus_volume_pricing/issues/41)
+- Dependabot can't resolve your Ruby dependency files [\#40](https://github.com/solidusio-contrib/solidus_volume_pricing/issues/40)
+- Dependabot can't resolve your Ruby dependency files [\#39](https://github.com/solidusio-contrib/solidus_volume_pricing/issues/39)
+- Dependabot can't resolve your Ruby dependency files [\#38](https://github.com/solidusio-contrib/solidus_volume_pricing/issues/38)
+- Dependabot can't resolve your Ruby dependency files [\#37](https://github.com/solidusio-contrib/solidus_volume_pricing/issues/37)
+- Dependabot can't resolve your Ruby dependency files [\#36](https://github.com/solidusio-contrib/solidus_volume_pricing/issues/36)
+- Dependabot can't resolve your Ruby dependency files [\#35](https://github.com/solidusio-contrib/solidus_volume_pricing/issues/35)
+- Can we get a new release? [\#29](https://github.com/solidusio-contrib/solidus_volume_pricing/issues/29)
+
+**Merged pull requests:**
+
+- Update supported ruby version [\#66](https://github.com/solidusio-contrib/solidus_volume_pricing/pull/66) ([mcrisologo](https://github.com/mcrisologo))
+- Bump version to 1.1.0 [\#65](https://github.com/solidusio-contrib/solidus_volume_pricing/pull/65) ([mcrisologo](https://github.com/mcrisologo))
+- Update to use forked solidus\_frontend when needed [\#64](https://github.com/solidusio-contrib/solidus_volume_pricing/pull/64) ([waiting-for-dev](https://github.com/waiting-for-dev))
+- Configure autoloader to ignore decorators [\#61](https://github.com/solidusio-contrib/solidus_volume_pricing/pull/61) ([pelargir](https://github.com/pelargir))
+- Updating gemspec for Ruby 3 support [\#60](https://github.com/solidusio-contrib/solidus_volume_pricing/pull/60) ([embold-given](https://github.com/embold-given))
+- Solidus 3 preparation [\#59](https://github.com/solidusio-contrib/solidus_volume_pricing/pull/59) ([cpfergus1](https://github.com/cpfergus1))
+- Upgrade to GitHub-native Dependabot [\#58](https://github.com/solidusio-contrib/solidus_volume_pricing/pull/58) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Relax solidus\_support dependency [\#50](https://github.com/solidusio-contrib/solidus_volume_pricing/pull/50) ([kennyadsl](https://github.com/kennyadsl))
+- Fix Dependabot looking for Gemfile-local [\#48](https://github.com/solidusio-contrib/solidus_volume_pricing/pull/48) ([aldesantis](https://github.com/aldesantis))
+- Fix role discounts [\#46](https://github.com/solidusio-contrib/solidus_volume_pricing/pull/46) ([hrdchz](https://github.com/hrdchz))
+- Rerun dev tools extension update command to improve the structure [\#45](https://github.com/solidusio-contrib/solidus_volume_pricing/pull/45) ([blocknotes](https://github.com/blocknotes))
+- Upgrade the extension using solidus\_dev\_support [\#43](https://github.com/solidusio-contrib/solidus_volume_pricing/pull/43) ([blocknotes](https://github.com/blocknotes))
+
 ## [v1.0.0](https://github.com/solidusio-contrib/solidus_volume_pricing/tree/v1.0.0) (2019-11-23)
 
 [Full Changelog](https://github.com/solidusio-contrib/solidus_volume_pricing/compare/v0.2.1...v1.0.0)
@@ -33,25 +70,17 @@
 - 1.0 fixes [\#7](https://github.com/solidusio-contrib/solidus_volume_pricing/pull/7) ([tvdeyen](https://github.com/tvdeyen))
 - Add pricers to calculate volume prices [\#4](https://github.com/solidusio-contrib/solidus_volume_pricing/pull/4) ([tvdeyen](https://github.com/tvdeyen))
 - Remove String monkey patch [\#3](https://github.com/solidusio-contrib/solidus_volume_pricing/pull/3) ([tvdeyen](https://github.com/tvdeyen))
+- Solidus 1.3 [\#2](https://github.com/solidusio-contrib/solidus_volume_pricing/pull/2) ([tvdeyen](https://github.com/tvdeyen))
+- Rename to solidus [\#1](https://github.com/solidusio-contrib/solidus_volume_pricing/pull/1) ([tvdeyen](https://github.com/tvdeyen))
 
 ## [v0.2.1](https://github.com/solidusio-contrib/solidus_volume_pricing/tree/v0.2.1) (2017-01-20)
 
 [Full Changelog](https://github.com/solidusio-contrib/solidus_volume_pricing/compare/v0.1.1...v0.2.1)
 
-**Merged pull requests:**
-
-- 0.2 fixes [\#6](https://github.com/solidusio-contrib/solidus_volume_pricing/pull/6) ([tvdeyen](https://github.com/tvdeyen))
-- Solidus 1.3 [\#2](https://github.com/solidusio-contrib/solidus_volume_pricing/pull/2) ([tvdeyen](https://github.com/tvdeyen))
-
 ## [v0.1.1](https://github.com/solidusio-contrib/solidus_volume_pricing/tree/v0.1.1) (2017-01-20)
 
 [Full Changelog](https://github.com/solidusio-contrib/solidus_volume_pricing/compare/9bcf78426749d2d73878c6c7c8eb3bf0e5747ada...v0.1.1)
 
-**Merged pull requests:**
-
-- 0.1 fixes [\#5](https://github.com/solidusio-contrib/solidus_volume_pricing/pull/5) ([tvdeyen](https://github.com/tvdeyen))
-- Rename to solidus [\#1](https://github.com/solidusio-contrib/solidus_volume_pricing/pull/1) ([tvdeyen](https://github.com/tvdeyen))
-
 
 
 \* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

data/Gemfile

@@ -1,27 +1,36 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
-gem 'solidus', git: 'https://github.com/solidusio/solidus.git', branch: branch
+solidus_git, solidus_frontend_git = if (branch == 'master') || (branch >= 'v3.2')
+                                      %w[solidusio/solidus solidusio/solidus_frontend]
+                                    else
+                                      %w[solidusio/solidus] * 2
+                                    end
+gem 'solidus', github: solidus_git, branch: branch
+gem 'solidus_frontend', github: solidus_frontend_git, branch: branch
 
 # Needed to help Bundler figure out how to resolve dependencies,
-# otherwise it takes forever to resolve them
-if branch == 'master' || Gem::Version.new(branch[1..-1]) >= Gem::Version.new('2.10.0')
-  gem 'rails', '~> 6.0'
-else
-  gem 'rails', '~> 5.2'
-end
+# otherwise it takes forever to resolve them.
+# See https://github.com/bundler/bundler/issues/6677
+gem 'rails', '>0.a'
+
+# Provides basic authentication functionality for testing parts of your engine
+gem 'solidus_auth_devise'
 
 case ENV['DB']
-when 'postgresql'
-  gem 'pg'
 when 'mysql'
   gem 'mysql2'
+when 'postgresql'
+  gem 'pg'
 else
   gem 'sqlite3'
 end
 
-gem 'solidus_extension_dev_tools', github: 'solidusio-contrib/solidus_extension_dev_tools'
-
 gemspec
+
+# Use a local Gemfile to include development dependencies that might not be
+# relevant for the project or for other contributors, e.g.: `gem 'pry-debug'`.
+send :eval_gemfile, 'Gemfile-local' if File.exist? 'Gemfile-local'

data/{LICENSE.md → LICENSE}

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2015 Spree Commerce and contributors.
+Copyright (c) 2009-2015 Spree Commerce and contributors, 2019 Sean Schofield
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -9,7 +9,7 @@ are permitted provided that the following conditions are met:
     * Redistributions in binary form must reproduce the above copyright notice,
       this list of conditions and the following disclaimer in the documentation
       and/or other materials provided with the distribution.
-    * Neither the name Spree nor the names of its contributors may be used to
+    * Neither the name Solidus nor the names of its contributors may be used to
       endorse or promote products derived from this software without specific
       prior written permission.
 

data/README.md

@@ -14,14 +14,14 @@ Each VolumePrice contains the following values:
 
 1. **Variant:** Each VolumePrice is associated with a _Variant_, which is used to link products to
    particular prices.
-1. **Name:** The human readable representation of the quantity range (Ex. 10-100). (Optional)
-1. **Discount Type** The type of discount to apply.  **Price:** sets price to the amount specified.
+2. **Name:** The human readable representation of the quantity range (Ex. 10-100). (Optional)
+3. **Discount Type** The type of discount to apply.  **Price:** sets price to the amount specified.
      * **Dollar:** subtracts specified amount from the Variant price.
      * **Percent:** subtracts the specified amounts percentage from the Variant price.
-1. **Range:** The quantity range for which the price is valid (See Below for Examples of Valid
+4. **Range:** The quantity range for which the price is valid (See Below for Examples of Valid
    Ranges.)
-1. **Amount:** The price of the product if the line item quantity falls within the specified range.
-1. **Position:** Integer value for `acts_as_list` (Helps keep the volume prices in a defined order.)
+5. **Amount:** The price of the product if the line item quantity falls within the specified range.
+6. **Position:** Integer value for `acts_as_list` (Helps keep the volume prices in a defined order.)
 
 ## Install
 

data/Rakefile

@@ -1,23 +1,6 @@
 # frozen_string_literal: true
 
-require 'bundler'
-Bundler::GemHelper.install_tasks
+require 'solidus_dev_support/rake_tasks'
+SolidusDevSupport::RakeTasks.install
 
-require 'rspec/core/rake_task'
-require 'spree/testing_support/extension_rake'
-
-RSpec::Core::RakeTask.new
-
-task :default do
-  if Dir["spec/dummy"].empty?
-    Rake::Task[:test_app].invoke
-    Dir.chdir("../../")
-  end
-  Rake::Task[:spec].invoke
-end
-
-desc 'Generates a dummy app for testing'
-task :test_app do
-  ENV['LIB_NAME'] = 'solidus_volume_pricing'
-  Rake::Task['extension:test_app'].invoke
-end
+task default: 'extension:specs'

data/app/models/spree/volume_price.rb

@@ -18,7 +18,7 @@ class Spree::VolumePrice < ApplicationRecord
   def self.for_variant(variant, user: nil)
     roles = [nil]
     if user
-      roles << user.resolve_role&.id
+      user.spree_roles.each {|r| roles << r.id}
     end
 
     where(

data/app/views/spree/admin/volume_prices/_volume_price_fields.html.erb

@@ -27,7 +27,9 @@
     <%= error_message_on(f.object, :role_id) %>
     <%= f.collection_select(:role_id, Spree::Role.all, :id, :name, { include_blank: t('spree.match_choices.none') }, { class: 'custom-select' }) %>
   </td>
-  <td class="actions">
-    <%= link_to_remove_fields t('spree.remove'), f, no_text: true %>
-  </td>
+  <% if f.object.persisted? %>
+    <td class="actions">
+      <%= link_to_delete f.object, url: admin_volume_price_url(f.object.id), no_text: true %>
+    </td>
+  <% end %>
 </tr>

data/bin/console

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "solidus_volume_pricing"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+$LOAD_PATH.unshift(*Dir["#{__dir__}/../app/*"])
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/rails

@@ -1,8 +1,15 @@
 #!/usr/bin/env ruby
+
 # frozen_string_literal: true
 
-ENGINE_ROOT = File.expand_path('..', __dir__)
-ENGINE_PATH = File.expand_path('../lib/solidus_volume_pricing/engine', __dir__)
+app_root = 'spec/dummy'
+
+unless File.exist? "#{app_root}/bin/rails"
+  system "bin/rake", app_root or begin # rubocop:disable Style/AndOr
+    warn "Automatic creation of the dummy app failed"
+    exit 1
+  end
+end
 
-require 'rails/all'
-require 'rails/engine/commands'
+Dir.chdir app_root
+exec 'bin/rails', *ARGV

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+gem install bundler --conservative
+bundle update
+bundle exec rake clobber

data/lib/generators/solidus_volume_pricing/install/install_generator.rb

@@ -10,7 +10,9 @@ module SolidusVolumePricing
       end
 
       def run_migrations
-        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask('Would you like to run the migrations now? [Y/n]'))
+        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(
+          ask('Would you like to run the migrations now? [Y/n]')
+        )
         if run_migrations
           run 'bundle exec rake db:migrate'
         else

data/lib/solidus_volume_pricing/engine.rb

@@ -1,25 +1,34 @@
 # frozen_string_literal: true
 
+require 'spree/core'
+
 module SolidusVolumePricing
   class Engine < Rails::Engine
+    include SolidusSupport::EngineExtensions
+
     isolate_namespace ::Spree
+
     engine_name 'solidus_volume_pricing'
 
     initializer 'solidus_volume_pricing.preferences', before: 'spree.environment' do
       ::Spree::AppConfiguration.class_eval do
         preference :use_master_variant_volume_pricing, :boolean, default: false
-        preference :volume_pricing_role, :string, default: 'wholesale'
       end
     end
 
     def self.activate
       Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')) do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)
+        Rails.autoloaders.main.ignore(c) if Rails.autoloaders.zeitwerk_enabled?
       end
       ::Spree::BackendConfiguration::CONFIGURATION_TABS << :volume_price_models
     end
 
-    config.autoload_paths += %W(#{config.root}/lib)
     config.to_prepare(&method(:activate).to_proc)
+
+    # use rspec for tests
+    config.generators do |g|
+      g.test_framework :rspec
+    end
   end
 end

data/{spec/factories/volume_price_factory.rb → lib/solidus_volume_pricing/testing_support/factories.rb}

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :volume_price, class: Spree::VolumePrice do
+  factory :volume_price, class: 'Spree::VolumePrice' do
     amount { 10 }
     discount_type { 'price' }
     range { '(1..5)' }
     association :variant
   end
 
-  factory :volume_price_model, class: Spree::VolumePriceModel do
+  factory :volume_price_model, class: 'Spree::VolumePriceModel' do
     name { 'name' }
   end
 end

data/lib/solidus_volume_pricing/version.rb

@@ -1,20 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusVolumePricing
-  module_function
-
-  # Returns the version of the currently loaded SolidusVolumePricing as a
-  # <tt>Gem::Version</tt>.
-  def version
-    Gem::Version.new VERSION::STRING
-  end
-
-  module VERSION
-    MAJOR = 1
-    MINOR = 0
-    TINY  = 0
-    PRE   = nil
-
-    STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
-  end
+  VERSION = '1.1.0'
 end

data/lib/solidus_volume_pricing.rb

@@ -4,6 +4,7 @@ require 'active_support/deprecation'
 require 'sassc/rails'
 require 'deface'
 require 'solidus_core'
+require 'solidus_support'
 require 'solidus_volume_pricing/engine'
 require 'solidus_volume_pricing/version'
 require 'solidus_volume_pricing/range_from_string'

data/solidus_volume_pricing.gemspec

@@ -1,32 +1,43 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('lib', __dir__)
-$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
-
+$:.push File.expand_path('lib', __dir__)
 require 'solidus_volume_pricing/version'
 
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'solidus_volume_pricing'
-  s.version     = SolidusVolumePricing.version
+  s.version     = SolidusVolumePricing::VERSION
   s.summary     = 'Allow prices to be configured in quantity ranges for each variant'
   s.description = s.summary
-  s.required_ruby_version = '>= 2.2.3'
+
+  s.required_ruby_version = '>= 2.5'
 
   s.author       = 'Sean Schofield'
   s.email        = 'sean@railsdog.com'
   s.homepage     = 'https://github.com/solidusio-contrib/solidus_volume_pricing'
-  s.license      = 'BSD-3'
+  s.license      = 'BSD-3-Clause'
+
+  s.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  s.test_files = Dir['spec/**/*']
+  s.bindir = "exe"
+  s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  if s.respond_to?(:metadata)
+    s.metadata["homepage_uri"] = s.homepage if s.homepage
+    s.metadata["source_code_uri"] = s.homepage if s.homepage
+  end
 
-  s.files        = `git ls-files`.split("\n")
-  s.test_files   = `git ls-files -- spec/*`.split("\n")
-  s.require_path = 'lib'
-  s.requirements << 'none'
+  s.add_runtime_dependency 'solidus_backend', ['>= 2.4.0', '< 4']
 
-  s.add_runtime_dependency 'deface', '~> 1.0'
-  s.add_runtime_dependency 'solidus_backend', '>= 2.0'
-  s.add_runtime_dependency 'solidus_core', '>= 2.0'
+  s.add_dependency 'coffee-rails'
+  s.add_dependency 'deface'
+  s.add_dependency 'sassc-rails'
+  s.add_dependency 'solidus_core', ['>= 2.4.0', '< 4']
+  s.add_dependency 'solidus_support', '~> 0.8'
 
   s.add_development_dependency 'shoulda-matchers'
-  s.add_development_dependency 'solidus_extension_dev_tools'
+  s.add_development_dependency 'solidus_dev_support'
 end

data/spec/features/manage_volume_price_models_feature_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe 'Managing volume price models' do
   stub_authorization!
 
-  it 'a admin can create and remove volume price models', :js do
+  it 'an admin can create and remove volume price models', :js do
     visit spree.admin_volume_price_models_path
     expect(page).to have_content('Volume Price Models')
 
@@ -19,10 +19,6 @@ RSpec.describe 'Managing volume price models' do
     end
     click_on 'Create'
 
-    within 'tr.volume_price.fields' do
-      expect(page).to have_field('volume_price_model_volume_prices_attributes_0_name', with: '5 pieces discount')
-      page.find('a[data-action="remove"]').click
-      expect(page).not_to have_field('volume_price_model_volume_prices_attributes_0_name', with: '5 pieces discount')
-    end
+    expect(page).to have_content('Discount')
   end
 end

data/spec/features/manage_volume_prices_feature_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe 'Managing volume prices' do
 
   let(:variant) { create(:variant) }
 
-  it 'a admin can create and remove volume prices', :js do
+  it 'an admin can create and remove volume prices', :js do
     visit spree.edit_admin_product_path(variant.product)
     click_on 'Volume Pricing'
     expect(page).to have_content('Volume Prices')
@@ -18,14 +18,13 @@ RSpec.describe 'Managing volume prices' do
     fill_in 'variant_volume_prices_attributes_0_amount', with: '1'
     click_on 'Update'
 
-    within 'tr.volume_price.fields' do
-      expect(page).to have_field('variant_volume_prices_attributes_0_name', with: '5 pieces discount')
-      page.find('a[data-action="remove"]').click
-      expect(page).not_to have_field('variant_volume_prices_attributes_0_name', with: '5 pieces discount')
-    end
+    expect(page).to have_field('variant_volume_prices_attributes_0_name', with: '5 pieces discount')
+    accept_confirm { page.find('a[data-action="remove"]').click }
+
+    expect(page).not_to have_field('variant_volume_prices_attributes_0_name', with: '5 pieces discount')
   end
 
-  it 'a admin editing a variant has a new volume price already built for her' do
+  it 'an admin editing a variant has a new volume price already built for her' do
     visit spree.edit_admin_product_variant_path(product_id: variant.product, id: variant)
     within '#volume_prices' do
       expect(page).to have_field('variant_volume_prices_attributes_0_name')

data/spec/models/solidus_volume_pricing/pricer_spec.rb

@@ -14,10 +14,6 @@ RSpec.describe SolidusVolumePricing::Pricer do
   let(:user) { create(:user) }
   let(:variant) { create(:variant, price: 10) }
 
-  before do
-    stub_spree_preferences(volume_pricing_role: role.name)
-  end
-
   it 'inherits from default variant pricer' do
     expect(described_class < Spree::Variant::PriceSelector).to be(true)
   end

data/spec/models/spree/line_item_spec.rb

@@ -19,7 +19,6 @@ RSpec.describe Spree::LineItem, type: :model do
 
   it 'updates the line item price when the quantity changes to match a range and role matches' do
     order.user.spree_roles << role
-    stub_spree_preferences(volume_pricing_role: role.name)
     expect(order.user.has_spree_role?(role.name.to_sym)).to be(true)
     variant.volume_prices.first.update(role_id: role.id)
     expect(line_item.price.to_f).to be(10.00)

data/spec/models/spree/volume_price_spec.rb

@@ -11,12 +11,7 @@ RSpec.describe Spree::VolumePrice, type: :model do
   it { is_expected.to validate_presence_of(:discount_type) }
   it { is_expected.to validate_presence_of(:amount) }
 
-  it do
-    expect(subject).to \
-      validate_inclusion_of(:discount_type).
-      in_array(%w(price dollar percent)).
-      with_message('shoulda-matchers test string is not a valid Volume Price Type')
-  end
+  it { is_expected.to validate_inclusion_of(:discount_type).in_array(%w[price dollar percent]) }
 
   describe '.for_variant' do
     subject { described_class.for_variant(variant, user: user) }
@@ -44,10 +39,6 @@ RSpec.describe Spree::VolumePrice, type: :model do
         create_list(:volume_price, 2, variant: variant, role_id: role.id)
       end
 
-      before do
-        stub_spree_preferences(volume_pricing_role: role.name)
-      end
-
       context 'whose role matches' do
         before do
           user.spree_roles = [role]

data/spec/spec_helper.rb

@@ -1,11 +1,24 @@
 # frozen_string_literal: true
 
+# Configure Rails Environment
 ENV['RAILS_ENV'] ||= 'test'
 
-require 'solidus_extension_dev_tools/rspec/coverage'
+# Run Coverage report
+require 'solidus_dev_support/rspec/coverage'
 
 require File.expand_path('dummy/config/environment.rb', __dir__)
 
-require 'solidus_extension_dev_tools/rspec/feature_helper'
+# Requires factories and other useful helpers defined in spree_core.
+require 'solidus_dev_support/rspec/feature_helper'
 
+# 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 }
+
+# Requires factories defined in lib/solidus_volume_pricing/testing_support/factories.rb
+SolidusDevSupport::TestingSupport::Factories.load_for(SolidusVolumePricing::Engine)
+
+RSpec.configure do |config|
+  config.infer_spec_type_from_file_location!
+  config.use_transactional_fixtures = false
+end

metadata

@@ -1,57 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: solidus_volume_pricing
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Sean Schofield
-autorequire: 
-bindir: bin
+autorequire:
+bindir: exe
 cert_chain: []
-date: 2019-11-25 00:00:00.000000000 Z
+date: 2023-02-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: solidus_backend
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+- !ruby/object:Gem::Dependency
+  name: coffee-rails
+  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: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: solidus_backend
+  name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.4.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.4.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+- !ruby/object:Gem::Dependency
+  name: solidus_support
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +121,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: solidus_extension_dev_tools
+  name: solidus_dev_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,6 +141,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".gem_release.yml"
+- ".github/dependabot.yml"
+- ".github/stale.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -94,7 +151,7 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Guardfile
-- LICENSE.md
+- LICENSE
 - README.md
 - Rakefile
 - app/assets/javascripts/spree/backend/solidus_volume_pricing.js
@@ -103,7 +160,6 @@ files:
 - app/decorators/controllers/solidus_volume_pricing/spree/admin/variants_controller_decorator.rb
 - app/decorators/helpers/solidus_volume_pricing/spree/base_helper_decorator.rb
 - app/decorators/models/solidus_volume_pricing/spree/line_item_decorator.rb
-- app/decorators/models/solidus_volume_pricing/spree/user_decorator.rb
 - app/decorators/models/solidus_volume_pricing/spree/variant_decorator.rb
 - app/models/solidus_volume_pricing/price_display.rb
 - app/models/solidus_volume_pricing/pricer.rb
@@ -124,7 +180,9 @@ files:
 - app/views/spree/admin/volume_prices/_table.html.erb
 - app/views/spree/admin/volume_prices/_volume_price_fields.html.erb
 - app/views/spree/products/_volume_pricing.html.erb
+- bin/console
 - bin/rails
+- bin/setup
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/pt.yml
@@ -142,10 +200,10 @@ files:
 - lib/solidus_volume_pricing.rb
 - lib/solidus_volume_pricing/engine.rb
 - lib/solidus_volume_pricing/range_from_string.rb
+- lib/solidus_volume_pricing/testing_support/factories.rb
 - lib/solidus_volume_pricing/version.rb
 - solidus_volume_pricing.gemspec
 - spec/controllers/spree/admin/variants_controller_spec.rb
-- spec/factories/volume_price_factory.rb
 - spec/features/manage_volume_price_models_feature_spec.rb
 - spec/features/manage_volume_prices_feature_spec.rb
 - spec/helpers/base_helper_spec.rb
@@ -160,9 +218,11 @@ files:
 - spec/support/shoulda.rb
 homepage: https://github.com/solidusio-contrib/solidus_volume_pricing
 licenses:
-- BSD-3
-metadata: {}
-post_install_message: 
+- BSD-3-Clause
+metadata:
+  homepage_uri: https://github.com/solidusio-contrib/solidus_volume_pricing
+  source_code_uri: https://github.com/solidusio-contrib/solidus_volume_pricing
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -170,21 +230,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.3
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements:
-- none
-rubygems_version: 3.0.6
-signing_key: 
+requirements: []
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Allow prices to be configured in quantity ranges for each variant
 test_files:
 - spec/controllers/spree/admin/variants_controller_spec.rb
-- spec/factories/volume_price_factory.rb
 - spec/features/manage_volume_price_models_feature_spec.rb
 - spec/features/manage_volume_prices_feature_spec.rb
 - spec/helpers/base_helper_spec.rb

data/app/decorators/models/solidus_volume_pricing/spree/user_decorator.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module SolidusVolumePricing
-  module Spree
-    module UserDecorator
-      def resolve_role
-        if has_spree_role? ::Spree::Config.volume_pricing_role.to_sym
-          ::Spree::Role.find_by name: ::Spree::Config.volume_pricing_role
-        else
-          ::Spree::Role.find_by name: 'user'
-        end
-      end
-
-      ::Spree.user_class.prepend self
-    end
-  end
-end