blacklight 3.8.1 → 3.8.2

data/test_support/bin/test.sh

@@ -111,6 +111,8 @@ end
 gem 'jettywrapper', '>= 1.2.0'
 " >> Gemfile
 
+export BUNDLE_GEMFILE=`pwd`/Gemfile
+
 bundle install
 check_errs $? "Bundle install failed." 
 
@@ -131,7 +133,7 @@ cp ../../test_support/alternate_controller.rb app/controllers/
 # end
 ruby -pi.bak -e 'gsub(/devise_for :users/, "devise_for :users\n  resources :alternate do\n    member do\n      get :facet\n    end\n  end")' config/routes.rb
 
-jetty_zip=$( echo $JETTY_URL | awk '{split($0,a,"/"); print "/tmp/blacklight_jetty_"a[length(a)]}')
+jetty_zip=$( JETTY_URL=$JETTY_URL ruby -e 'puts "/tmp/blacklight_jetty_#{ENV["JETTY_URL"].split("/").last}"')
 if [ ! -f $jetty_zip ]
 then
   curl -L $JETTY_URL -o $jetty_zip

data/test_support/features/record_view.feature

@@ -22,7 +22,6 @@ Feature: Record View
     And I should see "Call number:"
     And I should see "E99.D2 H437 2008"
     And I should see link rel=alternate tags
-    And the page title should be ""Strong Medicine speaks" - Blacklight"
 
   Scenario: Blank titles do not show up
     Given I am on the document page for id 2008305903

data/test_support/features/search.feature

@@ -11,7 +11,6 @@ Feature: Search
     And I should see a "search" button
     And I should not see the "startOverLink" element
     And I should see "Welcome!"
-    And the page title should be "Blacklight Search Results"
     And I should see a stylesheet
   
   Scenario: Search Page's type of search ("fielded search") choices

data/test_support/features/step_definitions/error_steps.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 # checkout http://blog.codefront.net/2007/03/31/testing-rescue_action_in_public-with-rspec/
 Then /^I should see a flash error "([^\"]*)"$/ do |message|
-  pageshould have_selector("div.notice", :content => message)
+  pageshould have_selector("div.notice", :text => message)
 end

data/test_support/features/step_definitions/general_steps.rb

@@ -10,7 +10,7 @@ Then /^I should see a stylesheet/ do
 end
 
 Then /^the page title should be "([^"]*)"$/i do |title|
-  page.should have_selector("title", :content => title)
+  page.should have_selector("title", :text => title)
 end
 
 Then /I should see "(.*)" (at least|at most|exactly) (.*) times?$/i do |target, comparator, expected_num|

data/test_support/features/step_definitions/search_facets_steps.rb

@@ -2,28 +2,28 @@
 # deprecated
 Then /^I should see the applied filter "([^\"]*)" with the value "([^\"]*)"$/ do |filter, text|
   page.should have_selector(".facet_limit") do |node|
-    node.should have_selector("h3", :content => filter)
-    node.should have_selector("span.selected", :content => text)
+    node.should have_selector("h3", :text => filter)
+    node.should have_selector("span.selected", :text => text)
   end
 end
 
 Then /^I should see the applied facet "([^\"]*)" with the value "([^\"]*)"$/ do |filter, text|
   page.should have_selector(".facet_limit") do |node|
-    node.should have_selector("h3", :content => filter)
-    node.should have_selector("span.selected", :content => text)
+    node.should have_selector("h3", :text => filter)
+    node.should have_selector("span.selected", :text => text)
   end
 end
 
 Then /^I should see the facet "([^\"]*)" with the value "([^\"]*)"$/ do |filter, text|
   page.should have_selector(".facet_limit") do |node|
-    node.should have_selector("h3", :content => filter)
-    node.should have_selector("a.label", :content => text)
+    node.should have_selector("h3", :text => filter)
+    node.should have_selector("a.label", :text => text)
   end
 end
 
 Then /^the facet "([^\"]+)" should display$/ do |filter|
   page.should have_selector(".facet_limit") do |node|
-    node.should have_selector("h3", :content => filter)
+    node.should have_selector("h3", :text => filter)
   end
 end
 

data/test_support/features/step_definitions/search_steps.rb

@@ -71,8 +71,8 @@ Then /^I should not get results$/ do
 end
 
 Then /^I should see the applied filter "([^\"]*)" with the value "([^\"]*)"$/ do |filter, text|
-  page.should have_selector("div#facets div h3", :content => filter)
-  page.should have_selector("div#facets div span.selected", :content => text)
+  page.should have_selector("div#facets div h3", :text => filter)
+  page.should have_selector("div#facets div span.selected", :text => text)
 end
 
 Then /^I should see an rss discovery link/ do

data/test_support/spec/helpers/blacklight_helper_spec.rb

@@ -206,7 +206,7 @@ describe BlacklightHelper do
      it "should consist of #document_heading wrapped in a <h1>" do
       @document = SolrDocument.new('title_display' => "A Fake Document")
 
-      render_document_heading.should have_selector("h1", :content => document_heading, :count => 1)
+      render_document_heading.should have_selector("h1", :text => document_heading, :count => 1)
       render_document_heading.html_safe?.should == true
      end
    end
