From baf13403185485f5f724938b5473bef81b7e3aaf Mon Sep 17 00:00:00 2001 From: Trey Terrell Date: Tue, 3 Jun 2014 13:56:06 -0700 Subject: [PATCH] Fixes facets in set pages. Closes #465. Closes #465 --- app/helpers/collections_helper.rb | 7 ++++++- spec/features/sets_spec.rb | 10 ++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/app/helpers/collections_helper.rb b/app/helpers/collections_helper.rb index 8fddcf88..fcc4a4b1 100644 --- a/app/helpers/collections_helper.rb +++ b/app/helpers/collections_helper.rb @@ -70,7 +70,12 @@ def link_to_next_document(next_document) # TODO: Improve me. def catalog_index_path(*args) if params[:controller] == "sets" - return sets_path(*(args << {:set => params[:set]})) + if args.last.kind_of?(Hash) + args.last.merge!({:set => params[:set]}) + else + args << {:set => params[:set]} + end + return sets_path(*(args)) end super end diff --git a/spec/features/sets_spec.rb b/spec/features/sets_spec.rb index 683a1c63..ce520bdb 100644 --- a/spec/features/sets_spec.rb +++ b/spec/features/sets_spec.rb @@ -113,6 +113,16 @@ expect(page).to have_content("Oregon State University") end end + context "and a facet is clicked" do + before do + click_link "Test Facet" + end + it "should stay in set context" do + within("#footer .contact") do + expect(page).to have_content("Oregon State University") + end + end + end context "and start over is clicked", :js => true do before do find("#startOverLink").click