Bump database

Also made some tweaks to the test to try and make it a little easier to
figure out what changed. It's still a little tricky but hopefully more
helpful now.

Author: maxjacobson

DATABASE_VERSION

@@ -1 +1 @@
-Mon Aug 14 10:13:11 EDT 2017
+Tue Jan 30 11:08:21 EST 2018

spec/cc/engine/bundler_audit/analyzer_spec.rb

@@ -24,9 +24,7 @@ module CC::Engine::BundlerAudit
 
           issues = analyze_directory(directory, engine_config_path: path)
 
-          expected_issues("unpatched_versions").each do |expected_issue|
-            expect(issues).to include(expected_issue)
-          end
+          expect(expected_issues("unpatched_versions")).to be_present_in(issues)
         end
       end
 
@@ -36,9 +34,7 @@ module CC::Engine::BundlerAudit
 
           issues = analyze_directory(directory, engine_config_path: path)
 
-          expected_issues("insecure_sources").each do |expected_issue|
-            expect(issues).to include(expected_issue)
-          end
+          expect(expected_issues("insecure_sources")).to be_present_in(issues)
         end
       end
 
@@ -48,9 +44,7 @@ module CC::Engine::BundlerAudit
 
           issues = analyze_directory(directory, engine_config_path: path)
 
-          expected_issues("alphanumeric_versions").each do |expected_issue|
-            expect(issues).to include(expected_issue)
-          end
+          expect(expected_issues("alphanumeric_versions")).to be_present_in(issues)
         end
       end
 

spec/fixtures/unpatched_versions/issues.json

@@ -278,7 +278,7 @@
         ],
         "check_name": "Insecure Dependency",
         "content": {
-            "body": "**Advisory**: CVE-2015-7578\n\n**URL**: https://groups.google.com/forum/#!topic/rubyonrails-security/uh--W4TDwmI\n\n**Solution**: upgrade to ~> 1.0.3"
+            "body": "**Advisory**: CVE-2015-7578\n\n**URL**: https://groups.google.com/forum/#!topic/rubyonrails-security/uh--W4TDwmI\n\n**Solution**: upgrade to >= 1.0.3"
         },
         "description": "Possible XSS vulnerability in rails-html-sanitizer",
         "fingerprint": "b344012bca53e8faaafbf0f943776ea0",
@@ -299,7 +299,7 @@
         ],
         "check_name": "Insecure Dependency",
         "content": {
-            "body": "**Advisory**: CVE-2015-7580\n\n**URL**: https://groups.google.com/forum/#!topic/rubyonrails-security/uh--W4TDwmI\n\n**Solution**: upgrade to ~> 1.0.3"
+            "body": "**Advisory**: CVE-2015-7580\n\n**URL**: https://groups.google.com/forum/#!topic/rubyonrails-security/uh--W4TDwmI\n\n**Solution**: upgrade to >= 1.0.3"
         },
         "description": "Possible XSS vulnerability in rails-html-sanitizer",
         "fingerprint": "10818805098b10f2fe6e181f0961445c",
@@ -341,7 +341,7 @@
     ],
     "check_name": "Insecure Dependency",
     "content": {
-      "body": "**Advisory**: CVE-2016-4658\n\n**URL**: https://github.com/sparklemotion/nokogiri/issues/1615\n\n**Solution**: upgrade to >= 1.7.1"
+      "body": "**Advisory**: CVE-2016-4658\n\n**Criticality**: High\n\n**URL**: https://github.com/sparklemotion/nokogiri/issues/1615\n\n**Solution**: upgrade to >= 1.7.1"
     },
     "description": "Nokogiri gem contains several vulnerabilities in libxml2 and libxslt",
     "location": {
@@ -352,7 +352,7 @@
       }
     },
     "remediation_points": 5000000,
-    "severity": "normal",
+    "severity": "critical",
     "type": "Issue",
     "fingerprint": "7cb910edbbeae3af56dcd8e4b7546bca"
   },

spec/spec_helper.rb

@@ -4,3 +4,5 @@
 require "pry"
 
 require "cc/engine/bundler_audit"
+
+require "support/be_present_in_helper"

spec/support/be_present_in_helper.rb

@@ -0,0 +1,27 @@
+module BePresentInHelper
+  def find_missing(expected_set, actual_set)
+    expected_set.select { |expected_set_member| !actual_set.include?(expected_set_member) }
+  end
+
+  def find_extra(expected_set, actual_set)
+    actual_set.select { |actual_set_member| !expected_set.include?(actual_set_member) }
+  end
+
+  RSpec::Matchers.define :be_present_in do |actual_set|
+    match do |expected_set|
+      find_missing(expected_set, actual_set).none?
+    end
+
+    failure_message do |expected_set|
+      missing = find_missing(expected_set, actual_set).map { |issue| issue["description"] }
+      extra = find_extra(expected_set, actual_set)
+      extra_description = extra.map { |issue| issue["description"] }
+
+      "Expected these issues to be present, but they weren't: \n#{missing.join("\n")}.\n\nFurther, these issues were present, but not expected (which is OK, but you could expect them if you want to): \n#{extra_description.join("\n")}\n\nFull JSON for the extra ones, in case you want to copy them into the expectation: \n#{JSON.pretty_generate(extra)}"
+    end
+  end
+end
+
+RSpec.configure do |conf|
+  conf.include(BePresentInHelper)
+end