diff options
| -rw-r--r-- | common.mk | 12 | ||||
| -rw-r--r-- | spec/lib/formatter_overrides.rb | 6 |
2 files changed, 12 insertions, 6 deletions
@@ -1469,8 +1469,8 @@ SYNTAX_SUGGEST_SPECS = PREPARE_SYNTAX_SUGGEST = test-syntax-suggest-prepare test-syntax-suggest: $(TEST_RUNNABLE)-test-syntax-suggest yes-test-syntax-suggest: yes-$(PREPARE_SYNTAX_SUGGEST) - $(XRUBY) -C $(srcdir) -Ispec/syntax_suggest .bundle/bin/rspec \ - --require spec_helper $(RSPECOPTS) spec/syntax_suggest/$(SYNTAX_SUGGEST_SPECS) + $(XRUBY) -C $(srcdir) -Ispec/syntax_suggest:spec/lib .bundle/bin/rspec \ + --require spec_helper --require formatter_overrides $(RSPECOPTS) spec/syntax_suggest/$(SYNTAX_SUGGEST_SPECS) no-test-syntax-suggest: check: $(DOT_WAIT) $(TEST_RUNNABLE)-$(PREPARE_SYNTAX_SUGGEST) test-syntax-suggest @@ -1498,8 +1498,8 @@ yes-test-bundler: $(PREPARE_BUNDLER) $(gnumake_recursive)$(XRUBY) \ -r./$(arch)-fake \ -e "exec(*ARGV)" -- \ - $(XRUBY) -C $(srcdir) -Ispec/bundler .bundle/bin/rspec \ - --require spec_helper $(RSPECOPTS) spec/bundler/$(BUNDLER_SPECS) + $(XRUBY) -C $(srcdir) -Ispec/bundler:spec/lib .bundle/bin/rspec \ + --require spec_helper --require formatter_overrides $(RSPECOPTS) spec/bundler/$(BUNDLER_SPECS) no-test-bundler: PARALLELRSPECOPTS = --runtime-log $(srcdir)/tmp/parallel_runtime_rspec.log @@ -1512,9 +1512,9 @@ yes-test-bundler-parallel: $(PREPARE_BUNDLER) $(XRUBY) -I$(srcdir)/spec/bundler \ -e "ENV['PARALLEL_TESTS_EXECUTABLE'] = ARGV.shift" \ -e "load ARGV.shift" \ - "$(XRUBY) -C $(srcdir) -Ispec/bundler .bundle/bin/rspec" \ + "$(XRUBY) -C $(srcdir) -Ispec/bundler:spec/lib .bundle/bin/rspec" \ $(srcdir)/.bundle/bin/parallel_rspec \ - -o "--require spec_helper" \ + -o "--require spec_helper --require formatter_overrides" \ $(PARALLELRSPECOPTS) $(srcdir)/spec/bundler/$(BUNDLER_SPECS) no-test-bundler-parallel: diff --git a/spec/lib/formatter_overrides.rb b/spec/lib/formatter_overrides.rb new file mode 100644 index 0000000000..4a61d425d1 --- /dev/null +++ b/spec/lib/formatter_overrides.rb @@ -0,0 +1,6 @@ +module FormatterOverrides + def example_pending(_); end + def dump_pending(_); end +end + +RSpec::Core::Formatters::ProgressFormatter.prepend FormatterOverrides |