Skip to content

Commit

Permalink
Merge pull request #20 from memotoro/fix-solidus-dev-support-dependency
Browse files Browse the repository at this point in the history
Changes solidus_extension_dev_tools to solidus_dev_support
  • Loading branch information
spaghetticode authored Dec 19, 2019
2 parents 1a4a157 + e3980be commit 251d871
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
inherit_from: .rubocop_todo.yml

require:
- solidus_extension_dev_tools/rubocop
- solidus_dev_support/rubocop

inherit_gem:
solidus_extension_dev_tools: .rubocop.extension.yml
solidus_dev_support: .rubocop.extension.yml

AllCops:
Exclude:
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ else
end

gem 'rails-controller-testing', group: :test
gem 'solidus_extension_dev_tools', github: 'solidusio-contrib/solidus_extension_dev_tools'
gem 'solidus_dev_support', github: 'solidusio-contrib/solidus_dev_support'

gemspec
2 changes: 1 addition & 1 deletion solidus_reports.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ Gem::Specification.new do |s|
s.add_dependency 'solidus_support'

s.add_development_dependency 'rspec-activemodel-mocks'
s.add_development_dependency 'solidus_extension_dev_tools'
s.add_development_dependency 'solidus_dev_support'
end
4 changes: 2 additions & 2 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

ENV['RAILS_ENV'] ||= 'test'

require 'solidus_extension_dev_tools/rspec/coverage'
require 'solidus_dev_support/rspec/coverage'

require File.expand_path('dummy/config/environment.rb', __dir__)

require 'solidus_extension_dev_tools/rspec/feature_helper'
require 'solidus_dev_support/rspec/feature_helper'

Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }

0 comments on commit 251d871

Please sign in to comment.