marty 9.3.0 → 9.3.2

data/spec/features/scripting_spec.rb

@@ -28,7 +28,7 @@ feature 'under Applications menu, Scripting workflows', js: true, speed: :slow d
   end
 
   def with_user(uname, &block)
-    u = Marty::User.find_by_login(uname)
+    u = Marty::User.find_by(login: uname)
     begin
       old_u, Mcfly.whodunnit = Mcfly.whodunnit, u
       block.call(u)
@@ -48,7 +48,7 @@ feature 'under Applications menu, Scripting workflows', js: true, speed: :slow d
                              'A3' => "#3\n",
                              'A4' => "#4\n",
                              'A5' => "#5\n",
-                           }, Date.today)
+                           }, Time.zone.today)
 
       # create 3 additional tags and modify A5 in the process
       (1..3).each do |i|
@@ -57,7 +57,7 @@ feature 'under Applications menu, Scripting workflows', js: true, speed: :slow d
         Marty::Script.
           load_script_bodies({
                                'A5' => body + "##{i}\n"
-                             }, Date.today + i.minute)
+                             }, Time.zone.today + i.minute)
       end
     end
   end

data/spec/features/scripting_test_spec.rb

@@ -20,7 +20,7 @@ feature 'under Applications menu, Scripting (debug) workflows', js: true do
   end
 
   def with_user(uname, &block)
-    u = Marty::User.find_by_login(uname)
+    u = Marty::User.find_by(login: uname)
     begin
       old_u, Mcfly.whodunnit = Mcfly.whodunnit, u
       block.call(u)
@@ -50,7 +50,7 @@ DELOREAN
         load_script_bodies({
                              'M1' => sample_script,
                              'M2' => sample_script.gsub(/a/, 'aa').gsub(/b/, 'bb'),
-                           }, Date.today)
+                           }, Time.zone.today)
 
       # add a DEV version of M1.
       s = Marty::Script.find_by(obsoleted_dt: 'infinity', name: 'M1')
@@ -78,7 +78,7 @@ DELOREAN
       Marty::Script.
         load_script_bodies({
                              'M3' => sample_script2,
-                           }, Date.today + 2.minute)
+                           }, Time.zone.today + 2.minutes)
     end
   end
 

data/spec/features/user_list_report_spec.rb

@@ -12,7 +12,7 @@ feature 'User List report', js: true do
   end
 
   def with_user(uname)
-    u = Marty::User.find_by_login(uname)
+    u = Marty::User.find_by(login: uname)
     begin
       old_u, Mcfly.whodunnit = Mcfly.whodunnit, u
       yield(u)

data/spec/fixtures/misc/data_grid_6.txt

@@ -0,0 +1,9 @@
+lenient boolean
+ltv_ratio_percent	numrange	v	
+loan_amortization_period_count	int4range	v	
+fn_ineligible	boolean	v	
+
+<60			false
+	<=300		false
+		true	false
+		false	false

data/spec/fixtures/misc/data_grid_7.txt

@@ -0,0 +1,7 @@
+Marty::DataGrid
+gridname	string	v	
+
+DataGrid2	DataGrid2
+DataGrid3	DataGrid3
+DataGrid4	DataGrid4
+DataGrid5	DataGrid5

data/spec/fixtures/misc/data_grid_8.txt

@@ -0,0 +1,10 @@
+integer
+mortgage_type	string	v	
+loan_amortization_period_count	int4range	v	
+
+FHA|USDA/Rural Housing|VA	>=96<=180	180
+FHA|USDA/Rural Housing|VA	>180<=360	360
+Conventional	>=96<=120	120
+Conventional	>120<=180	180
+Conventional	>180<=240	240
+Conventional	>240<=360	360

data/spec/fixtures/misc/data_grid_9.txt

@@ -0,0 +1,10 @@
+string
+mortgage_type	string	v	
+loan_amortization_period_count	int4range	v	
+
+FHA|USDA/Rural Housing|VA	>=96<=180	"180"
+FHA|USDA/Rural Housing|VA	>180<=360	"360"
+Conventional	>=96<=120	"120"
+Conventional	>120<=180	"180"
+Conventional	>180<=240	"240"
+Conventional	>240<=360	"360"

