Merge pull request #631 from projectblacklight/engine-cart

replace custom test app creation code and test-with-the-app code with engine_cart

Author: jcoyne

Rakefile

@@ -7,11 +7,12 @@ rescue LoadError
 end
 
 Bundler::GemHelper.install_tasks
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
 
 # load rake tasks defined in lib/tasks that are not loaded in lib/active_fedora.rb
 load "tasks/blacklight.rake"
 
 task :default => [:ci]
-task :spec => ['blacklight:spec']
 task :clean => ['blacklight:clean']
 

blacklight.gemspec

@@ -31,4 +31,5 @@ Gem::Specification.new do |s|
   s.add_dependency "bootstrap-sass", ">= 2.2.0", "< 2.4"
   s.add_development_dependency "jettywrapper", ">= 1.4.1"
   s.add_development_dependency "rspec-rails"
+  s.add_development_dependency 'engine_cart', ">= 0.1.0"
 end

gemfiles/rails3.gemfile

@@ -8,10 +8,15 @@ gem 'simplecov-rcov', :platform => :mri
 
 gem 'rails', "~> 3.2"
 
+gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
+
 group :test do
   gem 'devise'
+  gem 'devise-guests'
   gem "bootstrap-sass"
   gem 'turbolinks'
+  gem 'uglifier'
+  gem 'poltergeist'
   gem "unicode", :platforms => [:mri_18, :mri_19]
 end
 

gemfiles/rails4.gemfile

@@ -8,10 +8,14 @@ gem 'simplecov-rcov', :platform => :mri
 
 gem 'rails', '~> 4.0.0'
 
+gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
+
 group :test do
   gem 'devise'
+  gem 'devise-guests'
   gem "bootstrap-sass"
   gem 'turbolinks'
+  gem 'poltergeist'
   gem "unicode", :platforms => [:mri_18, :mri_19]
 end
 

spec/spec_helper.rb

@@ -16,9 +16,8 @@
   end
 end
 
-# version that works with our blacklight:spec stuff that calls specs
-# in a remote directory. 
-require File.expand_path("config/environment", ENV['RAILS_ROOT'] || File.expand_path("../internal", __FILE__))
+require 'engine_cart'
+EngineCart.load_application!
 
 require 'rspec/rails'
 require 'capybara/rspec'

tasks/blacklight.rake

@@ -1,12 +1,7 @@
 ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.0.0.zip"
-APP_ROOT = File.expand_path("../..", __FILE__)
-
-TEST_APP_TEMPLATES = 'spec/test_app_templates'
-TEST_APP = 'spec/internal'
 
 require 'jettywrapper'
-require 'rspec/core/rake_task'
-
+require 'engine_cart/rake_task'
 
 task :ci => 'jetty:clean' do
   ENV['environment'] = "test"
@@ -30,61 +25,18 @@ namespace :blacklight do
     end
   end
 
-
   desc "Run tests with coverage"
   task :coverage do
     ENV['COVERAGE'] = 'true'
-    Rake::Task["blacklight:spec"].invoke
-  end
-
-  desc "Run specs"
-  task :spec => [:generate] do |t|
-    spec_options = ENV['SPEC'] ? " SPEC=#{File.join(GEM_ROOT, ENV['SPEC'])}" : ''
-    within_test_app do
-      system "rake blacklight_test_app:spec#{spec_options}"
-      abort "Error running spec" unless $?.success?
-    end
+    Rake::Task["spec"].invoke
   end
 
   desc "Clean out the test rails app"
-  task :clean do
-    puts "Removing sample rails app"
-    `rm -rf #{TEST_APP}`
+  task :clean => ['engine_cart:clean'] do
   end
 
   desc "Create the test rails app"
-  task :generate do
-    unless File.exists?('spec/internal/Rakefile')
-      puts "Generating rails app"
-      `rails new #{TEST_APP}`
-      puts "Copying gemfile"
-      open("#{TEST_APP}/Gemfile", 'a') do |f|
-        f.write File.read(TEST_APP_TEMPLATES + "/Gemfile.extra")
-        f.write "gem 'blacklight', :path => '../../'" 
-      end
-      puts "Copying generator"
-      `cp -r #{TEST_APP_TEMPLATES}/lib/generators #{TEST_APP}/lib`
-      within_test_app do
-        puts "Bundle install"
-        `bundle install`
-        puts "running test_app_generator"
-        system "rails generate test_app"
-
-        puts "running migrations"
-        puts `rake db:migrate db:test:prepare`
-      end
-    end
-    puts "Done generating test app"
+  task :generate => ['engine_cart:generate'] do
   end
-
-
-
 end
 
-def within_test_app
-  FileUtils.cd(TEST_APP)
-  Bundler.with_clean_env do
-    yield
-  end
-  FileUtils.cd(APP_ROOT)
-end