rocketjob_mission_control 4.3.0 → 6.0.0.beta

data/test/helpers/rocket_job_mission_control/pagination_helper_test.rb

@@ -1,22 +1,20 @@
-require_relative '../../test_helper'
+require_relative "../../test_helper"
 
 module RocketJobMissionControl
   class PaginationHelperTest < ActionView::TestCase
     describe PaginationHelper do
-
-      describe '#page_nav_disabled_class' do
-        describe 'when the current position equals the boundary' do
-          it 'returns disabled' do
-            assert_equal 'disabled', page_nav_disabled_class(0, 0)
+      describe "#page_nav_disabled_class" do
+        describe "when the current position equals the boundary" do
+          it "returns disabled" do
+            assert_equal "disabled", page_nav_disabled_class(0, 0)
           end
         end
 
-        describe 'when the current position is NOT equal to the boundary' do
-          it 'returns blank' do
+        describe "when the current position is NOT equal to the boundary" do
+          it "returns blank" do
             assert page_nav_disabled_class(4, 0).blank?
           end
         end
-
       end
     end
   end

data/test/helpers/rocket_job_mission_control/servers_helper_test.rb

@@ -1,12 +1,12 @@
-require_relative '../../test_helper'
+require_relative "../../test_helper"
 
 module RocketJobMissionControl
   ServersHelper.include(RocketJobMissionControl::ApplicationHelper)
 
   class ServersHelperTest < ActionView::TestCase
     describe ServersHelper do
-      describe '#server_card_class' do
-        describe 'when the server is running' do
+      describe "#server_card_class" do
+        describe "when the server is running" do
           let(:server) do
             server = RocketJob::Server.new
             server.started
@@ -14,12 +14,12 @@ module RocketJobMissionControl
             server
           end
 
-          it 'returns the correct class' do
-            assert_equal 'callout-success', server_card_class(server)
+          it "returns the correct class" do
+            assert_equal "callout-success", server_card_class(server)
           end
         end
 
-        describe 'when the server is a zombie' do
+        describe "when the server is a zombie" do
           let(:server) do
             server = RocketJob::Server.new
             server.started
@@ -27,14 +27,14 @@ module RocketJobMissionControl
             server
           end
 
-          it 'returns the correct class' do
-            assert_equal 'callout-zombie', server_card_class(server)
+          it "returns the correct class" do
+            assert_equal "callout-zombie", server_card_class(server)
           end
         end
       end
 
-      describe '#server_icon' do
-        describe 'when the server is running' do
+      describe "#server_icon" do
+        describe "when the server is running" do
           let(:server) do
             server = RocketJob::Server.new
             server.started
@@ -42,12 +42,12 @@ module RocketJobMissionControl
             server
           end
 
-          it 'returns the correct class' do
-            assert_equal 'fas fa-play running', server_icon(server)
+          it "returns the correct class" do
+            assert_equal "fas fa-play running", server_icon(server)
           end
         end
 
-        describe 'when the server is a zombie' do
+        describe "when the server is a zombie" do
           let(:server) do
             server = RocketJob::Server.new
             server.started
@@ -55,8 +55,8 @@ module RocketJobMissionControl
             server
           end
 
-          it 'returns the correct class' do
-            assert_equal 'fas fa-hourglass zombie', server_icon(server)
+          it "returns the correct class" do
+            assert_equal "fas fa-hourglass zombie", server_icon(server)
           end
         end
       end

data/test/helpers/rocket_job_mission_control/slices_helper_test.rb

@@ -1,29 +1,27 @@
-require_relative '../../test_helper'
+require_relative "../../test_helper"
 
 module RocketJobMissionControl
   SlicesHelper.include(RocketJobMissionControl::ApplicationHelper)
   class SlicesHelperTest < ActionView::TestCase
     describe SlicesHelper do
+      describe "#display_slice_info" do
+        let(:slice) { {id: 42, name: "test"} }
 
