Merge pull request #276 from sferik/fix_regexp

Improve regexp that matches functional tests

Appraisals

@@ -5,4 +5,4 @@ end
 
 appraise "multi_json-legacy" do
   gem "multi_json", "~> 1.0.0"
-end
+end

lib/simplecov/command_guesser.rb

@@ -9,11 +9,11 @@ class << self
     # between rails unit/functional/integration tests impossible without this cached
     # item.
     attr_accessor :original_run_command
-    
+
     def guess
       from_env || from_command_line_options || from_defined_constants
     end
-    
+
     private
 
     def from_env
@@ -24,10 +24,10 @@ def from_env
         "(#{number}/#{ENV['PARALLEL_TEST_GROUPS']})"
       end
     end
-    
+
     def from_command_line_options
       case original_run_command
-        when /test\/functional\//, /test\/{.*?functional.*?}\//
+        when /test\/functional\//, /test\/\{.*functional.*\}\//
           "Functional Tests"
         when /test\/integration\//
           "Integration Tests"
@@ -41,7 +41,7 @@ def from_command_line_options
           nil
       end
     end
-  
+
     def from_defined_constants
       # If the command regexps fail, let's try checking defined constants.
       if defined?(RSpec)

lib/simplecov/version.rb

@@ -1,3 +1,3 @@
 module SimpleCov
   VERSION = "0.8.2"
-end
+end