marty 2.5.2 → 2.5.4

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
-ENV["RAILS_ENV"] ||= "test"
-ENV["TZ"] ||= "America/Los_Angeles"
+ENV['RAILS_ENV'] ||= 'test'
+ENV['TZ'] ||= 'America/Los_Angeles'
 
 require 'dummy/config/application'
 require 'rspec/rails'
@@ -11,15 +11,15 @@ 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__)
+ActiveRecord::Migrator.migrate File.expand_path('../../db/migrate/', __FILE__)
+ActiveRecord::Migrator.migrate File.expand_path('../dummy/db/migrate/', __FILE__)
 
 RSpec.configure do |config|
   config.include Marty::RSpec::Suite
   config.include Marty::RSpec::SharedConnection
   config.include Marty::RSpec::SharedConnectionDbHelpers
 
-  #RspecMarty::SharedConnection.classes_to_exclude_shared = ['Marty::Log']
+  # 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

data/spec/support/chromedriver.rb

@@ -2,12 +2,12 @@ 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={}
+  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}),
+          prefs: { 'download.default_directory' =>
+                  Marty::RSpec::DownloadHelper::PATH.to_s }),
         pageLoadStrategy: 'none',
       }
 
@@ -26,7 +26,6 @@ module Marty; module RSpec; module Chromedriver
   headless_args = ['no-sandbox', 'headless', 'disable-gpu', "window-size=#{window_size}"]
 
   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,
@@ -41,5 +40,4 @@ module Marty; module RSpec; module Chromedriver
   Capybara.default_driver    = :chrome
   Capybara.javascript_driver = ENV['HEADLESS'] == 'true' ?
                                  :headless_chrome : :chrome
-
 end end end

data/spec/support/components/netzke_combobox.rb

@@ -6,7 +6,7 @@ module Marty; module RSpec; module Components
   class NetzkeCombobox
     include Netzke
     include Capybara::DSL
-    #include RSpec::Matchers
+    # include RSpec::Matchers
 
     attr_reader :name, :combobox
 

data/spec/support/components/netzke_grid.rb

@@ -6,7 +6,7 @@ module Marty; module RSpec; module Components
   class NetzkeGrid
     include Netzke
     include Capybara::DSL
-    #include RSpec::Matchers
+    # include RSpec::Matchers
 
     attr_reader :name, :grid
 
@@ -53,7 +53,7 @@ module Marty; module RSpec; module Components
 
     def data_desc row
       res = run_js <<-JS
-          var r = #{grid}.getStore().getAt(#{row.to_i-1});
+          var r = #{grid}.getStore().getAt(#{row.to_i - 1});
           return r.data.desc
         JS
       res.gsub(/<.*?>/, '')
@@ -65,10 +65,10 @@ module Marty; module RSpec; module Components
           return #{ext_find(ext_arg('gridcolumn', text: col), 'grid')}.id
         JS
 
-      find("#" + el).click
+      find('#' + el).click
     end
 
-    def get_col_vals(col, cnt=row_count, init=0)
+    def get_col_vals(col, cnt = row_count, init = 0)
       # NOTE: does not validate the # of rows
       run_js <<-JS
           var result = [];
@@ -84,7 +84,7 @@ module Marty; module RSpec; module Components
         JS
     end
 
