marty 2.3.15 → 2.4.0

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 = system_user
+    Mcfly.whodunnit = UserHelpers.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 = system_user
+    Mcfly.whodunnit = UserHelpers.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 =
-        system_user.login
+        UserHelpers.system_user.login
     end
 
     let (:tuser) {
-      create_user('other_user')
+      UserHelpers.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 = system_user.dup
+        user = UserHelpers.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 = system_user
+        user = UserHelpers.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 = system_user
+        user = UserHelpers.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 = system_user
+        user = UserHelpers.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,22 +3,67 @@ ENV["RAILS_ENV"] ||= "test"
 require 'dummy/config/application'
 require 'rspec/rails'
 require 'database_cleaner'
-
-support = Pathname.new(__FILE__).parent.to_s + '/support'
-require "#{support}/suite"
-require "#{support}/shared_connection"
+require 'marty_rspec'
 
 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 Marty::RSpec::Suite
-  config.include Marty::RSpec::SharedConnection
-  config.include Marty::RSpec::SharedConnectionDbHelpers
+  config.include DelayedJobHelpers
+  config.include CleanDbHelpers
+  config.include SpecSetup
+  config.include Marty::IntegrationHelpers
+  config.include MartyRSpec::Util
 
-  #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
@@ -38,7 +83,7 @@ RSpec.configure do |config|
   end
 
   config.before(:each) do
-    marty_whodunnit
+    Mcfly.whodunnit = UserHelpers.system_user
   end
 
   config.after(:each, :js => true) do |example|
@@ -57,4 +102,19 @@ 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/{shared_connection_db_helpers.rb → clean_db_helpers.rb}

@@ -1,4 +1,4 @@
-module Marty; module RSpec; module SharedConnectionDbHelpers
+module CleanDbHelpers
   def current_db
     ActiveRecord::Base.connection_config[:database]
   end
@@ -15,4 +15,4 @@ module Marty; module RSpec; module SharedConnectionDbHelpers
     ActiveRecord::Base.reset_shared_connection
     self.use_transactional_tests = true
   end
-end end end
+end

data/spec/support/delayed_job_helpers.rb

@@ -1,4 +1,4 @@
-module Marty::RSpec::DelayedJobHelpers
+module DelayedJobHelpers
   def start_delayed_job
     # start delayed job workers and wait a few seconds
     `RAILS_ENV=test spec/dummy/script/delayed_job -n 4 stop | cat`

data/spec/support/{users.rb → integration_helpers.rb}

@@ -1,4 +1,5 @@
-module Marty; module RSpec; module Users
+module Marty::IntegrationHelpers
+  # test setup helpers
   def populate_test_users
     (1..2).each { |i|
       Rails.configuration.marty.roles.each { |role_name|
@@ -29,15 +30,12 @@ module Marty; module RSpec; module Users
     user.save
   end
 
-  def system_user
-    Marty::User.find_by_login('marty') # (system_login)
-  end
-
-  def create_user(name)
-    Marty::User.find_or_create_by!(login: name,
-                                   firstname: name,
-                                   lastname: 'test',
-                                   active: true)
+  def log_in_as(username)
+    Rails.configuration.marty.auth_source = 'local'
 
+    ensure_on("/")
+    log_in(username, Rails.configuration.marty.local_password)
+    ensure_on("/")
   end
-end end end
+
+end

data/spec/support/{setup.rb → spec_setup.rb}

@@ -1,9 +1,4 @@
-module Marty; module RSpec; module Setup
-
-  def marty_whodunnit
-    Mcfly.whodunnit = Marty::User.find_by_login('marty')
-  end
-
+module SpecSetup
   def load_scripts(path, dt)
     Marty::Script.load_scripts(path, dt)
     Marty::ScriptSet.clear_cache
@@ -18,19 +13,11 @@ module Marty; module RSpec; module Setup
     Marty::DataGrid.create_from_import(*args)
   end
 
-  def do_import_summary(*args)
-    Marty::DataImporter.do_import_summary(*args)
+  def marty_whodunnit
+    Mcfly.whodunnit = Marty::User.find_by_login('marty')
   end
 
-  def disable_triggers(table_name, &block)
-    begin
-      ActiveRecord::Base.connection.
-        execute("ALTER TABLE #{table_name} DISABLE TRIGGER USER;")
-
-      block.call
-    ensure
-      ActiveRecord::Base.connection.
-        execute("ALTER TABLE #{table_name} ENABLE TRIGGER USER;")
-    end
+  def do_import_summary(*args)
+    Marty::DataImporter.do_import_summary(*args)
   end
-end end end
+end

data/spec/support/user_helpers.rb

@@ -0,0 +1,12 @@
+module UserHelpers
+  def self.system_user
+    Marty::User.find_by_login('marty') # (system_login)
+  end
+
+  def self.create_user(name)
+    Marty::User.find_or_create_by!(login: name,
+                                   firstname: name,
+                                   lastname: 'test',
+                                   active: true)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.3.15
+  version: 2.4.0
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-08 00:00:00.000000000 Z
+date: 2018-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -484,6 +484,8 @@ files:
 - db/migrate/400_create_dg_plv8_v1_fns.rb
 - db/migrate/410_jsonb_promise_result.rb
 - db/migrate/411_create_vw_promises.rb
+- db/migrate/501_add_api_class_to_marty_api_config.rb
+- db/migrate/502_add_parameters_to_marty_api_auth.rb
 - db/seeds.rb
 - delorean/diagnostics.dl
 - delorean/script_report.dl
@@ -518,6 +520,7 @@ files:
 - lib/pyxll/sample.xlsx
 - lib/tasks/marty_tasks.rake
 - marty.gemspec
+- other/marty/api/base.rb
 - other/marty/diagnostic/aws/ec2_instance.rb
 - other/marty/diagnostic/base.rb
 - other/marty/diagnostic/collection.rb
@@ -542,8 +545,6 @@ files:
 - spec/controllers/rpc_import_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
-- spec/dummy/app/assets/client/application.css
-- spec/dummy/app/assets/client/application.js
 - spec/dummy/app/components/gemini/cm_auth_app.rb
 - spec/dummy/app/components/gemini/loan_program_view.rb
 - spec/dummy/app/components/gemini/my_rule_view.rb
@@ -1681,23 +1682,11 @@ files:
 - spec/other/diagnostic/reporter_spec.rb
 - spec/requests/routes_spec.rb
 - spec/spec_helper.rb
-- spec/support/chromedriver.rb
-- spec/support/components/netzke_combobox.rb
-- spec/support/components/netzke_grid.rb
-- spec/support/custom_matchers.rb
-- spec/support/custom_selectors.rb
+- spec/support/clean_db_helpers.rb
 - spec/support/delayed_job_helpers.rb
-- spec/support/download_helper.rb
-- spec/support/helper.rb
-- spec/support/netzke.rb
-- spec/support/performance_helper.rb
-- spec/support/post_run_logger.rb
-- spec/support/setup.rb
-- spec/support/shared_connection.rb
-- spec/support/shared_connection_db_helpers.rb
-- spec/support/structure_compare.rb
-- spec/support/suite.rb
-- spec/support/users.rb
+- spec/support/integration_helpers.rb
+- spec/support/spec_setup.rb
+- spec/support/user_helpers.rb
 homepage: https://github.com/arman000/marty
 licenses:
 - MIT
@@ -1718,7 +1707,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A framework for working with versioned data

data/spec/dummy/app/assets/client/application.css

@@ -1,13 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require_self
- *= require_tree .
- */

data/spec/dummy/app/assets/client/application.js

@@ -1,15 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
-//
-//= require jquery
-//= require jquery_ujs
-//= require_tree .

data/spec/support/chromedriver.rb

@@ -1,41 +0,0 @@
-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

data/spec/support/components/netzke_combobox.rb

@@ -1,57 +0,0 @@
-require 'capybara/dsl'
-require 'rspec/matchers'
-require Pathname.new(__FILE__).parent.parent.to_s + '/netzke'
-
-module Marty; module RSpec; module Components
-  class NetzkeCombobox
-    include Netzke
-    include Capybara::DSL
-    #include RSpec::Matchers
-
-    attr_reader :name, :combobox
-
-    def initialize(name)
-      @name = name
-      if /^\d+$/.match(name)
-        @combobox = ext_find('combobox', nil, name)
-      else
-        @combobox = ext_combo(name)
-      end
-    end
-
-    def select_values(values)
-      run_js <<-JS
-        var values = #{values.split(/,\s*/)};
-        #{combobox}
-        var arr = new Array();
-        for(var i=0; i < values.length; i++) {
-          arr[i] = combo.findRecordByDisplay(values[i]);
-        }
-        combo.select(arr);
-        if (combo.isExpanded) {
-          combo.onTriggerClick();
-        };
-        return true;
-        JS
-    end
-
-    def get_values
-      run_js <<-JS
-        var values = [];
-        #{combobox}
-        combo.getStore().each(
-          function(r) { values.push(r.data.text || r.data.field1); });
-        return values;
-      JS
-    end
-
-    def click
-      run_js <<-JS
-        #{combobox}
-        combo.onTriggerClick();
-        return true;
-        JS
-      wait_for_element { !ajax_loading? }
-    end
-  end
-end end end