marty 0.5.39 → 0.5.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c7c49130696eaee7cf90daac35a2e8f7de5b4d4
-  data.tar.gz: d9c02183be57f6889d9071b27461315571278226
+  metadata.gz: f166abb0b1bc5f9da59dc6c3879fbda45bfa1c2a
+  data.tar.gz: 78a16a950bbc27e7f34f54e6d123bd1bd3a112e8
 SHA512:
-  metadata.gz: 49df1bf75aac668d3e2e2431a38826a55f75bbf51a68194b7fee998f19bfa58f3e98cb63b724866d6764d7a0cc8d179bb00ed9a483f91acb606ba7fafd3d6ba1
-  data.tar.gz: 73d88973b75a3291f77db255243f99927e2ea8dd6d46d6f34bdc088e5d12799c9058d5219452721d231f7465202a62f4e63ca7c3cdb70b51f328beaf207e2034
+  metadata.gz: 19fc34d83a632f06a345f927dad2769d89310c3ff330abf34dd99f7bdd054799e29d5067e78dc3b167c669d5a0004ad6d293ba6fb63f24a053610f4bb090e1d6
+  data.tar.gz: d08d671febf9c71fde42c01c37f61a62d861544a3c30f39de44f55eb69b421444b45565b01f1ac94c78d54b56934d2ee52fa7ee3c0fd03ee542bfc1d7b7d7033

data/Gemfile

@@ -21,4 +21,7 @@ group :development, :test do
   gem 'netzke-core'
   gem 'netzke-basepack'
   gem 'netzke-testing' #, path: File.expand_path('../../netzke-testing', __FILE__)
+
+  #gem 'marty_rspec', path: File.expand_path('../../marty_rspec', __FILE__)
+  gem 'marty_rspec'
 end

data/app/controllers/marty/diagnostic_controller.rb

@@ -47,9 +47,9 @@ module Marty
     def git_details app_name = Rails.application.class.parent.to_s
       [
         Diagnostic.new("#{app_name} Git Version", true,
-                       `git describe 2>&1`.strip),
+               `git describe 2>&1`.strip),
         Diagnostic.new("#{app_name} Git Details", true,
-                       `git show --pretty=format:"sha: %h, %D" 2>&1`.strip)
+               `git show --pretty=format:"sha: %h, %D" --no-patch 2>&1`.strip)
       ]
     end
 

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "0.5.39"
+  VERSION = "0.5.40"
 end

data/spec/features/auth_app_spec.rb

@@ -23,11 +23,11 @@ feature 'Posting workflows', js: true do
     Marty::NewPostingForm.has_marty_permissions(BASE: :admin)
   end
 
-  let(:pg) { gridpanel('posting_grid') }
-
   it 'create posting and select it' do
     log_in_as('admin1')
 
+    posting_grid = netzke_find('posting_grid')
+
     by 'bring up new posting form' do
       wait_for_ajax
       press('Postings')
@@ -49,8 +49,8 @@ feature 'Posting workflows', js: true do
 
     and_by 'select new posting' do
       within(:gridpanel, 'posting_window', match: :first) do
-        expect(row_count(pg)).to eq 2
-        select_row(2, pg)
+        expect(posting_grid.row_count).to eq 2
+        posting_grid.select_row(2)
         press('Select')
       end
     end

data/spec/features/data_import_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 feature 'under Applications menu, Reports using  Data Import', js: true do
 
   before(:all) do
+    marty_whodunnit
     @clean_file = "/tmp/clean_#{Process.pid}.psql"
     save_clean_db(@clean_file)
     dt = Time.zone.now
@@ -49,21 +50,20 @@ feature 'under Applications menu, Reports using  Data Import', js: true do
                             )
   end
 
-  let(:tg) { gridpanel('tag_grid') }
-  let(:sg) { gridpanel('script_grid') }
-  let(:rf) { gridpanel('report_form') }
-
   it 'adds 2 new fannie bups via datareport script' do
     expect do
       log_in_as('marty')
       go_to_reporting
 
+      tag_grid = netzke_find('tag_grid')
+      script_grid = netzke_find('script_grid')
+
       by 'select BASE tag' do
-        select_row(2, tg)
+        tag_grid.select_row(2)
       end
 
       and_by 'select DataReport script & Data Import node' do
-        select_row(2, sg)
+        script_grid.select_row(2)
       end
 
       and_by 'select Data Import node' do
@@ -104,7 +104,8 @@ feature 'under Applications menu, Reports using  Data Import', js: true do
 
       and_by 'background job has shown up' do
         wait_for_ajax
