Merge commit 'cc444401c3c5934c44c063cef661dbbe917cd947'

enebo · Jul 15, 2015 · eb82919 · eb82919
2 parents 2894472 + cc44440
commit eb82919
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/spec/mspec/lib/mspec/utils/script.rb b/spec/mspec/lib/mspec/utils/script.rb
@@ -110,15 +110,7 @@ def custom_options(options)
   # Registers all filters and actions.
   def register
     if config[:formatter].nil?
-      # For some unidentified reason, running specs under MRI 2.0
-      # with the SpinnerFormatter adds a lot of errors.
-      buggy_spinner_formatter = RUBY_NAME == "ruby" && RUBY_VERSION < "2.1"
-
-      if STDOUT.tty? and !buggy_spinner_formatter
-        config[:formatter] = SpinnerFormatter
-      else
-        config[:formatter] = @files.size < 50 ? DottedFormatter : FileFormatter
-      end
+      config[:formatter] = STDOUT.tty? ? SpinnerFormatter : @files.size < 50 ? DottedFormatter : FileFormatter
     end
 
     if config[:formatter]