marty 1.2.9 → 2.0.0

data/spec/controllers/rpc_import_spec.rb

@@ -31,7 +31,7 @@ describe Marty::RpcController do
     # try the test 3 times for fun
     (0..2).each {
       tags.each_with_index { |t, i|
-        get 'evaluate', {
+        get 'evaluate', params: {
               format: :json,
               script: "B",
               node: "B",

data/spec/dummy/config/environments/test.rb

@@ -8,8 +8,10 @@ Dummy::Application.configure do
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_files = true
-  config.static_cache_control = "public, max-age=3600"
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = {
+    'Cache-Control' => 'public, max-age=3600'
+  }
 
   # Log error messages when you accidentally call methods on nil
   config.whiny_nils = true

data/spec/dummy/db/migrate/20140000000000_create_enums.rb

@@ -1,4 +1,4 @@
-class CreateEnums < ActiveRecord::Migration
+class CreateEnums < ActiveRecord::Migration[4.2]
   include Marty::Migrations
   def change
     new_enum(Gemini::EnumState, 'gemini')

data/spec/dummy/db/migrate/20150406171536_create_categories.rb

@@ -1,6 +1,6 @@
-class CreateCategories < ActiveRecord::Migration
+class CreateCategories < ActiveRecord::Migration[4.2]
   def up
-    ActiveRecord::Migration.new.create_table 'entities' do |t|
+    ActiveRecord::Migration[4.2].new.create_table 'entities' do |t|
       t.string :name
     end
     McflyAppendOnlyMigration.new.create_table 'gemini_bud_categories' do |t|

data/spec/dummy/db/migrate/20150408200916_create_loan_programs.rb

@@ -1,4 +1,4 @@
-class CreateLoanPrograms < ActiveRecord::Migration
+class CreateLoanPrograms < ActiveRecord::Migration[4.2]
   def up
     McflyMigration.new.create_table 'gemini_loan_programs' do |t|
       t.string   "name",                                                                   null: false

data/spec/dummy/db/migrate/20150408201429_create_types.rb

@@ -1,4 +1,4 @@
-class CreateTypes < ActiveRecord::Migration
+class CreateTypes < ActiveRecord::Migration[4.2]
   def up
     create_table 'gemini_amortization_types' do |t|
       t.string "name", null: false

data/spec/dummy/db/migrate/20151023000001_create_simple.rb

@@ -1,4 +1,4 @@
-class CreateSimple < ActiveRecord::Migration
+class CreateSimple < ActiveRecord::Migration[4.2]
   def up
     McflyMigration.new.create_table 'gemini_simples' do |t|
       t.string "some_name"

data/spec/dummy/db/migrate/20160100000038_create_gemini_states.rb

@@ -1,4 +1,4 @@
-class CreateGeminiStates < ActiveRecord::Migration
+class CreateGeminiStates < ActiveRecord::Migration[4.2]
   def change
     create_table :gemini_states do |t|
       t.string :name, null: false

data/spec/dummy/db/migrate/20160923183516_add_bulk_pricing_event_ops.rb

@@ -1,4 +1,4 @@
-class AddBulkPricingEventOps < ActiveRecord::Migration
+class AddBulkPricingEventOps < ActiveRecord::Migration[4.2]
   def change
     execute("COMMIT;")
     execute "ALTER TYPE enum_event_operations ADD VALUE 'PRICING';"

data/spec/dummy/db/migrate/20170706081300_add_state_array_to_lp.rb

@@ -1,4 +1,4 @@
-class AddStateArrayToLp < ActiveRecord::Migration
+class AddStateArrayToLp < ActiveRecord::Migration[4.2]
   def change
     add_column :gemini_loan_programs, :state_array, :enum_states,
                array: true, null: true

data/spec/dummy/db/migrate/20170725160000_add_misc_arrays_to_lp.rb

@@ -1,4 +1,4 @@
-class AddMiscArraysToLp < ActiveRecord::Migration
+class AddMiscArraysToLp < ActiveRecord::Migration[4.2]
   def change
     add_column :gemini_loan_programs, :test_int_array, :integer,
                array: true, null: true

data/spec/dummy/db/migrate/20171220150101_add_rule_type_enums.rb

@@ -1,4 +1,4 @@
-class AddRuleTypeEnums < ActiveRecord::Migration
+class AddRuleTypeEnums < ActiveRecord::Migration[4.2]
   def change
     [Gemini::XyzRuleType, Gemini::MyRuleType, Gemini::GuardOne,
      Gemini::GuardTwo, Gemini::XyzEnum].each do |cl|

data/spec/dummy/db/migrate/20171222150100_add_rule_indices.rb

@@ -1,4 +1,4 @@
-class AddRuleIndices < ActiveRecord::Migration
+class AddRuleIndices < ActiveRecord::Migration[4.2]
   def change
     ['gemini_my_rules',  'g_array',    :array,
      'gemini_my_rules',  'g_single',   :scalar,

data/spec/features/auth_app_spec.rb

@@ -48,6 +48,7 @@ feature 'Posting workflows', js: true do
 
     and_by 'select new posting' do
       within(:gridpanel, 'posting_window', match: :first) do
+        wait_for_ajax
         expect(posting_grid.row_count).to eq 2
         posting_grid.select_row(2)
         press('Select')

data/spec/features/data_import_spec.rb

@@ -70,7 +70,7 @@ feature 'under Applications menu, Reports using  Data Import', js: true do
         #hacky: assumes only 1 combobox without label
         within(:gridpanel, 'report_select', match: :first, wait: 5) do
           # hacky, hardcoding netzkecombobox dropdown arrow name
-          arrow = find(:input, 'nodename')['componentid'] + '-trigger-picker'
+          arrow = find(:input, 'nodename')['data-componentid'] + '-trigger-picker'
           find(:xpath, ".//div[@id='#{arrow}']").click
           find(:xpath, "//li[text()='Data Import Job (csv)']").click
         end
@@ -137,7 +137,7 @@ feature 'under Applications menu, Reports using  Data Import', js: true do
         #hacky: assumes only 1 combobox without label
         within(:gridpanel, 'report_select', match: :first) do
           # hacky, hardcoding netzkecombobox dropdown arrow name
-          arrow = find(:input, 'nodename')['componentid'] + '-trigger-picker'
+          arrow = find(:input, 'nodename')['data-componentid'] + '-trigger-picker'
           find(:xpath, ".//div[@id='#{arrow}']").click
           find(:xpath, "//li[text()='Data Import Job (csv)']").click
         end

data/spec/features/log_view_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 feature 'logger view', js: true, capybara: true do
 
   before(:all) do
-    self.use_transactional_fixtures = false
+    self.use_transactional_tests = false
     Marty::Log.delete_all
 
     info_s = { info: 'message' }
@@ -36,7 +36,7 @@ feature 'logger view', js: true, capybara: true do
   after(:all) do
     restore_clean_db(@clean_file)
     Marty::Log.delete_all
-    self.use_transactional_fixtures = true
+    self.use_transactional_tests = true
   end
 
   let(:logview) { netzke_find('log_view') }
@@ -66,10 +66,10 @@ feature 'logger view', js: true, capybara: true do
         find(:xpath, "//input[contains(@id, 'textfield')]", wait: 5).set(days)
         press('OK')
         wait_for_ready
-        find(:refresh).click
+        find('.x-tool-refresh').click
         wait_for_ready
       end
-
+      wait_for_ajax
       cnt = logview.row_count()
       expect(cnt).to eq(exp_count)
       types = logview.col_values('message_type', cnt, 0)

data/spec/features/reporting_spec.rb

@@ -94,7 +94,7 @@ DELOREAN
     #hacky: assumes only 1 combobox without label
     within(:gridpanel, 'report_select', match: :first) do
       # hacky, hardcoding netzkecombobox dropdown arrow name
-      arrow = find(:input, 'nodename')['componentid'] + '-trigger-picker'
+      arrow = find(:input, 'nodename')['data-componentid'] + '-trigger-picker'
       find(:xpath, ".//div[@id='#{arrow}']").click
       find(:xpath, "//li[text()='#{node_name}']").click
     end
@@ -121,7 +121,6 @@ DELOREAN
 
     by 'select 2nd tag' do
       wait_for_ajax
-      zoom_out
       tag_grid.select_row(2)
     end
 
@@ -187,7 +186,6 @@ DELOREAN
 
     by 'select 2nd tag' do
       wait_for_ajax
-      zoom_out
       tag_grid.select_row(2)
     end
 
@@ -219,7 +217,6 @@ DELOREAN
 
     by 'select 2nd tag' do
       wait_for_ajax
-      zoom_out
       tag_grid.select_row(2)
     end
 
@@ -245,7 +242,6 @@ DELOREAN
 
     by 'select 2nd tag' do
       wait_for_ajax
-      zoom_out
       tag_grid.select_row(2)
     end
 
@@ -255,8 +251,17 @@ DELOREAN
 
     and_by 'no DD [role: dev] (csv)' do
       expect(script_combo.get_values).to include('AA (csv)',
-                                             'CC (csv)',
-                                             '---')
+                                                 'CC (csv)',
+                                                 '---')
+    end
+  end
+
+  it 'can generate report through generated url' do
+    url = generate_rep_url(format: 'txt') + URI.encode('&disposition=inline')
+    visit url
+    wait_for_element do
+      expect(page).to have_content('XYZ1,XYZ2,XYZ3,XYZ4 1,2,3,4 2,4,6,8 ' +
+                                   '3,6,9,12 4,8,12,16')
     end
   end
 
@@ -276,21 +281,13 @@ DELOREAN
       wait_for_ajax
       set_field_value('XYZ', '', 'pt_name')
       set_field_value('true', 'textfield', 'selected_testing')
-      new_window = window_opened_by {press("Generate URL")}
-      within_window new_window do
+      press("Generate URL")
+      wait_for_ajax
+
+      within_window(switch_to_window(windows.last)) do
         url = generate_rep_url
         expect(page).to have_content(url)
       end
-      new_window.close
-    end
-  end
-
-  it 'can generate report through generated url' do
-    url = generate_rep_url(format: 'txt') + URI.encode('&disposition=inline')
-    visit url
-    wait_for_element do
-      expect(page).to have_content('XYZ1,XYZ2,XYZ3,XYZ4 1,2,3,4 2,4,6,8 ' +
-                                   '3,6,9,12 4,8,12,16')
     end
   end
 end

data/spec/features/rule_spec.rb

@@ -36,9 +36,12 @@ feature 'rule view', js: true do
   # click_checkbox in marty_rspec not working here for some reason
   def click_checkbox(name)
     q = %Q(checkbox[fieldLabel="#{name}"])
-    id = run_js "return  Ext.ComponentQuery.query('#{q}')[0].inputId"
-    find_by_id(id).click
+    page.execute_script <<-JS
+    var checkbox = Ext.ComponentQuery.query('#{q}')[0];
+    checkbox.setValue(!checkbox.value);
+    JS
   end
+
   # click_col in marty_rspec is not reliable
   def click_column(rv,name)
     cid = col_id(rv, name)
@@ -75,7 +78,6 @@ feature 'rule view', js: true do
   end
   it "rule workflow" do
     log_in_as('marty')
-    page.driver.browser.manage.window.maximize
     go_to_my_rules
     mrv = netzke_find("my_rule_view")
     # test required field
@@ -97,8 +99,8 @@ feature 'rule view', js: true do
     expect(mrv.row_count()).to eq(9)
     expect(mrv.get_row_vals(1)).to include({"name"=>"abc",
                                             "rule_type"=>"SimpleRule",
-                                            "start_dt"=>"2013-01-01T19:03:01.000Z",
-                                            "end_dt"=>"2030-01-01T16:03:01.000Z",
+                                            "start_dt"=>"2013-01-01T11:03:01",
+                                            "end_dt"=>"2030-01-01T08:03:01",
                                             "other_flag"=>false,
                                             "g_array"=>"",
                                             "g_single"=>"",
@@ -113,7 +115,8 @@ feature 'rule view', js: true do
                                             "computed_guards"=>"",
                                             "grids"=>"",
                                             "results"=>"",
-                                            })
+                                           })
+
     r = Gemini::MyRule.lookup('infinity','abc')
     expect(r.as_json).to include({"user_id"=>1,
                                   "o_user_id"=>nil,
@@ -153,8 +156,8 @@ feature 'rule view', js: true do
     wait_for_ajax
     exp = {"name"=>"abc",
            "rule_type"=>"SimpleRule",
-           "start_dt"=>"2013-01-01T19:03:01.000Z",
-           "end_dt"=>"2030-01-01T16:03:01.000Z",
+           "start_dt"=>"2013-01-01T11:03:01",
+           "end_dt"=>"2030-01-01T08:03:01",
            "other_flag"=>true,
            "g_array"=>"G1V1,G1V3",
            "g_single"=>"G2V2",

data/spec/features/scripting_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 feature 'under Applications menu, Scripting workflows', js: true do
 
   before(:all) do
-    self.use_transactional_fixtures = false
+    self.use_transactional_tests = false
 
     @clean_file = "/tmp/clean_#{Process.pid}.psql"
     save_clean_db(@clean_file)
@@ -20,7 +20,7 @@ feature 'under Applications menu, Scripting workflows', js: true do
 
   after(:all) do
     restore_clean_db(@clean_file)
-    self.use_transactional_fixtures = true
+    self.use_transactional_tests = true
   end
 
   def go_to_scripting

data/spec/features/scripting_test_spec.rb

@@ -100,7 +100,6 @@ DELOREAN
 
     by 'select M1 sample script' do
       wait_for_ajax
-      zoom_out
       tag_grid.select_row(2)
       script_grid.select_row(1)
       tab_press('Testing')
@@ -278,7 +277,6 @@ DELOREAN
 
     by 'select M3 sample script' do
       wait_for_ajax
-      zoom_out
       script_grid.select_row(3)
       tab_press('Testing')
     end

data/spec/features/user_view_spec.rb

@@ -40,7 +40,6 @@ feature 'under Sytem menu, User Management worflows', js: true do
 
     by 'add new user' do
       wait_for_ajax
-      zoom_out
       press('New User')
       within(:gridpanel, 'add_window', match: :first) do
         press 'OK'
@@ -78,10 +77,10 @@ feature 'under Sytem menu, User Management worflows', js: true do
     and_by 'check row got edited' do
       wait_for_ajax
       expect(user_view.get_row_vals(2)).to netzke_include({
-        :login=>"new_login", 
-        :firstname=>"new_fname", 
-        :lastname=>"new_lname", 
-        :active=>true, 
+        :login=>"new_login",
+        :firstname=>"new_fname",
+        :lastname=>"new_lname",
+        :active=>true,
         :roles=>"User Manager,Viewer",
         })
     end
@@ -114,7 +113,6 @@ feature 'under Sytem menu, User Management worflows', js: true do
       user_view = netzke_find('user_view')
       by 'check buttons' do
         find(:btn, 'New User', match: :first)
-        zoom_out
         user_view.select_row(1)
         expect(btn_disabled?('New User')).to be_falsy
         expect(btn_disabled?('Edit')).to be_falsy

data/spec/lib/logger_spec.rb

@@ -4,14 +4,14 @@ require 'job_helper'
 module Marty
   describe Logger do
     before(:all) do
-      self.use_transactional_fixtures = false
+      self.use_transactional_tests = false
     end
     before(:each) do
       Marty::Log.delete_all
     end
     after(:all) do
       Marty::Log.delete_all
-      self.use_transactional_fixtures = true
+      self.use_transactional_tests = true
     end
 
     it "log has its own connection" do
@@ -63,7 +63,7 @@ module Marty
       @clean_file = "/tmp/clean_#{Process.pid}.psql"
       save_clean_db(@clean_file)
       # transactional fixtures interfere with queueing jobs
-      self.use_transactional_fixtures = false
+      self.use_transactional_tests = false
       Marty::Log.cleanup(0)
 
       # Needed here because shutting transactional fixtures off
@@ -78,7 +78,7 @@ module Marty
       stop_delayed_job
       File.unlink("/tmp/logaction.txt")
       Marty::Log.cleanup(0)
-      self.use_transactional_fixtures = true
+      self.use_transactional_tests = true
     end
 
     it "handles heavy load" do

data/spec/models/event_spec.rb

@@ -8,7 +8,7 @@ describe Marty::Event do
     save_clean_db(@clean_file)
 
     # transactional fixtures interfere with queueing jobs
-    self.use_transactional_fixtures = false
+    self.use_transactional_tests = false
 
     # Needed here because shutting transactional fixtures off
     # means we lose the globally set user
@@ -65,7 +65,7 @@ describe Marty::Event do
   end
 
   after(:all) do
-    self.use_transactional_fixtures = true
+    self.use_transactional_tests = true
     restore_clean_db(@clean_file)
     stop_delayed_job
   end
@@ -172,7 +172,7 @@ describe Marty::Event do
                                  "enum_event_operation"=>"AVM",
                                  "comment"=>"wassup",
                                  "expire_secs"=>nil,
-                                 "error"=>'f'})
+                                 "error"=> false})
     Marty::Event.update_comment(ev.first, "updated")
     ev = Marty::Event.lookup_event('testcl1', 123, 'AVM')
     expect(ev.first).to include({"comment"=>"updated"})
@@ -192,7 +192,7 @@ describe Marty::Event do
                                  "enum_event_operation"=>"PRICING",
                                  "comment"=>"c comment",
                                  "expire_secs"=>nil,
-                                 "error"=>"f"})
+                                 "error"=>false})
 
     af = Marty::Event.all_finished
     expect(af.count).to eq(4)

data/spec/models/promise_spec.rb

@@ -6,7 +6,7 @@ describe Marty::Promise, slow: true do
     @clean_file = "/tmp/clean_#{Process.pid}.psql"
     save_clean_db(@clean_file)
     # transactional fixtures interfere with queueing jobs
-    self.use_transactional_fixtures = false
+    self.use_transactional_tests = false
 
     # Needed here because shutting transactional fixtures off
     # means we lose the globally set user