@@ -240,23 +240,23 @@ describe BlacklightHelper do
      it "should consist of the document title wrapped in a <a>" do
       data = {'id'=>'123456','title_display'=>['654321'] }
       @document = SolrDocument.new(data)
-      link_to_document(@document, { :label => :title_display }).should have_selector("a", :content => '654321', :count => 1)
+      link_to_document(@document, { :label => :title_display }).should have_selector("a", :text => '654321', :count => 1)
      end
      it "should accept and return a string label" do
       data = {'id'=>'123456','title_display'=>['654321'] }
       @document = SolrDocument.new(data)
-      link_to_document(@document, { :label => "title_display" }).should have_selector("a", :content => 'title_display', :count => 1)
+      link_to_document(@document, { :label => "title_display" }).should have_selector("a", :text => 'title_display', :count => 1)
      end
    
      it "should accept and return a Proc" do
       data = {'id'=>'123456','title_display'=>['654321'] }
       @document = SolrDocument.new(data)
-      link_to_document(@document, { :label => Proc.new { |doc, opts| doc.get(:id) + ": " + doc.get(:title_display) } }).should have_selector("a", :content => '123456: 654321', :count => 1)
+      link_to_document(@document, { :label => Proc.new { |doc, opts| doc.get(:id) + ": " + doc.get(:title_display) } }).should have_selector("a", :text => '123456: 654321', :count => 1)
      end
      it "should return id when label is missing" do
       data = {'id'=>'123456'}
       @document = SolrDocument.new(data)
-      link_to_document(@document, { :label => :title_display }).should have_selector("a", :content => '123456', :count => 1)
+      link_to_document(@document, { :label => :title_display }).should have_selector("a", :text => '123456', :count => 1)
      end
 
      it "should be html safe" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 3.8.1
+  version: 3.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-04 00:00:00.000000000 Z
+date: 2012-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -212,6 +212,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .gitmodules
+- .travis.yml
 - .yardopts
 - Gemfile
 - LICENSE
@@ -292,6 +293,7 @@ files:
 - app/models/bookmark.rb
 - app/models/record_mailer.rb
 - app/models/search.rb
+- app/models/solr_document.rb
 - app/views/_flash_msg.html.erb
 - app/views/_user_util_links.html.erb
 - app/views/bookmarks/_tools.html.erb
@@ -358,6 +360,35 @@ files:
 - blacklight.gemspec
 - config/locales/blacklight.en.yml
 - config/routes.rb
+- doc/Atom-Responses.md
+- doc/Blacklight-3.2-Release-Notes-and-Upgrade-Guide.md
+- doc/Blacklight-3.3-release-notes-and-upgrade-guide.md
+- doc/Blacklight-3.4-release-notes-and-upgrade-guide.md
+- doc/Blacklight-3.5-release-notes-and-upgrade-guide.md
+- doc/Blacklight-3.6-release-notes-and-upgrade-guide.md
+- doc/Blacklight-3.7-release-notes-and-upgrade-guide.md
+- doc/Blacklight-3.8-release-notes-and-upgrade-guide.md
+- doc/Blacklight-Add-ons.md
+- doc/Blacklight-configuration.md
+- doc/Blacklight-on-Heroku.md
+- doc/Community-principles.md
+- doc/Configuring-and-Customizing-Blacklight.md
+- doc/Contributing-to-Blacklight.md
+- doc/Examples.md
+- doc/Extending-or-Modifying-Blacklight-Search-Behavior.md
+- doc/Home.md
+- doc/How-to-release-a-version.md
+- doc/Indexing-your-data-into-solr.md
+- doc/Integration-with-Rails-Footnotes.md
+- doc/Pagination.md
+- doc/Providing-your-own-view-templates.md
+- doc/Quickstart.md
+- doc/README.md
+- doc/README_SOLR.md
+- doc/Release-Notes-And-Upgrade-Guides.md
+- doc/Sunspot-for-indexing.md
+- doc/User-Authentication.md
+- doc/testing.md
 - lib/SolrMarc.jar
 - lib/blacklight.rb
 - lib/blacklight/catalog.rb
@@ -420,6 +451,7 @@ files:
 - lib/railties/blacklight_cucumber.rake
 - lib/railties/blacklight_rspec.rake
 - lib/railties/solr_marc.rake
+- lib/solrmarc.log.1
 - test_support/.rspec
 - test_support/alternate_controller.rb
 - test_support/bin/run-tests.sh
@@ -455,6 +487,7 @@ files:
 - 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/features/alternate_controller_spec.rb
 - test_support/spec/helpers/blacklight_helper_spec.rb
 - test_support/spec/helpers/catalog_helper_spec.rb
 - test_support/spec/helpers/facets_helper_spec.rb
@@ -483,7 +516,6 @@ files:
 - 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/spec.opts
 - test_support/spec/spec_helper.rb
 - test_support/spec/support/assert_difference.rb
@@ -508,7 +540,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1025939682679006516
+      hash: -2337643494068461915
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -517,7 +549,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1025939682679006516
+      hash: -2337643494068461915
 requirements: []
 rubyforge_project: blacklight
 rubygems_version: 1.8.23