marty 2.3.15 → 2.4.0

data/other/marty/diagnostic/environment_variables.rb

@@ -13,7 +13,7 @@ module Marty::Diagnostic; class EnvironmentVariables < Base
       'SECRET_KEY_BASE']
 
     to_block = (Marty::Config['DIAG_ENV_BLOCK_IF_INCL'] || []).map(&:upcase) + [
-      'PASSWORD', 'DEBUG']
+      'ACCESS', 'SECRET', 'PASSWORD', 'DEBUG']
 
     to_delete.each{|k| env.delete(k)}
 

data/spec/controllers/job_controller_spec.rb

@@ -15,7 +15,7 @@ describe Marty::JobController, slow: true do
 
     # Needed here because shutting transactional fixtures off
     # means we lose the globally set uesr
-    Mcfly.whodunnit = system_user
+    Mcfly.whodunnit = UserHelpers.system_user
 
     Marty::Script.load_script_bodies(promise_bodies, Date.today)
 

data/spec/dummy/app/components/gemini/xyz_rule_view.rb

@@ -3,6 +3,7 @@ class Gemini::XyzRuleView < Marty::DeloreanRuleView
                         read: :admin,
                         update: :admin,
                         delete: :admin
+
   def self.klass
     Gemini::XyzRule
   end

data/spec/dummy/config/application.rb

@@ -74,6 +74,7 @@ module Dummy
     config.marty.system_account = 'marty'
     config.marty.local_password = 'marty'
     require 'class_list'