-        expect(row_count(treepanel('promise_view'))).to eq 1
+        promise_view = netzke_find('promise_view', 'treepanel')
+        expect(promise_view.row_count).to eq 1
         find(:xpath, "//tr[contains(@class, 'green-row')]", match: :first)
       end
 
@@ -120,12 +121,15 @@ feature 'under Applications menu, Reports using  Data Import', js: true do
       log_in_as('dev1')
       go_to_reporting
 
+      tag_grid = netzke_find('tag_grid')
+      script_grid = netzke_find('script_grid')
+
       by 'select BASE tag' do
-        select_row(2, tg)
+        tag_grid.select_row(2)
       end
 
       and_by 'select DataReport script & Data Import node' do
-        select_row(2, sg)
+        script_grid.select_row(2)
       end
 
       and_by 'select Data Import node' do

data/spec/features/reporting_spec.rb

@@ -90,10 +90,6 @@ DELOREAN
     }
   end
 
-  let(:tg) { gridpanel('tag_grid') }
-  let(:sg) { gridpanel('script_grid') }
-  let(:rf) { gridpanel('report_form') }
-
   def select_node node_name
     wait_for_ajax
     #hacky: assumes only 1 combobox without label
@@ -109,14 +105,17 @@ DELOREAN
     log_in_as('dev1')
     go_to_reporting
 
+    tag_grid = netzke_find('tag_grid')
+    script_grid = netzke_find('script_grid')
+
     by 'select 2nd tag' do
       wait_for_ajax
-      zoom_out(tg)
-      select_row(2, tg)
+      zoom_out
+      tag_grid.select_row(2)
     end
 
     and_by 'select SomeReport script & CC node' do
-      select_row(1, sg)
+      script_grid.select_row(1)
       select_node('CC (csv)')
     end
 
@@ -145,11 +144,11 @@ DELOREAN
     end
 
     and_by 'select 3rd tag' do
-      select_row(3, tg)
+      tag_grid.select_row(3)
     end
 
     and_by 'select SomeReport script' do
-      select_row(1, sg)
+      script_grid.select_row(1)
     end
 
     and_by 'validate script combobox' do
@@ -172,14 +171,17 @@ DELOREAN
     log_in_as('dev1')
     go_to_reporting
 
+    tag_grid = netzke_find('tag_grid')
+    script_grid = netzke_find('script_grid')
+
     by 'select 2nd tag' do
       wait_for_ajax
-      zoom_out(tg)
-      select_row(2, tg)
+      zoom_out
+      tag_grid.select_row(2)
     end
 
     and_by 'select SomeReport script & AA node' do
-      select_row(1, sg)
+      script_grid.select_row(1)
       select_node('AA (csv)')
     end
 
@@ -201,21 +203,24 @@ DELOREAN
     log_in_as('dev1')
     go_to_reporting
 
+    tag_grid = netzke_find('tag_grid')
+    script_grid = netzke_find('script_grid')
+
     by 'select 2nd tag' do
       wait_for_ajax
-      zoom_out(tg)
-      select_row(2, tg)
+      zoom_out
+      tag_grid.select_row(2)
     end
 
     and_by 'select SomeReport script & AA node' do
-      select_row(1, sg)
+      script_grid.select_row(1)
       select_node('DD [role: dev] (csv)')
     end
 
     and_by 'generate report disabled' do
       fill_in('Note Rate', with: '3.00')
-      expect(btn_disabled?('Generate Report', rf)).to be_truthy
-      expect(btn_disabled?('Background Report', rf)).to be_falsy
+      expect(btn_disabled?('Generate Report')).to be_truthy
+      expect(btn_disabled?('Background Report')).to be_falsy
     end
   end
 
@@ -223,14 +228,17 @@ DELOREAN
     log_in_as('viewer1')
     go_to_reporting
 
+    tag_grid = netzke_find('tag_grid')
+    script_grid = netzke_find('script_grid')
+
     by 'select 2nd tag' do
       wait_for_ajax
-      zoom_out(tg)
-      select_row(2, tg)
+      zoom_out
+      tag_grid.select_row(2)
     end
 
     and_by 'select SomeReport script & AA' do
-      select_row(1, sg)
+      script_grid.select_row(1)
     end
 
     and_by 'no DD [role: dev] (csv)' do

data/spec/features/scripting_spec.rb

@@ -66,17 +66,16 @@ feature 'under Applications menu, Scripting workflows', js: true do
     }
   end
 
-  let(:tg) { gridpanel('tag_grid') }
-  let(:sg) { gridpanel('script_grid') }
-  let(:sf) { gridpanel('script_form') }
-
   it 'adding scripts and tags & ensure proper validations' do
     log_in_as('dev1')
     go_to_scripting
 
