Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix error in image decorator with variant #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/solidus_decorators/spree/image_decorator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ def mailchimp_sync
SolidusMailchimpSync::ProductSynchronizer.new(self.viewable.product).auto_sync(force: true)
else
# image just on this variant, just need to sync this one.
SolidusMailchimpSync::VariantSynchronizer.new(self.variant).auto_sync(force: true)
SolidusMailchimpSync::VariantSynchronizer.new(self.viewable).auto_sync(force: true)
end
end
end
Expand Down
4 changes: 2 additions & 2 deletions lib/solidus_mailchimp_sync/factories.rb
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
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 'solidus_mailchimp_sync/factories'
end


FactoryGirl.modify do
FactoryBot.modify do
factory :order do
factory :order_with_line_items do
# This custom factory is from Solidus master at:
Expand Down
2 changes: 1 addition & 1 deletion solidus_mailchimp_sync.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Gem::Specification.new do |s|
s.add_development_dependency 'coffee-rails', '~> 4.2'
s.add_development_dependency 'sass-rails', '~> 5.0'
s.add_development_dependency 'database_cleaner', '~> 1.5'
s.add_development_dependency 'factory_girl', '~> 4.7'
s.add_development_dependency 'factory_bot', '~> 4.11'
s.add_development_dependency 'rspec-rails', '~> 3.5'
s.add_development_dependency 'rubocop', '~> 0.44'
s.add_development_dependency 'rubocop-rspec', '~> 1.8'
Expand Down
3 changes: 1 addition & 2 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

require 'rspec/rails'
require 'database_cleaner'
require 'ffaker'

# Requires supporting ruby files with custom matchers and macros, etc,
# in spec/support/ and its subdirectories.
Expand Down Expand Up @@ -58,7 +57,7 @@
end

RSpec.configure do |config|
config.include FactoryGirl::Syntax::Methods
config.include FactoryBot::Syntax::Methods

# Infer an example group's spec type from the file location.
config.infer_spec_type_from_file_location!
Expand Down