+
     config.marty.roles = [
                           :admin,
                           :dev,

data/spec/features/enum_spec.rb

@@ -14,27 +14,6 @@ feature 'test netzke + pg_enum compatibility', js: true do
   end
 
   it 'shows netzke grid combobox works w pg_enums' do
-
-    lp_grid = netzke_find('loan_program_view')
-    @amort_combo = netzke_find('amortization_type__name', 'combobox')
-    @mortgage_combo = netzke_find('mortgage_type__name', 'combobox')
-    @streamline_combo = netzke_find('streamline_type__name', 'combobox')
-    @state_combo = netzke_find('enum_state', 'combobox')
-
-    def setup_enum_form(stateVal)
-      @amort_combo.click
-      @amort_combo.select_values('Fixed')
-
-      @mortgage_combo.click
-      @mortgage_combo.select_values('FHA')
-
-      @streamline_combo.click
-      @streamline_combo.select_values('DURP')
-
-      @state_combo.click
-      @state_combo.select_values(stateVal)
-    end
-
     log_in_as('dev1')
 
     by 'navigating to loan program screen' do
@@ -42,6 +21,11 @@ feature 'test netzke + pg_enum compatibility', js: true do
       press('Loan Programs')
     end
 
+    lp_grid = netzke_find('loan_program_view')
+    amort_combo = netzke_find('amortization_type__name', 'combobox')
+    mortgage_combo = netzke_find('mortgage_type__name', 'combobox')
+    streamline_combo = netzke_find('streamline_type__name', 'combobox')
+    state_combo = netzke_find('enum_state', 'combobox')
 
     and_by 'bring up new window' do
       press('Add')
@@ -51,14 +35,14 @@ feature 'test netzke + pg_enum compatibility', js: true do
       within(:gridpanel, 'add_window', match: :first) do
         fill_in("Name", with: 'a_l_p')
 
-        @amort_combo.click
-        @amort_combo.select_values('Fixed')
+        amort_combo.click
+        amort_combo.select_values('Fixed')
 
-        @mortgage_combo.click
-        @mortgage_combo.select_values('FHA')
+        mortgage_combo.click
+        mortgage_combo.select_values('FHA')
 
-        @streamline_combo.click
-        @streamline_combo.select_values('DURP')
+        streamline_combo.click
+        streamline_combo.select_values('DURP')
 
         press('OK')
       end
@@ -74,7 +58,18 @@ feature 'test netzke + pg_enum compatibility', js: true do
     and_by 'fill form w enum value & duplicated name (error), then fix' do
       within(:gridpanel, 'add_window', match: :first) do
         fill_in("Name", with: 'a_l_p')
-        setup_enum_form("CA")
+        amort_combo.click
+        amort_combo.select_values('Fixed')
+
+        mortgage_combo.click
+        mortgage_combo.select_values('FHA')
+
+        streamline_combo.click
+        streamline_combo.select_values('DURP')
+
+        state_combo.click
+        state_combo.select_values('CA')
+
         press('OK')
 
         expect(find(:msg)).to have_content 'Name - record must be unique'
@@ -105,7 +100,18 @@ feature 'test netzke + pg_enum compatibility', js: true do
     and_by 'fill form w --- for enum value' do
       within(:gridpanel, 'add_window', match: :first) do
         fill_in("Name", with: 'a_l_p')
-        setup_enum_form("---")
+        amort_combo.click
+        amort_combo.select_values('Fixed')
+
+        mortgage_combo.click
+        mortgage_combo.select_values('FHA')
+
+        streamline_combo.click
+        streamline_combo.select_values('DURP')
+
+        state_combo.click
+        state_combo.select_values('---')
+
         press('OK')
       end
 
@@ -115,76 +121,5 @@ feature 'test netzke + pg_enum compatibility', js: true do
         expect(lp_grid.get_row_vals(1)).to netzke_include({enum_state: nil})
       end
     end
-
-    and_by 'delete leftover rows' do
-      lp_grid.select_row(1)
-      press('Delete')
-      press('Yes')
-      wait_for_ajax
-      lp_grid.select_row(1)
-      press('Delete')
-      press('Yes')
-      wait_for_ajax
-      expect(lp_grid.row_count).to eq(0)
-    end
-
-    and_by "bring up new window" do
-      press("Add")
-    end
-
-    and_by "fill form with state_enum DC" do
-      within(:gridpanel, "add_window", match: :first) do
-        fill_in("Name", with: "DC Row")
-        setup_enum_form("DC")
-        press("OK")
-      end
-    end
-
-    and_by "bring up new window" do
-      press("Add")
-    end
-
-    and_by "fill form with state_enum AS" do
-      within(:gridpanel, "add_window", match: :first) do
-        fill_in("Name", with: "AS Row")
-        setup_enum_form("AS")
-        press("OK")
-      end
-    end
-
-    and_by "bring up new window" do
-      press("Add")
-    end
-
-    and_by "fill form with state_enum WA" do
-      within(:gridpanel, "add_window", match: :first) do
-        fill_in("Name", with: "WA Row")
-        setup_enum_form("WA")
-        press("OK")
-      end
-    end
-
-    and_by "bring up new window" do
-      press("Add")
-    end
-
-    and_by "fill form with state_enum AZ" do
-      within(:gridpanel, "add_window", match: :first) do
-        fill_in("Name", with: "AZ Row")
-        setup_enum_form("AZ")
-        press("OK")
-      end
-    end
-
-    and_by "filter form by state_enum ASCENDING" do
-      press("Enum state")
-      expect(lp_grid.get_col_vals(:enum_state)).to eq(["AS","AZ","DC","WA"])
-    end
-
-    and_by "filter form by state_enum DESCENDING" do
-      press("Enum state")
-      expect(lp_grid.get_col_vals(:enum_state)).to eq(["WA","DC","AZ","AS"])
-    end
-
   end
 end

data/spec/features/log_view_spec.rb

@@ -45,7 +45,7 @@ feature 'logger view', js: true, capybara: true do
     press('System')
     show_submenu('Log Maintenance')
     press('View Log')
-    wait_for_ajax
+    wait_for_ready
 
     exp_types = ["fatal", "error", "info", "debug", "warn"]
     exp_messages = ["fatal message", "error message",
@@ -72,11 +72,11 @@ feature 'logger view', js: true, capybara: true do
       wait_for_ajax
       cnt = logview.row_count()
       expect(cnt).to eq(exp_count)
-      types = logview.get_col_vals('message_type', cnt, 0)
-      messages = logview.get_col_vals('message', cnt, 0)
-      details = logview.get_col_vals('details', cnt, 0).
+      types = logview.col_values('message_type', cnt, 0)
+      messages = logview.col_values('message', cnt, 0)
+      details = logview.col_values('details', cnt, 0).
                   map { |d| CGI.unescapeHTML(d) }
-      ts = logview.get_col_vals('timestamp_custom', cnt, 0)
+      ts = logview.col_values('timestamp_custom', cnt, 0)
       expect(ts).to eq(@ts.slice(0,exp_count))
       expect(types).to eq(exp_types.slice(0,exp_count))
       expect(messages).to eq(exp_messages.slice(0,exp_count))

data/spec/features/rule_spec.rb

@@ -200,7 +200,7 @@ feature 'rule view', js: true do
     exp = "Computed - Error in rule 'abc' field 'computed_guards': Syntax error on line 1"
     expect(page).to have_content(exp)
     sleep 2  # sleep needed for message to clear, otherwise failing tests could
-    # pass due to prior messages
+             # pass due to prior messages
 
     # lhs is not identifier - BaseRuleView#simple_to_has will raise
     fill_in(:computed_guards, with: '0sadf = 123j')
@@ -307,7 +307,7 @@ computed_value = if paramb
                  then param1 / (grid1_grid_result||1)
                  else (grid2_grid_result||1) / param1
 EOL
-    names = mrv.get_col_vals(:name, 9, 0)
+    names = mrv.col_values(:name, 9, 0)
     idx = names.index{|n|n=='Rule3'}+1
     mrv.select_row(idx)
     press("Edit")
@@ -326,9 +326,9 @@ EOL
     go_to_xyz_rules
     xrv = netzke_find("xyz_rule_view")
     expect(page).to have_content("Rule type")
-    expect(xrv.get_col_vals(:name, 5, 0)).to eq(["ZRule1", "ZRule2",
-                                                 "ZRule3", "ZRule4",
-                                                 "ZRule5"])
+    expect(xrv.col_values(:name, 5, 0)).to eq(["ZRule1", "ZRule2",
+                                                    "ZRule3", "ZRule4",
+                                                    "ZRule5"])
     xrv.select_row(1)
     press("Edit")
     fill_in("Range Guard 1", with: "[100,200)")
@@ -359,37 +359,37 @@ EOL
             "bv"=>"base_value"}}
 
     expect(r.first.as_json).to include(exp)
