-
- <% case @active_tab %>
- <% when 'primo' %>
- <%= render(partial: 'search/result_primo', collection: @results, as: :result) %>
- <% when 'timdex' %>
- <%= render(partial: 'search/result', collection: @results, as: :result) %>
- <% when 'all' %>
- <% @results.each do |result| %>
- <% if result[:source] == 'Primo' %>
+
+ <% @results.each do |result| %>
+ <% if result[:api] == 'primo' %>
<%= render(partial: 'search/result_primo', locals: { result: result }) %>
- <% else %>
+ <% elsif result[:api] == 'timdex' %>
<%= render(partial: 'search/result', locals: { result: result }) %>
<% end %>
<% end %>
- <% end %>
<%= render partial: "results_callouts" %>
diff --git a/test/controllers/application_controller_unit_test.rb b/test/controllers/application_controller_unit_test.rb
new file mode 100644
index 00000000..99b3eace
--- /dev/null
+++ b/test/controllers/application_controller_unit_test.rb
@@ -0,0 +1,66 @@
+require 'test_helper'
+
+class ApplicationControllerUnitTest < ActionController::TestCase
+ setup do
+ @controller = ApplicationController.new
+ end
+
+ test '#primo_tabs returns expected tabs' do
+ assert_equal %w[alma cdi primo], @controller.primo_tabs
+ end
+
+ test '#timdex_tabs returns expected tabs' do
+ assert_equal %w[aspace timdex timdex_alma website], @controller.timdex_tabs
+ end
+
+ test '#all_tabs includes both primo and timdex tabs as well as all tab' do
+ expected = %w[all alma cdi primo aspace timdex timdex_alma website]
+ assert_equal expected, @controller.all_tabs
+ end
+
+ test '#valid_tab? returns true for valid tabs' do
+ assert @controller.send(:valid_tab?, 'all')
+ assert @controller.send(:valid_tab?, 'alma')
+ assert @controller.send(:valid_tab?, 'timdex')
+ end
+
+ test '#valid_tab? returns false for invalid tabs' do
+ refute @controller.send(:valid_tab?, 'invalid')
+ refute @controller.send(:valid_tab?, '')
+ end
+
+ test 'set_active_tab defaults @active_tab to all when no params or cookies are set' do
+ @controller.stubs(:params).returns({})
+ @controller.stubs(:cookies).returns({})
+ @controller.set_active_tab
+ assert_equal 'all', @controller.instance_variable_get(:@active_tab)
+ end
+
+ test 'set_active_tab sets @active_tab to tab when tab params is valid' do
+ @controller.stubs(:params).returns({ tab: 'primo' })
+ @controller.stubs(:cookies).returns({})
+ @controller.set_active_tab
+ assert_equal 'primo', @controller.instance_variable_get(:@active_tab)
+ end
+
+ test 'set_active_tab sets @active_tab to all when tab params is invalid and no cookie is set' do
+ @controller.stubs(:params).returns({ tab: 'supertab' })
+ @controller.stubs(:cookies).returns({})
+ @controller.set_active_tab
+ assert_equal 'all', @controller.instance_variable_get(:@active_tab)
+ end
+
+ test 'set_active_tab sets @active_tab to cookie value when tab params is invalid and valid cookie is set' do
+ @controller.stubs(:params).returns({ tab: 'supertab' })
+ @controller.stubs(:cookies).returns({ last_tab: 'timdex' })
+ @controller.set_active_tab
+ assert_equal 'timdex', @controller.instance_variable_get(:@active_tab)
+ end
+
+ test 'set_active_tab sets @active_tab to all value when tab params is invalid and cookie is invalid' do
+ @controller.stubs(:params).returns({ tab: 'supertab' })
+ @controller.stubs(:cookies).returns({ last_tab: 'woohoo' })
+ @controller.set_active_tab
+ assert_equal 'all', @controller.instance_variable_get(:@active_tab)
+ end
+end
diff --git a/test/controllers/search_controller_test.rb b/test/controllers/search_controller_test.rb
index c652d1be..7a33dd13 100644
--- a/test/controllers/search_controller_test.rb
+++ b/test/controllers/search_controller_test.rb
@@ -4,6 +4,7 @@ class SearchControllerTest < ActionDispatch::IntegrationTest
def mock_primo_search_success
# Mock the Primo search components to avoid external API calls
sample_doc = {
+ api: 'primo',
title: 'Sample Primo Document Title',
format: 'Article',
year: '2025',
@@ -26,6 +27,7 @@ def mock_primo_search_success
def mock_timdex_search_success
# Mock the TIMDEX GraphQL client to avoid external API calls
sample_result = {
+ 'api' => 'timdex',
'title' => 'Sample TIMDEX Document Title',
'timdexRecordId' => 'sample-record-123',
'contentType' => [{ 'value' => 'Article' }],
@@ -593,12 +595,24 @@ def source_filter_count(controller)
assert_select 'a.tab-link.active[href*="tab=primo"]', count: 1
end
- test 'results respects timdex tab parameter' do
- mock_timdex_search_success
+ test 'results respects timdex all tab parameter' do
+ ClimateControl.modify FEATURE_TAB_TIMDEX_ALL: 'true' do
+ mock_timdex_search_success
- get '/results?q=test&tab=timdex'
- assert_response :success
- assert_select 'a.tab-link.active[href*="tab=timdex"]', count: 1
+ get '/results?q=test&tab=timdex'
+ assert_response :success
+ assert_select 'a.tab-link.active[href*="tab=timdex"]', count: 1
+ end
+ end
+
+ test 'results respects timdex alma tab parameter' do
+ ClimateControl.modify FEATURE_TAB_TIMDEX_ALMA: 'true' do
+ mock_timdex_search_success
+
+ get '/results?q=test&tab=timdex_alma'
+ assert_response :success
+ assert_select 'a.tab-link.active[href*="tab=timdex_alma"]', count: 1
+ end
end
test 'results shows tab navigation when GeoData is disabled' do
@@ -608,7 +622,9 @@ def source_filter_count(controller)
assert_response :success
assert_select '.tab-navigation', count: 1
assert_select 'a[href*="tab=primo"]', count: 1
- assert_select 'a[href*="tab=timdex"]', count: 1
+ # assert_select 'a[href*="tab=timdex"]', count: 1
+ assert_select 'a[href*="tab=aspace"]', count: 1
+ assert_select 'a[href*="tab=website"]', count: 1
end
test 'results handles primo search errors gracefully' do
@@ -726,7 +742,7 @@ def source_filter_count(controller)
get '/results?q=test&tab=all'
assert_response :success
-
+
# Verify that we get results from both sources
assert_select '.record-title', text: /Sample Primo Document Title/
assert_select '.record-title', text: /Sample TIMDEX Document Title/
@@ -768,7 +784,7 @@ def source_filter_count(controller)
get '/results?q=test&tab=all&page=49'
assert_response :success
-
+
# Should show primo continuation partial
assert_select '.primo-continuation', count: 1
assert_select '.primo-continuation h2', text: /Continue your search in Search Our Collections/
diff --git a/test/helpers/search_helper_test.rb b/test/helpers/search_helper_test.rb
index 88402627..a4c9297e 100644
--- a/test/helpers/search_helper_test.rb
+++ b/test/helpers/search_helper_test.rb
@@ -203,7 +203,7 @@ class SearchHelperTest < ActionView::TestCase
@active_tab = 'bar'
actual = link_to_tab('Foo')
- assert_select Nokogiri::HTML::Document.parse( actual ), 'a' do |link|
+ assert_select Nokogiri::HTML::Document.parse(actual), 'a' do |link|
assert_select '[class*=?]', 'active', count: 0
assert_select '[class*=?]', 'tab-link'
assert_select '[aria-current=?]', 'page', count: 0
@@ -214,7 +214,7 @@ class SearchHelperTest < ActionView::TestCase
@active_tab = 'foo'
actual = link_to_tab('Foo')
- assert_select Nokogiri::HTML::Document.parse( actual ), 'a' do |link|
+ assert_select Nokogiri::HTML::Document.parse(actual), 'a' do |link|
assert_select link, '[class*=?]', 'active'
assert_select link, '[aria-current=?]', 'page', count: 1
end
@@ -231,4 +231,36 @@ class SearchHelperTest < ActionView::TestCase
expected_url = 'https://mit.primo.exlibrisgroup.com/discovery/search?query=any%2Ccontains%2Cdata+%26+analytics&vid=01MIT_INST%3AMIT'
assert_equal expected_url, primo_search_url(query)
end
+
+ test 'tab label defaults to target when label is nil' do
+ @active_tab = 'sample_tab'
+ actual = link_to_tab('Sample Tab', nil)
+ assert_select Nokogiri::HTML::Document.parse(actual), 'a' do |link|
+ assert_equal link.text, 'Sample Tab'
+ end
+ end
+
+ test 'tab label uses label when label is provided' do
+ @active_tab = 'sample_tab'
+ actual = link_to_tab('Sample Tab', 'Custom Label')
+ assert_select Nokogiri::HTML::Document.parse(actual), 'a' do |link|
+ assert_equal link.text, 'Custom Label'
+ end
+ end
+
+ test 'tab param uses clean_target when label is nil' do
+ @active_tab = 'sample_tab'
+ actual = link_to_tab('Sample Tab', nil)
+ assert_select Nokogiri::HTML::Document.parse(actual), 'a' do |link|
+ assert_equal link.first[:href], '/results?tab=sample_tab'
+ end
+ end
+
+ test 'tab param uses clean_target when label is provided' do
+ @active_tab = 'sample_tab'
+ actual = link_to_tab('Sample Tab', 'Custom Label')
+ assert_select Nokogiri::HTML::Document.parse(actual), 'a' do |link|
+ assert_equal link.first[:href], '/results?tab=sample_tab'
+ end
+ end
end
diff --git a/test/models/normalize_primo_record_test.rb b/test/models/normalize_primo_record_test.rb
index b8e1740d..bc6ebd55 100644
--- a/test/models/normalize_primo_record_test.rb
+++ b/test/models/normalize_primo_record_test.rb
@@ -423,4 +423,9 @@ def cdi_record
assert_not_nil dedup_url
assert_match %r{/discovery/search\?}, dedup_url
end
+
+ test 'includes primo as source api' do
+ normalized = NormalizePrimoRecord.new(full_record, 'test query').normalize
+ assert_equal 'primo', normalized[:api]
+ end
end
diff --git a/test/models/normalize_primo_results_test.rb b/test/models/normalize_primo_results_test.rb
index f1d3ff16..e71bce62 100644
--- a/test/models/normalize_primo_results_test.rb
+++ b/test/models/normalize_primo_results_test.rb
@@ -67,4 +67,13 @@ def empty_results
normalizer = NormalizePrimoResults.new(nil, 'test query')
assert_equal 0, normalizer.total_results
end
+
+ test 'all primo results includes primo as source api' do
+ normalizer = NormalizePrimoResults.new(sample_results, 'test query')
+ normalized = normalizer.normalize
+
+ normalized.each do |result|
+ assert_equal 'primo', result[:api]
+ end
+ end
end
diff --git a/test/models/normalize_timdex_record_test.rb b/test/models/normalize_timdex_record_test.rb
index d3540603..fc60aafe 100644
--- a/test/models/normalize_timdex_record_test.rb
+++ b/test/models/normalize_timdex_record_test.rb
@@ -218,4 +218,9 @@ def minimal_record
assert_not_includes normalized.keys, 'other_availability'
assert_not_includes normalized.keys, 'container'
end
+
+ test 'includes timdex as source api' do
+ normalized = NormalizeTimdexRecord.new(full_record, 'test').normalize
+ assert_equal 'timdex', normalized[:api]
+ end
end
diff --git a/test/models/normalize_timdex_results_test.rb b/test/models/normalize_timdex_results_test.rb
index c7e71267..8b237690 100644
--- a/test/models/normalize_timdex_results_test.rb
+++ b/test/models/normalize_timdex_results_test.rb
@@ -85,4 +85,13 @@ def empty_timdex_response
# Test that query is stored (this would be used by individual record normalization)
assert_equal query, normalizer.instance_variable_get(:@query)
end
+
+ test 'all timdex results includes timdex as source api' do
+ normalizer = NormalizeTimdexResults.new(sample_timdex_response, 'test query')
+ normalized = normalizer.normalize
+
+ normalized.each do |result|
+ assert_equal 'timdex', result[:api]
+ end
+ end
end