blacklight 4.1.0 → 4.2.0

data/{test_support/spec → spec}/spec_helper.rb

@@ -16,10 +16,10 @@ if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.9/ and ruby_engine != "jruby"
   end
 end
 
-#require File.expand_path("../../config/environment", __FILE__)
 # 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("../..", __FILE__))
+require File.expand_path("config/environment", ENV['RAILS_ROOT'] || File.expand_path("../internal", __FILE__))
+
 require 'rspec/rails'
 require 'capybara/rspec'
 
@@ -27,7 +27,6 @@ require 'capybara/rspec'
 # 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. 
-#Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
 Dir[Pathname.new(File.expand_path("../support/**/*.rb", __FILE__))].each {|f| require f}
 
 

data/spec/test_app_templates/Gemfile.extra

@@ -0,0 +1,38 @@
+platforms :jruby do
+  gem 'jruby-openssl'
+  gem 'activerecord-jdbcsqlite3-adapter'
+  gem 'jdbc-sqlite3'
+  gem 'mediashelf-loggable', '>= 0.4.8'
+  gem 'therubyrhino'
+end
+
+platforms :ruby do
+ gem 'sqlite3'
+ gem 'execjs'
+ gem 'therubyracer', '~> 0.10.2'
+end
+
+gem 'blacklight', :path => '../../'
+gem 'jquery-rails'
+
+# For testing
+group :development, :test do
+  gem 'rspec-rails', '~> 2.12.0'
+end
+
+group :test do
+  gem 'generator_spec'
+  gem 'cucumber-rails', :require => false
+  gem 'database_cleaner', '>= 1.0.0.RC1'
+  if defined? :JRUBY_VERSION
+    gem 'capybara', '~> 1.0'
+  else
+    gem 'capybara'
+  end
+  gem 'rcov', :platform => :mri_18
+  gem 'simplecov', :platform => :mri_19
+  gem 'simplecov-rcov', :platform => :mri_19
+end
+
+gem 'jettywrapper', '>= 1.2.0'
+

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -0,0 +1,40 @@
+require 'rails/generators'
+
+class TestAppGenerator < Rails::Generators::Base
+  source_root File.expand_path("../../../../test_app_templates", __FILE__)
+
+  def fix_travis_rails_4 
+    if ENV['TRAVIS']
+      insert_into_file 'app/assets/stylesheets/application.css', :before =>'/*' do      
+        "@charset \"UTF-8\";\n"
+      end
+    end
+  end
+
+  def copy_rspec_rake_task
+    copy_file "lib/tasks/rspec.rake"
+  end
+
+  def remove_index 
+    remove_file "public/index.html"
+    remove_file 'app/assets/images/rails.png'
+  end
+
+  def run_blacklight_generator
+    say_status("warning", "GENERATING BL", :yellow)       
+
+    generate 'blacklight', '--devise'
+  end
+
+  def run_cucumber_generator
+    say_status("warning", "GENERATING cucumber", :yellow)       
+
+    generate 'cucumber:install'
+  end
+
+  def run_test_support_generator
+    say_status("warning", "GENERATING test_support", :yellow)       
+
+    generate 'blacklight:test_support'
+  end
+end

data/spec/test_app_templates/lib/tasks/rspec.rake

@@ -0,0 +1,8 @@
+require 'rspec/core/rake_task'
+desc "run the blacklight gem spec"
+gem_home = File.expand_path('../../../../..', __FILE__)
+RSpec::Core::RakeTask.new(:myspec) do |t|
+  t.pattern = gem_home + '/spec/**/*_spec.rb'
+  t.rspec_opts = "--colour"
+  t.ruby_opts = "-I#{gem_home}/spec"
+end

data/tasks/blacklight.rake

