diff options
| author | Seth Thomas <cheeseplus@chef.io> | 2018-08-07 14:43:10 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-07 14:43:10 -0600 |
| commit | 6f5c30a682570e4cc93b223596f21fbb08ca381c (patch) | |
| tree | d71b72160f74fd81421e91b8cb5248b0f043f862 | |
| parent | 96a945264d738f92e579fa2d4e094eddaf3a0d29 (diff) | |
| parent | 1ec19b715ea4ac1eec3be4c474569a56084e3e49 (diff) | |
| download | chef-6f5c30a682570e4cc93b223596f21fbb08ca381c.tar.gz | |
Merge pull request #7528 from chef/pin_rspec_13
Pin to rspec to < 3.8
| -rw-r--r-- | Gemfile.lock | 40 | ||||
| -rw-r--r-- | chef.gemspec | 2 |
2 files changed, 21 insertions, 21 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 25deab8459..e207f9521d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -31,9 +31,9 @@ PATH ohai (~> 13.0) plist (~> 3.2) proxifier (~> 1.0) - rspec-core (~> 3.5) - rspec-expectations (~> 3.5) - rspec-mocks (~> 3.5) + rspec-core (~> 3.5, < 3.8) + rspec-expectations (~> 3.5, < 3.8) + rspec-mocks (~> 3.5, < 3.8) rspec_junit_formatter (~> 0.2.0) serverspec (~> 2.7) specinfra (~> 2.10) @@ -62,9 +62,9 @@ PATH ohai (~> 13.0) plist (~> 3.2) proxifier (~> 1.0) - rspec-core (~> 3.5) - rspec-expectations (~> 3.5) - rspec-mocks (~> 3.5) + rspec-core (~> 3.5, < 3.8) + rspec-expectations (~> 3.5, < 3.8) + rspec-mocks (~> 3.5, < 3.8) rspec_junit_formatter (~> 0.2.0) serverspec (~> 2.7) specinfra (~> 2.10) @@ -257,22 +257,22 @@ GEM rake rake (12.3.1) rb-readline (0.5.5) - rspec (3.8.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.1) + rspec (3.7.0) + rspec-core (~> 3.7.0) + rspec-expectations (~> 3.7.0) + rspec-mocks (~> 3.7.0) + rspec-core (3.7.1) + rspec-support (~> 3.7.0) + rspec-expectations (3.7.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) + rspec-support (~> 3.7.0) rspec-its (1.2.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.8.0) + rspec-mocks (3.7.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-support (~> 3.7.0) + rspec-support (3.7.1) rspec_junit_formatter (0.2.3) builder (< 4) rspec-core (>= 2, < 4, != 2.12.0) @@ -284,7 +284,7 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-prof (0.17.0) - ruby-progressbar (1.9.0) + ruby-progressbar (1.10.0) ruby-shadow (2.5.0) rubyntlm (0.6.2) rubyzip (1.2.1) @@ -370,13 +370,13 @@ GEM logging (>= 1.6.1, < 3.0) nori (~> 2.0) rubyntlm (~> 0.6.0, >= 0.6.1) - winrm-fs (1.2.0) + winrm-fs (1.2.1) erubis (~> 2.7) logging (>= 1.6.1, < 3.0) rubyzip (~> 1.1) winrm (~> 2.0) wmi-lite (1.0.0) - yard (0.9.14) + yard (0.9.15) PLATFORMS ruby diff --git a/chef.gemspec b/chef.gemspec index a4c9244490..250660e5fb 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -40,7 +40,7 @@ Gem::Specification.new do |s| s.add_dependency "iso8601", "~> 0.9.1" # 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.5" } + %w{rspec-core rspec-expectations rspec-mocks}.each { |gem| s.add_dependency gem, "~> 3.5", "< 3.8" } s.add_dependency "rspec_junit_formatter", "~> 0.2.0" s.add_dependency "serverspec", "~> 2.7" s.add_dependency "specinfra", "~> 2.10" |