Skip to content

Commit

Permalink
Update engine_cart to 0.8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
jcoyne committed Jan 13, 2016
1 parent b55384c commit 7fa8ffc
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 7 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Expand Up @@ -17,6 +17,5 @@ test/version_tmp
tmp
lib/solrmarc.log
lib/solrmarc.log.*
spec/internal
.internal_test_app
jetty
.internal_test_app
15 changes: 12 additions & 3 deletions Gemfile
Expand Up @@ -7,7 +7,7 @@ gem 'simplecov', '~> 0.10', require: false
gem 'coveralls', require: false

# BEGIN ENGINE_CART BLOCK
# engine_cart: 0.8.0
# engine_cart: 0.8.2
# engine_cart stanza: 0.8.0
# the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path(".internal_test_app", File.dirname(__FILE__)))
Expand All @@ -21,12 +21,21 @@ if File.exist?(file)
else
Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies"

gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
if ENV['RAILS_VERSION']
if ENV['RAILS_VERSION'] == 'edge'
gem 'rails', github: 'rails/rails'
ENV['ENGINE_CART_RAILS_OPTIONS']= "--edge --skip-turbolinks"
else
gem 'rails', ENV['RAILS_VERSION']
end
end

if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^4.2/
gem 'bootstrap-sass', '>= 3.3.5.1'
#gem 'bootstrap-sass', '>= 3.3.5.1'
gem 'responders', "~> 2.0"
gem 'sass-rails', ">= 5.0"
elsif ENV['RAILS_VERSION'] =~ /^5.0/ || ENV['RAILS_VERSION'] == 'edge'
# nop
else
gem 'bootstrap-sass', '< 3.3.5' # 3.3.5 requires sass 3.3, incompatible with sass-rails 4.x
gem 'sass-rails', "< 5.0"
Expand Down
4 changes: 2 additions & 2 deletions spec/spec_helper.rb
Expand Up @@ -20,8 +20,8 @@

# Requires supporting ruby files with custom matchers and macros, etc,
# in spec/support/ and its subdirectories.
# Blacklight, again, make sure we're looking in the right place for em.
# Relative to HERE, NOT to Rails.root, which is off somewhere else.
# Blacklight, again, make sure we're looking in the right place for em.
# Relative to HERE, NOT to Rails.root, which is off somewhere else.
Dir[Pathname.new(File.expand_path("../support/**/*.rb", __FILE__))].each {|f| require f}

RSpec.configure do |config|
Expand Down

0 comments on commit 7fa8ffc

Please sign in to comment.