Skip to content

Commit

Permalink
HYC-1731 - Remove access and use fields from solr document (#997)
Browse files Browse the repository at this point in the history
* Remove access and use fields from solr document

* Update webdrivers, remove chromedriver version override

* Require webdriver

* Permit connections to another google chrome base url

* Revert require change
  • Loading branch information
bbpennel authored Sep 11, 2023
1 parent da44224 commit d4197b6
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 17 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,6 @@ group :test do
gem 'selenium-webdriver', '~> 4.8'
gem 'shoulda-matchers', '~> 5.1.0'
gem 'simplecov'
gem 'webdrivers'
gem 'webdrivers', '~> 5.3', require: false
gem 'webmock', '~> 3.14.0'
end
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1021,10 +1021,10 @@ GEM
activemodel (>= 5.0)
bindex (>= 0.4.0)
railties (>= 5.0)
webdrivers (5.2.0)
webdrivers (5.3.1)
nokogiri (~> 1.6)
rubyzip (>= 1.3.0)
selenium-webdriver (~> 4.0)
selenium-webdriver (~> 4.0, < 4.11)
webmock (3.14.0)
addressable (>= 2.8.0)
crack (>= 0.3.2)
Expand Down Expand Up @@ -1102,7 +1102,7 @@ DEPENDENCIES
turbolinks (~> 5.2.1)
uglifier (~> 4.2.0)
web-console (~> 3.7.0)
webdrivers
webdrivers (~> 5.3)
webmock (~> 3.14.0)

RUBY VERSION
Expand Down
8 changes: 0 additions & 8 deletions app/models/solr_document.rb
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,6 @@ def academic_concentration
self['academic_concentration_tesim']
end

def access
self['access_tesim']
end

def admin_note
self['admin_note_tesim']
end
Expand Down Expand Up @@ -339,8 +335,4 @@ def translator_display
def url
self['url_tesim']
end

def use
self['use_tesim']
end
end
2 changes: 1 addition & 1 deletion spec/rails_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
require 'webmock/rspec'

WebMock.disable_net_connect!(allow_localhost: true, allow: ['fedora:8080', 'solr8:8983', 'fcrepo:8080', 'solr:8983', 'opaquenamespace.org',
'chromedriver.storage.googleapis.com'])
'googlechromelabs.github.io', 'chromedriver.storage.googleapis.com', 'https://edgedl.me.gvt1.com'])
Capybara.default_normalize_ws = true

# Add additional requires below this line. Rails is not loaded until this point!
Expand Down
4 changes: 0 additions & 4 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,7 @@
end

require 'capybara/rspec'
# Temporarily fix chromedriver version, as newer versions are not accessible from the original
# download path. We could revisit this when we are on ruby 3 and there may be appropriate
# versions of selenium available
require 'webdrivers'
Webdrivers::Chromedriver.required_version = '114.0.5735.90'
require 'webmock/rspec'
require 'shoulda/matchers'
Shoulda::Matchers.configure do |config|
Expand Down

0 comments on commit d4197b6

Please sign in to comment.