-    expect(xrv.get_col_vals(:g_string, 8, 0)).to eq(["aaa", "bbb", "ccc", "ddd",
-                                                     "eee", "eee", "eee", "eee"])
+    expect(xrv.col_values(:g_string, 8, 0)).to eq(["aaa", "bbb", "ccc", "ddd",
+                                                   "eee", "eee", "eee", "eee"])
     click_column(xrv, "String list Guard")
-    expect(xrv.get_col_vals(:g_string, 8, 0)).to eq(["eee", "eee", "eee", "eee",
-                                                     "ddd", "ccc", "bbb", "aaa"])
+    expect(xrv.col_values(:g_string, 8, 0)).to eq(["eee", "eee", "eee", "eee",
+                                                   "ddd", "ccc", "bbb", "aaa"])
     column_filter(xrv, "String list Guard", "eee")
     rc = xrv.row_count
-    expect(xrv.get_col_vals(:g_string,rc,0)).to eq(["eee", "eee", "eee", "eee"])
+    expect(xrv.col_values(:g_string,rc,0)).to eq(["eee", "eee", "eee", "eee"])
     column_filter_toggle(xrv, "String list Guard")
     rc = xrv.row_count
-    expect(xrv.get_col_vals(:g_string,rc,0)).to eq(["eee", "eee", "eee", "eee",
-                                                    "ddd", "ccc", "bbb", "aaa"])
+    expect(xrv.col_values(:g_string,rc,0)).to eq(["eee", "eee", "eee", "eee",
+                                                  "ddd", "ccc", "bbb", "aaa"])
     column_filter(xrv, "Grids", "Grid1")
     rc = xrv.row_count
