minor refactor

Author: tycooon

.gitignore

@@ -26,6 +26,7 @@ tmp
 ## PROJECT::SPECIFIC
 
 .yardoc
+.ruby-version
 spec/fixtures/coverage
 spec/fixtures/frameworks/coverage
 test_projects/**/coverage

lib/simplecov/combine/files_combiner.rb

@@ -14,13 +14,16 @@ module FilesCombiner
       #
       # @return [Hash]
       #
-      def combine(coverage_a, coverage_b)
+      def combine(cov_a, cov_b)
         combination = {}
-        combination[:lines] = Combine.combine(LinesCombiner, coverage_a[:lines], coverage_b[:lines])
+        combination[:lines] = Combine.combine(LinesCombiner, cov_a[:lines], cov_b[:lines])
 
-        if SimpleCov.branch_coverage?
-          combination[:branches] = Combine.combine(BranchesCombiner, coverage_a[:branches], coverage_b[:branches])
-          combination[:methods] = Combine.combine(MethodsCombiner, coverage_a[:methods], coverage_b[:methods])
+        if SimpleCov.branch_coverage? # rubocop:disable Style/IfUnlessModifier
+          combination[:branches] = Combine.combine(BranchesCombiner, cov_a[:branches], cov_b[:branches])
+        end
+
+        if SimpleCov.method_coverage? # rubocop:disable Style/IfUnlessModifier
+          combination[:methods] = Combine.combine(MethodsCombiner, cov_a[:methods], cov_b[:methods])
         end
 
         combination

lib/simplecov/configuration.rb

@@ -409,8 +409,7 @@ def method_coverage?
     end
 
     def coverage_start_arguments_supported?
-      # safe to cache as within one process this value should never
-      # change
+      # safe to cache as within one process this value should never change
       return @coverage_start_arguments_supported if defined?(@coverage_start_arguments_supported)
 
       @coverage_start_arguments_supported = begin
@@ -426,19 +425,16 @@ def coverage_start_arguments_supported?
 
     def raise_if_criterion_disabled(criterion)
       raise_if_criterion_unsupported(criterion)
-      # rubocop:disable Style/IfUnlessModifier
-      unless coverage_criterion_enabled?(criterion)
+
+      unless coverage_criterion_enabled?(criterion) # rubocop:disable Style/IfUnlessModifier
         raise "Coverage criterion #{criterion} is disabled! Please enable it first through enable_coverage #{criterion} (if supported)"
       end
-      # rubocop:enable Style/IfUnlessModifier
     end
 
     def raise_if_criterion_unsupported(criterion)
-      # rubocop:disable Style/IfUnlessModifier
-      unless SUPPORTED_COVERAGE_CRITERIA.member?(criterion)
+      unless SUPPORTED_COVERAGE_CRITERIA.member?(criterion) # rubocop:disable Style/IfUnlessModifier
         raise "Unsupported coverage criterion #{criterion}, supported values are #{SUPPORTED_COVERAGE_CRITERIA}"
       end
-      # rubocop:enable Style/IfUnlessModifier
     end
 
     def minimum_possible_coverage_exceeded(coverage_option)

spec/combine/results_combiner_spec.rb

@@ -49,6 +49,7 @@
 
     before do
       SimpleCov.enable_coverage :branch
+      SimpleCov.enable_coverage :method
     end
 
     context "a merge" do