@@ -0,0 +1,97 @@
+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'
+
+
+task :ci => 'jetty:clean' do
+  ENV['environment'] = "test"
+  jetty_params = Jettywrapper.load_config
+  jetty_params[:startup_wait]= 60
+  error = Jettywrapper.wrap(jetty_params) do
+    Rake::Task["blacklight:fixtures"].invoke
+    Rake::Task['blacklight:coverage'].invoke
+    Rake::Task['blacklight:cucumber'].invoke
+  end
+  raise "test failures: #{error}" if error
+  # Only create documentation if the tests have passed
+  #Rake::Task["active_fedora:doc"].invoke
+end
+
+namespace :blacklight do
+  desc "Load fixtures"
+  task :fixtures => [:generate] do
+    within_test_app do
+      system "rake solr:marc:index_test_data RAILS_ENV=test"
+      abort "Error running fixtures" unless $?.success?
+    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|
+    focused_spec = ENV['SPEC'] ? " SPEC=#{File.join(GEM_ROOT, ENV['SPEC'])}" : ''
+    within_test_app do
+      system "rake myspec#{focused_spec}"
+      abort "Error running spec" unless $?.success?
+    end
+  end
+
+  desc "Run cucumber features"
+  task :cucumber => [:generate] do |t|
+    within_test_app do
+      system "rake blacklight:cucumber"
+      abort "Error running cucumber" unless $?.success?
+    end
+  end
+  
+
+  desc "Clean out the test rails app"
+  task :clean do
+    puts "Removing sample rails app"
+    `rm -rf #{TEST_APP}`
+  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"
+      `cat #{TEST_APP_TEMPLATES}/Gemfile.extra >> #{TEST_APP}/Gemfile`
+      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"
+  end
+
+
+
+end
+
+def within_test_app
+  FileUtils.cd(TEST_APP)
+  Bundler.with_clean_env do
+    yield
+  end
+  FileUtils.cd(APP_ROOT)
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -38,7 +38,7 @@ cert_chain:
   W4KPvarE4dgxT4TXIIKkh/K/Z9yaYt73biInVukEI9H2HHWkuAyblxg1jcR/zy+w
   K27NJ2vhSpx2PPhb
   -----END CERTIFICATE-----
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -150,14 +150,28 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.4.1
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Blacklight is an open source Solr user interface discovery platform.
   You can use Blacklight to enable searching and browsing of your collections. Blacklight
   uses the Apache Solr search engine to search full text and/or metadata.
@@ -169,6 +183,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .gitmodules
+- .rspec
 - .travis.yml
 - .yardopts
 - Gemfile
@@ -312,9 +327,36 @@ files:
 - app/views/shared/_footer.html.erb
 - app/views/shared/_header_navbar.html.erb
 - blacklight.gemspec
+- config/jetty.yml
 - config/locales/blacklight.en.yml
 - config/locales/blacklight.fr.yml
 - config/routes.rb
+- features/bookmarks.feature
+- features/did_you_mean.feature
+- features/librarian_view.feature
+- features/record_view.feature
+- features/saved_searches.feature
+- features/search.feature
+- features/search_filters.feature
+- features/search_history.feature
+- features/search_pagination.feature
+- features/search_results.feature
+- features/search_sort.feature
+- features/step_definitions/bookmarks_steps.rb
+- features/step_definitions/error_steps.rb
+- features/step_definitions/general_steps.rb
+- features/step_definitions/record_view_steps.rb
+- features/step_definitions/saved_searches_steps.rb
+- features/step_definitions/search_facets_steps.rb
+- features/step_definitions/search_history_steps.rb
+- features/step_definitions/search_pagination_steps.rb
+- features/step_definitions/search_result_steps.rb
+- features/step_definitions/search_steps.rb
+- features/step_definitions/user_steps.rb
+- features/step_definitions/web_steps.rb
+- features/support/env.rb
+- features/support/paths.rb
+- features/support/selectors.rb
 - gemfiles/rails3.gemfile
 - gemfiles/rails4.gemfile
 - lib/SolrMarc.jar
