Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ GEM
thor (~> 1)
threaded (~> 0)
java-properties (0.3.0)
json (2.19.7)
language_server-protocol (3.17.0.5)
json (2.20.0)
language_server-protocol (3.17.0.6)
lint_roller (1.1.0)
logger (1.7.0)
moneta (1.0.0)
Expand Down Expand Up @@ -52,7 +52,7 @@ GEM
rspec-retry (0.6.2)
rspec-core (> 3.3)
rspec-support (3.13.6)
rubocop (1.87.0)
rubocop (1.88.2)
json (~> 2.3)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0)
Expand All @@ -63,12 +63,13 @@ GEM
rubocop-ast (>= 1.49.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.49.1)
rubocop-ast (1.50.0)
parser (>= 3.3.7.2)
prism (~> 1.7)
rubocop-rspec (3.9.0)
rubocop-rspec (3.10.2)
lint_roller (~> 1.1)
rubocop (~> 1.81)
regexp_parser (>= 2.0)
rubocop (~> 1.86, >= 1.86.2)
ruby-progressbar (1.13.0)
thor (1.4.0)
threaded (0.0.4)
Expand Down
4 changes: 2 additions & 2 deletions test/spec/settings_xml_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,8 @@
end

app.deploy do
expect(clean_output(app.output)).not_to match(/remote: ! Warning: Using existing settings\.xml file\./)
expect(clean_output(app.output)).not_to match(/would normally be used as the settings\.xml configuration/)
expect(clean_output(app.output)).not_to include('remote: ! Warning: Using existing settings.xml file.')
expect(clean_output(app.output)).not_to include('would normally be used as the settings.xml configuration')
expect(clean_output(app.output)).to(
include("[BUILDPACK INTEGRATION TEST - SETTINGS TEST VALUE] #{existing_test_value}")
)
Expand Down