Add support for v3.1

.circleci/config.yml

@@ -26,7 +26,6 @@ workflows:
     jobs:
       - run-specs-with-postgres
       - run-specs-with-mysql
-      - lint-code
 
   "Weekly run specs against master":
     triggers:

Rakefile

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 require 'solidus_dev_support/rake_tasks'
-require 'rubocop/rake_task'
-
 SolidusDevSupport::RakeTasks.install
-RuboCop::RakeTask.new
 
-task default: %i(rubocop extension:specs)
+task default: 'extension:specs'

app/models/spree/locality.rb

@@ -5,6 +5,6 @@ class Locality < Spree::Base
     belongs_to :state, class_name: 'Spree::State'
     has_one :country, through: :state
 
-    validates :name, presence: true, uniqueness: { scope: :state_id }
+    validates :name, presence: true
   end
 end

db/migrate/20200903233530_create_locality.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateLocality < ActiveRecord::Migration[5.2]
   def change
     create_table :spree_localities do |t|

db/migrate/20200907165834_add_locality_id_to_address.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddLocalityIdToAddress < ActiveRecord::Migration[5.2]
   def change
     add_column :spree_addresses, :locality_id, :integer

db/migrate/20200909165022_add_locality_id_to_stock_locations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddLocalityIdToStockLocations < ActiveRecord::Migration[5.2]
   def change
     add_column :spree_stock_locations, :locality_id, :integer, index: true

lib/solidus_zones_by_city.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 require 'solidus_core'
+require 'solidus_backend'
 require 'solidus_support'
+require 'deface'
 
 require 'solidus_zones_by_city/version'
 require 'solidus_zones_by_city/engine'

lib/solidus_zones_by_city/engine.rb

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
-require 'spree/core'
 require 'solidus_zones_by_city'
 
 module SolidusZonesByCity
   class Engine < Rails::Engine
     include SolidusSupport::EngineExtensions
 
-    isolate_namespace ::Spree
+    isolate_namespace Spree
 
     engine_name 'solidus_zones_by_city'
 

lib/solidus_zones_by_city/factories.rb → lib/solidus_zones_by_city/testing_support/factories.rb

@@ -24,7 +24,7 @@
     locality do |address|
       state = address.state
       Spree::Locality.find_by(name: city_name, state: state) ||
-        create(:city, name: city_name, state: state)
+        create(:locality, name: city_name, state: state)
     end
   end
 end
@@ -45,7 +45,7 @@
     locality do |stock_location|
       state = stock_location.state
       Spree::Locality.find_by(name: city_name, state: state) ||
-      create(:city, name: city_name, state: state)
+      create(:locality, name: city_name, state: state)
     end
   end
 end

solidus_zones_by_city.gemspec

@@ -2,36 +2,39 @@
 
 require_relative 'lib/solidus_zones_by_city/version'
 
-Gem::Specification.new do |spec|
-  spec.name = 'solidus_zones_by_city'
-  spec.version = SolidusZonesByCity::VERSION
-  spec.authors = ['César Carruitero']
-  spec.email = 'ccarruitero@protonmail.com'
+Gem::Specification.new do |s|
+  s.name = 'solidus_zones_by_city'
+  s.version = SolidusZonesByCity::VERSION
+  s.authors = ['César Carruitero']
+  s.email = 'ccarruitero@protonmail.com'
 
-  spec.summary = 'Allow zones at city level'
-  spec.description = spec.summary
-  spec.homepage = 'https://github.com/magma-labs/solidus_zones_by_city'
-  spec.license = 'BSD-3-Clause'
+  s.summary = 'Allow zones at city level'
+  s.description = s.summary
+  s.homepage = 'http://github.com/magma-labs/solidus_zones_by_city'
+  s.license = 'BSD-3-Clause'
 
-  spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = 'https://github.com/magma-labs/solidus_zones_by_city'
-  spec.metadata['changelog_uri'] = 'https://github.com/magma-labs/solidus_zones_by_city/releases'
+  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
 
