marty 1.2.9 → 2.0.0

data/spec/other/diagnostic/base_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe Marty::Diagnostic::Base do
   def sample_data consistent=true
-    node_data_a = Marty::Diagnostic::Base.pack(include_ip=false){'A'}
-    node_data_b = Marty::Diagnostic::Base.pack(include_ip=false){'B'}
+    node_data_a = described_class.pack(include_ip=false){'A'}
+    node_data_b = described_class.pack(include_ip=false){'B'}
 
     data = {
       'NodeA' => node_data_a,
@@ -18,8 +18,8 @@ describe Marty::Diagnostic::Base do
     a = sample_data
     b = sample_data(consistent=false)
 
-    expect(Marty::Diagnostic::Base.consistent?(a)).to eq(true)
-    expect(Marty::Diagnostic::Base.consistent?(b)).to eq(false)
+    expect(described_class.consistent?(a)).to eq(true)
+    expect(described_class.consistent?(b)).to eq(false)
   end
 
   it 'can produce a valid diagnostic hash from a String' do
@@ -31,7 +31,7 @@ describe Marty::Diagnostic::Base do
       }
     }
 
-    expect(Marty::Diagnostic::Base.pack(include_ip=false){'A'}).to eq(expected)
+    expect(described_class.pack(include_ip=false){'A'}).to eq(expected)
   end
 
   it 'can produce a valid diagnostic hash from a Hash' do
@@ -58,15 +58,15 @@ describe Marty::Diagnostic::Base do
       },
     }
 