data/spec/lib/data_blame_spec.rb

@@ -16,7 +16,7 @@ describe 'Blame Report', slow: true do
     time5 = Time.zone.parse '2019-01-27 05:14:50 -0800'
 
     posting = Marty::Posting.do_create('BASE', time3 - 2.hours, 'base posting')
-    @pt = Marty::Posting.find_by_name(posting.name).created_dt
+    @pt = Marty::Posting.find_by(name: posting.name).created_dt
 
     bc = Gemini::BudCategory.create(name: 'Conv Fixed 30', created_dt: time1)
     bc2 = Gemini::BudCategory.create(name: 'Govt Fixed 30', created_dt: time1)

data/spec/lib/data_importer_spec.rb

@@ -129,7 +129,7 @@ describe DataImporter do
     Gemini::FannieBup.count.should == 6
 
     # spot-check the import
-    bc = Gemini::BudCategory.find_by_name('Conv Fixed 30')
+    bc = Gemini::BudCategory.find_by(name: 'Conv Fixed 30')
     fb = Gemini::FannieBup.where(bud_category_id: bc.id, note_rate: 2.50).first
     fb.buy_up.should == 4.41300
     fb.buy_down.should == 7.22800
@@ -418,7 +418,7 @@ describe DataImporter do
   end
 
   it 'should be able to export' do
-    Marty::Script.load_scripts(nil, Date.today)
+    Marty::Script.load_scripts(nil, Time.zone.today)
     Marty::ScriptSet.clear_cache
     Marty::DataImporter.do_import_summary(Gemini::BudCategory, bud_cats)
     Marty::DataImporter.do_import_summary(Gemini::FannieBup, fannie_bup1)
@@ -441,7 +441,7 @@ describe 'Blame Report without yml translations' do
                                       note_rate: nil
                                     }
                                    )
-    Marty::Script.load_scripts(nil, Date.today)
+    Marty::Script.load_scripts(nil, Time.zone.today)
     Marty::ScriptSet.clear_cache
     p = Marty::Posting.do_create('BASE', DateTime.yesterday, 'yesterday')
     Marty::DataImporter.do_import_summary(Gemini::BudCategory, bud_cats)
@@ -468,7 +468,7 @@ describe 'Blame Report with yml translations' do
   before(:each) do
     I18n.backend.store_translations(:en, attributes: { note_rate: 'Note Rate' })
 
-    Marty::Script.load_scripts(nil, Date.today)
+    Marty::Script.load_scripts(nil, Time.zone.today)
     Marty::ScriptSet.clear_cache
     p = Marty::Posting.do_create('BASE', DateTime.yesterday, 'yesterday')
     Marty::DataImporter.do_import_summary(Gemini::BudCategory, bud_cats)

data/spec/lib/delorean_query_spec.rb

@@ -88,7 +88,7 @@ describe 'DeloreanQuery' do
     Marty::Script.load_script_bodies(
       {
         'A' => script,
-      }, Date.today)
+      }, Time.zone.today)
 
     @engine = Marty::ScriptSet.new.get_engine('A')
   end

data/spec/lib/logger_spec.rb

@@ -74,7 +74,7 @@ module Marty
       # means we lose the globally set user
       Mcfly.whodunnit = system_user
 
-      Marty::Script.load_script_bodies(promise_bodies, Date.today)
+      Marty::Script.load_script_bodies(promise_bodies, Time.zone.today)
       start_delayed_job
     end
 

data/spec/lib/mcfly_model_spec.rb

@@ -76,7 +76,7 @@ describe 'McflyModel' do
     @clean_file = "/tmp/clean_#{Process.pid}.psql"
     save_clean_db(@clean_file)
     marty_whodunnit
-    dt = Date.today
+    dt = Time.zone.today
     Marty::DataImporter.do_import_summary(Gemini::Entity, entities)
     Marty::DataImporter.do_import_summary(Gemini::BudCategory, bud_cats)
     Marty::DataImporter.do_import_summary(Gemini::FannieBup, fannie_bup)
