Skip to content

Commit

Permalink
upgrade to support spree v4.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Kimsrung Lov committed May 30, 2023
1 parent 1417bff commit e5c6ac0
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 41 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ pkg/*
spec/dummy
coverage
.rvmrc
.nvmrc
.ruby-version
.ruby-gemset
.tool-versions
tmp
gemfiles/*.gemfile.lock
6 changes: 4 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ git_source(:github) do |repo_name|
"https://github.com/#{repo_name}.git"
end

gem 'spree', github: 'spree/spree', branch: 'master'
gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: 'master'
gem 'spree', github: 'spree/spree', branch: 'main'
gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: 'main'
gem 'rails-controller-testing'
gem 'byebug'


gemspec
3 changes: 3 additions & 0 deletions app/assets/config/spree_reviews_manifest.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
//= link_tree ../images
//= link_tree ../javascripts
//= link_directory ../stylesheets .css
37 changes: 0 additions & 37 deletions app/helpers/spree/api/api_helpers_decorator.rb

This file was deleted.

1 change: 1 addition & 0 deletions config/initializers/asset.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Rails.application.config.assets.precompile << 'spree_reviews_manifest.js'
5 changes: 5 additions & 0 deletions config/initializers/spree_permitted_attributes.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module Spree
module PermittedAttributes
@@product_attributes += %i[avg_rating reviews_count]
end
end
1 change: 1 addition & 0 deletions lib/spree_reviews.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
require 'spree_core'
require 'spree_extension'
require 'spree_backend'
require 'spree_reviews/engine'
require 'spree_reviews/version'
require 'deface'
Expand Down
5 changes: 5 additions & 0 deletions lib/spree_reviews/engine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,17 @@ class Engine < Rails::Engine
isolate_namespace Spree
engine_name 'spree_reviews'

config.autoload_paths += %W[#{config.root}/lib]
# use rspec for tests
config.generators do |g|
g.test_framework :rspec
end

initializer 'spree_reviews.environment', before: :load_config_initializers do |_app|
Config = Configuration.new
end

config.after_initialize do
Spree::Reviews::Config = Spree::ReviewSetting.new
end

Expand Down
2 changes: 1 addition & 1 deletion spec/controllers/products_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
end

it "adds #{attrib} to the set of available attributes from Spree API" do
expect(Spree::Api::ApiHelpers.product_attributes).to include(attrib)
expect(Spree::PermittedAttributes.product_attributes).to include(attrib)
end
end
end
1 change: 1 addition & 0 deletions spec/features/admin_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
within("tr#review_#{review.id}") do
find('.approve').click
end
sleep(3)
expect(review.reload.approved).to be(true)
end

Expand Down
4 changes: 3 additions & 1 deletion spree_reviews.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,15 @@ Gem::Specification.new do |s|
s.require_path = 'lib'
s.requirements << 'none'

spree_version = '>= 3.2.0', '< 5.0'
spree_version = '>= 4.5'
s.add_dependency 'deface', '~> 1.0'
s.add_dependency 'spree_api', spree_version
s.add_dependency 'spree_backend', spree_version
s.add_dependency 'spree_frontend', spree_version
s.add_dependency 'spree_core', spree_version
s.add_dependency 'spree_extension'

s.add_development_dependency 'sass-rails'
s.add_development_dependency 'spree_dev_tools'
s.add_development_dependency 'pg'
end

0 comments on commit e5c6ac0

Please sign in to comment.