jruby · Mar 24, 2015 · Mar 24, 2015
diff --git a/spec/mspec/.travis.yml b/spec/mspec/.travis.yml
@@ -1,8 +1,6 @@
 language: ruby
 script:
   - bundle exec rspec
-jdk:
-  - openjdk7
 rvm:
   - 1.8.7
   - 1.9.3

diff --git a/spec/mspec/Gemfile.lock b/spec/mspec/Gemfile.lock
@@ -8,14 +8,14 @@ GEM
   specs:
     diff-lcs (1.2.5)
     rake (10.4.2)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.2)
-    rspec-expectations (2.99.2)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.3)
+    rspec-mocks (2.14.6)
 
 PLATFORMS
   java
@@ -24,4 +24,4 @@ PLATFORMS
 DEPENDENCIES
   mspec!
   rake (~> 10.0)
-  rspec (~> 2.8)
+  rspec (~> 2.14.1)
diff --git a/spec/mspec/lib/mspec/runner/actions/tally.rb b/spec/mspec/lib/mspec/runner/actions/tally.rb
@@ -62,10 +62,9 @@ def tag
   end
 
   def format
-    results = [ file, example, expectation, failure, error ]
+    results = [ file, example, expectation, failure, error, tag ]
     if [:report, :report_on, :verify].any? { |m| MSpec.mode? m }
       results << guard
-      results << tag
     end
     results.join(", ")
   end

diff --git a/spec/mspec/mspec.gemspec b/spec/mspec/mspec.gemspec
@@ -27,14 +27,14 @@ MSpec attempts to use the simplest Ruby language features
 so that beginning Ruby implementations can run it.
                       EOS
   gem.has_rdoc                  = true
-  gem.extra_rdoc_files          = %w[ README LICENSE ]
+  gem.extra_rdoc_files          = %w[ README.md LICENSE ]
   gem.rubygems_version  = %q{1.3.5}
   gem.rubyforge_project         = 'http://rubyforge.org/projects/mspec'
 
   gem.rdoc_options  << '--title' << 'MSpec Gem' <<
-                    '--main' << 'README' <<
+                    '--main' << 'README.md' <<
                     '--line-numbers'
 
   gem.add_development_dependency "rake",   "~> 10.0"
-  gem.add_development_dependency "rspec",  "~> 2.8"
+  gem.add_development_dependency "rspec",  "~> 2.14.1"
 end
diff --git a/spec/mspec/spec/commands/mspec_spec.rb b/spec/mspec/spec/commands/mspec_spec.rb
@@ -143,7 +143,7 @@
 
 Finished in 42 seconds
 
-2 files, 2 examples, 4 expectations, 0 failures, 0 errors
+2 files, 2 examples, 4 expectations, 0 failures, 0 errors, 0 tagged
 ]
   end
 
@@ -174,7 +174,7 @@
 
 Finished in 42 seconds
 
-1 file, 1 example, 2 expectations, 0 failures, 0 errors
+1 file, 1 example, 2 expectations, 0 failures, 0 errors, 0 tagged
 ]
   end
 end

diff --git a/spec/mspec/spec/runner/actions/tally_spec.rb b/spec/mspec/spec/runner/actions/tally_spec.rb
@@ -180,7 +180,8 @@
     @tally.examples! 2
     @tally.expectations! 4
     @tally.errors!
-    @tally.format.should == "1 file, 2 examples, 4 expectations, 0 failures, 1 error"
+    @tally.tagged!
+    @tally.format.should == "1 file, 2 examples, 4 expectations, 0 failures, 1 error, 1 tagged"
   end
 
   it "includes guards if MSpec is in verify mode" do
@@ -189,9 +190,10 @@
     @tally.examples! 2
     @tally.expectations! 4
     @tally.errors!
+    @tally.tagged!
     @tally.guards!
     @tally.format.should ==
-      "1 file, 2 examples, 4 expectations, 0 failures, 1 error, 1 guard, 0 tagged"
+      "1 file, 2 examples, 4 expectations, 0 failures, 1 error, 1 tagged, 1 guard"
   end
 
   it "includes guards if MSpec is in report mode" do
@@ -200,9 +202,10 @@
     @tally.examples! 2
     @tally.expectations! 4
     @tally.errors!
+    @tally.tagged!
     @tally.guards! 2
     @tally.format.should ==
-      "1 file, 2 examples, 4 expectations, 0 failures, 1 error, 2 guards, 0 tagged"
+      "1 file, 2 examples, 4 expectations, 0 failures, 1 error, 1 tagged, 2 guards"
   end
 
   it "includes guards if MSpec is in report_on mode" do
@@ -213,7 +216,7 @@
     @tally.errors!
     @tally.guards! 2
     @tally.format.should ==
-      "1 file, 2 examples, 4 expectations, 0 failures, 1 error, 2 guards, 0 tagged"
+      "1 file, 2 examples, 4 expectations, 0 failures, 1 error, 0 tagged, 2 guards"
   end
 end
 
@@ -312,7 +315,7 @@
     @tally.expectation @state
     exc = ExceptionState.new nil, nil, SpecExpectationNotMetError.new("Failed!")
     @tally.exception exc
-    @tally.format.should == "1 file, 1 example, 2 expectations, 1 failure, 0 errors"
+    @tally.format.should == "1 file, 1 example, 2 expectations, 1 failure, 0 errors, 0 tagged"
   end
 end
 

diff --git a/spec/mspec/spec/runner/formatters/describe_spec.rb b/spec/mspec/spec/runner/formatters/describe_spec.rb
@@ -37,7 +37,7 @@
 
   it "prints a tally of counts" do
     @formatter.finish
-    @out.should =~ /^1 file, 1 example, 2 expectations, 0 failures, 0 errors$/
+    @out.should =~ /^1 file, 1 example, 2 expectations, 0 failures, 0 errors, 0 tagged$/
   end
 
   it "does not print exceptions" do
@@ -46,7 +46,7 @@
 
 Finished in 2.0 seconds
 
-1 file, 1 example, 2 expectations, 0 failures, 0 errors
+1 file, 1 example, 2 expectations, 0 failures, 0 errors, 0 tagged
 ]
   end
 
@@ -61,7 +61,7 @@
 
 Finished in 2.0 seconds
 
-1 file, 1 example, 2 expectations, 0 failures, 0 errors
+1 file, 1 example, 2 expectations, 0 failures, 0 errors, 0 tagged
 ]
   end
 end