marty 2.3.14 → 2.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da67a7b3a76528a69a24aa349d488d0675a0d9b3de9733c3b67abd5bd04428f8
-  data.tar.gz: 915575d95227cd4c01a7d1b2b5ffb77b9846789a0d303462c8590a708aa0f83d
+  metadata.gz: a297a85d0d4cdfde6d667e399b64684900dba8e9b9faaffa355737c8c5c5678b
+  data.tar.gz: 46c85fe0f1c7de9d3fba4d55b216d3e7daa24cc6a9f76cf1d75befb15cdf5284
 SHA512:
-  metadata.gz: ecba775e4ad650d2ef22a0d79ae33d7743864e3ebef3ab7597513c122048441226db7a44f3b55f5a0aa606d626836561f118c9db5f49df1e44adb9013620e6ae
-  data.tar.gz: 13ce94510034f486dcff99496d7cba902b53f1ddc0d56ebcc99a2b639c5a040c084c2a45b3d83e2b187cc3ada48e9977c1fe92dbeccea003b5c46a13f847f7a4
+  metadata.gz: ac982f3abebddb0f92269d41eed6c100c297feac1a9726693abaeba7b93b3d0c281525f2df3ed7d94d43e67a12a95eb2782f65d8010ab94e4e4157b43bb5bbf6
+  data.tar.gz: f4816a56f8b3b61f72acb67faeffdd17f55010db418ab520f60f11c2058c123928c54e813c78e28c9b22a94b45620ea84568b091de90b41352735334da6658a7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    marty (2.3.13)
+    marty (2.3.15)
       aws-sigv4 (~> 1.0, >= 1.0.2)
       axlsx (= 3.0.0pre)
       coderay
@@ -106,7 +106,7 @@ GEM
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     io-like (0.3.0)
-    json-schema (2.8.0)
+    json-schema (2.8.1)
       addressable (>= 2.4)
     loofah (2.2.2)
       crass (~> 1.0.2)

data/app/models/marty/delorean_rule.rb

@@ -152,10 +152,9 @@ class Marty::DeloreanRule < Marty::BaseRule
         estack_full = resh.delete(:err_stack)
         estack = estack_full && {
           err_stack: estack_full.select{ |l| l.starts_with?('DELOREAN')}} || {}
+        detail = { input: params, dgparams: dgparams} + resh + estack
         Marty::Logger.info("Rule Log #{ruleh['name']}",
-                           { input: params,
-                             dgparams: dgparams } + resh + estack
-                          )
+                           Marty::Util.scrub_obj(detail))
       end
     end
   end

data/lib/marty/util.rb

@@ -132,4 +132,19 @@ module Marty::Util
     URI.encode("#{Marty::Util.marty_path}/report?data=#{data}"\
                "&reptitle=#{title}&format=#{format}")
   end
+
+  def self.scrub_obj(obj)
+    trav = lambda {|o|
+           if o.is_a?(Hash)
+             return o.each_with_object({}) {|(k, v), h| h[k] = trav.call(v)}
+           elsif o.is_a?(Array)
+             return o.map {|v| trav.call(v)}
+           elsif o.to_s.length > 10000
+             o.class.to_s
+           else
+             o
+           end
+    }
+    trav.call(obj)
+  end
 end

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "2.3.14"
+  VERSION = "2.3.15"
 end

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 = UserHelpers.system_user
+    Mcfly.whodunnit = system_user
 
     Marty::Script.load_script_bodies(promise_bodies, Date.today)
 

data/spec/features/enum_spec.rb

@@ -178,12 +178,12 @@ feature 'test netzke + pg_enum compatibility', js: true do
 
     and_by "filter form by state_enum ASCENDING" do
       press("Enum state")
-      expect(lp_grid.col_values(:enum_state)).to eq(["AS","AZ","DC","WA"])
+      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.col_values(:enum_state)).to eq(["WA","DC","AZ","AS"])
+      expect(lp_grid.get_col_vals(:enum_state)).to eq(["WA","DC","AZ","AS"])
     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_ready
+    wait_for_ajax
 
     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.col_values('message_type', cnt, 0)
-      messages = logview.col_values('message', cnt, 0)
-      details = logview.col_values('details', cnt, 0).
+      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).
                   map { |d| CGI.unescapeHTML(d) }