@@ -93,7 +93,7 @@ describe 'McflyModel' do
       Marty::Script.load_script_bodies(
         {
           name => (errscript % fn),
-        }, Date.today)
+        }, Time.zone.today)
     end
 
     Marty::Script.load_script_bodies({ 'E5' => (errscript2 % 'a_func_p') }, dt)

data/spec/lib/table_report_spec.rb

@@ -27,7 +27,7 @@ describe 'Blame Report', slow: true do
     time5 = Time.zone.parse '2019-01-27 05:14:50 -0800'
 
     posting = Marty::Posting.do_create('BASE', time5 - 2.hours, 'base posting')
-    @pt_name = Marty::Posting.find_by_name(posting.name).name
+    @pt_name = Marty::Posting.find_by(name: posting.name).name
 
     bc = Gemini::BudCategory.create(name: 'Conv Fixed 30', created_dt: time1)
     bc2 = Gemini::BudCategory.create(name: 'Govt Fixed 30', created_dt: time1)

data/spec/models/api_auth_spec.rb

@@ -6,7 +6,7 @@ module Marty
       Marty::Script.load_script_bodies({
                            'Script1' => "A:\n    a = 1\n",
                            'NewScript1' => "B:\n    b = 0\n",
-                         }, Date.today)
+      }, Time.zone.today)
 
       @api = ApiAuth.new
       @api.app_name = 'TestApp'
@@ -70,7 +70,7 @@ module Marty
         s.name = 'TestScript'
         s.body = '-- Test3'
         # Creates a script in the future - no tag exists
-        s.created_dt = Time.now + 1.minute
+        s.created_dt = Time.zone.now + 1.minute
         s.save!
 
         api = ApiAuth.new

data/spec/models/data_grid_spec.rb

@@ -608,7 +608,7 @@ EOS
       end
 
       it 'should handle DataGrid typed data grids -- non mcfly' do
-        ca = Gemini::State.find_by_name('CA')
+        ca = Gemini::State.find_by(name: 'CA')
 
         res = lookup_grid_helper('infinity', 'Gb', 'property_state' => ca)
         expect(res).to eq [70, 'Gb']
@@ -620,7 +620,7 @@ EOS
 
       it 'should handle typed (enum) data lookup_grid' do
         pt = 'infinity'
-        ca = Gemini::State.find_by_name('CA')
+        ca = Gemini::State.find_by(name: 'CA')
 
         res = Marty::DataGrid.
                 lookup_grid_h(pt, 'Gb', { 'property_state' => ca }, false)
@@ -884,7 +884,7 @@ EOS
       end
 
       it 'should be able to externally export/import grids' do
-        load_scripts(nil, Date.today)
+        load_scripts(nil, Time.zone.today)
 
         dg = dg_from_import('G1', G1)
 

data/spec/models/posting_spec.rb

@@ -44,19 +44,19 @@ module Marty
           before do
             PostingType.create(name: 'SNAPSHOT')
             PostingType.create(name: 'OTHER')
-            Posting.do_create('BASE',     0.day.from_now, 'base posting')
+            Posting.do_create('BASE',     0.days.from_now, 'base posting')
             Posting.do_create('SNAPSHOT', 1.day.from_now, 'snapshot1 posting')
-            Posting.do_create('SNAPSHOT', 2.day.from_now, 'snapshot2 posting')
-            Posting.do_create('OTHER', 3.day.from_now, 'other1 posting')
-            Posting.do_create('SNAPSHOT', 4.day.from_now, 'snapshot3 posting')
-            Posting.do_create('OTHER', 5.day.from_now, 'other2 posting')
+            Posting.do_create('SNAPSHOT', 2.days.from_now, 'snapshot2 posting')
+            Posting.do_create('OTHER', 3.days.from_now, 'other1 posting')
+            Posting.do_create('SNAPSHOT', 4.days.from_now, 'snapshot3 posting')
+            Posting.do_create('OTHER', 5.days.from_now, 'other2 posting')
           end
 
           it 'filters on a single posting type' do
             # First param is just the limit (max) to return
             res = Posting.get_latest_by_type(10, ['BASE'])
             expect(res.count).to eq 1
