summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBundlerbot <bot@bundler.io>2019-09-24 14:59:55 +0000
committerBundlerbot <bot@bundler.io>2019-09-24 14:59:55 +0000
commit9b9e0156e2200c3e046a4964689d5c13053a1f73 (patch)
tree700bdbf8c752c19482b7fedb1e31f682ccb888b4
parent3260d5994ec33bfaf81162c61d0d20bfff023375 (diff)
parent789d18141660b4dabe692908bd6bcb588cc67379 (diff)
downloadbundler-9b9e0156e2200c3e046a4964689d5c13053a1f73.tar.gz
Merge #7360
7360: Consistenly use the default RSpec formatter r=hsbt a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was that our default RSpec formatter is `--documentation`, but we're overriding it almost everywhere to use `--progress`. ### What was your diagnosis of the problem? My diagnosis was that we should probably use the default formatter, since I think we all prefer it. ### What is your fix for the problem, implemented in this PR? My fix is to do that. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
-rw-r--r--.azure-pipelines/steps.yml2
-rw-r--r--.rspec1
-rw-r--r--.rspec_parallel1
-rw-r--r--Rakefile2
4 files changed, 2 insertions, 4 deletions
diff --git a/.azure-pipelines/steps.yml b/.azure-pipelines/steps.yml
index d23c52b584..1aedc8a4f8 100644
--- a/.azure-pipelines/steps.yml
+++ b/.azure-pipelines/steps.yml
@@ -28,7 +28,7 @@ steps:
displayName: 'gem install rspec_junit_formatter'
- script: |
- ruby -r rspec_junit_formatter bin/rspec --format progress --format RspecJunitFormatter -o rspec/bundler-junit-results.xml || exit 0
+ ruby -r rspec_junit_formatter bin/rspec --format RspecJunitFormatter -o rspec/bundler-junit-results.xml || exit 0
displayName: 'ruby bin/rspec'
- task: PublishTestResults@2
diff --git a/.rspec b/.rspec
index a4aa3ddbf0..f1e953553f 100644
--- a/.rspec
+++ b/.rspec
@@ -1,4 +1,3 @@
---format documentation
--color
--warnings
--require spec_helper
diff --git a/.rspec_parallel b/.rspec_parallel
index 6989221a44..8b7ea4229b 100644
--- a/.rspec_parallel
+++ b/.rspec_parallel
@@ -1,4 +1,3 @@
---format progress
--format ParallelTests::RSpec::RuntimeLogger --out tmp/parallel_runtime_rspec.log
--require spec_helper
--require support/parallel.rb
diff --git a/Rakefile b/Rakefile
index 901e813240..dbf8698200 100644
--- a/Rakefile
+++ b/Rakefile
@@ -21,7 +21,7 @@ end
desc "Run specs"
task :spec do
- sh("bin/rspec --format progress")
+ sh("bin/rspec")
end
namespace :spec do