Skip to content

Commit

Permalink
Upgrade rails to latest version.
Browse files Browse the repository at this point in the history 
Bundler also updated minitest which changed handling of
Hash and keywork arguments in mock expectations. The tests
are adjusted accordingly.
  • Loading branch information
@oneiros
oneiros committed Aug 25, 2022
1 parent c0e2121 commit 9ab0791
Show file tree
Hide file tree
Showing 3 changed files with 69 additions and 69 deletions.
132 changes: 66 additions & 66 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,67 +2,67 @@ GEM
remote: https://rubygems.org/
specs:
CFPropertyList (2.3.6)
actioncable (7.0.2.4)
actionpack (= 7.0.2.4)
activesupport (= 7.0.2.4)
actioncable (7.0.3.1)
actionpack (= 7.0.3.1)
activesupport (= 7.0.3.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (7.0.2.4)
actionpack (= 7.0.2.4)
activejob (= 7.0.2.4)
activerecord (= 7.0.2.4)
activestorage (= 7.0.2.4)
activesupport (= 7.0.2.4)
actionmailbox (7.0.3.1)
actionpack (= 7.0.3.1)
activejob (= 7.0.3.1)
activerecord (= 7.0.3.1)
activestorage (= 7.0.3.1)
activesupport (= 7.0.3.1)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.0.2.4)
actionpack (= 7.0.2.4)
actionview (= 7.0.2.4)
activejob (= 7.0.2.4)
activesupport (= 7.0.2.4)
actionmailer (7.0.3.1)
actionpack (= 7.0.3.1)
actionview (= 7.0.3.1)
activejob (= 7.0.3.1)
activesupport (= 7.0.3.1)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.2.4)
actionview (= 7.0.2.4)
activesupport (= 7.0.2.4)
actionpack (7.0.3.1)
actionview (= 7.0.3.1)
activesupport (= 7.0.3.1)
rack (~> 2.0, >= 2.2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (7.0.2.4)
actionpack (= 7.0.2.4)
activerecord (= 7.0.2.4)
activestorage (= 7.0.2.4)
activesupport (= 7.0.2.4)
actiontext (7.0.3.1)
actionpack (= 7.0.3.1)
activerecord (= 7.0.3.1)
activestorage (= 7.0.3.1)
activesupport (= 7.0.3.1)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.2.4)
activesupport (= 7.0.2.4)
actionview (7.0.3.1)
activesupport (= 7.0.3.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (7.0.2.4)
activesupport (= 7.0.2.4)
activejob (7.0.3.1)
activesupport (= 7.0.3.1)
globalid (>= 0.3.6)
activemodel (7.0.2.4)
activesupport (= 7.0.2.4)
activerecord (7.0.2.4)
activemodel (= 7.0.2.4)
activesupport (= 7.0.2.4)
activestorage (7.0.2.4)
actionpack (= 7.0.2.4)
activejob (= 7.0.2.4)
activerecord (= 7.0.2.4)
activesupport (= 7.0.2.4)
activemodel (7.0.3.1)
activesupport (= 7.0.3.1)
activerecord (7.0.3.1)
activemodel (= 7.0.3.1)
activesupport (= 7.0.3.1)
activestorage (7.0.3.1)
actionpack (= 7.0.3.1)
activejob (= 7.0.3.1)
activerecord (= 7.0.3.1)
activesupport (= 7.0.3.1)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.2.4)
activesupport (7.0.3.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand Down Expand Up @@ -105,7 +105,7 @@ GEM
deep_merge (1.2.2)
digest (3.1.0)
docile (1.4.0)
erubi (1.10.0)
erubi (1.11.0)
execjs (2.8.1)
facter (4.2.9)
hocon (~> 1.3)
Expand Down Expand Up @@ -136,7 +136,7 @@ GEM
httparty (0.20.0)
mime-types (~> 3.0)
multi_xml (>= 0.5.2)
i18n (1.10.0)
i18n (1.12.0)
concurrent-ruby (~> 1.0)
importmap-rails (1.0.3)
actionpack (>= 6.0.0)
Expand Down Expand Up @@ -167,7 +167,7 @@ GEM
mini_portile2 (2.8.0)
mini_racer (0.6.2)
libv8-node (~> 16.10.0.0)
minitest (5.15.0)
minitest (5.16.3)
multi_json (1.15.0)
multi_xml (0.6.0)
net-imap (0.2.3)
Expand All @@ -186,12 +186,12 @@ GEM
net-protocol
timeout
nio4r (2.5.8)
nokogiri (1.13.6)
nokogiri (1.13.8)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
nokogiri (1.13.6-x86_64-darwin)
nokogiri (1.13.8-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.13.6-x86_64-linux)
nokogiri (1.13.8-x86_64-linux)
racc (~> 1.4)
optimist (3.0.1)
parallel (1.22.1)
Expand Down Expand Up @@ -229,31 +229,31 @@ GEM
puppetdb-ruby (1.2.0)
httparty
racc (1.6.0)
rack (2.2.3.1)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (7.0.2.4)
actioncable (= 7.0.2.4)
actionmailbox (= 7.0.2.4)
actionmailer (= 7.0.2.4)
actionpack (= 7.0.2.4)
actiontext (= 7.0.2.4)
actionview (= 7.0.2.4)
activejob (= 7.0.2.4)
activemodel (= 7.0.2.4)
activerecord (= 7.0.2.4)
activestorage (= 7.0.2.4)
activesupport (= 7.0.2.4)
rack (2.2.4)
rack-test (2.0.2)
rack (>= 1.3)
rails (7.0.3.1)
actioncable (= 7.0.3.1)
actionmailbox (= 7.0.3.1)
actionmailer (= 7.0.3.1)
actionpack (= 7.0.3.1)
actiontext (= 7.0.3.1)
actionview (= 7.0.3.1)
activejob (= 7.0.3.1)
activemodel (= 7.0.3.1)
activerecord (= 7.0.3.1)
activestorage (= 7.0.3.1)
activesupport (= 7.0.3.1)
bundler (>= 1.15.0)
railties (= 7.0.2.4)
railties (= 7.0.3.1)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.4.3)
loofah (~> 2.3)
railties (7.0.2.4)
actionpack (= 7.0.2.4)
activesupport (= 7.0.2.4)
railties (7.0.3.1)
actionpack (= 7.0.3.1)
activesupport (= 7.0.3.1)
method_source
rake (>= 12.2)
thor (~> 1.0)
Expand Down Expand Up @@ -316,14 +316,14 @@ GEM
sqlite3 (1.4.2)
stimulus-rails (1.0.4)
railties (>= 6.0.0)
strscan (3.0.1)
strscan (3.0.4)
thor (1.2.1)
tilt (2.0.10)
timeout (0.2.0)
timeout (0.3.0)
turbo-rails (1.0.1)
actionpack (>= 6.0.0)
railties (>= 6.0.0)
tzinfo (2.0.4)
tzinfo (2.0.5)
concurrent-ruby (~> 1.0)
unicode-display_width (2.1.0)
web-console (4.2.0)
Expand All @@ -340,7 +340,7 @@ GEM
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.5.4)
zeitwerk (2.6.0)

