Skip to content

Commit

Permalink
Merge pull request #1013 from MITLibraries/ruby3
Browse files Browse the repository at this point in the history
Update to ruby 3.1.2
  • Loading branch information
JPrevost authored Aug 3, 2022
2 parents 14e4bfe + 8ab1ae7 commit 90ae4d6
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.6
3.1.2
5 changes: 4 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
source 'https://rubygems.org'
ruby '2.7.6'
ruby '3.1.2'

git_source(:github) do |repo_name|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?('/')
Expand All @@ -19,6 +19,9 @@ gem 'kaminari'
gem 'lograge'
gem 'marc'
gem 'mitlibraries-theme'
gem 'net-imap', require: false
gem 'net-pop', require: false
gem 'net-smtp', require: false
gem 'omniauth-rails_csrf_protection'
gem 'omniauth-saml'
gem 'paper_trail'
Expand Down
27 changes: 22 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ GEM
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
digest (3.1.0)
docile (1.4.0)
dotenv (2.8.1)
dotenv-rails (2.8.1)
Expand Down Expand Up @@ -217,6 +218,20 @@ GEM
momentjs-rails (2.29.1.1)
railties (>= 3.1)
msgpack (1.5.4)
net-imap (0.2.3)
digest
net-protocol
strscan
net-pop (0.1.1)
digest
net-protocol
timeout
net-protocol (0.1.3)
timeout
net-smtp (0.3.1)
digest
net-protocol
timeout
nio4r (2.5.8)
nokogiri (1.13.8)
mini_portile2 (~> 2.8.0)
Expand Down Expand Up @@ -331,9 +346,6 @@ GEM
sentry-ruby (~> 5.4.1)
sentry-ruby (5.4.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
sentry-ruby-core (5.4.1)
concurrent-ruby
sentry-ruby (= 5.4.1)
simple_form (5.1.0)
actionpack (>= 5.2)
activemodel (>= 5.2)
Expand All @@ -354,9 +366,11 @@ GEM
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sqlite3 (1.4.4)
strscan (3.0.4)
thor (1.2.1)
tilt (2.0.10)
timecop (0.9.5)
timeout (0.3.0)
tzinfo (2.0.5)
concurrent-ruby (~> 1.0)
uglifier (4.2.0)
Expand Down Expand Up @@ -406,6 +420,9 @@ DEPENDENCIES
marc
minitest-reporters
mitlibraries-theme
net-imap
net-pop
net-smtp
omniauth-rails_csrf_protection
omniauth-saml
paper_trail
Expand All @@ -431,7 +448,7 @@ DEPENDENCIES
zip_tricks

RUBY VERSION
ruby 2.7.6p219
ruby 3.1.2p20

BUNDLED WITH
2.1.4
2.3.7
4 changes: 3 additions & 1 deletion test/jobs/dspace_publication_results_job_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,9 @@ def teardown
"Unknown status small victory; cannot continue (thesis #{@invalid_status_thesis.id})"

# invalid data
assert_includes results[:errors], "Error reading from SQS queue: undefined method `split' for nil:NilClass"
assert_includes results[:errors], "Error reading from SQS queue: undefined method `split' for nil:NilClass\n\n"\
" thesis_id = package_id.split('_').last\n "\
"^^^^^^"

# no thesis
assert_includes results[:errors], "Couldn't find Thesis with 'id'=9999999999999"
Expand Down
4 changes: 2 additions & 2 deletions test/models/marc_batch_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
class MarcBatchTest < ActiveSupport::TestCase
test 'builds zip file' do
zip_file = MarcBatch.new([theses(:one)], 'marc.xml', 'marc.zip').build
assert File.exists?(zip_file)
assert File.exist?(zip_file)
end

test 'zip file contains only marcxml file' do
Expand All @@ -19,6 +19,6 @@ class MarcBatchTest < ActiveSupport::TestCase
batch = MarcBatch.new([theses(:one)], 'marc.xml', 'marc.zip')
zip_file = batch.build
marc_tempfile_path = batch.instance_variable_get(:@marc_filename)
assert_not File.exists?(marc_tempfile_path)
assert_not File.exist?(marc_tempfile_path)
end
end

0 comments on commit 90ae4d6

Please sign in to comment.