Merge pull request #12 from martinandert/fix-from_filename-not-forwar…

…ding-type-arg Fix #from_filename not forwarding type arg
highb · Aug 23, 2017 · 60a4c02 · 60a4c02
2 parents 949fed7 + 9aeaefc
commit 60a4c02
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/pathspec.rb b/lib/pathspec.rb
@@ -75,7 +75,7 @@ def drive_letter_to_path(path)
 
   # Generate specs from a filename, such as a .gitignore
   def self.from_filename(filename, type=:git)
-    self.from_lines(File.open(filename, 'r'))
+    self.from_lines(File.open(filename, 'r'), type)
   end
 
   def self.from_lines(lines, type=:git)

diff --git a/spec/unit/pathspec_spec.rb b/spec/unit/pathspec_spec.rb
@@ -307,6 +307,15 @@
       expect(subject.match('anna')).to be false
       expect(subject.match('abba')).to be true
     end
+
+    context "#from_filename" do
+      it "forwards the type argument" do
+        expect(File).to receive(:open).and_return(anything)
+        expect(PathSpec).to receive(:from_lines).with(anything, :regex)
+
+        PathSpec.from_filename "/some/file", :regex
+      end
+    end
   end
 
   context "unsuppored spec type" do