Skip to content

Commit

Permalink
Merge pull request #15 from projectblacklight/engine_cart_0-3
Browse files Browse the repository at this point in the history
Run tests the engine_cart 0.3 way
  • Loading branch information
jrochkind committed Mar 18, 2014
2 parents ffd4f18 + 3f8cdcd commit f986a1b
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 16 deletions.
11 changes: 11 additions & 0 deletions Gemfile
Expand Up @@ -11,6 +11,17 @@ group :test do
gem 'turbolinks'
end

gem 'sass-rails'
# If we don't specify 2.11.0 we'll end up with sprockets 2.12.0 in the main
# Gemfile.lock but since sass-rails gets generated (rails new) into the test app
# it'll want sprockets 2.11.0 and we'll have a conflict
gem 'sprockets', '2.11.0'

# If we don't specify 3.2.15 we'll end up with sass 3.3.2 in the main
# Gemfile.lock but since sass-rails gets generated (rails new) into the test app
# it'll want sass 3.2.0 and we'll have a conflict
gem 'sass', '~> 3.2.0'

if File.exists?('spec/test_app_templates/Gemfile.extra')
eval File.read('spec/test_app_templates/Gemfile.extra'), nil, 'spec/test_app_templates/Gemfile.extra'
end
5 changes: 3 additions & 2 deletions spec/test_app_templates/lib/generators/test_app_generator.rb
Expand Up @@ -3,8 +3,9 @@
class TestAppGenerator < Rails::Generators::Base
source_root File.expand_path("../../../../test_app_templates", __FILE__)

def copy_blacklight_test_app_rake_task
copy_file "lib/tasks/blacklight_test_app.rake"
# This is only necessary for Rails 3
def remove_index
remove_file "public/index.html"
end

def run_blacklight_generator
Expand Down
14 changes: 0 additions & 14 deletions spec/test_app_templates/lib/tasks/blacklight_test_app.rake

This file was deleted.

0 comments on commit f986a1b

Please sign in to comment.