-            r0 = Posting.find_by_name(res[0]['name'])
+            r0 = Posting.find_by(name: res[0]['name'])
             expect(r0.comment).to eq 'base posting'
           end
 
@@ -64,8 +64,8 @@ module Marty
             res = Posting.get_latest_by_type(10, ['BASE', 'SNAPSHOT'])
             expect(res.count).to eq 4
             # snapshot3 is most recent with this filter
-            r0 = Posting.find_by_name(res[0]['name'])
-            r3 = Posting.find_by_name(res[3]['name'])
+            r0 = Posting.find_by(name: res[0]['name'])
+            r3 = Posting.find_by(name: res[3]['name'])
             expect(r0.comment).to eq 'snapshot3 posting'
             expect(r3.comment).to eq 'base posting'
           end
@@ -74,8 +74,8 @@ module Marty
             res = Posting.get_latest_by_type(10, ['SNAPSHOT', 'OTHER'])
             expect(res.count).to eq 5
             # other2 is most recent with this filter
-            r0 = Posting.find_by_name(res[0]['name'])
-            r4 = Posting.find_by_name(res[4]['name'])
+            r0 = Posting.find_by(name: res[0]['name'])
+            r4 = Posting.find_by(name: res[4]['name'])
             expect(r0.comment).to eq 'other2 posting'
             expect(r4.comment).to eq 'snapshot1 posting'
           end
@@ -84,8 +84,8 @@ module Marty
             res = Posting.get_latest_by_type(3, ['SNAPSHOT', 'OTHER'])
             expect(res.count).to eq 3
             # other2 is most recent with this filter
-            r0 = Posting.find_by_name(res[0]['name'])
-            r2 = Posting.find_by_name(res[2]['name'])
+            r0 = Posting.find_by(name: res[0]['name'])
+            r2 = Posting.find_by(name: res[2]['name'])
             expect(r0.comment).to eq 'other2 posting'
             expect(r2.comment).to eq 'other1 posting'
           end

data/spec/models/promise_spec.rb

@@ -12,7 +12,7 @@ describe Marty::Promise, slow: true, retry: 3 do
     # means we lose the globally set user
     Mcfly.whodunnit = system_user
 
-    Marty::Script.load_script_bodies(promise_bodies, Date.today)
+    Marty::Script.load_script_bodies(promise_bodies, Time.zone.today)
 
     start_delayed_job
   end

data/spec/models/rule_spec.rb

