make room for both sets of tests

ABaldwinHunter · ABaldwinHunter · commit c01f5eefae89 · 2015-09-20T18:44:59.000-04:00
diff --git a/lib/cc/analyzer/engines_runner.rb b/lib/cc/analyzer/engines_runner.rb
@@ -80,7 +80,7 @@ def include_paths
       end
 
       def exclude_paths
-        @exclude_paths ||= PathPatterns.new(@config.exclude_paths || []).expanded + gitignore_paths
+        PathPatterns.new(@config.exclude_paths || []).expanded + gitignore_paths
       end
 
       def gitignore_paths
@@ -90,7 +90,6 @@ def gitignore_paths
           []
         end
       end
-
     end
   end
 end
diff --git a/spec/cc/analyzer/include_paths_builder_spec.rb b/spec/cc/analyzer/include_paths_builder_spec.rb
@@ -8,8 +8,9 @@ module CC::Analyzer
       within_temp_dir { test.call }
     end
 
-    let(:builder) { CC::Analyzer::IncludePathsBuilder.new(cc_excludes, []) }
+    let(:builder) { CC::Analyzer::IncludePathsBuilder.new(cc_excludes, cc_includes) }
     let(:cc_excludes) { [] }
+    let(:cc_includes) { [] }
     let(:result) { builder.build }
 
     before do
@@ -221,5 +222,26 @@ module CC::Analyzer
         result.include?("subdir/subdir/").must_equal(false)
       end
     end
+
+    describe "when cc_include_paths are passed in addition to excludes" do
+      let(:cc_excludes) { ["untrackable.rb"] }
+      let(:cc_includes) { ["untrackable.rb", "subdir"] }
+
+      before do
+        make_file("untrackable.rb")
+        make_file("trackable.rb")
+        make_file("subdir/subdir_trackable.rb")
+        make_file("subdir/foo.rb")
+        make_file("subdir/baz.rb")
+      end
+
+      it "includes requested paths" do
+        result.include?("subdir/").must_equal(true)
+      end
+
+      it "omits requested paths that are excluded by .codeclimate.yml" do
+        result.include?("untrackable.rb").must_equal(false)
+      end
+    end
   end
 end