PLATFORMS
ruby
Expand Down
4 changes: 2 additions & 2 deletions test/models/key_test.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class KeyTest < ActiveSupport::TestCase
test "#save_value uses underlying hiera_data object" do
key = Key.new(@node, "hdm::integer")
hiera_data = MiniTest::Mock.new
hiera_data.expect(:write_key, true, ["hierarchy", "/path", "hdm::integer", 23, Hash])
hiera_data.expect(:write_key, true, ["hierarchy", "/path", "hdm::integer", 23], facts: Hash)
key.stub(:hiera_data, hiera_data) do
key.save_value("hierarchy", "/path", "23")
end
Expand All @@ -78,7 +78,7 @@ class KeyTest < ActiveSupport::TestCase
test "#remove_value uses underlying hiera_data object" do
key = Key.new(@node, "hdm::integer")
hiera_data = MiniTest::Mock.new
hiera_data.expect(:remove_key, true, ["hierarchy", "/path", "hdm::integer", Hash])
hiera_data.expect(:remove_key, true, ["hierarchy", "/path", "hdm::integer"], facts: Hash)
key.stub(:hiera_data, hiera_data) do
key.remove_value("hierarchy", "/path")
end
Expand Down
2 changes: 1 addition & 1 deletion test/models/ldap_test.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class LdapTest < ActiveSupport::TestCase
ldap = Ldap.new
net_ldap = Minitest::Mock.new
ldap.stub(:ldap, net_ldap) do
net_ldap.expect(:bind_as, 42, [Hash])
net_ldap.expect(:bind_as, 42, [], filter: String, password: String)
authentic = ldap.authenticate("test@example.com", "secret")
assert_equal authentic, 42
net_ldap.verify
Expand Down

0 comments on commit 9ab0791

Please sign in to comment.