umlaut 4.0.0.beta3 → 4.0.0.beta4

data/test/functional/search_controller_test.rb

@@ -1,40 +0,0 @@
-require 'test_helper'
-class SearchControllerTest < ActionController::TestCase
-  setup do
-    @controller = SearchController.new
-  end
-
-  test "index" do
-    get :index
-    assert_response :success
-    assert_select "title", "Find It | Journals"
-    assert_select ".umlaut-search-form", 2
-    assert_select ".umlaut-results", 0
-  end
-
-  # Tests don't currently support contains searching because sdalton can't/won't
-  # figure out FULLTEXT indexing in MySQL, so we'll test begins with searching.
-  test "journal search" do
-    return unless Sfx4::Local::AzTitle.connection_configured?
-    get :journal_search, "rft.jtitle"=>"Account", "umlaut.title_search_type"=>"begins"
-    assert_response :success
-    assert_select "title", "Find It | Journal titles that begin with &#39;Account&#39;"
-    assert_select ".umlaut-search-form", 1
-    assert_select ".umlaut-results", 1
-    assert_select ".umlaut-results .umlaut-result", :minimum => 1
-    assert_select ".umlaut-pagination", 2
-    assert_select ".umlaut-az", 0
-  end
-
-  test "journal list" do
-    return unless Sfx4::Local::AzTitle.connection_configured?
-    get :journal_list, :id => "A"
-    assert_response :success
-    assert_select "title", "Find It | Browse by Journal Title: A"
-    assert_select ".umlaut-search-form", 1
-    assert_select ".umlaut-results", 1
-    assert_select ".umlaut-results .umlaut-result", :minimum => 1 
-    assert_select ".umlaut-pagination", 2
-    assert_select ".umlaut-az", 1
-  end
-end

data/test/functional/store_controller_test.rb

@@ -1,29 +0,0 @@
-require 'test_helper'
-class StoreControllerTest < ActionController::TestCase
-  fixtures :permalinks, :requests, :referents, :referent_values
-  test "index with permalink referent" do
-    permalink = permalinks(:nytimes)
-    referent = permalink.referent
-    get :index, {id: permalink.id}
-    # assert_redirected_to doesn't work as advertised so HACK!
-    assert(@controller.location.starts_with?("http://test.host/resolve?umlaut.referent_id=#{referent.id}&url_ver=Z39.88-2004&url_ctx_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Actx&ctx_ver=Z39.88-2004&"), "Not redirecting to the correct location.")
-    assert(/rft\.issn=0362-4331/===@controller.location, "In the redirect url, rft.issn is expected to be \"0362-4331\", but isn't. Actual location: #{@controller.location}")
-    assert(/rft\.jtitle=The\+New\+York\+times/===@controller.location, "In the redirect url, rft.jtitle is expected to be \"The New York times\", but isn't. Actual location: #{@controller.location}")
-  end
-
-  test "index without permalink referent" do
-    permalink = permalinks(:expired_referent)
-    get :index, {id: permalink.id}
-    assert_response :redirect
-    # assert_redirected_to doesn't work as advertised so HACK!
-    assert(@controller.location.starts_with?("http://test.host/resolve?umlaut.referent_id="), "Not redirecting to the correct location.")
-    assert(/rft\.issn=0028792X/===@controller.location, "In the redirect url, rft.issn is expected to be \"0028792X\", but isn't. Actual location: #{@controller.location}")
-    assert(/rft\.jtitle=The\+New\+Yorker/===@controller.location, "In the redirect url, rft.jtitle is expected to be \"The New Yorker\", but isn't. Actual location: #{@controller.location}")
-  end
-
-  test "error" do
-    get :index, {id: "this should not be found"}
-    assert_response :not_found
-    assert_select 'title', "The page you were looking for doesn't exist (404)"
-  end
-end

data/test/helper/list_with_limit_test.rb

