diff options
| author | tyler-ball <tyleraball@gmail.com> | 2014-12-08 08:36:09 -0800 |
|---|---|---|
| committer | tyler-ball <tyleraball@gmail.com> | 2014-12-09 08:32:09 -0800 |
| commit | 009070c41489ff0876c3989970a967ac318d84f6 (patch) | |
| tree | 822a72c9fd1c84ecad00352394bbbc10e7a4b2d3 | |
| parent | c6e5654a18f236dd75bb59472e80887c27310d99 (diff) | |
| download | chef-tball/update-serverspec.tar.gz | |
Updating serverspec to pull in PR I submittedtball/update-serverspec
| -rw-r--r-- | chef.gemspec | 4 | ||||
| -rw-r--r-- | lib/chef/audit/audit_event_proxy.rb | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/chef.gemspec b/chef.gemspec index eb7528e630..43fb3d16fe 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -37,8 +37,8 @@ Gem::Specification.new do |s| %w(rspec-core rspec-expectations rspec-mocks).each { |gem| s.add_dependency gem, "~> 3.1" } s.add_dependency "rspec_junit_formatter", "~> 0.2.0" - s.add_dependency "serverspec", "~> 2.3" - s.add_dependency "specinfra", "~> 2.4" + s.add_dependency "serverspec", "~> 2.7" + s.add_dependency "specinfra", "~> 2.10" s.add_development_dependency "rack" diff --git a/lib/chef/audit/audit_event_proxy.rb b/lib/chef/audit/audit_event_proxy.rb index 36160db9bb..1e40258113 100644 --- a/lib/chef/audit/audit_event_proxy.rb +++ b/lib/chef/audit/audit_event_proxy.rb @@ -43,8 +43,7 @@ class Chef described_class = example.metadata[:described_class] if described_class resource_type = described_class.class.name.split(':')[-1] - # TODO https://github.com/serverspec/serverspec/pull/493 - resource_name = described_class.instance_variable_get(:@name) + resource_name = described_class.name end # The following code builds up the context - the list of wrapping `describe` or `control` blocks |