diff options
| author | Tim Smith <tsmith@chef.io> | 2020-10-29 13:47:11 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-29 13:47:11 -0700 |
| commit | ec36256856d79246dedf41c3ea984b6ff2552585 (patch) | |
| tree | 7f90e6957b65e861d7216d8b8f85c24ce17f61f4 | |
| parent | b4d9dce4ecb31aa935cbe20053b2d335d62032bf (diff) | |
| parent | 7630ec6786d270690374fbaac6afe6d0f6f0ad2b (diff) | |
| download | chef-ec36256856d79246dedf41c3ea984b6ff2552585.tar.gz | |
Merge pull request #10579 from chef/remove-rspec-junit-formatter
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | Gemfile | 5 | ||||
| -rw-r--r-- | Gemfile.lock | 8 | ||||
| -rw-r--r-- | chef-config/Gemfile | 4 | ||||
| -rw-r--r-- | omnibus/omnibus-test.ps1 | 6 | ||||
| -rw-r--r-- | omnibus/omnibus-test.sh | 2 |
5 files changed, 8 insertions, 17 deletions
@@ -54,10 +54,7 @@ end group(:development, :test) do gem "rake" - gem "rspec-core", "~> 3.5" - gem "rspec-mocks", "~> 3.5" - gem "rspec-expectations", "~> 3.5" - gem "rspec_junit_formatter", "~> 0.2.0" + gem "rspec" gem "webmock" gem "fauxhai-ng" # for chef-utils gem end diff --git a/Gemfile.lock b/Gemfile.lock index 90eea5a235..cf62041a0c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -313,9 +313,6 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-support (3.9.4) - rspec_junit_formatter (0.2.3) - builder (< 4) - rspec-core (>= 2, < 4, != 2.12.0) rubocop (0.93.1) parallel (~> 1.10) parser (>= 2.7.1.5) @@ -451,10 +448,7 @@ DEPENDENCIES pry-stack_explorer rake rb-readline - rspec-core (~> 3.5) - rspec-expectations (~> 3.5) - rspec-mocks (~> 3.5) - rspec_junit_formatter (~> 0.2.0) + rspec ruby-prof (< 1.3.0) ruby-shadow webmock diff --git a/chef-config/Gemfile b/chef-config/Gemfile index 7881fe6fd8..4498154338 100644 --- a/chef-config/Gemfile +++ b/chef-config/Gemfile @@ -6,5 +6,5 @@ gemspec group(:development, :test) do gem "rake" - gem "rspec", "~> 3.2" -end
\ No newline at end of file + gem "rspec" +end diff --git a/omnibus/omnibus-test.ps1 b/omnibus/omnibus-test.ps1 index b30409596a..aa23a6442a 100644 --- a/omnibus/omnibus-test.ps1 +++ b/omnibus/omnibus-test.ps1 @@ -114,13 +114,13 @@ $env:Path = $p # desktop heap exhaustion seems likely (https://docs.microsoft.com/en-us/archive/blogs/ntdebugging/desktop-heap-overview) $exit = 0 -bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f progress --profile -- ./spec/unit +bundle exec rspec -f progress --profile -- ./spec/unit If ($lastexitcode -ne 0) { $exit = 1 } -bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f progress --profile -- ./spec/functional +bundle exec rspec -f progress --profile -- ./spec/functional If ($lastexitcode -ne 0) { $exit = 1 } -bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f progress --profile -- ./spec/integration +bundle exec rspec -f progress --profile -- ./spec/integration If ($lastexitcode -ne 0) { $exit = 1 } Exit $exit diff --git a/omnibus/omnibus-test.sh b/omnibus/omnibus-test.sh index c0ec0e1575..2c1313681c 100644 --- a/omnibus/omnibus-test.sh +++ b/omnibus/omnibus-test.sh @@ -151,4 +151,4 @@ export CHEF_LICENSE=accept-no-persist cd "$chef_gem" sudo -E bundle install --jobs=3 --retry=3 -sudo -E bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml --profile -f progress +sudo -E bundle exec rspec --profile -f progress |