blacklight 4.9.0 → 5.0.0.pre1

data/spec/support/assert_difference.rb

@@ -5,13 +5,13 @@ def assert_difference(executable, how_many = 1, &block)
   before = eval(executable)
   yield
   after = eval(executable)
-  expect(after).to eq(before + how_many)
+  after.should == before + how_many
 end
 
 def assert_no_difference(executable, &block)
   before = eval(executable)
   yield
   after = eval(executable)
-  expect(after).to eq(before)
+  after.should == before
 end
 

data/spec/support/features.rb

@@ -4,15 +4,4 @@ require File.expand_path("../features/session_helpers.rb", __FILE__)
 
 RSpec.configure do |config|
   config.include Features::SessionHelpers, type: :feature
-
-  # rspec-rails 3 will no longer automatically infer an example group's spec type
-  # from the file location. You can explicitly opt-in to the feature using this
-  # config option.
-  # To explicitly tag specs without using automatic inference, set the `:type`
-  # metadata manually:
-  #
-  #     describe ThingsController, :type => :controller do
-  #       # Equivalent to being in spec/controllers
-  #     end
-  config.infer_spec_type_from_file_location!
 end

data/spec/support/features/session_helpers.rb

@@ -14,9 +14,9 @@ module Features
       email = "#{login}@#{login}.com"
       user = User.create(:email => email, :password => "password", :password_confirmation => "password")
       visit new_user_session_path
-      fill_in("user_email", :with => email)
-      fill_in("user_password", :with => "password")
-      click_button("Log in")
+      fill_in("user_email", :with => email) 
+      fill_in("user_password", :with => "password") 
+      click_button("Sign in")
     end
   end
 end

data/spec/support/include_text.rb

@@ -8,11 +8,11 @@ module RSpec::Rails
         @content.include?(text)
       end
 
-      failure_message do |text|
+      failure_message_for_should do |text|
         "expected '#{@content}' to contain '#{text}'"
       end
 
-      failure_message_when_negated do |text|
+      failure_message_for_should_not do |text|
         "expected #{@content} to not contain '#{text}'"
       end
     end

data/spec/test_app_templates/Gemfile.extra

@@ -1,3 +1,9 @@
+platforms :jruby do
+  gem 'jdbc-sqlite3'
+  gem 'mediashelf-loggable', '>= 0.4.8'
+  gem 'therubyrhino'
+end
+
 platforms :ruby do
  gem 'sqlite3'
 end
@@ -5,10 +11,12 @@ end
 gem 'jquery-rails'
 
 group :test do
+  gem 'rspec-rails', '~> 2.13'
   gem 'generator_spec'
   gem 'poltergeist'
-  gem 'capybara'
+  gem 'simplecov', :platform => :mri_19
+  gem 'simplecov-rcov', :platform => :mri_19
 end
 
 gem 'jettywrapper', '>= 1.2.0'
-gem 'test-unit'
+

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

@@ -1,11 +1,11 @@
 require 'rails/generators'
 
 class TestAppGenerator < Rails::Generators::Base
-  source_root "../spec/test_app_templates"
+  source_root File.expand_path("../../../../test_app_templates", __FILE__)
 
-  def fix_travis_rails_4
+  def fix_travis_rails_4 
     if ENV['TRAVIS']
-      insert_into_file 'app/assets/stylesheets/application.css', :before =>'/*' do
+      insert_into_file 'app/assets/stylesheets/application.css', :before =>'/*' do      
         "@charset \"UTF-8\";\n"
       end
     end
@@ -15,31 +15,25 @@ class TestAppGenerator < Rails::Generators::Base
     copy_file "lib/tasks/blacklight_test_app.rake"
   end
 
-  def remove_index
+  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)
+    say_status("warning", "GENERATING BL", :yellow)       
+    gem 'blacklight_marc', :github => 'projectblacklight/blacklight_marc'
 