-      describe '#display_slice_info' do
-        let(:slice) { {id: 42, name: 'test'} }
-
-        describe 'when encrypted' do
-          it 'only shows encrypted text' do
-            assert_equal 'encrypted', display_slice_info(slice, true)
+        describe "when encrypted" do
+          it "only shows encrypted text" do
+            assert_equal "encrypted", display_slice_info(slice, true)
           end
         end
 
-        describe 'when not encrypted' do
+        describe "when not encrypted" do
           it "does not return 'encrypted'" do
-            refute_equal 'encrypted', display_slice_info([1, 2], false)
+            refute_equal "encrypted", display_slice_info([1, 2], false)
           end
 
           it "displays the slice info" do
             assert_equal "[<br />  1,<br />  2<br />]", display_slice_info([1, 2], false)
           end
         end
-
       end
     end
   end

data/test/models/rocket_job_mission_control/dirmon_sanitizer_test.rb

@@ -0,0 +1,146 @@
+require_relative "../../test_helper"
+
+class DirmonSanitizerTest < Minitest::Test
+  describe RocketJobMissionControl::DirmonSanitizer do
+    class SampleJob < RocketJob::Job
+      include RocketJob::Batch
+
+      input_category format: :csv
+      output_category format: :csv
+      output_category name: :errors, format: :csv
+
+      field :client_name, type: String, user_editable: true
+      field :zip_code, type: Integer, user_editable: true
+
+      self.destroy_on_complete = false
+
+      def perform(record)
+        record
+      end
+    end
+
+    let :sample_job do
+      SampleJob.new
+    end
+
+    let :job_class_name do
+      SampleJob.name
+    end
+
+    let :properties do
+      {
+        client_name:                  "Jack",
+        zip_code:                     12345,
+        input_categories_attributes:  {0 => {format: :json}},
+        output_categories_attributes: {0 => {name: :errors, format: :json}}
+      }
+    end
+
+    let :sanitized_properties do
+      {
+        client_name:       "Jill",
+        zip_code:          45673,
+        input_categories:  [{name: "main", format: "json", slice_size: 100, skip_unknown: "false"}],
+        output_categories: [{name: "errors", format: "json"}]
+      }
+    end
+
+    let :dirmon_entry do
+      RocketJob::DirmonEntry.new(
+        name:           "Test",
+        job_class_name: job_class_name,
+        pattern:        "the_path",
+        properties:     properties
+      )
+    end
+
+    describe ".sanitize" do
+      it "passes permissible fields" do
+        params   = {
+          name:              "Test2",
+          job_class_name:    job_class_name,
+          pattern:           "another/path",
+          archive_directory: "archive/path",
+          properties:        properties
+        }
+        cleansed = RocketJobMissionControl::DirmonSanitizer.sanitize(params, SampleJob, dirmon_entry)
+        assert_equal 0, dirmon_entry.errors.count
+        expected = {:archive_directory => "archive/path", :job_class_name => "DirmonSanitizerTest::SampleJob", :name => "Test2", :pattern => "another/path", :properties => {:client_name => "Jack", :zip_code => 12345, :input_categories => [{:format => :json}], :output_categories => [{:name => :errors, :format => :json}]}}
+        assert_equal expected, cleansed
+      end
+
+      it "strips blank values" do
+        params   = {
+          name:              "",
+          job_class_name:    "",
+          pattern:           "",
+          archive_directory: "",
+          bad_field:         "Not permissible",
+          properties:        {
+            client_name:                  "",
+            zip_code:                     "",
+            input_categories_attributes:  {0 => {format: ""}},
+            output_categories_attributes: {0 => {name: "", format: ""}}
+          }
+        }
+        cleansed = RocketJobMissionControl::DirmonSanitizer.sanitize(params, SampleJob, dirmon_entry)
+        assert_equal 0, dirmon_entry.errors.count
+        expected = {}
+        assert_equal expected, cleansed
+      end
+    end
+
+    describe ".diff_category" do
+      it "returns only different values" do
+        default_category = sample_job.input_category
+        properties       = {
+          name:         "main",
+          format:       "psv",
+          slice_size:   100,
+          skip_unknown: false
+        }
+        updated_category = RocketJob::Category::Input.new(properties)
+
+        diff = RocketJobMissionControl::DirmonSanitizer.diff_category(properties, updated_category, default_category)
+
+        expected = {:format => "psv", :name => "main"}
+        assert_equal expected, diff
+      end
+
+      it "is empty with no changes" do
+        default_category = sample_job.input_category
+        properties       = {
+          name:         "main",
+          format:       "csv",
+          slice_size:   100,
+          skip_unknown: false
+        }
+        updated_category = RocketJob::Category::Input.new(properties)
+
+        diff = RocketJobMissionControl::DirmonSanitizer.diff_category(properties, updated_category, default_category)
+
+        expected = {}
+        assert_equal expected, diff
+      end
+
+      it "empty" do
+        default_category = sample_job.input_category
+        properties       = {}
+        updated_category = RocketJob::Category::Input.new(properties)
+
+        diff = RocketJobMissionControl::DirmonSanitizer.diff_category(properties, updated_category, default_category)
+
+        expected = {}
+        assert_equal expected, diff
+      end
+    end
+
+    describe ".diff_properties" do
+      it "returns only different values" do
+        diff     = RocketJobMissionControl::DirmonSanitizer.diff_properties(sanitized_properties, dirmon_entry)
+        expected = {:client_name => "Jill", :zip_code => 45673, :input_categories => [{:format => "json", :name => "main"}], :output_categories => [{:format => "json", :name => "errors"}]}
+        assert_equal expected, diff
+      end
+    end
+  end
+end