-    # netzke reports jsonb as string
-    expect(xrv.get_col_vals(:grids,rc,0)).to eq([%Q({"grid1":"DataGrid1"}),
-                                                 %Q({"grid1":"DataGrid1"})])
+                                         # netzke reports jsonb as string
+    expect(xrv.col_values(:grids,rc,0)).to eq([%Q({"grid1":"DataGrid1"}),
+                                               %Q({"grid1":"DataGrid1"})])
     column_filter_toggle(xrv, "Grids")
     rc = xrv.row_count
-    expect(xrv.get_col_vals(:grids,rc,0)).to eq([%Q({"grid1":"DataGrid3"}),
-                                                 %Q({"grid1":"DataGrid3"}),
-                                                 %Q({"grid1":"DataGrid3"}),
-                                                 %Q({"grid1":"DataGrid3"}),
-                                                 %Q({"grid1":"DataGrid3"}),
-                                                 %Q({"grid1":"DataGrid2"}),
-                                                 %Q({"grid1":"DataGrid1"}),
-                                                 %Q({"grid1":"DataGrid1"})])
+    expect(xrv.col_values(:grids,rc,0)).to eq([%Q({"grid1":"DataGrid3"}),
+                                               %Q({"grid1":"DataGrid3"}),
+                                               %Q({"grid1":"DataGrid3"}),
+                                               %Q({"grid1":"DataGrid3"}),
+                                               %Q({"grid1":"DataGrid3"}),
+                                               %Q({"grid1":"DataGrid2"}),
+                                               %Q({"grid1":"DataGrid1"}),
+                                               %Q({"grid1":"DataGrid1"})])
     press("Applications")
     press("Data Grids")
     dgv = netzke_find("data_grid_view")
-    cvs = dgv.get_col_vals(:name, 4, 0)
+    cvs = dgv.col_values(:name, 4, 0)
     ind1 = cvs.index("DataGrid1")+1
     ind4 = cvs.index("DataGrid4")+1
     dgv.select_row(ind1)
@@ -406,8 +406,8 @@ EOL
     go_to_xyz_rules
     wait_for_ajax
 
-    names = xrv.get_col_vals(:name, 5, 0)
-    gvs = xrv.get_col_vals(:grids, 5, 0)
+    names = xrv.col_values(:name, 5, 0)
+    gvs = xrv.col_values(:grids, 5, 0)
     g1h = {"grid1"=>"DataGrid1 new"}
     expect(JSON.parse(gvs[names.index("ZRule1")])).to eq(g1h)
     expect(JSON.parse(gvs[names.index("ZRule2")])).to eq(g1h)
@@ -415,14 +415,14 @@ EOL
     go_to_my_rules
     wait_for_ajax
 
-    names = mrv.get_col_vals(:name, 9, 0)
-    gvs = mrv.get_col_vals(:grids, 9, 0)
-    rvs = mrv.get_col_vals(:results, 9, 0)
+    names = mrv.col_values(:name, 9, 0)
+    gvs = mrv.col_values(:grids, 9, 0)
+    rvs = mrv.col_values(:results, 9, 0)
     expect(JSON.parse(gvs[names.index('abc')])).to eq(g1h)
     expect(JSON.parse(gvs[names.index('Rule2b')])).to eq(g1h +
                                                          {"grid2"=>"DataGrid2"})
     expect(JSON.parse(rvs[names.index('Rule5')])["other_grid"]).to eq(
-                                                                     '"DataGrid4 new"')
+                                                               '"DataGrid4 new"')
 
   end
 end

data/spec/features/user_view_spec.rb

@@ -33,8 +33,6 @@ feature 'under Sytem menu, User Management worflows', js: true do
 
   it 'marty user can add/edit but not delete users' do
     log_in_as('marty')
-    wait_for_ajax
-
     go_to_user_view
 
     user_view = netzke_find('user_view')

data/spec/lib/logger_spec.rb

@@ -68,7 +68,7 @@ module Marty
 
       # Needed here because shutting transactional fixtures off
       # means we lose the globally set user
-      Mcfly.whodunnit = system_user
+      Mcfly.whodunnit = UserHelpers.system_user
 
       Marty::Script.load_script_bodies(promise_bodies, Date.today)
       start_delayed_job

data/spec/models/api_auth_spec.rb

@@ -15,6 +15,10 @@ module Marty
       @api.reload
     end
 