@@ -384,85 +426,60 @@ files:
 - lib/railties/blacklight_cucumber.rake
 - lib/railties/blacklight_rspec.rake
 - lib/railties/solr_marc.rake
-- test_support/.rspec
-- test_support/bin/run-tests.sh
-- test_support/bin/setup-test-app.sh
-- test_support/bin/test.sh
+- spec/controllers/application_controller_spec.rb
+- spec/controllers/bookmarks_controller_spec.rb
+- spec/controllers/catalog_controller_spec.rb
+- spec/controllers/search_history_controller_spec.rb
+- spec/data/sample_docs.yml
+- spec/data/test_data.utf8.mrc
+- spec/helpers/blacklight_helper_spec.rb
+- spec/helpers/catalog_helper_spec.rb
+- spec/helpers/facets_helper_spec.rb
+- spec/helpers/hash_as_hidden_fields_spec.rb
+- spec/helpers/html_head_helper_spec.rb
+- spec/helpers/render_constraints_helper_spec.rb
+- spec/helpers/search_history_constraints_helper_spec.rb
+- spec/lib/blacklight_configurable_spec.rb
+- spec/lib/blacklight_configuration_spec.rb
+- spec/lib/blacklight_email_spec.rb
+- spec/lib/blacklight_sms_spec.rb
+- spec/lib/blacklight_solr_document_dublin_core_spec.rb
+- spec/lib/blacklight_solr_document_marc_spec.rb
+- spec/lib/blacklight_solr_document_more_like_this_spec.rb
+- spec/lib/blacklight_solr_document_spec.rb
+- spec/lib/blacklight_solr_response_spec.rb
+- spec/lib/blacklight_spec.rb
+- spec/lib/blacklight_user_spec.rb
+- spec/lib/facet_paginator_spec.rb
+- spec/lib/marc_export_spec.rb
+- spec/lib/search_fields_spec.rb
+- spec/lib/solr_helper_spec.rb
+- spec/lib/tasks/blacklight_task_spec.rb
+- spec/lib/tasks/solr_marc_task_spec.rb
+- spec/lib/utils_spec.rb
+- spec/models/bookmark_spec.rb
+- spec/models/record_mailer_spec.rb
+- spec/models/search_spec.rb
+- spec/models/solr_docment_spec.rb
+- spec/rcov.opts
+- spec/requests/alternate_controller_spec.rb
+- spec/routing/catalog_routing_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/support/assert_difference.rb
+- spec/support/include_text.rb
+- spec/test_app_templates/Gemfile.extra
+- spec/test_app_templates/lib/generators/test_app_generator.rb
+- spec/test_app_templates/lib/tasks/rspec.rake
+- spec/views/catalog/_constraints_element.html.erb_spec.rb
+- spec/views/catalog/_document_list.html.erb_spec.rb
+- spec/views/catalog/_facets.html.erb_spec.rb
+- spec/views/catalog/_index_default.erb_spec.rb
+- spec/views/catalog/_show_default.erb_spec.rb
+- spec/views/catalog/_show_sidebar.erb_spec.rb
+- spec/views/catalog/index.atom.builder_spec.rb
+- tasks/blacklight.rake
 - test_support/data/test_data.utf8.mrc
