diff options
| author | Thom May <thom@chef.io> | 2016-07-20 15:22:27 +0100 |
|---|---|---|
| committer | Thom May <thom@chef.io> | 2016-07-20 15:22:27 +0100 |
| commit | f20ac282e1eef2ca1b9838bf8c908ab0f79fae81 (patch) | |
| tree | 4b862670289271db55ce69fe3ef6514553f48a31 | |
| parent | 162d988d3bcfce2773ef2831fa33e416f53731f6 (diff) | |
| download | chef-f20ac282e1eef2ca1b9838bf8c908ab0f79fae81.tar.gz | |
Update to rspec 3.5tm/new_world_rspec
Signed-off-by: Thom May <thom@chef.io>
| -rw-r--r-- | Gemfile.lock | 34 | ||||
| -rw-r--r-- | chef.gemspec | 2 | ||||
| -rw-r--r-- | lib/chef/audit/runner.rb | 2 |
3 files changed, 19 insertions, 19 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index b6ad024bca..e314bc9ef9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -37,9 +37,9 @@ PATH ohai (>= 8.6.0.alpha.1, < 9) plist (~> 3.2) proxifier (~> 1.0) - rspec-core (~> 3.4.0) - rspec-expectations (~> 3.4.0) - rspec-mocks (~> 3.4.0) + rspec-core (~> 3.5) + rspec-expectations (~> 3.5) + rspec-mocks (~> 3.5) rspec_junit_formatter (~> 0.2.0) serverspec (~> 2.7) specinfra (~> 2.10) @@ -66,9 +66,9 @@ PATH ohai (>= 8.6.0.alpha.1, < 9) plist (~> 3.2) proxifier (~> 1.0) - rspec-core (~> 3.4.0) - rspec-expectations (~> 3.4.0) - rspec-mocks (~> 3.4.0) + rspec-core (~> 3.5) + rspec-expectations (~> 3.5) + rspec-mocks (~> 3.5) rspec_junit_formatter (~> 0.2.0) serverspec (~> 2.7) specinfra (~> 2.10) @@ -305,22 +305,22 @@ GEM rake (11.2.2) rb-readline (0.5.3) retryable (2.0.3) - rspec (3.4.0) - rspec-core (~> 3.4.0) - rspec-expectations (~> 3.4.0) - rspec-mocks (~> 3.4.0) - rspec-core (3.4.4) - rspec-support (~> 3.4.0) - rspec-expectations (3.4.0) + rspec (3.5.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-core (3.5.1) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) + rspec-support (~> 3.5.0) rspec-its (1.2.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.4.1) + rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-support (3.4.1) + rspec-support (~> 3.5.0) + rspec-support (3.5.0) rspec_junit_formatter (0.2.3) builder (< 4) rspec-core (>= 2, < 4, != 2.12.0) diff --git a/chef.gemspec b/chef.gemspec index ce42b4af63..12c0aa5e3e 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -38,7 +38,7 @@ Gem::Specification.new do |s| s.add_dependency "iniparse", "~> 1.4" # Audit mode requires these, so they are non-developmental dependencies now - %w{rspec-core rspec-expectations rspec-mocks}.each { |gem| s.add_dependency gem, "~> 3.4.0" } + %w{rspec-core rspec-expectations rspec-mocks}.each { |gem| s.add_dependency gem, "~> 3.5" } s.add_dependency "rspec_junit_formatter", "~> 0.2.0" s.add_dependency "serverspec", "~> 2.7" s.add_dependency "specinfra", "~> 2.10" diff --git a/lib/chef/audit/runner.rb b/lib/chef/audit/runner.rb index 100a72d2e1..837346381c 100644 --- a/lib/chef/audit/runner.rb +++ b/lib/chef/audit/runner.rb @@ -165,7 +165,7 @@ class Chef add_example_group_methods run_context.audits.each do |name, group| ctl_grp = RSpec::Core::ExampleGroup.__control_group__(*group.args, &group.block) - RSpec.world.register(ctl_grp) + RSpec.world.record(ctl_grp) end end |