run specs with engine_cart

.gitignore

@@ -6,3 +6,8 @@ Gemfile.lock
 test/dummy/log
 *.sqlite3
 .rvmrc
+spec/internal
+tmp
+coverage
+pkg
+.bundle

Gemfile

@@ -1,20 +1,29 @@
 source "http://rubygems.org"
 
 # Declare your gem's dependencies in blacklight-hierarchy-facets.gemspec.
-# Bundler will treat runtime dependencies like base dependencies, and
-# development dependencies will be added by default to the :development group.
 gemspec
 
-# jquery-rails is used by the dummy application
-gem "jquery-rails"
-
 # Declare any dependencies that are still in development here instead of in
 # your gemspec. These might include edge Rails or gems from your path or
 # Git. Remember to move these dependencies to your gemspec before releasing
 # your gem to rubygems.org.
 
-# To use debugger
-# gem 'ruby-debug'
+# sprockets 2.11.0 required by blacklight test app generated by engine_cart 
+# If we don't specify it here, we'll end up with a conflict with version in Gemfile.lock
+gem 'sprockets', '2.11.0'
+
+# sass 3.2.0 required by blacklight test app generated by engine_cart 
+# If we don't specify it here, we'll end up with a conflict with version in Gemfile.lock
+gem 'sass', '~> 3.2.0'
+gem 'bootstrap-sass', ">= 3.1.1.1"
+
+# load local rails test instance Gemfile (engine cart adds this automagically)
+#file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path("../spec/internal", __FILE__))
+#if File.exists?(file)
+#  puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
+#  instance_eval File.read(file)
+#end
 
-gem 'sqlite3'
-gem 'fakeweb'
+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

Rakefile

@@ -1,9 +1,32 @@
 #!/usr/bin/env rake
 begin
   require 'bundler/setup'
+  Bundler::GemHelper.install_tasks
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
+
+require 'engine_cart/rake_task'
+TEST_APP_TEMPLATES = 'spec/test_app_templates'
+TEST_APP = 'spec/internal'
+#ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.0.0.zip"
+APP_ROOT = File.expand_path("..", __FILE__)
+
+task :default => :ci
+
+
+require 'rspec/core/rake_task'
+
+desc "Run specs"
+RSpec::Core::RakeTask.new(:rspec) do |spec|
+  spec.rspec_opts = ["-c", "-f progress", "-r ./spec/spec_helper.rb"]
+end
+task :spec => :rspec
+
+
+desc "Execute Continuous Integration Build"
+task :ci => ['engine_cart:clean', 'engine_cart:generate', 'rspec']
+
 begin
   require 'rdoc/task'
 rescue LoadError
@@ -12,27 +35,11 @@ rescue LoadError
   RDoc::Task = Rake::RDocTask
 end
 
+desc "Create rdoc"
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Blacklight::Hierarchy'
   rdoc.options << '--line-numbers'
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-
-
-
-
-Bundler::GemHelper.install_tasks
-
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-
-task :default => :test

lib/blacklight/hierarchy.rb

@@ -1,6 +1,7 @@
-require 'blacklight/hierarchy/engine'
+require 'blacklight/hierarchy/version'
 
 module Blacklight
   module Hierarchy
+    require 'blacklight/hierarchy/engine'
   end
 end

lib/blacklight/hierarchy/engine.rb

@@ -1,3 +1,5 @@
+require 'blacklight'
+
 module Blacklight
   module Hierarchy
     class Engine < Rails::Engine

lib/generators/blacklight_hierarchy/install_generator.rb

@@ -0,0 +1,6 @@
+require 'rails/generators'
+
+module BlacklightHierarchy
+  class Install < Rails::Generators::Base
+  end
+end

spec/integration/integration_spec.rb → spec/features/basic_spec.rb2

@@ -1,26 +1,27 @@
 require 'spec_helper'
 
 describe "catalog" do
-  use_vcr_cassette "solr"
+
   before(:each) do
     CatalogController.blacklight_config = Blacklight::Configuration.new
     CatalogController.configure_blacklight do |config|
-      config.index.show_link = 'title_display'
+      config.index.title_field = 'title_display'
       config.default_solr_params = {
         :rows => 10
       }
+      response = "{'responseHeader'=>{'status'=>0,'QTime'=>4,'params'=>{'wt'=>'ruby','rows'=>'0'}},'response'=>{'numFound'=>30,'start'=>0,'maxScore'=>1.0,'docs' => [{'id' => '1', 'title_display'=>'title'}]},'facet_counts'=>{'facet_queries'=>{},'facet_fields'=>{'tag_facet'=>['a:b:c',30,'a:b:d', 25, 'a:c:d', 5, 'p:r:q', 25, 'x:y', 5, 'n', 1] }, 'facet_dates'=>{},'facet_ranges'=>{}}}"
+
       config.add_facet_field 'tag_facet', :label => 'Tag', :partial => 'blacklight/hierarchy/facet_hierarchy'
-    config.facet_display = {
-      :hierarchy => {
-        'tag' => [nil]
-      }
-    }
-
+      config.facet_display = {
+        :hierarchy => {
+          'tag' => [nil]
+        }
+      }  
     end
   end