-    generate 'blacklight', '--devise'
+    Bundler.with_clean_env do
+      run "bundle install"
+    end
+
+    generate 'blacklight', '--devise --marc'
   end
 
   def run_test_support_generator
-    say_status("warning", "GENERATING test_support", :yellow)
+    say_status("warning", "GENERATING test_support", :yellow)       
 
     generate 'blacklight:test_support'
   end
-
-  # Add favicon.ico to asset path
-  # ADD THIS LINE Rails.application.config.assets.precompile += %w( favicon.ico )
-  # TO config/assets.rb
-  def add_favicon_to_asset_path
-    say_status("warning", "ADDING FAVICON TO ASSET PATH", :yellow)
-
-    append_to_file 'config/initializers/assets.rb' do
-      'Rails.application.config.assets.precompile += %w( favicon.ico )'
-    end
-  end
 end

data/spec/views/catalog/_constraints_element.html.erb_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 describe "catalog/_constraints_element.html.erb" do
   describe "for simple display" do
@@ -7,9 +7,9 @@ describe "catalog/_constraints_element.html.erb" do
       render :partial => "catalog/constraints_element", :locals => {:label => "my label", :value => "my value"}
     end
     it "should render label and value" do
-      expect(rendered).to have_selector("span.appliedFilter.constraint") do |s|
-        expect(s).to have_selector "span.filterName", :content => "my label"
-        expect(s).to have_selector "span.filterValue", :content => "my value" 
+      rendered.should have_selector("span.appliedFilter.constraint") do |s|
+        s.should have_selector "span.filterName", :content => "my label"
+        s.should have_selector "span.filterValue", :content => "my value" 
       end
     end
   end
@@ -19,14 +19,14 @@ describe "catalog/_constraints_element.html.erb" do
       render :partial => "catalog/constraints_element", :locals => {:label => "my label", :value => "my value", :options => {:remove => "http://remove"}}
     end
     it "should include remove link" do
-      expect(rendered).to have_selector("span.appliedFilter") do |s|
-        expect(s).to have_selector("a.btnRemove.imgReplace[href='http://remove']")
+      rendered.should have_selector("span.appliedFilter") do |s|
+        s.should have_selector(".remove[href='http://remove']")
       end    
     end
 
     it "should have an accessible remove label" do
-      expect(rendered).to have_selector("a.imgReplace") do |s|
-        expect(s).to have_content("Remove constraint my label: my value")
+      rendered.should have_selector(".remove") do |s|
+        s.should have_content("Remove constraint my label: my value")
       end
     end
   end
@@ -36,8 +36,8 @@ describe "catalog/_constraints_element.html.erb" do
       render :partial => "catalog/constraints_element", :locals => {:label => "my label", :value => "my value", :options => {:check => false}}
     end
     it "should not include checkmark" do
-      expect(rendered).to have_selector("span.appliedFilter") do |s|
-        expect(s).not_to have_selector("img[src$='checkmark.gif']")
+      rendered.should have_selector("span.appliedFilter") do |s|
+        s.should_not have_selector("img[src$='checkmark.gif']")
       end   
     end
   end
@@ -47,7 +47,7 @@ describe "catalog/_constraints_element.html.erb" do
       render :partial => "catalog/constraints_element", :locals => {:label => "my label", :value => "my value", :options => {:classes => ["class1", "class2"]}}
     end
     it "should include them" do
-      expect(rendered).to have_selector("span.appliedFilter.constraint.class1.class2")
+      rendered.should have_selector("span.appliedFilter.constraint.class1.class2")
     end
   end
 
@@ -56,8 +56,8 @@ describe "catalog/_constraints_element.html.erb" do
       render( :partial => "catalog/constraints_element", :locals => {:label => "<span class='custom_label'>my label</span>", :value => "<span class='custom_value'>my value</span>", :options => {:escape_label => false, :escape_value => false}} )
     end
     it "should not escape key and value" do