@@ -437,7 +437,7 @@ module Marty::RuleSpec
           to receive(:evaluate).and_raise('hi mom')
         expect do
           simple.compute(@ruleopts_myrule,
-                         'pt' => Time.now)
+                         'pt' => Time.zone.now)
         end        .to raise_error(/hi mom/)
         # simple2a should return results without evaluation (they are all fixed)
         expect(simple2a.compute(@ruleopts_myrule, 'pt' => Time.zone.now)).to eq(

data/spec/models/script_spec.rb

@@ -175,7 +175,7 @@ describe Marty::Script do
       it 'gets the files from the default paths' do
         allow(Dir).to receive(:glob).and_return([])
         Marty::Script.get_script_filenames
-        expect(Dir).to have_received(:glob).with("#{Rails.root}/delorean/**/*.dl")
+        expect(Dir).to have_received(:glob).with(Rails.root.join('delorean/**/*.dl').to_s)
         expect(Dir).to have_received(:glob).
           with(File.expand_path('../../../delorean/**/*.dl', __FILE__))
         expect(Dir).to have_received(:glob).twice

data/spec/other/diagnostic/delayed_job_version_spec.rb

@@ -11,7 +11,7 @@ describe Marty::Diagnostic::DelayedJobVersion do
   end
 
   before(:each) do
-    Marty::Script.load_scripts(nil, Date.today)
+    Marty::Script.load_scripts(nil, Time.zone.today)
     allow(described_class).to receive(:scope).and_return(nil)
   end
 

data/spec/spec_helper.rb

@@ -1,6 +1,9 @@
 ENV['RAILS_ENV'] ||= 'test'
 ENV['TZ'] ||= 'America/Los_Angeles'
 
+require_relative 'support/simplecov_helper'
+SimpleCovHelper.start!
+
 require 'dummy/config/application'
 require 'rspec/rails'
 require 'database_cleaner'

data/spec/support/netzke.rb

@@ -101,14 +101,14 @@ module Marty; module RSpec; module Netzke
 
   def wait_for_element(seconds_to_wait = 2.0, sleeptime = 0.1)
     res = nil
-    start_time = current_time = Time.now
+    start_time = current_time = Time.zone.now
     while !res && current_time - start_time < seconds_to_wait
       begin
         res = yield
       rescue StandardError
       ensure
         sleep sleeptime
-        current_time = Time.now
+        current_time = Time.zone.now
       end
     end
     res

data/spec/support/setup.rb

@@ -1,6 +1,6 @@
 module Marty; module RSpec; module Setup
   def marty_whodunnit
-    Mcfly.whodunnit = Marty::User.find_by_login('marty')
+    Mcfly.whodunnit = Marty::User.find_by(login: 'marty')
   end
 
   def load_scripts(path, dt)

data/spec/support/simplecov_helper.rb

@@ -0,0 +1,94 @@
+# Credit to: https://gitlab.com/gitlab-org/gitlab-foss/blob/master/spec/simplecov_env.rb
+
+require 'simplecov'
+require 'active_support/core_ext/numeric/time'
+
+module SimpleCovHelper
+  def self.merge_all_results!
+    resultset_files = Pathname.glob(
+      File.join(SimpleCov.coverage_path, '**', '.resultset.json')
+    )
+
+    result_array = begin
+                    resultset_files.map do |result_file|
+                      SimpleCov::Result.from_hash JSON.parse(result_file.read)
+                    end
+                   rescue StandardError => e
+                     {}
+                   end
+
+    merged = SimpleCov::ResultMerger.merge_results(*result_array)
+    merged.format!
+
+    # Print out to console all the groups and their percents + hits/line.
+    groups = merged.groups.map do |group, files|
+      [group, files.covered_percent, files.covered_strength]
+    end
+    sorted_groups = groups.sort_by { |_gr, per, _str| -per }
+    sorted_groups.each do |group|
+      gr_name, percent, strength = group
+      puts "Group '#{gr_name}': #{percent} covered at #{strength} hits/line"
+    end
+  end
+
+  def self.configure_job
+    # This should only be run as part of an RSpec pipeline
+    return unless defined?(RSpec)
+
+    SimpleCov.configure do
+      if ENV['GITLAB_CI']
+        job_name = ENV['CI_JOB_NAME'] || nil
+        coverage_dir "coverage/#{job_name}"
+        command_name job_name
+        SimpleCov.at_exit { SimpleCov.result }
+      else
+        command_options = RSpec::Core::ConfigurationOptions.new(ARGV)
+        rspec_directories = command_options.options[:files_or_directories_to_run]
+        case rspec_directories.length
+        when 1
+          category = Dir.exist?(rspec_directories[0]) ? rspec_directories[0] : nil
+          coverage_dir "coverage/#{category}"
+          command_name category
+        else
+          coverage_dir 'coverage/'
+        end
+      end
+    end
+  end
+
+  def self.configure_profile
+    SimpleCov.configure do
+      load_profile 'test_frameworks'
+      load_profile 'root_filter'
+      load_profile 'bundler_filter'
+      track_files '{app,lib,config}/**/*.rb'
+      track_files 'db/seeds.rb'
+
+      add_filter '/vendor/ruby/'
+      add_filter 'spec/'
+
+      add_group 'Libraries',         'lib'
+      add_group 'Assets',            'app/assets'
+      add_group 'Channels',          'app/channels'
+      add_group 'Netzke Components', 'app/components'
+      add_group 'Controllers',       'app/controllers'
+      add_group 'Helpers',           'app/helpers'
+      add_group 'Jobs',              'app/jobs'
+      add_group 'Models',            'app/models'
+      add_group 'Services',          'app/services'
+      add_group 'Views',             'app/views'
+
+      use_merging true
+      merge_timeout 365.days
+    end
+  end
+
+  def self.start!
+    return unless ENV['COVERAGE'] == 'true'
+
+    configure_profile
+    configure_job
+
+    SimpleCov.start
+  end
+end