@@ -1,101 +0,0 @@
-require 'test_helper'
-require 'nokogiri'
-
-class ListWithLimitTest < ActionView::TestCase
-  include ResolveHelper
-  
-  # Have to override url_for to supply a default controller, so
-  # routing won't complain for our tests -- we don't actually
-  # want/need to test routing here, we just need to stop routing
-  # from complaining. This is very hacky yes. 
-  def url_for(*args)
-    if args.first.kind_of? Hash
-      args.first[:controller] ||= "resolve"
-    end
-    super
-  end
-
-  def setup
-    @user_request = Request.new(:id => 999999)
-  end
-  
-  # the visible 'ul', and the one hidden under expand-contract. 
-  # second one may be empty. 
-  def both_lists(str)
-    dom = Nokogiri::HTML::fragment(str)
-    
-    first = dom.at_css("ul")
-    second = dom.at_css("div.collapse ul")
-    
-    return [first, second, dom]
-  end
-    
-  @@li_lambda = lambda do |item, index|
-    "<li data-value='#{item}'>#{item}</li>".html_safe
-  end
-  
-  def test_list_under_limit            
-    out = list_with_limit("foo", %w{1 2 3 4}, :limit => 5, &@@li_lambda)
-      
-    visible_list, hidden_list = both_lists(out)
-    
-    assert_not_nil visible_list    
-    assert_length 4, visible_list.css("li")
-    
-    assert_nil hidden_list    
-  end
-  
-  def test_list_at_limit
-    out = list_with_limit("foo", %w{1 2 3 4 5}, :limit => 5, &@@li_lambda)
-      
-    visible_list, hidden_list = both_lists(out)
-    
-    assert_not_nil visible_list    
-    assert_length 5, visible_list.css("li")
-    
-    assert_nil hidden_list
-  end
-  
-  def test_list_one_more_than_limit
-    # Only FOUR orig items in visible list, then the 'more' link, then two
-    # in hidden -- this makes sense for screen real estate purposes of the limit.
-    out = list_with_limit("foo", %w{1 2 3 4 5 6}, :limit => 5, &@@li_lambda)
-      
-    visible_list, hidden_list, dom = both_lists(out)
-    
-    assert_not_nil visible_list    
-    assert_length 4, visible_list.css("li") 
-    
-    assert_present dom.at_css("ul + div.collapsible a.collapse-toggle")
-        
-    assert_not_nil hidden_list
-    assert_length 2, hidden_list.css("li")
-
-    assert dom.at_css(".collapsible").text.include?("Show 2 more")
-  end
-  
-  def test_list_many_more_than_limit    
-    out = list_with_limit("foo", %w{1 2 3 4 5 6 7 8 9 10}, :limit => 5, &@@li_lambda)
-      
-    visible_list, hidden_list, dom = both_lists(out)
-    
-    assert_not_nil visible_list    
-    assert_length 4, visible_list.css("li") 
-    
-    assert_present dom.at_css("ul + div.collapsible a.collapse-toggle")
-    
-    assert_not_nil hidden_list
-    assert_length 6, hidden_list.css("li") 
-  end
-  
-  def test_html_unsafety_maintained
-    out = list_with_limit("foo", %w{1 2 3 4 5 6 7 8 9 10}, :limit => 5) do |item|
-      "<should be escaped> #{item}"
-    end
-    
-    assert ! out.include?("<should be escaped>"), "Does not include un-escaped angle brackets"
-    assert_equal 10, out.scan("&lt;should be escaped&gt;").length, "Includes escaped angle brackets"     
-  end
-
-end
-

data/test/integration/permalinks_test.rb

@@ -1,14 +0,0 @@
-require 'test_helper'
-
-class PermalinksTest < ActionDispatch::IntegrationTest
-
-    
-  test "missing id" do    
-    get "/go/999999999"
-    
-    assert_response(:missing)    
-  end
-  
-  
-  
-end

data/test/integration/request_reuse_test.rb