-      expect(rendered).to have_selector("span.appliedFilter.constraint span.filterName span.custom_label")
-      expect(rendered).to have_selector("span.appliedFilter.constraint span.filterValue span.custom_value")
+      rendered.should have_selector("span.appliedFilter.constraint span.filterName span.custom_label")
+      rendered.should have_selector("span.appliedFilter.constraint span.filterValue span.custom_value")
     end
 
   end

data/spec/views/catalog/_document.html.erb_spec.rb

@@ -10,7 +10,7 @@ describe "catalog/_document" do
   end
 
   it "should render the header, thumbnail and index" do
-    allow(view).to receive(:blacklight_config).and_return(blacklight_config)
+    view.stub(:blacklight_config).and_return(blacklight_config)
     stub_template "catalog/_document_header.html.erb" => "document_header"
     stub_template "catalog/_thumbnail_default.html.erb" => "thumbnail_default"
     stub_template "catalog/_index_default.html.erb" => "index_default"

data/spec/views/catalog/_document_list.html.erb_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 describe "/catalog/_document_list.html.erb" do  
   

data/spec/views/catalog/_facets.html.erb_spec.rb

@@ -1,14 +1,14 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 describe "catalog/_facets" do
   before do
     @mock_config = Blacklight::Configuration.new
-    allow(view).to receive_messages(:blacklight_config => @mock_config)
+    view.stub(:blacklight_config => @mock_config)
   end
   it "should not have a header if no facets are displayed" do
-    allow(view).to receive_messages(:render_facet_partials => '')
+    view.stub(:render_facet_partials => '')
     render
-    expect(rendered).not_to have_selector('h4')
+    rendered.should_not have_selector('h4')
   end
 
   it "should have a header" do
@@ -16,15 +16,15 @@ describe "catalog/_facets" do
       @mock_field_1 = double(:field => 'facet_field_1',
                        :label => 'label')
       @mock_display_facet_1 = double(:name => 'facet_field_1', :items => [Blacklight::SolrResponse::Facets::FacetItem.new(:value => 'Value', :hits => 1234)])