-- test_support/features/bookmarks.feature
-- test_support/features/did_you_mean.feature
-- test_support/features/librarian_view.feature
-- test_support/features/record_view.feature
-- test_support/features/saved_searches.feature
-- test_support/features/search.feature
-- test_support/features/search_filters.feature
-- test_support/features/search_history.feature
-- test_support/features/search_pagination.feature
-- test_support/features/search_results.feature
-- test_support/features/search_sort.feature
-- test_support/features/step_definitions/bookmarks_steps.rb
-- test_support/features/step_definitions/error_steps.rb
-- test_support/features/step_definitions/general_steps.rb
-- test_support/features/step_definitions/record_view_steps.rb
-- test_support/features/step_definitions/saved_searches_steps.rb
-- test_support/features/step_definitions/search_facets_steps.rb
-- test_support/features/step_definitions/search_history_steps.rb
-- test_support/features/step_definitions/search_pagination_steps.rb
-- test_support/features/step_definitions/search_result_steps.rb
-- test_support/features/step_definitions/search_steps.rb
-- test_support/features/step_definitions/user_steps.rb
-- test_support/features/step_definitions/web_steps.rb
-- test_support/features/support/env.rb
-- test_support/features/support/paths.rb
-- test_support/features/support/selectors.rb
-- test_support/spec/controllers/application_controller_spec.rb
-- test_support/spec/controllers/catalog_controller_spec.rb
-- test_support/spec/controllers/search_history_controller_spec.rb
-- test_support/spec/data/sample_docs.yml
-- test_support/spec/data/test_data.utf8.mrc
-- test_support/spec/helpers/blacklight_helper_spec.rb
-- test_support/spec/helpers/catalog_helper_spec.rb
-- test_support/spec/helpers/facets_helper_spec.rb
-- test_support/spec/helpers/hash_as_hidden_fields_spec.rb
-- test_support/spec/helpers/html_head_helper_spec.rb
-- test_support/spec/helpers/render_constraints_helper_spec.rb
-- test_support/spec/helpers/search_history_constraints_helper_spec.rb
-- test_support/spec/lib/blacklight_configurable_spec.rb
-- test_support/spec/lib/blacklight_configuration_spec.rb
-- test_support/spec/lib/blacklight_email_spec.rb
-- test_support/spec/lib/blacklight_sms_spec.rb
-- test_support/spec/lib/blacklight_solr_document_dublin_core_spec.rb
-- test_support/spec/lib/blacklight_solr_document_marc_spec.rb
-- test_support/spec/lib/blacklight_solr_document_more_like_this_spec.rb
-- test_support/spec/lib/blacklight_solr_document_spec.rb
-- test_support/spec/lib/blacklight_solr_response_spec.rb
-- test_support/spec/lib/blacklight_spec.rb
-- test_support/spec/lib/blacklight_user_spec.rb
-- test_support/spec/lib/facet_paginator_spec.rb
-- test_support/spec/lib/marc_export_spec.rb
-- test_support/spec/lib/search_fields_spec.rb
-- test_support/spec/lib/solr_helper_spec.rb
-- test_support/spec/lib/tasks/blacklight_task_spec.rb
-- test_support/spec/lib/tasks/solr_marc_task_spec.rb
-- test_support/spec/lib/utils_spec.rb
-- test_support/spec/models/bookmark_spec.rb
-- test_support/spec/models/record_mailer_spec.rb
-- test_support/spec/models/search_spec.rb
-- test_support/spec/models/solr_docment_spec.rb
-- test_support/spec/rcov.opts
-- test_support/spec/requests/alternate_controller_spec.rb
-- test_support/spec/routing/catalog_routing_spec.rb
-- test_support/spec/spec.opts
-- test_support/spec/spec_helper.rb
-- test_support/spec/support/assert_difference.rb
-- test_support/spec/support/include_text.rb
-- test_support/spec/views/catalog/_constraints_element.html.erb_spec.rb
-- test_support/spec/views/catalog/_document_list.html.erb_spec.rb
-- test_support/spec/views/catalog/_facets.html.erb_spec.rb
-- test_support/spec/views/catalog/_index_default.erb_spec.rb
-- test_support/spec/views/catalog/_show_default.erb_spec.rb
-- test_support/spec/views/catalog/_show_sidebar.erb_spec.rb
-- test_support/spec/views/catalog/index.atom.builder_spec.rb
 homepage: http://projectblacklight.org/
 licenses: []
 metadata: {}