+    script_grid = netzke_find('script_grid')
+    tag_grid = netzke_find('tag_grid')
+
     by 'select DEV tag' do
       wait_for_ajax
-      select_row(1, tg)
+      tag_grid.select_row(1)
     end
 
     and_by 'add script' do
@@ -90,8 +89,8 @@ feature 'under Applications menu, Scripting workflows', js: true do
     and_by 'select the new script' do
       wait_for_ajax
       within(:gridpanel, 'script_grid', match: :first) do
-        validate_row_values(6, sg, name: 'Xyz', tag: 'DEV')
-        select_row(6, sg)
+        script_grid.validate_row_values(6, name: 'Xyz', tag: 'DEV')
+        script_grid.select_row(6)
       end
     end
 
@@ -118,20 +117,20 @@ feature 'under Applications menu, Scripting workflows', js: true do
     and_by 'new tag shows up' do
       wait_for_ajax
       within(:gridpanel, 'tag_grid', match: :first) do
-        expect(row_count(tg)).to eq 6
+        expect(tag_grid.row_count).to eq 6
       end
     end
 
     and_by 'tag row 2 has 6 scripts' do
-      select_row(2, tg)
+      tag_grid.select_row(2)
       wait_for_ajax
-      expect(row_count(sg)).to eq 6
+      expect(script_grid.row_count).to eq 6
     end
 
     and_by 'tag row 3 has 5 scripts' do
-      select_row(3, tg)
+      tag_grid.select_row(3)
       wait_for_ajax
-      expect(row_count(sg)).to eq 5
+      expect(script_grid.row_count).to eq 5
     end
   end
 
@@ -139,9 +138,12 @@ feature 'under Applications menu, Scripting workflows', js: true do
     log_in_as('dev1')
     go_to_scripting
 
+    script_grid = netzke_find('script_grid')
+    tag_grid = netzke_find('tag_grid')
+
     by 'select DEV tag' do
       wait_for_ajax
-      select_row(1, tg)
+      tag_grid.select_row(1)
     end
 
     and_by 'add script with duplicate name' do
@@ -164,7 +166,7 @@ feature 'under Applications menu, Scripting workflows', js: true do
 
     and_by 'no script got added' do
       wait_for_ajax
-      expect(row_count(sg)).to eq 5
+      expect(script_grid.row_count).to eq 5
     end
   end
 
@@ -173,13 +175,15 @@ feature 'under Applications menu, Scripting workflows', js: true do
     # no nav buttons available, but check direct access
     ensure_on('/#scripting')
 
+    script_grid = netzke_find('script_grid')
+    tag_grid = netzke_find('tag_grid')
+
     by 'nothing should work & log out' do
       wait_for_ajax
-      expect(row_count(sg)).to eq 0
-      expect(row_count(tg)).to eq 0
-      expect(btn_disabled?('New Script', sg)).to be_truthy
-      expect(btn_disabled?('Delete Script', sg)).to be_truthy
-      expect(btn_disabled?('New Tag', tg)).to be_truthy
+      expect(script_grid.row_count).to eq 0
+      expect(tag_grid.row_count).to eq 0
+      expect(btn_disabled?('New Script')).to be_truthy
+      expect(btn_disabled?('New Tag')).to be_truthy
       log_out
     end
 
@@ -190,16 +194,15 @@ feature 'under Applications menu, Scripting workflows', js: true do
 
     and_by 'viewable but cannot add scripts or tags' do
       wait_for_ajax
-      expect(row_count(sg)).to eq 5
-      select_row(1, tg)
+      expect(script_grid.row_count).to eq 5
+      tag_grid.select_row(1)
       wait_for_ajax
-      expect(btn_disabled?('New Script', sg)).to be_truthy
-      expect(btn_disabled?('Delete Script', sg)).to be_truthy
-      expect(btn_disabled?('New Tag', tg)).to be_truthy
-      select_row(4, tg)
+      expect(btn_disabled?('New Script')).to be_truthy
+      expect(btn_disabled?('New Tag')).to be_truthy
+      tag_grid.select_row(4)
       wait_for_ajax
-      expect(row_count(sg)).to eq 5
-      expect(btn_disabled?('Save', sf)).to be_truthy
+      expect(script_grid.row_count).to eq 5
+      expect(btn_disabled?('Save')).to be_truthy
     end
   end
 
@@ -207,14 +210,18 @@ feature 'under Applications menu, Scripting workflows', js: true do
     log_in_as('dev1')
     go_to_scripting
 