-    expect(Marty::Diagnostic::Base.
+    expect(described_class.
              pack(include_ip=false){test_a}).to eq(expected)
-    expect(Marty::Diagnostic::Base.
+    expect(described_class.
              pack(include_ip=false){test_a}).to eq(expected)
   end
 
   it 'can produce a valid diagnostic hash from an error Hash' do
-    test = Marty::Diagnostic::Base.pack(include_ip=false){
-      Marty::Diagnostic::Base.error('E')
+    test = described_class.pack(include_ip=false){
+      described_class.error('E')
     }
 
     expected = {
@@ -83,7 +83,7 @@ describe Marty::Diagnostic::Base do
     test_a = {
       'ImportantA' => 'A',
       'ImportantB' => 'B',
-      'ImportantC' => Marty::Diagnostic::Base.create_info('C') + {
+      'ImportantC' => described_class.create_info('C') + {
         'extra' => 'D'
       }
     }
@@ -96,7 +96,7 @@ describe Marty::Diagnostic::Base do
       }
     }
 
-    expect{Marty::Diagnostic::Base.pack{test_a}}.to raise_error(RuntimeError)
-    expect{Marty::Diagnostic::Base.pack{test_b}}.to raise_error(RuntimeError)
+    expect{described_class.pack{test_a}}.to raise_error(RuntimeError)
+    expect{described_class.pack{test_b}}.to raise_error(RuntimeError)
   end
 end

data/spec/other/diagnostic/collection_spec.rb

@@ -2,31 +2,31 @@ require 'spec_helper'
 
 describe Marty::Diagnostic::Collection do
   def sample_data consistent = true
-    node_a_data = Marty::Diagnostic::Collection.pack(include_ip=false){'A'}
+    node_a_data = described_class.pack(include_ip=false){'A'}
     data = {
       'NodeA' => node_a_data,
       'NodeB' => node_a_data,
     }
     return data if consistent
-    data + {'NodeB' => {'Base' => Marty::Diagnostic::Collection.error('B')}}
+    data + {'NodeB' => {'Base' => described_class.error('B')}}
   end
 
   it 'all diagnostics in diagnostics class attribute are generated' do
     diags = [Marty::Diagnostic::Version, Marty::Diagnostic::Nodes]
     expected = diags.map{|d| d.generate}.reduce(:deep_merge)
-    Marty::Diagnostic::Collection.diagnostics = diags
-    expect(Marty::Diagnostic::Collection.generate).to eq(expected)
+    described_class.diagnostics = diags
+    expect(described_class.generate).to eq(expected)
   end
 
   it 'declares data consistency via status consistency' do
     a = sample_data
     b = sample_data + {
-      'NodeB' => Marty::Diagnostic::Collection.pack(include_ip=false){'B'}
+      'NodeB' => described_class.pack(include_ip=false){'B'}
     }
     c = sample_data(consistent=false)
 
-    expect(Marty::Diagnostic::Collection.consistent?(a)).to eq(true)
-    expect(Marty::Diagnostic::Collection.consistent?(b)).to eq(true)
-    expect(Marty::Diagnostic::Collection.consistent?(c)).to eq(false)
+    expect(described_class.consistent?(a)).to eq(true)
+    expect(described_class.consistent?(b)).to eq(true)
+    expect(described_class.consistent?(c)).to eq(false)
   end
 end

data/spec/other/diagnostic/{delayed_job_spec.rb → delayed_job_version_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'job_helper'
 
-describe Marty::Diagnostic::DelayedJob do
+describe Marty::Diagnostic::DelayedJobVersion do
   # used to stub request object
   class DummyRequest
     attr_accessor :params, :port
@@ -12,7 +12,7 @@ describe Marty::Diagnostic::DelayedJob do
 
   before(:each) do
     Marty::Script.load_scripts(nil, Date.today)
-    allow(Marty::Diagnostic::DelayedJob).to receive(:scope).and_return(nil)
+    allow(described_class).to receive(:scope).and_return(nil)
   end
 
   def sample_data
@@ -30,14 +30,14 @@ describe Marty::Diagnostic::DelayedJob do
   it 'can detect if all workers are running correct application version' do
     ENV['DELAYED_VER'] = Marty::VERSION
     start_delayed_job
-    expect(Marty::Diagnostic::DelayedJob.generate).to eq(sample_data)
+    expect(described_class.generate).to eq(sample_data)
     stop_delayed_job
   end
 
   it 'will fail if DELAYED_VER is not set' do
     ENV.delete('DELAYED_VER')
     start_delayed_job
-    expect{Marty::Diagnostic::DelayedJob.generate}.to raise_error(RuntimeError)
+    expect{described_class.generate}.to raise_error(RuntimeError)
     stop_delayed_job
   end
 end

data/spec/other/diagnostic/delayed_job_workers_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+require 'job_helper'
+
+describe Marty::Diagnostic::DelayedJobWorkers do
+  def sample_data ip=nil, error=false
+    {
+      ip || Marty::Helper.my_ip => {
+        'DelayedJobWorkers' => {
+          'description' => error ? "3" : "4",
+          'status'      => true,
+          'consistent'  => nil
+        },
+      }
+    }
+  end
+
+  def sample_aggregate error=false
+    [
+      sample_data(ip='0.0.0.0'),
+      sample_data(ip='0.0.0.1'),
+      sample_data(ip='0.0.0.2', error=error),
+      sample_data(ip='0.0.0.3'),
+    ].reduce(:merge)
+  end
+
+  it 'can determine the number of workers on a node' do
+    start_delayed_job
+    expect(described_class.generate).to eq(sample_data)
+    stop_delayed_job
+  end
+
+  it 'can determine if there are nodes with missing workers' do
+    consistent   = sample_aggregate
+    inconsistent = sample_aggregate(error=true)
+
+    expect(described_class.consistent?(consistent)).to eq(true)
+    expect(described_class.consistent?(inconsistent)).to eq(false)
+  end
+
+  it 'recognizes zero workers as an error' do
+    data = described_class.generate.values[0]
+    expect(data['DelayedJobWorkers']['status']).to eq(false)
+  end
+end

data/spec/other/diagnostic/reporter_spec.rb

@@ -111,15 +111,15 @@ describe Marty::Diagnostic::Reporter do
 
   describe 'display mechanism for version diagnostic' do
     before(:all) do
-      Marty::Diagnostic::Reporter.diagnostics = [Marty::Diagnostic::Version]
+      described_class.diagnostics = [Marty::Diagnostic::Version]
     end
 
     before(:each) do
-      Marty::Diagnostic::Reporter.request = DummyRequest.new
+      described_class.request = DummyRequest.new
     end
 
     it 'masks consistent nodes for display (version)' do
-      Marty::Diagnostic::Reporter.request.params = params(scope='local')
+      described_class.request.params = params(scope='local')
       data = {
         'Version' => {
           'NodeA' => version_data,
@@ -209,27 +209,27 @@ describe Marty::Diagnostic::Reporter do
       </div>
       ERB
 
-      test = Marty::Diagnostic::Reporter.displays(data)
+      test = described_class.displays(data)
       expect(minimize(test)).to eq(minimize(expected))
     end
 
     it 'can detect errors in diagnostic for display and api' do
-      Marty::Diagnostic::Reporter.request.params = params
+      described_class.request.params = params
       n  = aggregate_data
       e  = aggregate_data(status: false)
       c  = aggregate_data(consistent: false)
       ce = aggregate_data(status: false, consistent: false)
 
       aggregate_failures do
-        expect(Marty::Diagnostic::Reporter.errors(n)).to eq({})
-        expect(Marty::Diagnostic::Reporter.errors(e)).not_to eq({})
-        expect(Marty::Diagnostic::Reporter.errors(c)).not_to eq({})
-        expect(Marty::Diagnostic::Reporter.errors(ce)).not_to eq({})
+        expect(described_class.errors(n)).to eq({})
+        expect(described_class.errors(e)).not_to eq({})
+        expect(described_class.errors(c)).not_to eq({})
+        expect(described_class.errors(ce)).not_to eq({})
       end
     end
 
     it 'can survive and display fatal errors' do
-      Marty::Diagnostic::Reporter.request.params = params
+      described_class.request.params = params
 
       a_err_a = Marty::Diagnostic::Fatal.message('A',
                                                  node: 'NodeA')
@@ -293,13 +293,9 @@ describe Marty::Diagnostic::Reporter do
           </tr>
         </table>
       </div>
-      <h3 class="error">
-         Something went wrong.</br>
-         Consistency is checked between remaining nodes if applicable.
-      </h3>
       ERB
 
-      result = Marty::Diagnostic::Reporter.displays(data)
+      result = described_class.displays(data)
       expect(minimize(result)).to eq(minimize(expected))
     end
   end
@@ -307,12 +303,12 @@ describe Marty::Diagnostic::Reporter do
   describe 'aggregation consistency functionality' do
     it 'env diagnostic' do
       test, expected = aggregate_consistency_data('EnvironmentVariables')
-      expect(Marty::Diagnostic::Reporter.consistency(test)).to eq(expected)
+      expect(described_class.consistency(test)).to eq(expected)
     end
 
     it 'marks data as consistent/inconsistent' do
       test, expected = aggregate_consistency_data
-      expect(Marty::Diagnostic::Reporter.consistency(test)).to eq(expected)
+      expect(described_class.consistency(test)).to eq(expected)
     end
   end
 end

data/spec/spec_helper.rb

@@ -12,6 +12,17 @@ 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
@@ -26,27 +37,23 @@ class ActiveRecord::Base
 
   def self.connection
     CLASSES_TO_EXCLUDE_FROM_SHARED.include?(model_name) ? orig_connection :
-      @@shared_connection || retrieve_connection
+      @@shared_connection ||
+      ConnectionPool::Wrapper.new(:size => 1) {retrieve_connection}
   end
 
   def self.reset_shared_connection
-    @@shared_connection = retrieve_connection
+    @@shared_connection = ConnectionPool::Wrapper.
+                            new(:size => 1) {retrieve_connection}
   end
 end
 
-Capybara.register_driver :selenium do |app|
-  # use personal firefox if it exists
-  personal_firefox = File.expand_path('~/firefox/firefox')
-  Selenium::WebDriver::Firefox::Binary.path = personal_firefox if
-    File.exists?(personal_firefox)
-
-  client = Selenium::WebDriver::Remote::Http::Default.new
-  profile = Selenium::WebDriver::Firefox::Profile.new
-  profile.load_no_focus_lib = true
-  Capybara::Selenium::Driver.new(app, :profile => profile,
-                                 :http_client => client)
-end
+register_chrome_driver
+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
 
@@ -95,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/clean_db_helpers.rb

@@ -8,11 +8,11 @@ module CleanDbHelpers
   end
 
   def restore_clean_db(clean_file, remove_file = true)
-    self.use_transactional_fixtures = false
+    self.use_transactional_tests = false
     `pg_restore -j 2 -O -x -c -d #{current_db} #{clean_file}`
     `rm -f #{clean_file}` if remove_file
     ActiveRecord::Base.clear_all_connections!
     ActiveRecord::Base.reset_shared_connection
-    self.use_transactional_fixtures = true
+    self.use_transactional_tests = true
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 2.0.0
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-09 00:00:00.000000000 Z
+date: 2018-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -31,47 +31,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.21'
 - !ruby/object:Gem::Dependency
-  name: netzke-core
+  name: netzke
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: netzke-basepack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 6.5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: netzke-testing
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 6.5.0.0
 - !ruby/object:Gem::Dependency
   name: axlsx
   requirement: !ruby/object:Gem::Requirement
@@ -106,14 +78,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.19
+        version: 0.0.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.19
+        version: 0.0.20
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
@@ -525,7 +497,8 @@ files:
 - other/marty/diagnostic/base.rb
 - other/marty/diagnostic/collection.rb
 - other/marty/diagnostic/database.rb
-- other/marty/diagnostic/delayed_job.rb
+- other/marty/diagnostic/delayed_job_version.rb
+- other/marty/diagnostic/delayed_job_workers.rb
 - other/marty/diagnostic/environment_variables.rb
 - other/marty/diagnostic/fatal.rb
 - other/marty/diagnostic/node.rb
@@ -535,6 +508,7 @@ files:
 - other/marty/diagnostic/request.rb
 - other/marty/diagnostic/version.rb
 - script/rails
+- script_id,
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/diagnostic/controller_spec.rb
 - spec/controllers/job_controller_spec.rb
@@ -1675,7 +1649,8 @@ files:
 - spec/models/user_spec.rb
 - spec/other/diagnostic/base_spec.rb
 - spec/other/diagnostic/collection_spec.rb
-- spec/other/diagnostic/delayed_job_spec.rb
+- spec/other/diagnostic/delayed_job_version_spec.rb
+- spec/other/diagnostic/delayed_job_workers_spec.rb
 - spec/other/diagnostic/reporter_spec.rb
 - spec/requests/routes_spec.rb
 - spec/spec_helper.rb