-  spec.required_ruby_version = Gem::Requirement.new('~> 2.5')
+  s.required_ruby_version = Gem::Requirement.new('>= 2.5')
 
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   files = Dir.chdir(__dir__) { `git ls-files -z`.split("\x0") }
 
-  spec.files = files.grep_v(%r{^(test|spec|features)/})
-  spec.test_files = files.grep(%r{^(test|spec|features)/})
-  spec.bindir = "exe"
-  spec.executables = files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 3']
-  spec.add_dependency 'solidus_support', '~> 0.5'
-
-  spec.add_development_dependency 'shoulda-matchers'
-  spec.add_development_dependency 'solidus_dev_support'
+  s.files = files.grep_v(%r{^(test|spec|features)/})
+  s.test_files = files.grep(%r{^(test|spec|features)/})
+  s.bindir = "exe"
+  s.executables = files.grep(%r{^exe/}) { |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_dependency 'deface', '~> 1.0'
+  s.add_dependency 'solidus_backend', ['>= 2.5', '< 4']
+  s.add_dependency 'solidus_core', ['>= 2.5', '< 4']
+  s.add_dependency 'solidus_support', '~> 0.5'
+
+  s.add_development_dependency 'autoprefixer-rails', '~> 10.2.5'
+  s.add_development_dependency 'rspec-activemodel-mocks'
+  s.add_development_dependency 'shoulda-matchers'
+  s.add_development_dependency 'solidus_dev_support', '~> 2.3'
 end

spec/features/admin/zones_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
-describe 'Zones admin page', type: :feature, js: true do
+RSpec.describe 'Zones admin page', type: :feature, js: true do
   stub_authorization!
 
   let!(:city) { create(:city) }

spec/models/spree/address_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 RSpec.describe Spree::Address, type: :model do
   describe 'associations' do
     it { is_expected.to belong_to(:locality).optional }

spec/models/spree/locality_spec.rb

@@ -1,14 +1,11 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 RSpec.describe Spree::Locality, type: :model do
   describe 'associations' do
     it { is_expected.to belong_to(:state) }
   end
 
   describe 'validations' do
     it { is_expected.to validate_presence_of(:name) }
-    it { is_expected.to validate_uniqueness_of(:name).scoped_to(:state_id) }
   end
 end

spec/models/spree/state_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 RSpec.describe Spree::State, type: :model do
   describe 'associations' do
     it { is_expected.to have_many(:localities) }

spec/models/spree/stock_location_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 RSpec.describe Spree::StockLocation, type: :model do
   describe 'associations' do
     it { is_expected.to belong_to(:locality).optional }

spec/models/spree/zone_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 RSpec.describe Spree::Zone do
   context 'when zone is city type' do
     let(:zone) { create(:zone, name: 'CityZone') }

spec/spec_helper.rb

@@ -3,8 +3,6 @@
 # Configure Rails Environment
 ENV['RAILS_ENV'] = 'test'
 
-require 'shoulda/matchers'
-
 # Run Coverage report
 require 'solidus_dev_support/rspec/coverage'
 
@@ -20,8 +18,8 @@
 # in spec/support/ and its subdirectories.
 Dir["#{__dir__}/support/**/*.rb"].sort.each { |f| require f }
 
-# Requires factories defined in lib/solidus_zones_by_city/factories.rb
-require 'solidus_zones_by_city/factories'
+# Requires factories defined in lib/solidus_related_products/testing_support/factories.rb
+SolidusDevSupport::TestingSupport::Factories.load_for(SolidusZonesByCity::Engine)
 
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
@@ -31,10 +29,3 @@
     config.extend Spree::TestingSupport::AuthorizationHelpers::Request, type: :system
   end
 end
-
-Shoulda::Matchers.configure do |config|
-  config.integrate do |with|
-    with.test_framework :rspec
-    with.library :rails
-  end
-end

spec/support/activemodel_mocks.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require 'rspec-activemodel-mocks'

spec/support/shoulda_matchers.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'shoulda-matchers'
+
+Shoulda::Matchers.configure do |config|
+  config.integrate do |with|
+    with.test_framework :rspec
+    with.library :rails
+  end
+end