Enabling pending feature

rspec · Sep 8, 2009 · f4fe5f5 · f4fe5f5
1 parent 36f9fab
commit f4fe5f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...hers/define_matcher_outside_rspec.feature → ...hers/define_matcher_outside_rspec.feature b/...hers/define_matcher_outside_rspec.feature → ...hers/define_matcher_outside_rspec.feature
@@ -9,7 +9,7 @@ Feature: define matcher outside rspec
       """
       $:.unshift File.join(File.dirname(__FILE__), "/../../lib")
       require 'test/unit'
-      require 'spec/expectations'
+      require 'rspec/expectations'
       
       Rspec::Matchers.define :be_a_multiple_of do |expected|
         match do |actual|
@@ -18,7 +18,7 @@ Feature: define matcher outside rspec
       end
       
       class Test::Unit::TestCase
-        include Spec::Matchers
+        include Rspec::Matchers
       end
       
       class TestMultiples < Test::Unit::TestCase

diff --git a/lib/rspec/core/configuration.rb b/lib/rspec/core/configuration.rb
@@ -116,7 +116,7 @@ def formatter_class
 
       def formatter=(formatter_to_use)
         formatter_class = case formatter_to_use.to_s
-        when /doc/
+        when /doc/, 's'
           Rspec::Core::Formatters::DocumentationFormatter
         when 'progress' 
           Rspec::Core::Formatters::ProgressFormatter