data/test/models/rocket_job_mission_control/job_sanitizer_test.rb

@@ -1,4 +1,4 @@
-require_relative '../../test_helper'
+require_relative "../../test_helper"
 
 class JobSanitizerTest < Minitest::Test
   describe RocketJobMissionControl::JobSanitizer do
@@ -10,83 +10,88 @@ class JobSanitizerTest < Minitest::Test
     after do
     end
 
-    describe '.sanitize' do
-      it 'passes permissible fields' do
+    describe ".sanitize" do
+      it "passes permissible fields" do
         properties = {
-          string:  'hello',
-          integer: '12',
-          symbol:  'name',
-          secure:  'Not permissible'
+          string:  "hello",
+          integer: "12",
+          symbol:  "name",
+          secure:  "Not permissible"
         }
-        cleansed   = RocketJobMissionControl::JobSanitizer.sanitize(properties, @job.class, @job, false)
+        cleansed = RocketJobMissionControl::JobSanitizer.sanitize(properties, @job.class, @job, false)
         assert_equal 0, @job.errors.count
         assert_equal 3, cleansed.count
-        assert_equal({:string => "hello", :integer => "12", :symbol => "name"}, cleansed)
+        assert_equal({string: "hello", integer: "12", symbol: "name"}, cleansed)
       end
 
-      it 'strips blank values' do
+      it "strips blank values" do
         properties = {
-          string:    '',
-          integer:   '',
-          symbol:    '',
-          secure:    'Not permissible',
-          log_level: ''
+          string:    "",
+          integer:   "",
+          symbol:    "",
+          secure:    "Not permissible",
+          log_level: ""
         }
-        cleansed   = RocketJobMissionControl::JobSanitizer.sanitize(properties, @job.class, @job, false)
+        cleansed = RocketJobMissionControl::JobSanitizer.sanitize(properties, @job.class, @job, false)
         assert_equal 0, @job.errors.count
         assert_equal 0, cleansed.count
       end
 
-      it 'nils blank values' do
+      it "nils blank values" do
         properties = {
-          string:     '',
-          integer:    '',
-          symbol:     '',
-          hash_field: '',
-          secure:     'Not permissible',
-          log_level:  ''
+          string:     "",
+          integer:    "",
+          symbol:     "",
+          hash_field: "",
+          secure:     "Not permissible",
+          log_level:  ""
         }
-        cleansed   = RocketJobMissionControl::JobSanitizer.sanitize(properties, @job.class, @job, true)
+        cleansed = RocketJobMissionControl::JobSanitizer.sanitize(properties, @job.class, @job, true)
         assert_equal 0, @job.errors.count, @job.errors
         assert_equal 5, cleansed.count
         assert_equal({log_level: nil, hash_field: nil, integer: nil, string: nil, symbol: nil}, cleansed)
       end
 
