fix specs and cves

grosser · Apr 29, 2014 · 5e52c27 · 5e52c27
1 parent 8e60213
commit 5e52c27
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/bundler/organization_audit.rb b/lib/bundler/organization_audit.rb
@@ -37,7 +37,7 @@ def audit_repo(repo, options)
           if download_file(repo, "Gemfile.lock")
             command = "bundle-audit"
             if options[:ignore_cves] && options[:ignore_cves].any?
-              command << " --ignore #{options[:ignore_cves].map { |cve| cve.start_with?("CVE-") ? cve : "CVE-#{cve}"  }.join(" ")}"
+              command << " --ignore #{options[:ignore_cves].map { |cve| cve  }.join(" ")}"
             end
             vulnerable = !sh(command)
           else

diff --git a/spec/bundler/organization_audit_spec.rb b/spec/bundler/organization_audit_spec.rb
@@ -44,7 +44,7 @@
 
   context "CLI" do
     it "can audit a user" do
-      result = audit("--user anamartinez")
+      result = audit("--user anamartinez --ignore ruby-cldr-timezones --ignore enefele")
       result.should include "I18N-tools\nNo Gemfile.lock found" # did not use audit when not necessary
       result.should include "js-cldr-timezones\nbundle-audit\nNo unpatched versions found" # used audit where necessary
     end
@@ -66,7 +66,7 @@
     end
 
     it "ignores CVEs via --ignore-cve" do
-      result = audit("--user user-with-unpatched-apps --ignore-cve 2013-0269 2>/dev/null", :keep_output => true)
+      result = audit("--user user-with-unpatched-apps --ignore-cve OSVDB-90074 2>/dev/null", :keep_output => true)
       result.should == ""
     end