+    script_grid = netzke_find('script_grid')
+    tag_grid = netzke_find('tag_grid')
+
+
     by 'select tag row 2' do
       wait_for_ajax
-      select_row(2, tg)
+      tag_grid.select_row(2)
     end
 
     and_by 'select script row 5' do
       wait_for_ajax
-      select_row(5, sg)
+      script_grid.select_row(5)
     end
 
     and_by 'form displays correct body' do
@@ -223,12 +230,12 @@ feature 'under Applications menu, Scripting workflows', js: true do
     end
 
     and_by 'select different tag' do
-      select_row(4, tg)
+      tag_grid.select_row(4)
     end
 
     and_by 'select script row 5' do
       wait_for_ajax
-      select_row(5, sg)
+      script_grid.select_row(5)
     end
 
     and_by 'form displays updated body' do
@@ -241,14 +248,17 @@ feature 'under Applications menu, Scripting workflows', js: true do
     log_in_as('dev1')
     go_to_scripting
 
+    script_grid = netzke_find('script_grid')
+    tag_grid = netzke_find('tag_grid')
+
     by 'select DEV tag' do
       wait_for_ajax
-      select_row(1, tg)
+      tag_grid.select_row(1)
     end
 
     and_by 'select script row 5' do
       wait_for_ajax
-      select_row(5, sg)
+      script_grid.select_row(5)
     end
 
     and_by 'edit script form body' do
@@ -261,13 +271,13 @@ feature 'under Applications menu, Scripting workflows', js: true do
 
     and_by 'new script does not exist in old tag' do
       wait_for_ajax
-      select_row(2, tg)
+      tag_grid.select_row(2)
       # FIX?  selection change required to refresh script form
-      select_row(1, sg)
-      select_row(5, sg)
+      script_grid.select_row(1)
+      script_grid.select_row(5)
       wait_for_ajax
       expect(page).not_to have_content "#123\n#456\n"
-      select_row(1, sg)
+      script_grid.select_row(1)
     end
 
     and_by 'make new tag' do
@@ -280,11 +290,11 @@ feature 'under Applications menu, Scripting workflows', js: true do
 
     and_by 'new tag contains new script' do
       wait_for_ajax
-      select_row(2, tg)
+      tag_grid.select_row(2)
       wait_for_ajax
-      select_row(5, sg)
+      script_grid.select_row(5)
       expect(page).to have_content "#123\n#456\n"
-      expect(validate_row_values(2, tg, comment: 'ABCD')).to be_truthy
+      tag_grid.validate_row_values(2, comment: 'ABCD')
     end
   end
 
@@ -292,14 +302,17 @@ feature 'under Applications menu, Scripting workflows', js: true do
     log_in_as('dev1')
     go_to_scripting
 
+    script_grid = netzke_find('script_grid')
+    tag_grid = netzke_find('tag_grid')
+
     by 'select DEV tag' do
       wait_for_ajax
-      select_row(1, tg)
+      tag_grid.select_row(1)
     end
 
     and_by 'select script row 1' do
       wait_for_ajax
-      select_row(1, sg)
+      script_grid.select_row(1)
     end
 
     and_by 'save without changes' do
@@ -312,20 +325,23 @@ feature 'under Applications menu, Scripting workflows', js: true do
     log_in_as('dev1')
     go_to_scripting
 
+    script_grid = netzke_find('script_grid')
+    tag_grid = netzke_find('tag_grid')
+
     by 'select DEV tag' do
       wait_for_ajax
-      select_row(1, tg)
+      tag_grid.select_row(1)
     end
 
     and_by 'delete script' do
-      select_row(1, sg)
+      script_grid.select_row(1)
       press('Delete Script')
       find(:xpath, "//div[text()='Confirmation']", wait: 5)
       press('Yes')
     end
 
     and_by 'script is gone' do
-      expect(row_count(sg)).to eq 4
+      expect(script_grid.row_count).to eq 4
     end
   end
 
@@ -333,13 +349,16 @@ feature 'under Applications menu, Scripting workflows', js: true do
     log_in_as('dev1')
     go_to_scripting
 
+    script_grid = netzke_find('script_grid')
+    tag_grid = netzke_find('tag_grid')
+
     by 'select not DEV tag' do
       wait_for_ajax
-      select_row(2, tg)
+      tag_grid.select_row(2)
     end
 
     and_by 'delete script' do
-      select_row(1, sg)
+      script_grid.select_row(1)
       press('Delete Script')
       find(:xpath, "//div[text()='Confirmation']", wait: 5)
       press('Yes')