@@ -487,4 +504,82 @@ signing_key:
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
   index.
-test_files: []
+test_files:
+- features/bookmarks.feature
+- features/did_you_mean.feature
+- features/librarian_view.feature
+- features/record_view.feature
+- features/saved_searches.feature
+- features/search.feature
+- features/search_filters.feature
+- features/search_history.feature
+- features/search_pagination.feature
+- features/search_results.feature
+- features/search_sort.feature
+- features/step_definitions/bookmarks_steps.rb
+- features/step_definitions/error_steps.rb
+- features/step_definitions/general_steps.rb
+- features/step_definitions/record_view_steps.rb
+- features/step_definitions/saved_searches_steps.rb
+- features/step_definitions/search_facets_steps.rb
+- features/step_definitions/search_history_steps.rb
+- features/step_definitions/search_pagination_steps.rb
+- features/step_definitions/search_result_steps.rb
+- features/step_definitions/search_steps.rb
+- features/step_definitions/user_steps.rb
+- features/step_definitions/web_steps.rb
+- features/support/env.rb
+- features/support/paths.rb
+- features/support/selectors.rb
+- spec/controllers/application_controller_spec.rb
+- spec/controllers/bookmarks_controller_spec.rb
+- spec/controllers/catalog_controller_spec.rb
+- spec/controllers/search_history_controller_spec.rb
+- spec/data/sample_docs.yml
+- spec/data/test_data.utf8.mrc
+- spec/helpers/blacklight_helper_spec.rb
+- spec/helpers/catalog_helper_spec.rb
+- spec/helpers/facets_helper_spec.rb
+- spec/helpers/hash_as_hidden_fields_spec.rb
+- spec/helpers/html_head_helper_spec.rb
+- spec/helpers/render_constraints_helper_spec.rb
+- spec/helpers/search_history_constraints_helper_spec.rb
+- spec/lib/blacklight_configurable_spec.rb
+- spec/lib/blacklight_configuration_spec.rb
+- spec/lib/blacklight_email_spec.rb
+- spec/lib/blacklight_sms_spec.rb
+- spec/lib/blacklight_solr_document_dublin_core_spec.rb
+- spec/lib/blacklight_solr_document_marc_spec.rb
+- spec/lib/blacklight_solr_document_more_like_this_spec.rb
+- spec/lib/blacklight_solr_document_spec.rb
+- spec/lib/blacklight_solr_response_spec.rb
+- spec/lib/blacklight_spec.rb
+- spec/lib/blacklight_user_spec.rb
+- spec/lib/facet_paginator_spec.rb
+- spec/lib/marc_export_spec.rb
+- spec/lib/search_fields_spec.rb
+- spec/lib/solr_helper_spec.rb
+- spec/lib/tasks/blacklight_task_spec.rb
+- spec/lib/tasks/solr_marc_task_spec.rb
+- spec/lib/utils_spec.rb
+- spec/models/bookmark_spec.rb
+- spec/models/record_mailer_spec.rb
+- spec/models/search_spec.rb
+- spec/models/solr_docment_spec.rb
+- spec/rcov.opts
+- spec/requests/alternate_controller_spec.rb
+- spec/routing/catalog_routing_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/support/assert_difference.rb
+- spec/support/include_text.rb
+- spec/test_app_templates/Gemfile.extra
+- spec/test_app_templates/lib/generators/test_app_generator.rb
+- spec/test_app_templates/lib/tasks/rspec.rake
+- spec/views/catalog/_constraints_element.html.erb_spec.rb
+- spec/views/catalog/_document_list.html.erb_spec.rb
+- spec/views/catalog/_facets.html.erb_spec.rb
+- spec/views/catalog/_index_default.erb_spec.rb
+- spec/views/catalog/_show_default.erb_spec.rb
+- spec/views/catalog/_show_sidebar.erb_spec.rb
+- spec/views/catalog/index.atom.builder_spec.rb