fix more rspec issues

rapid7 · Mar 22, 2018 · 497c581 · 497c581
1 parent f272257
commit 497c581
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/lib/mdm/host/operating_system_normalization.rb b/lib/mdm/host/operating_system_normalization.rb
@@ -493,7 +493,8 @@ def guess_purpose_from_match(match)
         i.each_char do |j|
           begin
             pstr << j.downcase.encode("UTF-8")
-          rescue Encoding::UndefinedConversionError => e
+          rescue Encoding::UndefinedConversionError
+          # rescue Encoding::UndefinedConversionError => e
             # this works in Framework, but causes a Travis CI error
             # elog("Found incompatible (non-ANSI) character in guess_purpose_from_match")
           end

diff --git a/spec/dummy/config/environments/test.rb b/spec/dummy/config/environments/test.rb
@@ -13,7 +13,7 @@
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  config.serve_static_files = true
   config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -14,10 +14,10 @@
 #   # don't generate local report as it is inaccessible on travis-ci, which is why coveralls is being used.
 #   SimpleCov.formatter = Coveralls::SimpleCov::Formatter
 # else
-  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
       # either generate the local report
       SimpleCov::Formatter::HTMLFormatter
-  ]
+  ])
 # end
 
 require File.expand_path('../dummy/config/environment.rb',  __FILE__)