Merge pull request #29 from aitbw/aitbw/spec_suite_maintenance

Spec suite maintenance

Gemfile

@@ -1,18 +1,19 @@
 source 'https://rubygems.org'
 
 branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
-gem 'solidus', github: 'solidusio/solidus', branch: branch
+gem 'solidus', git: 'https://github.com/solidusio/solidus.git', branch: branch
 gem 'solidus_auth_devise'
 
-if branch == 'master' || branch >= "v2.3"
-  gem 'rails', '~> 5.1.0' # hack for broken bundler dependency resolution
-elsif branch >= "v2.0"
-  gem 'rails', '~> 5.0.0' # hack for broken bundler dependency resolution
+if branch < 'v2.5'
+  gem 'factory_bot', '4.10.0'
 else
-  gem "rails", '~> 4.2.0' # hack for broken bundler dependency resolution
+  gem 'factory_bot', '> 4.10.0'
 end
 
-gem 'pg'
-gem 'mysql2'
+if ENV['DB'] == 'mysql'
+  gem 'mysql2', '~> 0.4.10'
+else
+  gem 'pg', '~> 0.21'
+end
 
 gemspec

app/models/solidus_easypost/estimator.rb

@@ -16,7 +16,7 @@ def shipping_rates(package, frontend_only = true)
             shipping_method: find_or_create_shipping_method(rate)
           )
 
-          shipping_rates << spree_rate if spree_rate.shipping_method.frontend?
+          shipping_rates << spree_rate if spree_rate.shipping_method.available_to_users?
         end
 
         # Sets cheapest rate to be selected by default
@@ -39,7 +39,7 @@ def find_or_create_shipping_method(rate)
       method_name = "#{ rate.carrier } #{ rate.service }"
       Spree::ShippingMethod.find_or_create_by(admin_name: method_name) do |r|
         r.name = method_name
-        r.display_on = 'back_end'
+        r.available_to_users = false
         r.code = rate.service
         r.calculator = Spree::Calculator::Shipping::FlatRate.create
         r.shipping_categories = [Spree::ShippingCategory.first]

lib/spree_easypost/factories.rb

@@ -1,11 +1,11 @@
-FactoryGirl.define do
+FactoryBot.define do
   # Define your Spree extensions Factories within this file to enable applications, and other extensions to use and override them.
   #
   # Example adding this to your spec_helper will load these Factories for use:
   # require 'spree_easypost/factories'
 end
 
-FactoryGirl.modify do
+FactoryBot.modify do
   factory :address do
     lastname "Doe"
   end

solidus_easypost.gemspec

@@ -19,11 +19,11 @@ Gem::Specification.new do |s|
   s.add_dependency 'solidus', ['>= 1.1', '< 3.x']
   s.add_dependency 'solidus_support', '>= 0.1.1'
   s.add_dependency 'easypost'
+  s.add_dependency "deface", '~> 1.0'
 
   s.add_development_dependency 'capybara', '~> 2.1'
   s.add_development_dependency 'coffee-rails'
   s.add_development_dependency 'database_cleaner'
-  s.add_development_dependency 'factory_girl', '~> 4.4'
   s.add_development_dependency 'ffaker'
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'sass-rails'