@@ -1,66 +0,0 @@
-require 'test_helper'
-
-class RequestReuseTest < ActionDispatch::IntegrationTest
-  def setup
-    # for these tests, we don't want to actually execute any services, zero it out.
-    @orig_service_store_config = ServiceStore.config["default"]["services"]
-    ServiceStore.config["default"]["services"] = {}        
-  end
-  
-  def teardown
-    # restore original services, see setup
-    ServiceStore.config["default"]["services"] = @orig_service_store_config
-  end
-    
-  test "reuse_of_request_in_session" do
-    sess = open_session
-    
-    request_params = { :issn => "012345678" }
-    
-    sess.get "/resolve", request_params 
-            
-    created_request_id = sess.assigns[:user_request].id
-    
-    get "/resolve", request_params
-    
-    # re-use same user_request object    
-    assert_equal( created_request_id, sess.assigns[:user_request].id  )
-    
-  end
-  
-  test "no re-use from different session" do
-    request_params = { :issn => "012345678" }
-    
-    sess1 = open_session                    
-    sess1.get "/resolve", request_params        
-    created_request_id = sess1.assigns[:user_request].id
-  
-    sess2 = open_session      
-    sess2.get "/resolve", request_params        
-    # no re-use, different umlaut Reqeust object.     
-    assert_not_equal( created_request_id, sess2.assigns[:user_request].id  )    
-  end
-  
-  test "umlaut.force_new_request" do
-    
-    request_params = { :issn => "012345679" }
-    
-    sess1 = open_session                    
-    sess1.get "/resolve", request_params        
-    created_request_id = sess1.assigns[:user_request].id
-  
-    # Wind up with new different request with force_new_request
-    sess1.get "/resolve", request_params.merge("umlaut.force_new_request" => "true")
-    request_after_forced = sess1.assigns[:user_request].id
-    
-    assert_not_equal( request_after_forced, created_request_id  )
-
-    # Make a request again without force param, still get the latter request,
-    # the one created when we forced it.     
-    sess1.get "/resolve", request_params    
-    assert_equal( sess1.assigns[:user_request].id, request_after_forced  )        
-  end
-  
-  
-  
-end

data/test/support/test_with_cassette.rb

@@ -1,37 +0,0 @@
-# Copied from jrochkind's bento search.
-# TODO: Investigate a DRYer way to copy from jrochkind's bento search.
-module TestWithCassette
-  def test_with_cassette(name, group = nil, vcr_options ={}, &block)
-    # cribbed from Rails and modified for VCR
-    # https://github.com/rails/rails/blob/b451de0d6de4df6bc66b274cec73b919f823d5ae/activesupport/lib/active_support/testing/declarative.rb#L25
-
-    test_name_safe = name.gsub(/\s+/,'_')
-
-    test_method_name = "test_#{test_name_safe}".to_sym
-
-    raise "#{test_method_name} is already defined in #{self}" if methods.include?(test_method_name)
-
-    cassette_name = vcr_options.delete(:cassette)
-    unless cassette_name
-      # calculate default cassette name from test name
-      cassette_name = test_name_safe
-      # put in group subdir if group
-      cassette_name = "#{group}/#{cassette_name}" if group
-    end
-
-    # default tag with groupname, can be over-ridden.
-    vcr_options = {:tag => group}.merge(vcr_options) if group
-
-    if block_given?
-      define_method(test_method_name) do
-        VCR.use_cassette(cassette_name , vcr_options) do
-          instance_eval &block
-        end
-      end
-    else
-      define_method(test_method_name) do
-        flunk "No implementation provided for #{name}"
-      end
-    end
-  end
-end

data/test/test_helper.rb