-      allow(view).to receive_messages(:facet_field_names => [:facet_field_1],
+      view.stub(:facet_field_names => [:facet_field_1],
                 :facet_limit_for => 10 )
 
       @response = double()
-      allow(@response).to receive(:facet_by_field_name).with(:facet_field_1) { @mock_display_facet_1 }
+      @response.stub(:facet_by_field_name).with(:facet_field_1) { @mock_display_facet_1 }
 
-    allow(view).to receive_messages(:render_facet_partials => '')
+    view.stub(:render_facet_partials => '')
     render
-    expect(rendered).to have_selector('h4')
+    rendered.should have_selector('h4')
   end
 
   describe "facet display" do
@@ -32,24 +32,23 @@ describe "catalog/_facets" do
       @mock_field_1 = double(:field => 'facet_field_1',
                        :label => 'label')
       @mock_display_facet_1 = double(:name => 'facet_field_1', :items => [Blacklight::SolrResponse::Facets::FacetItem.new(:value => 'Value', :hits => 1234)])
-      allow(view).to receive_messages(:facet_field_names => [:facet_field_1],
+      view.stub(:facet_field_names => [:facet_field_1],
                 :facet_limit_for => 10 )
 
       @response = double()
-      allow(@response).to receive(:facet_by_field_name).with(:facet_field_1) { @mock_display_facet_1 }
+      @response.stub(:facet_by_field_name).with(:facet_field_1) { @mock_display_facet_1 }
 
     end 
 
     it "should have a(n accessible) header" do
       render
-      expect(rendered).to have_selector('h5')
-      expect(rendered).to have_selector('h5 > a')
+      rendered.should have_selector('h5')
     end
 
     it "should list values" do
       render
-      expect(rendered).to have_selector('a.facet_select')
-      expect(rendered).to have_selector('.count')
+      rendered.should have_selector('a.facet_select')
+      rendered.should have_selector('.facet-count')
     end
 
   end

data/spec/views/catalog/_index_default.erb_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 # spec for default partial to display solr document fields 
 #  in catalog INDEX view
@@ -22,44 +22,44 @@ describe "/catalog/_index_default.erb" do
     @fname_4 = "four_field"
     
     @document = double("solr_doc")
-    allow(@document).to receive(:get).with(@fname_1, hash_including(:sep => nil)).and_return("val_1")
-    allow(@document).to receive(:get).with(@fname_2, hash_including(:sep => nil)).and_return("val_2")
-    allow(@document).to receive(:get).with(@fname_3, hash_including(:sep => nil)).and_return(nil)
-    allow(@document).to receive(:get).with(@fname_4, hash_including(:sep => nil)).and_return("val_4")
+    @document.stub(:get).with(@fname_1, hash_including(:sep => nil)).and_return("val_1")
+    @document.stub(:get).with(@fname_2, hash_including(:sep => nil)).and_return("val_2")
+    @document.stub(:get).with(@fname_3, hash_including(:sep => nil)).and_return(nil)
+    @document.stub(:get).with(@fname_4, hash_including(:sep => nil)).and_return("val_4")
     
-    allow(@document).to receive(:has?).with(@fname_1).and_return(true)
-    allow(@document).to receive(:has?).with(@fname_2).and_return(true)
-    allow(@document).to receive(:has?).with(@fname_3).and_return(false)
-    allow(@document).to receive(:has?).with(@fname_4).and_return(true)
+    @document.stub(:has?).with(@fname_1).and_return(true)
+    @document.stub(:has?).with(@fname_2).and_return(true)
+    @document.stub(:has?).with(@fname_3).and_return(false)
+    @document.stub(:has?).with(@fname_4).and_return(true)
     
     # cover any remaining fields in initalizer
-    allow(@document).to receive(:[])
+    @document.stub(:[])
     
     @flabel_1 = "One:"
     @flabel_3 = "Three:"
     @flabel_4 = "Four:"
 
-    allow(view).to receive(:blacklight_config).and_return(@config)
+    view.stub(:blacklight_config).and_return(@config)
     assigns[:document] = @document
     @rendered = view.render_document_partial @document, :index
   end
 
   it "should only display fields listed in the initializer" do
-    expect(@rendered).not_to include_text("val_2")
-    expect(@rendered).not_to include_text(@fname_2)
+    @rendered.should_not include_text("val_2")
+    @rendered.should_not include_text(@fname_2)
   end
   
   it "should skip over fields listed in initializer that are not in solr response" do
-    expect(@rendered).not_to include_text(@fname_3)
+    @rendered.should_not include_text(@fname_3)
   end
 
   it "should display field labels from initializer and raw solr field names in the class" do
     # labels
-    expect(@rendered).to include_text(@flabel_1)
-    expect(@rendered).to include_text(@flabel_4)
+    @rendered.should include_text(@flabel_1)
+    @rendered.should include_text(@flabel_4)
     # classes    
-    expect(@rendered).to include_text("blacklight-#{@fname_1}")
-    expect(@rendered).to include_text("blacklight-#{@fname_4}")
+    @rendered.should include_text("blacklight-#{@fname_1}")
+    @rendered.should include_text("blacklight-#{@fname_4}")
   end
   
 # this test probably belongs in a Cucumber feature
@@ -68,9 +68,9 @@ describe "/catalog/_index_default.erb" do
 #  end
 
   it "should have values for displayed fields" do
-    expect(@rendered).to include_text("val_1")
-    expect(@rendered).to include_text("val_4")
-    expect(@rendered).not_to include_text("val_2")
+    @rendered.should include_text("val_1")
+    @rendered.should include_text("val_4")
+    @rendered.should_not include_text("val_2")
   end
 
 end

data/spec/views/catalog/_search_header.erb_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 # spec for sidebar partial in catalog show view
 

data/spec/views/catalog/_show_default.erb_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 # spec for default partial to display solr document fields 
 #  in catalog show view
@@ -24,44 +24,44 @@ describe "/catalog/_show_default.html.erb" do
     @fname_4 = "four_field"
     
     @document = double("solr_doc")
-    allow(@document).to receive(:get).with(@fname_1, hash_including(:sep => nil)).and_return("val_1")
-    allow(@document).to receive(:get).with(@fname_2, hash_including(:sep => nil)).and_return("val_2")
-    allow(@document).to receive(:get).with(@fname_3, hash_including(:sep => nil)).and_return(nil)
-    allow(@document).to receive(:get).with(@fname_4, hash_including(:sep => nil)).and_return("val_4")
+    @document.stub(:get).with(@fname_1, hash_including(:sep => nil)).and_return("val_1")
+    @document.stub(:get).with(@fname_2, hash_including(:sep => nil)).and_return("val_2")
+    @document.stub(:get).with(@fname_3, hash_including(:sep => nil)).and_return(nil)
+    @document.stub(:get).with(@fname_4, hash_including(:sep => nil)).and_return("val_4")
     
-    allow(@document).to receive(:'has?').with(@fname_1).and_return(true)
-    allow(@document).to receive(:'has?').with(@fname_2).and_return(true)
-    allow(@document).to receive(:'has?').with(@fname_3).and_return(false)
-    allow(@document).to receive(:'has?').with(@fname_4).and_return(true)
+    @document.stub(:'has?').with(@fname_1).and_return(true)
+    @document.stub(:'has?').with(@fname_2).and_return(true)
+    @document.stub(:'has?').with(@fname_3).and_return(false)
+    @document.stub(:'has?').with(@fname_4).and_return(true)
     
     # cover any remaining fields in initalizer
-    allow(@document).to receive(:[])
+    @document.stub(:[])
     
     @flabel_1 = "One:"
     @flabel_3 = "Two:"
     @flabel_4 = "Four:"
 
-    allow(view).to receive(:blacklight_config).and_return(@config)
+    view.stub(:blacklight_config).and_return(@config)
     assigns[:document] = @document
     @rendered = view.render_document_partial @document, :show
   end
 
   it "should only display fields listed in the initializer" do
-    expect(@rendered).not_to include_text("val_2")
-    expect(@rendered).not_to include_text(@fname_2)
+    @rendered.should_not include_text("val_2")
+    @rendered.should_not include_text(@fname_2)
   end
   
   it "should skip over fields listed in initializer that are not in solr response" do
-    expect(@rendered).not_to include_text(@fname_3)
+    @rendered.should_not include_text(@fname_3)
   end
 
   it "should display field labels from initializer and raw solr field names in the class" do
     # labels
-    expect(@rendered).to include_text(@flabel_1)
-    expect(@rendered).to include_text(@flabel_4)
+    @rendered.should include_text(@flabel_1)
+    @rendered.should include_text(@flabel_4)
     # classes    
-    expect(@rendered).to include_text("blacklight-#{@fname_1}")
-    expect(@rendered).to include_text("blacklight-#{@fname_4}")
+    @rendered.should include_text("blacklight-#{@fname_1}")
+    @rendered.should include_text("blacklight-#{@fname_4}")
   end
   
 # this test probably belongs in a Cucumber feature
@@ -70,9 +70,9 @@ describe "/catalog/_show_default.html.erb" do
 #  end
 
   it "should have values for displayed fields" do
-    expect(@rendered).to include_text("val_1")
-    expect(@rendered).to include_text("val_4")
-    expect(@rendered).not_to include_text("val_2")
+    @rendered.should include_text("val_1")
+    @rendered.should include_text("val_4")
+    @rendered.should_not include_text("val_2")
   end
 
 end