blacklight_advanced_search 6.3.1 → 6.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8156e789ee66f1e0ea1d36b6b41911ed857d3102
4
- data.tar.gz: 810a801b6979eeb1567b734dba238d5adfb238c0
3
+ metadata.gz: 8365d9d4f076bf6a58ec18ea43463eebdb731548
4
+ data.tar.gz: e5d13463ee038b937f495392c03495e9e74a0fc5
5
5
  SHA512:
6
- metadata.gz: 5445c21147710a2e6f4e278842735fcd5e57e3161434808a713a238f672ad0a239682cdd84fe3480ac6a9f2865cf7bcfce2a3ac74331e54d97229484fd144e75
7
- data.tar.gz: 9573952d47629c2d9cd4e95fc273be2d7916037fa3d8d3c87da036186de49104b0ae5d05141813a830d26867acc0664476282fd8a277e6f2fa8f8d5cc2a17ef7
6
+ metadata.gz: 7498bba1f4df86db9bde461fa099e3af88a00e55bc20fb5818d40285f292c96e41aa13348f38ce98777be784e458f1f84ed8032c845fabcdfc54b526594ca8fe
7
+ data.tar.gz: 1172e9a02a4442f23711f4be3bff51489329e95a5e782361e7eb79b887e7721fa30cb5453bf61f5cd96878b1260ca5a91a8f3eaf4bb3f3316adb2fea30c349a9
data/Rakefile CHANGED
@@ -27,7 +27,7 @@ task :ci => ['rubocop', 'engine_cart:generate'] do
27
27
  require 'solr_wrapper'
28
28
 
29
29
  SolrWrapper.wrap(port: '8983') do |solr|
30
- solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path(File.dirname(__FILE__)), "solr", "conf")) do
30
+ solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path(__dir__), "solr", "conf")) do
31
31
  Rake::Task['fixtures'].invoke
32
32
  Rake::Task['spec'].invoke
33
33
  end
data/VERSION CHANGED
@@ -1 +1 @@
1
- 6.3.1
1
+ 6.4.0
@@ -7,7 +7,7 @@
7
7
 
8
8
  <%= form_tag search_catalog_path, :class => 'advanced form-horizontal', :method => :get do %>
9
9
 
10
- <%= render_hash_as_hidden_fields(search_state.params_for_search(advanced_search_context)) %>
10
+ <%= render_hash_as_hidden_fields(advanced_search_context) %>
11
11
 
12
12
  <div class="input-criteria">
13
13
 
@@ -10,6 +10,6 @@ module BlacklightAdvancedSearch::ParsingNestingParser
10
10
  def local_param_hash(key, config)
11
11
  field_def = config.search_fields[key]
12
12
 
13
- (field_def[:solr_parameters] || {}).merge(field_def[:solr_local_parameters] || {})
13
+ (field_def[:solr_adv_parameters] || field_def[:solr_parameters] || {}).merge(field_def[:solr_local_parameters] || {})
14
14
  end
15
15
  end
@@ -54,4 +54,22 @@ describe "Blacklight Advanced Search Form" do
54
54
  visit '/advanced'
55
55
  expect(page).to have_selector('input#title')
56
56
  end
57
+
58
+ describe "prepopulated advanced search form" do
59
+ before do
60
+ visit '/advanced?all_fields=&author=&commit=Search&op=AND&search_field=advanced&title=cheese'
61
+ end
62
+
63
+ it "should not create hidden inputs for search fields" do
64
+ expect(page).not_to have_selector('.advanced input[type="hidden"][name="title"]', visible: false)
65
+ expect(page).to have_selector('.advanced input[type="text"][name="title"]')
66
+ end
67
+
68
+ it "should not have multiple parameters for a search field" do
69
+ fill_in "title", :with => "bread"
70
+ click_on "advanced-search-submit"
71
+ expect(page.current_url).to match(/bread/)
72
+ expect(page.current_url).not_to match(/cheese/)
73
+ end
74
+ end
57
75
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: blacklight_advanced_search
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.3.1
4
+ version: 6.4.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jonathan Rochkind
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2017-06-15 00:00:00.000000000 Z
12
+ date: 2018-09-10 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: blacklight