summaryrefslogtreecommitdiff
path: root/spec/mspec/spec
diff options
context:
space:
mode:
authorBenoit Daloze <eregontp@gmail.com>2019-11-30 21:26:49 +0100
committerBenoit Daloze <eregontp@gmail.com>2019-11-30 21:26:49 +0100
commitab8345271eb87ff155d8bd5f22f53a4cf2902c26 (patch)
treea775c04b2f78d0e5ee566251f4cfbbaaf1051328 /spec/mspec/spec
parent93a512414cbe3713f478038f6d4f5fe81c4eb62a (diff)
Update to ruby/mspec@a401f63
Diffstat (limited to 'spec/mspec/spec')
-rw-r--r--spec/mspec/spec/integration/run_spec.rb8
-rw-r--r--spec/mspec/spec/runner/formatters/multi_spec.rb4
2 files changed, 10 insertions, 2 deletions
diff --git a/spec/mspec/spec/integration/run_spec.rb b/spec/mspec/spec/integration/run_spec.rb
index 6703e83150..df10f77094 100644
--- a/spec/mspec/spec/integration/run_spec.rb
+++ b/spec/mspec/spec/integration/run_spec.rb
@@ -37,8 +37,14 @@ EOS
ret.success?.should == false
end
- it "runs the specs in parallel with -j" do
+ it "runs the specs in parallel with -j using the dotted formatter" do
out, ret = run_mspec("run", "-j #{fixtures}/a_spec.rb #{fixtures}/b_spec.rb")
+ out.should == "RUBY_DESCRIPTION\n...\n#{a_spec_output}\n#{ab_stats}"
+ ret.success?.should == false
+ end
+
+ it "runs the specs in parallel with -j -fa" do
+ out, ret = run_mspec("run", "-j -fa #{fixtures}/a_spec.rb #{fixtures}/b_spec.rb")
progress_bar =
"\r[/ | 0% | 00:00:00] \e[0;32m 0F \e[0;32m 0E\e[0m " +
"\r[- | ==================50% | 00:00:00] \e[0;32m 0F \e[0;32m 0E\e[0m " +
diff --git a/spec/mspec/spec/runner/formatters/multi_spec.rb b/spec/mspec/spec/runner/formatters/multi_spec.rb
index 72bf629f71..d0ed8edc93 100644
--- a/spec/mspec/spec/runner/formatters/multi_spec.rb
+++ b/spec/mspec/spec/runner/formatters/multi_spec.rb
@@ -1,6 +1,8 @@
require File.dirname(__FILE__) + '/../../spec_helper'
+require 'mspec/runner/formatters/dotted'
require 'mspec/runner/formatters/multi'
require 'mspec/runner/example'
+require 'yaml'
describe MultiFormatter, "#aggregate_results" do
before :each do
@@ -14,7 +16,7 @@ describe MultiFormatter, "#aggregate_results" do
@hash = { "files"=>1, "examples"=>1, "expectations"=>2, "failures"=>0, "errors"=>0 }
YAML.stub(:load).and_return(@hash)
- @formatter = MultiFormatter.new
+ @formatter = DottedFormatter.new.extend(MultiFormatter)
@formatter.timer.stub(:format).and_return("Finished in 42 seconds")
end