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
4 changes: 0 additions & 4 deletions src/mod/guard.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,6 @@ def call(status)
result << { :name => 'bundler.locked', :reason => 'bundler.unlocked' }
end

if status[:bundler][:frozen]
result << { :name => 'bundler.frozen', :reason => 'bundler.frozen' }
end

if !status[:fs][:writable]
result << { :name => 'fs.writable', :reason => 'fs.readonly' }
end
Expand Down
48 changes: 29 additions & 19 deletions test/bin/test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -152,14 +152,6 @@
},
[{ fixture: 'frozen' }, { fixture: 'hot', env: 'BUNDLE_FROZEN=true' }] => {
[
{ engine: 'ruby', version: '1.8' },
{ engine: 'ruby', version: '1.9' },
{ engine: 'ruby', version: '2.0' },
{ engine: 'ruby', version: '2.1' },
{ engine: 'ruby', version: '2.2' },
{ engine: 'ruby', version: '2.3' },
{ engine: 'ruby', version: '2.4' },
{ engine: 'ruby', version: '2.5' },
{ engine: 'ruby', version: '2.6' },
{ engine: 'ruby', version: '2.7' },
{ engine: 'ruby', version: '3.0' },
Expand All @@ -168,17 +160,15 @@
{ engine: 'ruby', version: '3.3' },
{ engine: 'ruby', version: '3.4' },
{ engine: 'ruby', version: '3.5' },
{ engine: 'jruby', version: '9.2' },
{ engine: 'jruby', version: '9.3' },
{ engine: 'jruby', version: '9.4' },
{ engine: 'jruby', version: '10.0' },
] => [
'telemetry should include start',
'injection should abort',
'abort reason should include bundler.frozen',
'injection should proceed',
'injection should succeed',
'telemetry should include complete',
'abort reason should be empty',
'telemetry start should not include result report',
'telemetry conclusion should include result report',
'reported result type should be abort',
'reported result type should be success',
],
},
{ fixture: 'hot', env: 'BUNDLE_PATH=/bundle' } => {
Expand Down Expand Up @@ -313,6 +303,30 @@
'reported result type should be success',
],
},
{ fixture: 'frozen', inject: true, injector: 'datadog', packaged: true } => {
[
{ engine: 'ruby', version: '2.6' },
{ engine: 'ruby', version: '2.7' },
{ engine: 'ruby', version: '3.0' },
{ engine: 'ruby', version: '3.1' },
{ engine: 'ruby', version: '3.2' },
{ engine: 'ruby', version: '3.3' },
{ engine: 'ruby', version: '3.4' },
{ engine: 'ruby', version: '3.5' },
] => [
'telemetry should include complete',
'app gemfile should not include datadog',
'app lockfile should not include datadog',
'new gemfile should exist',
'new lockfile should exist',
'new gemfile should include datadog',
'new lockfile should include datadog',
'gem datadog should have require option',
'telemetry start should not include result report',
'telemetry conclusion should include result report',
'reported result type should be success',
],
},
{ fixture: 'hot', inject: true, injector: 'datadog', packaged: true } => {
[
{ engine: 'ruby', version: '2.6' },
Expand Down Expand Up @@ -444,10 +458,6 @@ def example(desc, &block)
context.telemetry.any? { |e| e['points'].any? { |p| p['name'] == 'library_entrypoint.abort' && p['tags'].include?('reason:bundler.deployment') } }
end

example 'abort reason should include bundler.frozen' do |context|
context.telemetry.any? { |e| e['points'].any? { |p| p['name'] == 'library_entrypoint.abort' && p['tags'].include?('reason:bundler.frozen') } }
end

example 'abort reason should include bundler.unbundled' do |context|
context.telemetry.any? { |e| e['points'].any? { |p| p['name'] == 'library_entrypoint.abort' && p['tags'].include?('reason:bundler.unbundled') } }
end
Expand Down