-    def validate_col_vals(col, val, cnt, init=0)
+    def validate_col_vals(col, val, cnt, init = 0)
       run_js <<-JS
           for (var i = #{init}; i < #{init.to_i + cnt.to_i}; i++) {
             #{ext_cell_val('i', col, grid)}
@@ -101,20 +101,20 @@ module Marty; module RSpec; module Components
         JS
     end
 
-    def select_row(row, click_after=true)
+    def select_row(row, click_after = true)
       resid = run_js(<<-JS, 10.0)
           #{ext_var(grid, 'grid')}
-          grid.getSelectionModel().select(#{row.to_i-1});
-          return grid.getView().getNode(#{row.to_i-1}).id;
+          grid.getSelectionModel().select(#{row.to_i - 1});
+          return grid.getView().getNode(#{row.to_i - 1}).id;
         JS
       el = find_by_id(resid)
       el.click if click_after
       wait_for_ajax
-      return el
+      el
     end
 
     def set_row_vals row, fields
-      js_set_fields = fields.each_pair.map do |k,v|
+      js_set_fields = fields.each_pair.map do |k, v|
         "r.set('#{k}', '#{v}');"
       end.join
 
@@ -124,14 +124,14 @@ module Marty; module RSpec; module Components
         JS
     end
 
-    def get_row_vals row, fields=nil
+    def get_row_vals row, fields = nil
       res = run_js <<-JS
           #{ext_var(grid, 'grid')}
           return Ext.encode(#{ext_row(row.to_i - 1, 'grid')}.data);
         JS
       temp = JSON.parse(res)
       parsed = temp.merge(temp.delete('association_values') || {})
-      fields ? fields.each_with_object({}).each{|k,h| h[k] = parsed[k]} :
+      fields ? fields.each_with_object({}).each { |k, h| h[k] = parsed[k] } :
         parsed
     end
 
@@ -201,7 +201,7 @@ module Marty; module RSpec; module Components
           #{ext_var(ext_netzkecombo(field), 'combo')}
           #{ext_var(ext_celleditor, 'editor')}
 
-          editor.startEditByPosition({ row:#{row.to_i-1},
+          editor.startEditByPosition({ row:#{row.to_i - 1},
             column:grid.headerCt.items.findIndex('name', '#{field}') });
 
           var now = new Date().getTime();
@@ -216,7 +216,7 @@ module Marty; module RSpec; module Components
           #{ext_var(grid, 'grid')}
           #{ext_var(ext_celleditor, 'editor')}
 
-          editor.startEditByPosition({ row:#{row.to_i-1},
+          editor.startEditByPosition({ row:#{row.to_i - 1},
             column:grid.headerCt.items.findIndex('name', '#{field}') });
           return editor.activeEditor.field.inputId;
         JS
@@ -237,7 +237,7 @@ module Marty; module RSpec; module Components
           #{ext_var(grid, 'grid')}
           #{ext_var(ext_celleditor, 'editor')}
 
-          editor.startEditByPosition({ row:#{row.to_i-1},
+          editor.startEditByPosition({ row:#{row.to_i - 1},
             column:grid.headerCt.items.findIndex('name', '#{field}') });
           return editor.activeEditor.field.getItemId();
         JS
@@ -323,7 +323,7 @@ module Marty; module RSpec; module Components
           #{ext_var(ext_netzkecombo(field), 'combo')}
           #{ext_var(ext_celleditor, 'editor')}
 
-          editor.startEditByPosition({ row:#{row.to_i-1},
+          editor.startEditByPosition({ row:#{row.to_i - 1},
             column:grid.headerCt.items.findIndex('name', '#{field}') });
 
           var now = new Date().getTime();
@@ -339,7 +339,7 @@ module Marty; module RSpec; module Components
           #{ext_combo(field, 'combo')}
           #{ext_var(ext_celleditor, 'editor')}
 
-          editor.startEditByPosition({ row:#{row.to_i-1},
+          editor.startEditByPosition({ row:#{row.to_i - 1},
             column:grid.headerCt.items.findIndex('name', '#{field}') });
         JS
     end

data/spec/support/custom_matchers.rb

@@ -2,8 +2,8 @@ require 'rspec'
 
 RSpec::Matchers.define :netzke_include do |expected|
   match do |actual|
-    parsed_values = actual.each_with_object({}) do | (k, v), h |
-      h[k] = v == "False" ? false : v
+    parsed_values = actual.each_with_object({}) do |(k, v), h|
+      h[k] = v == 'False' ? false : v
     end
     expect(parsed_values).to include(expected.stringify_keys)
   end

data/spec/support/download_helper.rb

@@ -7,7 +7,7 @@ module Marty::RSpec::DownloadHelper
   extend self
 
   def downloads
-    Dir[PATH.join("*")]
+    Dir[PATH.join('*')]
   end
 
   def download

data/spec/support/helper.rb

@@ -6,8 +6,7 @@ module Marty; module RSpec;
     # Helper function which increments a global counter.  Can be used by
     # tests which run Delorean code to see how many times some code is
     # being called.  Works for rule scripts as well.
-    delorean_fn :global_inc, sig: 1 do
-      |inc|
+    delorean_fn :global_inc, sig: 1 do |inc|
       @@global_inc ||= 0
 
       if inc

data/spec/support/netzke.rb

@@ -1,7 +1,7 @@
 module Marty; module RSpec; module Netzke
   MAX_WAIT_TIME = 5.0
 
-  def by message, level=0
+  def by message, level = 0
     wait_for_ready(10)
     pending(message) unless block_given?
     yield
@@ -25,39 +25,39 @@ module Marty; module RSpec; module Netzke
         log_out
         wait_for_ajax
       end
-    rescue
+    rescue StandardError
       # ignore error
     end
 
-    find(:xpath, "//span", text: 'Sign in', match: :first, wait: 5).click
-    fill_in("login", :with => username)
-    fill_in("password", :with => password)
-    press("OK")
+    find(:xpath, '//span', text: 'Sign in', match: :first, wait: 5).click
+    fill_in('login', :with => username)
+    fill_in('password', :with => password)
+    press('OK')
     wait_for_ajax
   end
 
   def log_in_as(username)
     Rails.configuration.marty.auth_source = 'local'
 
-    ensure_on("/")
+    ensure_on('/')
     log_in(username, Rails.configuration.marty.local_password)
-    ensure_on("/")
+    ensure_on('/')
   end
 
   def log_out
-    press("Current user")
-    press("Sign out")
+    press('Current user')
+    press('Sign out')
   end
 
   def press button_name, index_of = 0
     wait_for_element do
       begin
         cmp = first("a[data-qtip='#{button_name}']")
-        cmp ||= first(:xpath, ".//a", text: "#{button_name}")
+        cmp ||= first(:xpath, './/a', text: button_name.to_s)
         cmp ||= find(:btn, button_name, match: :first)
         cmp.click
         true
-      rescue
+      rescue StandardError
         find_by_id(ext_button_id(button_name, index_of), visible: :all).click
         true
       end
@@ -104,7 +104,7 @@ module Marty; module RSpec; module Netzke
     while !res && current_time - start_time < seconds_to_wait
       begin
         res = yield
-      rescue
+      rescue StandardError
       ensure
         sleep sleeptime
         current_time = Time.now
@@ -152,9 +152,9 @@ module Marty; module RSpec; module Netzke
     JS
   end
 
-  def set_field_value value, field_type='textfield', name=''
-    args1 = name.empty? ? "" : "[fieldLabel='#{name}']"
-    args2 = name.empty? ? "" : "[name='#{name}']"
+  def set_field_value value, field_type = 'textfield', name = ''
+    args1 = name.empty? ? '' : "[fieldLabel='#{name}']"
+    args2 = name.empty? ? '' : "[name='#{name}']"
     run_js <<-JS
       var field = Ext.ComponentQuery.query("#{field_type}#{args1}")[0];
       field = field || Ext.ComponentQuery.query("#{field_type}#{args2}")[0];
@@ -209,31 +209,31 @@ module Marty; module RSpec; module Netzke
   def press_key_in(key, el_id)
     kd = key.downcase
     use_key = ['enter', 'return'].include?(kd) ? kd.to_sym : key
-    el = find_by_id("#{el_id}")
+    el = find_by_id(el_id.to_s)
     el.native.send_keys(use_key)
   end
 
   def simple_escape! text
-    text.gsub!(/(\r\n|\n)/, "\\n")
-    text.gsub!(/\t/, "\\t")
+    text.gsub!(/(\r\n|\n)/, '\\n')
+    text.gsub!(/\t/, '\\t')
   end
 
   def simple_escape text
-    text.gsub(/(\r\n|\n)/, "\\n")
-      .gsub(/\t/, "\\t")
-      .gsub(/"/, '\"')
+    text.gsub(/(\r\n|\n)/, '\\n').
+      gsub(/\t/, '\\t').
+      gsub(/"/, '\"')
   end
 
-  def type_in(type_s, el_id)
-    el = find_by_id("#{el_id}")
-    el.native.clear()
+  def type_in(type_s, el_id, enter: false)
+    el = find_by_id(el_id.to_s)
     type_s.each_char do |key|
       el.native.send_keys(key)
     end
-    el.send_keys(:enter)
+    el.send_keys(:enter) if enter
   end
 
   private
+
   ############################################################################
   # ExtJS/Netzke helper javascripts:
   #   Netzke component lookups, arguments for helper methods
@@ -255,7 +255,7 @@ module Marty; module RSpec; module Netzke
     JS
   end
 
-  def ext_var(ext_find_str, var_name='ext_c')
+  def ext_var(ext_find_str, var_name = 'ext_c')
     <<-JS
       var #{var_name} = #{ext_find_str};
     JS
@@ -267,7 +267,7 @@ module Marty; module RSpec; module Netzke
     JS
   end
 
-  def ext_combo combo_label, c_name='combo'
+  def ext_combo combo_label, c_name = 'combo'
     <<-JS
       #{ext_var(ext_find(ext_arg('combobox', fieldLabel: combo_label)), c_name)}
       #{c_name} = #{c_name} ||
@@ -275,19 +275,19 @@ module Marty; module RSpec; module Netzke
     JS
   end
 
-  def ext_celleditor(grid_name='grid')
+  def ext_celleditor(grid_name = 'grid')
     <<-JS
       #{grid_name}.getPlugin('celleditor')
     JS
   end
 
-  def ext_row(row, grid_name='grid')
+  def ext_row(row, grid_name = 'grid')
     <<-JS
       #{grid_name}.getStore().getAt(#{row})
     JS
   end
 
-  def ext_col(col, grid_name='grid')
+  def ext_col(col, grid_name = 'grid')
     <<-JS
       #{ext_find(ext_arg('gridcolumn', name: "\"#{col}\""), grid_name)}
     JS

data/spec/support/performance_helper.rb

@@ -4,22 +4,22 @@ module Marty; module RSpec; module PerformanceHelper
   include Marty::RSpec::PostRunLogger
 
   def calculate_baseline iterations
-    Benchmark.measure {
-      ActiveRecord::Base.uncached {(0...iterations).each { yield }}
-    }
+    Benchmark.measure do
+      ActiveRecord::Base.uncached { (0...iterations).each { yield } }
+    end
   end
 
-  def compare_baseline baseline, timings, opts={}
-    result_time = timings.map{|t| t.total}.sum
+  def compare_baseline baseline, timings, opts = {}
+    result_time = timings.map(&:total).sum
     factor      = result_time / baseline.total
 
     lb = opts.delete(:lower_bound) || 1.5
     ub = opts.delete(:upper_bound) || 5.0
 
-    post_run_log '  '+'-'*45,
-                 "   baseline: %.2f, result: %.2f, factor: %.2f" %
+    post_run_log '  ' + '-' * 45,
+                 '   baseline: %.2f, result: %.2f, factor: %.2f' %
                  [baseline.total, result_time, factor],
-                 '  '+'-'*45
+                 '  ' + '-' * 45
 
     expect(result_time).to be_between(baseline.total * lb, baseline.total * ub)
   end

data/spec/support/post_run_logger.rb

@@ -12,7 +12,7 @@ module Marty; module RSpec; module PostRunLogger
     def self.store_data(name, line)
       data << "  #{test_number}) #{name}"
       data << Array(line).map { |string| "     #{string}" }
-      data << ""
+      data << ''
     end
 
     def self.dump_data
@@ -21,7 +21,6 @@ module Marty; module RSpec; module PostRunLogger
         puts data
       end
     end
-
   end
 
   def post_run_log(*log_string)

data/spec/support/setup.rb

@@ -1,5 +1,4 @@
 module Marty; module RSpec; module Setup
-
   def marty_whodunnit
     Mcfly.whodunnit = Marty::User.find_by_login('marty')
   end
@@ -23,14 +22,12 @@ module Marty; module RSpec; module Setup
   end
 
   def disable_triggers(table_name, &block)
-    begin
       ActiveRecord::Base.connection.
         execute("ALTER TABLE #{table_name} DISABLE TRIGGER USER;")
 
       block.call
-    ensure
+  ensure
       ActiveRecord::Base.connection.
         execute("ALTER TABLE #{table_name} ENABLE TRIGGER USER;")
-    end
   end
 end end end