+
   it "should display the hierarchy" do
     visit '/'
-
     page.should have_selector('li.h-node', :content => 'a')
     page.should have_selector('li.h-node > ul > li.h-node', :content => 'b')
     page.should have_selector('li.h-node li.h-leaf', :content => 'c (30)')
@@ -39,3 +40,7 @@
     page.all(:css, 'li.h-leaf a').map { |a| a[:href].to_s }.should include(catalog_index_path('f' => { 'tag_facet' => ['x:y'] }))
   end
 end
+
+
+
+

spec/features/integration_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe "Facet Hierarchy", :vcr => {:cassette_name => "solr"} do
+
+  before(:each) do
+    CatalogController.blacklight_config = Blacklight::Configuration.new
+    CatalogController.configure_blacklight do |config|
+#      config.index.title_field = 'title_display'
+#      config.default_solr_params = {
+#        :rows => 10
+#      }
+      config.add_facet_field 'tag_facet', :label => 'Tag', :partial => 'blacklight/hierarchy/facet_hierarchy'
+      config.facet_display = {
+        :hierarchy => {
+          'tag' => [nil]
+        }
+      }
+      config.default_solr_params[:'facet.field'] = config.facet_fields.keys
+    end
+  end
+
+  it 'uses the solr cassette' do
+    expect(VCR.current_cassette.name).to eql "solr"
+  end
+
+  it "should display the hierarchy" do
+    visit '/'
+#p page.source  
+    expect(page).to have_selector('li.h-node', :text => 'a')
+    expect(page).to have_selector('li.h-node > ul > li.h-node', :text => 'b')
+    expect(page).to have_selector('li.h-node li.h-leaf', :text => 'c (30)')
+    expect(page).to have_selector('li.h-node li.h-leaf', :text => 'd (25)')
+    expect(page).to have_selector('li.h-node > ul > li.h-node', :text => 'c')
+    expect(page).to have_selector('li.h-node li.h-leaf', :text => 'd (5)')
+    expect(page).to have_selector('.facet-hierarchy > li.h-leaf', :text => 'n (1)')
+    expect(page).to have_selector('li.h-node li.h-leaf', :text => 'q (25)')
+    expect(page).to have_selector('li.h-node li.h-leaf', :text => 'x (5)')
+  end
+
+  it "should properly link the hierarchy" do
+    visit '/'
+#p page.all(:css, 'li.h-leaf a')    
+    expect(page.all(:css, 'li.h-leaf a').map { |a| a[:href].to_s }).to include(catalog_index_path('f' => { 'tag_facet' => ['n'] }))
+    expect(page.all(:css, 'li.h-leaf a').map { |a| a[:href].to_s }).to include(catalog_index_path('f' => { 'tag_facet' => ['a:b:c'] }))
+    expect(page.all(:css, 'li.h-leaf a').map { |a| a[:href].to_s }).to include(catalog_index_path('f' => { 'tag_facet' => ['x:y'] }))
+  end
+end

spec/spec_helper.rb

@@ -1,13 +1,23 @@
-require 'rubygems'
+#require 'rubygems'
+#require 'bundler/setup'
+
+ENV["RAILS_ENV"] ||= "test"
+
+require 'blacklight'
+require 'blacklight/hierarchy'
+
+require 'engine_cart'
+EngineCart.load_application!
+
+require 'coveralls'
+Coveralls.wear!
 
-require 'combustion'
-require 'blacklight/engine'
-require 'blacklight/hierarchy/engine'
 require 'rsolr'
-require 'rsolr-ext'
-require 'rsolr-ext/response'
+#require 'rsolr-ext'
+#require 'rsolr-ext/response'
+require 'capybara/rails'
 require 'capybara/rspec'
-Combustion.initialize!
+require 'rspec/rails'
 
 
 # Setup blacklight environment
@@ -17,16 +27,16 @@
 
 VCR.configure do |config|
   config.hook_into :fakeweb
+#  config.hook_into :webmock
   config.cassette_library_dir = 'spec/vcr_cassettes'
+  config.configure_rspec_metadata!
   config.default_cassette_options = {
       :serialize_with => :psych 
   }
 end
 
-require 'rspec/rails'
-require 'capybara/rails'
 
 RSpec.configure do |config|
-  config.extend VCR::RSpec::Macros
-
+  config.infer_spec_type_from_file_location!
+  config.include Capybara::DSL
 end

spec/test_app_templates/Gemfile.extra

@@ -0,0 +1,5 @@
+group :test do
+  gem 'generator_spec'
+end
+
+gem 'blacklight'

spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -0,0 +1,25 @@
+require 'rails/generators'
+
+class TestAppGenerator < Rails::Generators::Base
+  source_root File.expand_path("../../../../test_app_templates", __FILE__)
+
+  # This is only necessary for Rails 3
+  def remove_index
+    remove_file "public/index.html"
+  end
+
+  def run_blacklight_generator
+    say_status("warning", "GENERATING BL", :yellow)
+
+    Bundler.with_clean_env do
+      run "bundle install"
+    end
+
+    generate 'blacklight:install'
+  end
+
+  def run_hierarchy_install
+    generate 'blacklight_hierarchy:install'
+  end
+
+end