-      it 'parses JSON' do
+      it "parses JSON" do
         properties = {
-          string:     '',
-          secure:     'Not permissible',
+          string:     "",
+          secure:     "Not permissible",
           hash_field: '{"state":"FL"}'
         }
-        cleansed   = RocketJobMissionControl::JobSanitizer.sanitize(properties, @job.class, @job, false)
+        cleansed = RocketJobMissionControl::JobSanitizer.sanitize(properties, @job.class, @job, false)
         assert_equal 0, @job.errors.count
         assert_equal 1, cleansed.count
-        assert_equal({'state' => 'FL'}, cleansed[:hash_field])
+        assert_equal({"state" => "FL"}, cleansed[:hash_field])
       end
 
-      it 'sets the error for invalid JSON' do
+      it "sets the error for invalid JSON" do
         properties = {
-          string:     'hello',
-          secure:     'Not permissible',
-          hash_field: '{ bad json }'
+          string:     "hello",
+          secure:     "Not permissible",
+          hash_field: "{ bad json }"
         }
-        cleansed   = RocketJobMissionControl::JobSanitizer.sanitize(properties, @job.class, @job, false)
+        cleansed = RocketJobMissionControl::JobSanitizer.sanitize(properties, @job.class, @job, false)
         assert_equal 1, @job.errors.count
-        assert first = @job.errors.first
-        assert_equal first.first, :properties
-        assert first.second.include?('unexpected token'), first
-        assert_equal({hash_field: "{ bad json }", string: 'hello'}, cleansed)
+        if Rails.version.to_f >= 6.1
+          assert error = @job.errors.first
+          assert_equal error.attribute, :properties
+          assert error.message.include?("unexpected token"), error
+        else
+          assert error = @job.errors.first
+          assert_equal error.first, :properties
+          assert error.second.include?("unexpected token"), error
+        end
+        assert_equal({hash_field: "{ bad json }", string: "hello"}, cleansed)
       end
 
-      it 'Keeps empty JSON Hash' do
+      it "Keeps empty JSON Hash" do
         properties = {
-          hash_field: '{ }'
+          hash_field: "{ }"
         }
-        cleansed   = RocketJobMissionControl::JobSanitizer.sanitize(properties, @job.class, @job, false)
+        cleansed = RocketJobMissionControl::JobSanitizer.sanitize(properties, @job.class, @job, false)
         assert_equal 0, @job.errors.count
         assert_equal({hash_field: {}}, cleansed)
       end
     end
-
   end
 end

data/test/models/rocket_job_mission_control/query_test.rb

@@ -1,7 +1,6 @@
-require_relative '../../test_helper'
+require_relative "../../test_helper"
 
 class QueryTest < Minitest::Test
-
   class NoopJob < RocketJob::Job
     field :record_count, type: Integer, default: 0
     def perform(record)
@@ -18,56 +17,56 @@ class QueryTest < Minitest::Test
       NoopJob.delete_all
     end
 
-    describe '#query' do
-      it 'sorts ascending by id' do
+    describe "#query" do
+      it "sorts ascending by id" do
         count       = 0
         previous_id = nil
         RocketJobMissionControl::Query.new(NoopJob.all, _id: 1).query.each do |job|
           assert(previous_id < job.id, "Wrong sort order. #{previous_id} < #{job.id}") if previous_id
           previous_id = job.id
-          count       += 1
+          count += 1
         end
         assert_equal @jobs.count, count
       end
 
-      it 'sorts descending by id' do
+      it "sorts descending by id" do
         count       = 0
         previous_id = nil
         RocketJobMissionControl::Query.new(NoopJob.all, _id: -1).query.each do |job|
           assert(previous_id > job.id, "Wrong sort order. #{previous_id} > #{job.id}") if previous_id
           previous_id = job.id
-          count       += 1
+          count += 1
         end
         assert_equal @jobs.count, count
       end
 