-      ts = logview.col_values('timestamp_custom', cnt, 0)
+      ts = logview.get_col_vals('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.col_values(:name, 9, 0)
+    names = mrv.get_col_vals(: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.col_values(:name, 5, 0)).to eq(["ZRule1", "ZRule2",
-                                                    "ZRule3", "ZRule4",
-                                                    "ZRule5"])
+    expect(xrv.get_col_vals(: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.col_values(:g_string, 8, 0)).to eq(["aaa", "bbb", "ccc", "ddd",
-                                                   "eee", "eee", "eee", "eee"])
+    expect(xrv.get_col_vals(:g_string, 8, 0)).to eq(["aaa", "bbb", "ccc", "ddd",
+                                                     "eee", "eee", "eee", "eee"])
     click_column(xrv, "String list Guard")
-    expect(xrv.col_values(:g_string, 8, 0)).to eq(["eee", "eee", "eee", "eee",
-                                                   "ddd", "ccc", "bbb", "aaa"])
+    expect(xrv.get_col_vals(: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.col_values(:g_string,rc,0)).to eq(["eee", "eee", "eee", "eee"])
+    expect(xrv.get_col_vals(:g_string,rc,0)).to eq(["eee", "eee", "eee", "eee"])
     column_filter_toggle(xrv, "String list Guard")
     rc = xrv.row_count
-    expect(xrv.col_values(:g_string,rc,0)).to eq(["eee", "eee", "eee", "eee",
-                                                  "ddd", "ccc", "bbb", "aaa"])
+    expect(xrv.get_col_vals(: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.col_values(:grids,rc,0)).to eq([%Q({"grid1":"DataGrid1"}),
-                                               %Q({"grid1":"DataGrid1"})])
+    # netzke reports jsonb as string
+    expect(xrv.get_col_vals(:grids,rc,0)).to eq([%Q({"grid1":"DataGrid1"}),
+                                                 %Q({"grid1":"DataGrid1"})])
     column_filter_toggle(xrv, "Grids")
     rc = xrv.row_count
-    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"})])
+    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"})])
     press("Applications")
     press("Data Grids")
     dgv = netzke_find("data_grid_view")
-    cvs = dgv.col_values(:name, 4, 0)
+    cvs = dgv.get_col_vals(: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.col_values(:name, 5, 0)
-    gvs = xrv.col_values(:grids, 5, 0)
+    names = xrv.get_col_vals(:name, 5, 0)
+    gvs = xrv.get_col_vals(: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.col_values(:name, 9, 0)
-    gvs = mrv.col_values(:grids, 9, 0)
-    rvs = mrv.col_values(:results, 9, 0)
+    names = mrv.get_col_vals(:name, 9, 0)
+    gvs = mrv.get_col_vals(:grids, 9, 0)
+    rvs = mrv.get_col_vals(: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,6 +33,8 @@ 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 = UserHelpers.system_user
+      Mcfly.whodunnit = system_user
 
       Marty::Script.load_script_bodies(promise_bodies, Date.today)
       start_delayed_job

data/spec/models/event_spec.rb

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

data/spec/models/promise_spec.rb

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

data/spec/models/user_spec.rb

@@ -4,11 +4,11 @@ module Marty
   describe User do
     before(:each) do
       Rails.configuration.marty.system_account =
-        UserHelpers.system_user.login
+        system_user.login
     end
 
     let (:tuser) {
-      UserHelpers.create_user('other_user')
+      create_user('other_user')
     }
 
     describe "validations" do
@@ -22,7 +22,7 @@ module Marty
 
       it "should require unique login" do
         expect(Mcfly.whodunnit).to_not be_nil
-        user = UserHelpers.system_user.dup
+        user = system_user.dup
         expect(user).to_not be_valid
         expect(user.errors[:login].to_s).to include('already been taken')
         user.login = 'marty2'
@@ -30,7 +30,7 @@ module Marty
       end
 
       it "should not allow Gemini account to be de-activated" do
-        user = UserHelpers.system_user
+        user = system_user
         user.active = false
         expect(user).to_not be_valid
         expect(user.errors[:base].to_s).
@@ -38,14 +38,14 @@ module Marty
       end
 
       it "should not allow accounts to be deleted" do
-        user = UserHelpers.system_user
+        user = system_user
         user.destroy
         expect(user.destroyed?).to be false
       end
 
       it "should not allow user managers to edit the Gemini account" do
         Mcfly.whodunnit = tuser
-        user = UserHelpers.system_user
+        user = system_user
         allow_any_instance_of(Marty::User).to receive(:user_manager_only).
           and_return(true)
         user.firstname = 'Testing'

data/spec/spec_helper.rb

@@ -3,67 +3,22 @@ ENV["RAILS_ENV"] ||= "test"
 require 'dummy/config/application'
 require 'rspec/rails'
 require 'database_cleaner'
-require 'marty_rspec'
+
+support = Pathname.new(__FILE__).parent.to_s + '/support'
+require "#{support}/suite"
+require "#{support}/shared_connection"
 
 Dummy::Application.initialize! unless Dummy::Application.initialized?
 
 ActiveRecord::Migrator.migrate File.expand_path("../../db/migrate/", __FILE__)
 ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
 
-Dir[Rails.root.join("../support/**/*.rb")].each { |f| require f }
-
-def register_chrome_driver driver = :chrome, options={}
-  Capybara.register_driver driver do |app|
-    caps = Selenium::WebDriver::Remote::Capabilities.
-             chrome(options + {pageLoadStrategy: 'none'})
-
-    Capybara::Selenium::Driver.new(app,
-                                   browser: :chrome,
-                                   desired_capabilities: caps)
-  end
-end
-
-CLASSES_TO_EXCLUDE_FROM_SHARED = ["Marty::Log"]
-class ActiveRecord::Base
-  mattr_accessor :shared_connection
-  class << self
-    alias_method :orig_connection, :connection
-  end
-  def self.clear_connection
-    @@shared_connection = nil
-  end
-
-  clear_connection
-
-  def self.connection
-    CLASSES_TO_EXCLUDE_FROM_SHARED.include?(model_name) ? orig_connection :
-      @@shared_connection ||
-      ConnectionPool::Wrapper.new(:size => 1) {retrieve_connection}
-  end
-
-  def self.reset_shared_connection
-    @@shared_connection = ConnectionPool::Wrapper.
-                            new(:size => 1) {retrieve_connection}
-  end
-end
-
-register_chrome_driver(:chrome, chromeOptions: { args: %w[start-maximized]})
-register_chrome_driver(:headless,
-                       chromeOptions: {
-                         args: %w[headless disable-gpu window-size=3840,2160]
-                       })
-
-Capybara.javascript_driver = ENV['HEADLESS'] == 'true' ? :headless : :chrome
-
-ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection
-
 RSpec.configure do |config|
-  config.include DelayedJobHelpers
-  config.include CleanDbHelpers
-  config.include SpecSetup
-  config.include Marty::IntegrationHelpers
-  config.include MartyRSpec::Util
+  config.include Marty::RSpec::Suite
+  config.include Marty::RSpec::SharedConnection
+  config.include Marty::RSpec::SharedConnectionDbHelpers
 
+  #RspecMarty::SharedConnection.classes_to_exclude_shared = ['Marty::Log']
   Capybara.default_max_wait_time = 3
 
   # TODO: Continue to remove should syntax from specs - remove this line to see
@@ -83,7 +38,7 @@ RSpec.configure do |config|
   end
 
   config.before(:each) do
-    Mcfly.whodunnit = UserHelpers.system_user
+    marty_whodunnit
   end
 
   config.after(:each, :js => true) do |example|
@@ -102,19 +57,4 @@ RSpec.configure do |config|
   config.use_transactional_fixtures = true
 
   Netzke::Testing.rspec_init(config)
-
-  # FIXME: temporary monkey patch to fix marty_rspec for new extjs/rails
-  module MartyRSpec
-    module Components
-      class NetzkeGrid
-        def get_row_vals row
-          res = run_js <<-JS
-          #{ext_var(grid, 'grid')}
-          return Ext.encode(#{ext_row(row.to_i - 1, 'grid')}.data);
-          JS
-          JSON.parse(res)
-        end
-      end
-    end
-  end
 end

data/spec/support/chromedriver.rb

@@ -0,0 +1,41 @@
+require 'selenium-webdriver'
+require Pathname.new(__FILE__).parent.to_s + '/download_helper'
+
+module Marty; module RSpec; module Chromedriver
+  def self.register_chrome_driver driver= :chrome, opts={}
+    Capybara.register_driver driver do |app|
+      copts = {
+        chromeOptions: opts.deep_merge(
+          prefs: {'download.default_directory' =>
+                  Marty::RSpec::DownloadHelper::PATH.to_s}),
+        pageLoadStrategy: 'none',
+      }
+      caps = Selenium::WebDriver::Remote::Capabilities.chrome(copts)
+      driver = Capybara::Selenium::Driver.new(app,
+                                              browser: :chrome,
+                                              desired_capabilities: caps)
+      yield driver if block_given?
+      driver
+    end
+  end
+
+  register_chrome_driver
+
+  headless_args =  %w[headless disable-gpu window-size=3840,2160]
+  register_chrome_driver(:headless_chrome, args: headless_args) do |driver|
+
+    # workaround to enable downloading with headless chrome
+    bridge = driver.browser.send(:bridge)
+    bridge.http.call(:post,
+                     "/session/#{bridge.session_id}/chromium/send_command",
+                     cmd: 'Page.setDownloadBehavior',
+                     params: {
+                       behavior: 'allow',
+                       downloadPath: Marty::RSpec::DownloadHelper::PATH.to_s
+                     })
+  end
+
+  Capybara.default_driver    = :chrome
+  Capybara.javascript_driver = ENV['HEADLESS'] == 'true' ?
+                                 :headless_chrome : :chrome
+end end end