@@ -1,147 +0,0 @@
-ENV["RAILS_ENV"] ||= "test"
-
-require File.expand_path('../dummy/config/environment', __FILE__)
-#require 'engine_cart'
-#EngineCart.load_application!
-
-require 'rails/test_help'
-require 'minitest/unit'
-
-require 'coveralls'
-Coveralls.wear!
-
-
-ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__) 
-
-Rails.backtrace_cleaner.remove_silencers!
-
-# Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-
-# Complete stack trace with deprecation warnings from rails
-ActiveSupport::Deprecation.debug = true
-#ActiveSupport::Deprecation.silenced = true
-
-# Fix stack traces to include Umlaut source lines
-#Rails.backtrace_cleaner.remove_silencers!
-#app_dirs_pattern = /^\/?(app|config|lib|test)/
-#Rails.backtrace_cleaner.add_silencer do |line|
-#  require 'debugger'
-#  debugger if line =~ /umlaut/
-#  line =~ app_dirs_pattern 
-#end
-
-require 'collection'
-Collection.forward_background_exceptions = true
-
-class ActiveSupport::TestCase
-  ActiveRecord::Migration.check_pending!
-
-  # Load SFX 4 fixtures only if we are explicitly creating a mock_instance
-  # which should really only be the case for travis-ci.org
-  def self.sfx4_fixtures(*fixture_names)
-    # Load SFX 4 fixtures only if we are explicitly creating a mock_instance
-    # which should really only be the case for travis-ci.org
-    if (sfx4_mock_instance?)
-      warn "Loading SFX4 fixtures."
-      sfx4s = ["Local"]
-
-      # Get the db module associate with this sfx4 instance
-      # Get the connection from the :Base class for each sfx4
-      # Set the path
-      path = "#{File.dirname(__FILE__)}/fixtures/sfx4/local"
-
-      # Get class names hash of table_name => class_name
-      class_names = {}
-      connection = nil
-
-      fixture_names.collect{|t|t.to_s}.each do |table| 
-
-        require "sfx4/local/#{table}" rescue nil
-
-        next unless Sfx4::Local.const_defined?(table.classify)
-        #Find class from table name
-        klass = Sfx4::Local.const_get table.classify
-        connection ||= klass.connection
-
-        class_names[klass.table_name.downcase.to_sym] = klass
-
-        # Table names are just the keys of the class names
-        table_names = class_names.keys.collect{|t| t.to_s.upcase}
-        # Create and Instantiate Fixtures
-        ActiveRecord::FixtureSet.create_fixtures(path, table_names, class_names){connection}.first.fixtures
-      end
-    else
-      warn  "\n!!!Skipping SFX4 fixtures since the SFX DB specified is not a mock instance.!!!\n"
-    end
-  end
-  
-  def self.sfx4_mock_instance?
-    (Sfx4::Local::Base.connection_configured? and
-      Sfx4::Local::Base.connection_config[:mock_instance])
-  end
-end
-
-# VCR is used to 'record' HTTP interactions with
-# third party services used in tests, and play em
-# back. Useful for efficiency, also useful for
-# testing code against API's that not everyone
-# has access to -- the responses can be cached
-# and re-used. 
-require 'vcr'
-require 'webmock'
-
-# To allow us to do real HTTP requests in a VCR.turned_off, we
-# have to tell webmock to let us. 
-WebMock.allow_net_connect!
-
-without_ctx_tim = VCR.request_matchers.uri_without_param(:ctx_tim)
-VCR.configure do |c|
-  c.cassette_library_dir = 'test/vcr_cassettes'
-  # webmock needed for HTTPClient testing
-  c.hook_into :webmock 
-  c.register_request_matcher(:uri_without_ctx_tim, &without_ctx_tim)
-  # c.debug_logger = $stderr
-  c.filter_sensitive_data("BX_TOKEN") { ENV['BX_TOKEN'] } unless ENV['BX_TOKEN'].blank?
-end
-
-# Silly way to not have to rewrite all our tests if we
-# temporarily disable VCR, make VCR.use_cassette a no-op
-# instead of no-such-method. 
-if ! defined? VCR
-  module VCR
-    def self.use_cassette(*args)
-      yield
-    end
-  end
-end
-
-def assert_length(size, list)
-  assert_equal size, list.length, "Expected size of #{size} for #{list}"
-end
-
-# We want to put assert_present and assert_blank back, they were
-# useful, why did minitest deprecate it?
-module ActiveSupport::Testing::Assertions
-  def assert_present(object, message=nil)
-    message ||= "#{object.inspect} is blank"
-    assert object.present?, message
-  end
-
-  def assert_blank(object, message=nil)
-    message ||= "#{object.inspect} is not blank"
-    assert object.blank?, message
-  end
-end
-
-# Methods you can use to make a mocked up Rails Request and corersponding Umlaut Request
-# Pass in a URL, absolute or partial, eg "/resolve?isbn=X"
-def fake_rails_request(umlaut_url)  
-  # hard to figure out how to mock a request, this seems to work
-  ActionController::TestRequest.new(Rack::MockRequest.env_for(umlaut_url))    
-end
-
-def fake_umlaut_request(umlaut_url)
-  rails_request = fake_rails_request(umlaut_url)
-  Request.find_or_create(rails_request.params, {}, rails_request)
-end