-      it 'sorts ascending by description' do
+      it "sorts ascending by description" do
         count    = 0
         previous = nil
         RocketJobMissionControl::Query.new(NoopJob.all, description: 1).query.each do |job|
           assert(previous < job.description, "Wrong sort order. #{previous} < #{job.description}") if previous
           previous = job.description
-          count    += 1
+          count += 1
         end
         assert_equal @jobs.count, count
       end
 
-      it 'sorts ascending by id with a search' do
+      it "sorts ascending by id with a search" do
         q = RocketJobMissionControl::Query.new(NoopJob.all, description: 1)
         q.search_columns << :description
-        q.search_term = 'Job 1'
+        q.search_term = "Job 1"
 
         count       = 0
         previous_id = nil
         q.query.each do |job|
           assert(previous_id < job.id, "Wrong sort order. #{previous_id} < #{job.id}") if previous_id
           previous_id = job.id
-          count       += 1
+          count += 1
         end
         assert_equal 2, count
       end
 
-      it 'paginates with sort' do
+      it "paginates with sort" do
         q           = RocketJobMissionControl::Query.new(NoopJob.all, _id: 1)
         q.start     = 1
         q.page_size = 3
@@ -77,15 +76,15 @@ class QueryTest < Minitest::Test
         q.query.each do |job|
           assert(previous_id < job.id, "Wrong sort order. #{previous_id} < #{job.id}") if previous_id
           previous_id = job.id
-          count       += 1
+          count += 1
         end
         assert_equal 3, count
       end
 
-      it 'paginates with sort and search' do
+      it "paginates with sort and search" do
         q = RocketJobMissionControl::Query.new(NoopJob.all, _id: 1)
         q.search_columns << :description
-        q.search_term = 'Job'
+        q.search_term = "Job"
         q.start       = 1
         q.page_size   = 3
 
@@ -94,12 +93,12 @@ class QueryTest < Minitest::Test
         q.query.each do |job|
           assert(previous_id < job.id, "Wrong sort order. #{previous_id} < #{job.id}") if previous_id
           previous_id = job.id
-          count       += 1
+          count += 1
         end
         assert_equal 3, count
       end
 
-      it 'sorts ascending by record_count' do
+      it "sorts ascending by record_count" do
         count    = 0
         previous = nil
         RocketJobMissionControl::Query.new(NoopJob.all, record_count: 1).query.each do |job|
@@ -110,7 +109,7 @@ class QueryTest < Minitest::Test
         assert_equal @jobs.count, count
       end
 
-      it 'sorts descending by record_count' do
+      it "sorts descending by record_count" do
         count    = 0
         previous = nil
         RocketJobMissionControl::Query.new(NoopJob.all, record_count: -1).query.each do |job|
@@ -122,15 +121,15 @@ class QueryTest < Minitest::Test
       end
     end
 
-    describe '#count' do
-      it 'without search' do
+    describe "#count" do
+      it "without search" do
         assert_equal 10, RocketJobMissionControl::Query.new(NoopJob.all, description: 1).count
       end
 
-      it 'with search and pagination' do
+      it "with search and pagination" do
         q = RocketJobMissionControl::Query.new(NoopJob.all, description: 1)
         q.search_columns << :description
-        q.search_term = 'Job 1'
+        q.search_term = "Job 1"
         # Pagination should be ignored
         q.start       = 1
         q.page_size   = 1
@@ -138,21 +137,20 @@ class QueryTest < Minitest::Test
       end
     end
 
-    describe '#unfiltered_count' do
-      it 'without search' do
+    describe "#unfiltered_count" do
+      it "without search" do
         assert_equal 10, RocketJobMissionControl::Query.new(NoopJob.all, description: 1).unfiltered_count
       end
 
-      it 'with search and pagination' do
+      it "with search and pagination" do
         q = RocketJobMissionControl::Query.new(NoopJob.all, description: 1)
         q.search_columns << :description
-        q.search_term = 'Job 1'
+        q.search_term = "Job 1"
         # Pagination should be ignored
         q.start       = 1
         q.page_size   = 3
         assert_equal 10, q.unfiltered_count
       end
     end
-
   end
 end