+    def create_params script, key
+      {script: script, api_key: key}
+    end
+
     describe "validations" do
       it "should require app name, api key and script name" do
         api = ApiAuth.new
@@ -126,12 +130,15 @@ module Marty
     describe "authorization" do
       it "should pass when script is not secured" do
         # Script is not secured by any entries
-        expect(ApiAuth.authorized?('SomeScript','SomeKey')).to be_truthy
+        params = create_params('SomeScript','SomeKey')
+        expect(Marty::Api::Base.is_authorized?(params)).to be_truthy
       end
 
       it "should pass when script is secured and key is valid" do
         expect(@api.script_name).to include('Script1')
-        expect(ApiAuth.authorized?(@api.script_name,@api.api_key)).to be_truthy
+
+        params = create_params(@api.script_name, @api.api_key)
+        expect(Marty::Api::Base.is_authorized?(params)).to be_truthy
       end
 
       it "should pass when script is secured and key is valid 2" do
@@ -139,7 +146,9 @@ module Marty
         a.app_name = @api.app_name + 'x'
         a.script_name = 'NewScript1'
         a.save!
-        expect(ApiAuth.authorized?('NewScript1',a.api_key)).to be_truthy
+
+        params = create_params('NewScript1', a.api_key)
+        expect(Marty::Api::Base.is_authorized?(params)).to be_truthy
       end
 
       it "should match on exact script name" do
@@ -147,11 +156,14 @@ module Marty
         a.app_name = @api.app_name + 'x'
         a.script_name = 'NewScript1'
         a.save!
-        expect(ApiAuth.authorized?('Script1',a.api_key)).to be_falsey
+
+        params = create_params('Script1', a.api_key)
+        expect(Marty::Api::Base.is_authorized?(params)).to be_falsey
       end
 
       it "should fail when script is secured and key is invalid" do
-        expect(ApiAuth.authorized?('Script1','SomeKey')).to be_falsey
+        params = create_params('Script1', 'SomeKey')
+        expect(Marty::Api::Base.is_authorized?(params)).to be_falsey
       end
 
       it "should fail when script is secured and key is invalid (2)" do
@@ -159,18 +171,25 @@ module Marty
         a.app_name = @api.app_name + 'x'
         a.script_name = 'NewScript1'
         a.save!
-        expect(ApiAuth.authorized?('NewScript1',@api.api_key)).to be_falsey
+
+        params = create_params('NewScript1', @api.api_key)
+        expect(Marty::Api::Base.is_authorized?(params)).to be_falsey
       end
 
       it "should fail when script is secured and key is not specified" do
-        expect(ApiAuth.authorized?('Script1',nil)).to be_falsey
-        expect(ApiAuth.authorized?('Script1','')).to be_falsey
+        params = create_params('Script1', nil)
+        expect(Marty::Api::Base.is_authorized?(params)).to be_falsey
+
+        params = create_params('Script1', '')
+        expect(Marty::Api::Base.is_authorized?(params)).to be_falsey
       end
 
       it "should pass when api_auth is deleted and no other auths exist" do
-        expect(ApiAuth.authorized?(@api.script_name,@api.api_key)).to be_truthy
+        params = create_params(@api.script_name, @api.api_key)
+        expect(Marty::Api::Base.is_authorized?(params)).to be_truthy
         @api.delete
-        expect(ApiAuth.authorized?(@api.script_name,@api.api_key)).to be_truthy
+
+        expect(Marty::Api::Base.is_authorized?(params)).to be_truthy
       end
 
       it "should fail when api_auth is deleted and another auth exists" do
@@ -178,9 +197,11 @@ module Marty
         api.app_name += 'x'
         api.api_key = nil
         api.save!
-        expect(ApiAuth.authorized?(@api.script_name,@api.api_key)).to be_truthy
+
+        params = create_params(@api.script_name, @api.api_key)
+        expect(Marty::Api::Base.is_authorized?(params)).to be_truthy
         @api.delete
-        expect(ApiAuth.authorized?(@api.script_name,@api.api_key)).to be_falsey
+        expect(Marty::Api::Base.is_authorized?(params)).to be_falsey
       end
     end
   end