rocketjob_mission_control 5.0.0 → 6.0.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/Rakefile +1 -2
- data/app/assets/config/manifest.js +3 -0
- data/app/assets/fonts/glyphicons-halflings-regular.eot +0 -0
- data/app/assets/fonts/glyphicons-halflings-regular.svg +288 -0
- data/app/assets/fonts/glyphicons-halflings-regular.ttf +0 -0
- data/app/assets/fonts/glyphicons-halflings-regular.woff +0 -0
- data/app/assets/fonts/glyphicons-halflings-regular.woff2 +0 -0
- data/app/assets/javascripts/rocket_job_mission_control/application.js +10 -11
- data/app/assets/javascripts/rocket_job_mission_control/base.js +1 -1
- data/app/assets/javascripts/rocket_job_mission_control/bootstrap.min.js +6 -0
- data/app/assets/javascripts/rocket_job_mission_control/{datatable.js → datatable_init.js} +0 -0
- data/{vendor/assets/javascripts → app/assets/javascripts/rocket_job_mission_control}/datatables.min.js +0 -0
- data/app/assets/javascripts/rocket_job_mission_control/dirmon_entries.js +1 -1
- data/app/assets/javascripts/rocket_job_mission_control/jquery-3.5.1.min.js +2 -0
- data/app/assets/javascripts/rocket_job_mission_control/nested_fields.js +112 -0
- data/app/assets/javascripts/rocket_job_mission_control/selectize.min.js +3 -0
- data/app/assets/javascripts/rocket_job_mission_control/selectize_init.js +6 -0
- data/app/assets/stylesheets/rocket_job_mission_control/{application.scss → application.css} +9 -8
- data/app/assets/stylesheets/rocket_job_mission_control/base.css +420 -0
- data/app/assets/stylesheets/rocket_job_mission_control/bootstrap.min.css.erb +6 -0
- data/app/assets/stylesheets/rocket_job_mission_control/bootstrap.min.css.map +1 -0
- data/app/assets/stylesheets/rocket_job_mission_control/{callout.scss → callout.css} +50 -52
- data/{vendor/assets/stylesheets → app/assets/stylesheets/rocket_job_mission_control}/datatables.min.css +0 -0
- data/{vendor/assets/stylesheets → app/assets/stylesheets/rocket_job_mission_control}/fontawesome-all.min.css.erb +0 -0
- data/app/assets/stylesheets/rocket_job_mission_control/jobs.css +56 -0
- data/app/assets/stylesheets/rocket_job_mission_control/selectize.bootstrap3.css +1 -0
- data/app/assets/stylesheets/rocket_job_mission_control/selectize.css +19 -0
- data/app/assets/stylesheets/rocket_job_mission_control/worker_processes.css +7 -0
- data/app/controllers/rocket_job_mission_control/application_controller.rb +3 -1
- data/app/controllers/rocket_job_mission_control/dirmon_entries_controller.rb +23 -23
- data/app/controllers/rocket_job_mission_control/jobs_controller.rb +50 -7
- data/app/controllers/rocket_job_mission_control/servers_controller.rb +7 -7
- data/app/datatables/rocket_job_mission_control/dirmon_entries_datatable.rb +1 -1
- data/app/datatables/rocket_job_mission_control/jobs_datatable.rb +1 -1
- data/app/helpers/rocket_job_mission_control/application_helper.rb +51 -26
- data/app/helpers/rocket_job_mission_control/dirmon_entries_helper.rb +12 -0
- data/app/helpers/rocket_job_mission_control/jobs_helper.rb +76 -8
- data/app/helpers/rocket_job_mission_control/servers_helper.rb +4 -0
- data/app/models/rocket_job_mission_control/dirmon_sanitizer.rb +68 -0
- data/app/models/rocket_job_mission_control/job_sanitizer.rb +37 -0
- data/app/views/layouts/rocket_job_mission_control/application.html.erb +2 -2
- data/app/views/layouts/rocket_job_mission_control/partials/_flash.html.erb +4 -4
- data/app/views/rocket_job_mission_control/dirmon_entries/_form.html.erb +78 -42
- data/app/views/rocket_job_mission_control/dirmon_entries/_input_categories.html.erb +59 -0
- data/app/views/rocket_job_mission_control/dirmon_entries/_input_category_fields.html.erb +56 -0
- data/app/views/rocket_job_mission_control/dirmon_entries/_output_categories.html.erb +44 -0
- data/app/views/rocket_job_mission_control/dirmon_entries/_output_category_fields.html.erb +36 -0
- data/app/views/rocket_job_mission_control/dirmon_entries/_status.html.erb +22 -16
- data/app/views/rocket_job_mission_control/dirmon_entries/copy.html.erb +1 -1
- data/app/views/rocket_job_mission_control/dirmon_entries/edit.html.erb +7 -3
- data/app/views/rocket_job_mission_control/dirmon_entries/show.html.erb +2 -3
- data/app/views/rocket_job_mission_control/jobs/_attributes.html.erb +28 -0
- data/app/views/rocket_job_mission_control/jobs/_dates.html.erb +35 -0
- data/app/views/rocket_job_mission_control/jobs/_details.html.erb +125 -0
- data/app/views/rocket_job_mission_control/jobs/_exception.html.erb +22 -0
- data/app/views/rocket_job_mission_control/jobs/_input_categories.html.erb +76 -0
- data/app/views/rocket_job_mission_control/jobs/_input_category_fields.html.erb +56 -0
- data/app/views/rocket_job_mission_control/jobs/_output_categories.html.erb +49 -0
- data/app/views/rocket_job_mission_control/jobs/_output_category_fields.html.erb +36 -0
- data/app/views/rocket_job_mission_control/jobs/_retryable.html.erb +16 -0
- data/app/views/rocket_job_mission_control/jobs/_status.html.erb +20 -48
- data/app/views/rocket_job_mission_control/jobs/edit.html.erb +28 -0
- data/app/views/rocket_job_mission_control/jobs/edit_slice.html.erb +2 -2
- data/app/views/rocket_job_mission_control/jobs/exception.html.erb +1 -1
- data/app/views/rocket_job_mission_control/jobs/index.html.erb +24 -18
- data/app/views/rocket_job_mission_control/jobs/show.html.erb +32 -58
- data/app/views/rocket_job_mission_control/jobs/view_slice.html.erb +6 -4
- data/config/initializers/assets.rb +3 -4
- data/lib/rocket_job_mission_control/engine.rb +2 -2
- data/lib/rocket_job_mission_control/version.rb +1 -1
- data/test/controllers/rocket_job_mission_control/application_controller_test.rb +4 -12
- data/test/controllers/rocket_job_mission_control/dirmon_entries_controller_test.rb +20 -52
- data/test/controllers/rocket_job_mission_control/jobs_controller_test.rb +21 -41
- data/test/controllers/rocket_job_mission_control/servers_controller_test.rb +3 -3
- data/test/models/rocket_job_mission_control/dirmon_sanitizer_test.rb +146 -0
- data/test/models/rocket_job_mission_control/job_sanitizer_test.rb +9 -3
- data/test/test_helper.rb +6 -12
- metadata +73 -53
- data/app/assets/javascripts/rocket_job_mission_control/selectize.js +0 -8
- data/app/assets/stylesheets/rocket_job_mission_control/base.scss +0 -436
- data/app/assets/stylesheets/rocket_job_mission_control/bootstrap_and_overrides.scss +0 -488
- data/app/assets/stylesheets/rocket_job_mission_control/jobs.scss +0 -72
- data/app/assets/stylesheets/rocket_job_mission_control/worker_processes.scss +0 -9
- data/vendor/assets/javascripts/bootstrap.min.js +0 -7
- data/vendor/assets/javascripts/microplugin.js +0 -135
- data/vendor/assets/javascripts/selectize.js +0 -3058
- data/vendor/assets/javascripts/sifter.js +0 -470
- data/vendor/assets/stylesheets/bootstrap.min.css +0 -6
- data/vendor/assets/stylesheets/bootstrap.min.css.map +0 -1
- data/vendor/assets/stylesheets/selectize.bootstrap3.css +0 -408
- data/vendor/assets/stylesheets/selectize.css +0 -317
@@ -26,7 +26,8 @@ module RocketJobMissionControl
|
|
26
26
|
end
|
27
27
|
|
28
28
|
let :failed_job do
|
29
|
-
job = KaboomBatchJob.new
|
29
|
+
job = KaboomBatchJob.new
|
30
|
+
job.input_category.slice_size = 1
|
30
31
|
job.upload do |stream|
|
31
32
|
stream << "first record"
|
32
33
|
stream << "second record"
|
@@ -56,9 +57,7 @@ module RocketJobMissionControl
|
|
56
57
|
describe "PATCH ##{state}" do
|
57
58
|
describe "with an invalid job id" do
|
58
59
|
before do
|
59
|
-
params
|
60
|
-
params = {params: params} if Rails.version.to_i >= 5
|
61
|
-
patch state, params
|
60
|
+
patch state, params: {id: 42, job: {id: 42, priority: 12}}
|
62
61
|
end
|
63
62
|
|
64
63
|
it "redirects" do
|
@@ -66,7 +65,7 @@ module RocketJobMissionControl
|
|
66
65
|
end
|
67
66
|
|
68
67
|
it "adds a flash alert message" do
|
69
|
-
assert_equal I18n.t(:failure, scope: %i[job find], id: 42), flash[:
|
68
|
+
assert_equal I18n.t(:failure, scope: %i[job find], id: 42), flash[:danger]
|
70
69
|
end
|
71
70
|
end
|
72
71
|
|
@@ -81,8 +80,7 @@ module RocketJobMissionControl
|
|
81
80
|
pausable_job.fail!
|
82
81
|
end
|
83
82
|
params = {id: pausable_job.id, job: {id: pausable_job.id, priority: pausable_job.priority}}
|
84
|
-
|
85
|
-
patch state, params
|
83
|
+
patch state, params: params
|
86
84
|
end
|
87
85
|
|
88
86
|
it "redirects to the job" do
|
@@ -100,9 +98,7 @@ module RocketJobMissionControl
|
|
100
98
|
let(:scheduled_job) { RocketJob::Jobs::SimpleJob.create!(run_at: 2.days.from_now) }
|
101
99
|
|
102
100
|
before do
|
103
|
-
params
|
104
|
-
params = {params: params} if Rails.version.to_i >= 5
|
105
|
-
patch :run_now, params
|
101
|
+
patch :run_now, params: {id: scheduled_job.id}
|
106
102
|
end
|
107
103
|
|
108
104
|
it "redirects to the job path" do
|
@@ -117,9 +113,7 @@ module RocketJobMissionControl
|
|
117
113
|
describe "PATCH #update" do
|
118
114
|
describe "with an invalid job id" do
|
119
115
|
before do
|
120
|
-
params
|
121
|
-
params = {params: params} if Rails.version.to_i >= 5
|
122
|
-
patch :update, params
|
116
|
+
patch :update, params: {id: 42, job: {id: 42, priority: 12}}
|
123
117
|
end
|
124
118
|
|
125
119
|
it "redirects" do
|
@@ -127,15 +121,14 @@ module RocketJobMissionControl
|
|
127
121
|
end
|
128
122
|
|
129
123
|
it "adds a flash alert message" do
|
130
|
-
assert_equal I18n.t(:failure, scope: %i[job find], id: 42), flash[:
|
124
|
+
assert_equal I18n.t(:failure, scope: %i[job find], id: 42), flash[:danger]
|
131
125
|
end
|
132
126
|
end
|
133
127
|
|
134
128
|
describe "with a valid job id" do
|
135
129
|
before do
|
136
130
|
params = {id: job.id, job: {id: job.id, priority: 12, blah: 23, description: "", log_level: "", state: "failed"}}
|
137
|
-
|
138
|
-
patch :update, params
|
131
|
+
patch :update, params: params
|
139
132
|
end
|
140
133
|
|
141
134
|
it "redirects to the job" do
|
@@ -158,9 +151,7 @@ module RocketJobMissionControl
|
|
158
151
|
describe "GET #show" do
|
159
152
|
describe "with an invalid job id" do
|
160
153
|
before do
|
161
|
-
params
|
162
|
-
params = {params: params} if Rails.version.to_i >= 5
|
163
|
-
get :show, params
|
154
|
+
get :show, params: {id: 42}
|
164
155
|
end
|
165
156
|
|
166
157
|
it "redirects" do
|
@@ -168,15 +159,13 @@ module RocketJobMissionControl
|
|
168
159
|
end
|
169
160
|
|
170
161
|
it "adds a flash alert message" do
|
171
|
-
assert_equal I18n.t(:failure, scope: %i[job find], id: 42), flash[:
|
162
|
+
assert_equal I18n.t(:failure, scope: %i[job find], id: 42), flash[:danger]
|
172
163
|
end
|
173
164
|
end
|
174
165
|
|
175
166
|
describe "with a valid job id" do
|
176
167
|
before do
|
177
|
-
params
|
178
|
-
params = {params: params} if Rails.version.to_i >= 5
|
179
|
-
get :show, params
|
168
|
+
get :show, params: {id: job.id}
|
180
169
|
end
|
181
170
|
|
182
171
|
it "succeeds" do
|
@@ -192,9 +181,7 @@ module RocketJobMissionControl
|
|
192
181
|
describe "GET #exception" do
|
193
182
|
describe "with an invalid job id" do
|
194
183
|
before do
|
195
|
-
params
|
196
|
-
params = {params: params} if Rails.version.to_i >= 5
|
197
|
-
get :exception, params
|
184
|
+
get :exception, params: {id: 42}
|
198
185
|
end
|
199
186
|
|
200
187
|
it "redirects" do
|
@@ -202,16 +189,14 @@ module RocketJobMissionControl
|
|
202
189
|
end
|
203
190
|
|
204
191
|
it "adds a flash alert message" do
|
205
|
-
assert_equal I18n.t(:failure, scope: %i[job find], id: 42), flash[:
|
192
|
+
assert_equal I18n.t(:failure, scope: %i[job find], id: 42), flash[:danger]
|
206
193
|
end
|
207
194
|
end
|
208
195
|
|
209
196
|
describe "with a valid job id" do
|
210
197
|
describe "without an exception" do
|
211
198
|
before do
|
212
|
-
params
|
213
|
-
params = {params: params} if Rails.version.to_i >= 5
|
214
|
-
get :exception, params
|
199
|
+
get :exception, params: {id: failed_job.id, error_type: "Blah"}
|
215
200
|
end
|
216
201
|
|
217
202
|
it "redirects to job path" do
|
@@ -219,15 +204,13 @@ module RocketJobMissionControl
|
|
219
204
|
end
|
220
205
|
|
221
206
|
it "notifies the user" do
|
222
|
-
assert_equal I18n.t(:no_errors, scope: %i[job failures]), flash[:
|
207
|
+
assert_equal I18n.t(:no_errors, scope: %i[job failures]), flash[:warning]
|
223
208
|
end
|
224
209
|
end
|
225
210
|
|
226
211
|
describe "with exception" do
|
227
212
|
before do
|
228
|
-
params
|
229
|
-
params = {params: params} if Rails.version.to_i >= 5
|
230
|
-
get :exception, params
|
213
|
+
get :exception, params: {id: failed_job.id, error_type: "ArgumentError"}
|
231
214
|
end
|
232
215
|
|
233
216
|
it "succeeds" do
|
@@ -404,13 +387,12 @@ module RocketJobMissionControl
|
|
404
387
|
end
|
405
388
|
|
406
389
|
@params = {id: pausable_job.id, job: {id: pausable_job.id, priority: pausable_job.priority}}
|
407
|
-
@params = {params: @params} if Rails.version.to_i >= 5
|
408
390
|
end
|
409
391
|
|
410
392
|
%i[admin editor operator manager].each do |role|
|
411
393
|
it "redirects with #{method} method and role #{role}" do
|
412
394
|
set_role(role)
|
413
|
-
patch method, @params
|
395
|
+
patch method, params: @params
|
414
396
|
assert_response(:redirect)
|
415
397
|
end
|
416
398
|
end
|
@@ -419,7 +401,7 @@ module RocketJobMissionControl
|
|
419
401
|
it "raises authentication error for #{role}" do
|
420
402
|
set_role(role)
|
421
403
|
assert_raises AccessGranted::AccessDenied do
|
422
|
-
patch method, @params
|
404
|
+
patch method, params: @params
|
423
405
|
end
|
424
406
|
end
|
425
407
|
end
|
@@ -431,8 +413,7 @@ module RocketJobMissionControl
|
|
431
413
|
describe "with a failed slice" do
|
432
414
|
it "access ##{method}" do
|
433
415
|
params = {:error_type => "ArgumentError", "record_number" => "9", "id" => failed_job.id}
|
434
|
-
|
435
|
-
get method, params
|
416
|
+
get method, params: params
|
436
417
|
assert_response :success
|
437
418
|
end
|
438
419
|
end
|
@@ -441,8 +422,7 @@ module RocketJobMissionControl
|
|
441
422
|
describe "#update slice" do
|
442
423
|
before do
|
443
424
|
params = {"job" => {"records" => %w[1 2 3]}, "error_type" => "CSV::MalformedCSVError", "offset" => "1", "id" => failed_job.id.to_s}
|
444
|
-
|
445
|
-
post :update_slice, params
|
425
|
+
post :update_slice, params: params
|
446
426
|
end
|
447
427
|
|
448
428
|
it "redirects" do
|
@@ -65,7 +65,7 @@ module RocketJobMissionControl
|
|
65
65
|
end
|
66
66
|
|
67
67
|
it "does not display an error message" do
|
68
|
-
assert_nil flash[:
|
68
|
+
assert_nil flash[:danger]
|
69
69
|
end
|
70
70
|
end
|
71
71
|
end
|
@@ -90,7 +90,7 @@ module RocketJobMissionControl
|
|
90
90
|
end
|
91
91
|
|
92
92
|
it "displays a flash message" do
|
93
|
-
assert_equal I18n.t(:success, scope: %i[server destroy]), flash[:
|
93
|
+
assert_equal I18n.t(:success, scope: %i[server destroy]), flash[:success]
|
94
94
|
end
|
95
95
|
|
96
96
|
it "destroys the server" do
|
@@ -108,7 +108,7 @@ module RocketJobMissionControl
|
|
108
108
|
end
|
109
109
|
|
110
110
|
it "displays a flash message" do
|
111
|
-
assert_equal I18n.t(:failure, scope: %i[server find], id: 999_999), flash[:
|
111
|
+
assert_equal I18n.t(:failure, scope: %i[server find], id: 999_999), flash[:danger]
|
112
112
|
end
|
113
113
|
end
|
114
114
|
end
|
@@ -0,0 +1,146 @@
|
|
1
|
+
require_relative "../../test_helper"
|
2
|
+
|
3
|
+
class DirmonSanitizerTest < Minitest::Test
|
4
|
+
describe RocketJobMissionControl::DirmonSanitizer do
|
5
|
+
class SampleJob < RocketJob::Job
|
6
|
+
include RocketJob::Batch
|
7
|
+
|
8
|
+
input_category format: :csv
|
9
|
+
output_category format: :csv
|
10
|
+
output_category name: :errors, format: :csv
|
11
|
+
|
12
|
+
field :client_name, type: String, user_editable: true
|
13
|
+
field :zip_code, type: Integer, user_editable: true
|
14
|
+
|
15
|
+
self.destroy_on_complete = false
|
16
|
+
|
17
|
+
def perform(record)
|
18
|
+
record
|
19
|
+
end
|
20
|
+
end
|
21
|
+
|
22
|
+
let :sample_job do
|
23
|
+
SampleJob.new
|
24
|
+
end
|
25
|
+
|
26
|
+
let :job_class_name do
|
27
|
+
SampleJob.name
|
28
|
+
end
|
29
|
+
|
30
|
+
let :properties do
|
31
|
+
{
|
32
|
+
client_name: "Jack",
|
33
|
+
zip_code: 12345,
|
34
|
+
input_categories_attributes: {0 => {format: :json}},
|
35
|
+
output_categories_attributes: {0 => {name: :errors, format: :json}}
|
36
|
+
}
|
37
|
+
end
|
38
|
+
|
39
|
+
let :sanitized_properties do
|
40
|
+
{
|
41
|
+
client_name: "Jill",
|
42
|
+
zip_code: 45673,
|
43
|
+
input_categories: [{name: "main", format: "json", slice_size: 100, skip_unknown: "false"}],
|
44
|
+
output_categories: [{name: "errors", format: "json"}]
|
45
|
+
}
|
46
|
+
end
|
47
|
+
|
48
|
+
let :dirmon_entry do
|
49
|
+
RocketJob::DirmonEntry.new(
|
50
|
+
name: "Test",
|
51
|
+
job_class_name: job_class_name,
|
52
|
+
pattern: "the_path",
|
53
|
+
properties: properties
|
54
|
+
)
|
55
|
+
end
|
56
|
+
|
57
|
+
describe ".sanitize" do
|
58
|
+
it "passes permissible fields" do
|
59
|
+
params = {
|
60
|
+
name: "Test2",
|
61
|
+
job_class_name: job_class_name,
|
62
|
+
pattern: "another/path",
|
63
|
+
archive_directory: "archive/path",
|
64
|
+
properties: properties
|
65
|
+
}
|
66
|
+
cleansed = RocketJobMissionControl::DirmonSanitizer.sanitize(params, SampleJob, dirmon_entry)
|
67
|
+
assert_equal 0, dirmon_entry.errors.count
|
68
|
+
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}]}}
|
69
|
+
assert_equal expected, cleansed
|
70
|
+
end
|
71
|
+
|
72
|
+
it "strips blank values" do
|
73
|
+
params = {
|
74
|
+
name: "",
|
75
|
+
job_class_name: "",
|
76
|
+
pattern: "",
|
77
|
+
archive_directory: "",
|
78
|
+
bad_field: "Not permissible",
|
79
|
+
properties: {
|
80
|
+
client_name: "",
|
81
|
+
zip_code: "",
|
82
|
+
input_categories_attributes: {0 => {format: ""}},
|
83
|
+
output_categories_attributes: {0 => {name: "", format: ""}}
|
84
|
+
}
|
85
|
+
}
|
86
|
+
cleansed = RocketJobMissionControl::DirmonSanitizer.sanitize(params, SampleJob, dirmon_entry)
|
87
|
+
assert_equal 0, dirmon_entry.errors.count
|
88
|
+
expected = {}
|
89
|
+
assert_equal expected, cleansed
|
90
|
+
end
|
91
|
+
end
|
92
|
+
|
93
|
+
describe ".diff_category" do
|
94
|
+
it "returns only different values" do
|
95
|
+
default_category = sample_job.input_category
|
96
|
+
properties = {
|
97
|
+
name: "main",
|
98
|
+
format: "psv",
|
99
|
+
slice_size: 100,
|
100
|
+
skip_unknown: false
|
101
|
+
}
|
102
|
+
updated_category = RocketJob::Category::Input.new(properties)
|
103
|
+
|
104
|
+
diff = RocketJobMissionControl::DirmonSanitizer.diff_category(properties, updated_category, default_category)
|
105
|
+
|
106
|
+
expected = {:format => "psv", :name => "main"}
|
107
|
+
assert_equal expected, diff
|
108
|
+
end
|
109
|
+
|
110
|
+
it "is empty with no changes" do
|
111
|
+
default_category = sample_job.input_category
|
112
|
+
properties = {
|
113
|
+
name: "main",
|
114
|
+
format: "csv",
|
115
|
+
slice_size: 100,
|
116
|
+
skip_unknown: false
|
117
|
+
}
|
118
|
+
updated_category = RocketJob::Category::Input.new(properties)
|
119
|
+
|
120
|
+
diff = RocketJobMissionControl::DirmonSanitizer.diff_category(properties, updated_category, default_category)
|
121
|
+
|
122
|
+
expected = {}
|
123
|
+
assert_equal expected, diff
|
124
|
+
end
|
125
|
+
|
126
|
+
it "empty" do
|
127
|
+
default_category = sample_job.input_category
|
128
|
+
properties = {}
|
129
|
+
updated_category = RocketJob::Category::Input.new(properties)
|
130
|
+
|
131
|
+
diff = RocketJobMissionControl::DirmonSanitizer.diff_category(properties, updated_category, default_category)
|
132
|
+
|
133
|
+
expected = {}
|
134
|
+
assert_equal expected, diff
|
135
|
+
end
|
136
|
+
end
|
137
|
+
|
138
|
+
describe ".diff_properties" do
|
139
|
+
it "returns only different values" do
|
140
|
+
diff = RocketJobMissionControl::DirmonSanitizer.diff_properties(sanitized_properties, dirmon_entry)
|
141
|
+
expected = {:client_name => "Jill", :zip_code => 45673, :input_categories => [{:format => "json", :name => "main"}], :output_categories => [{:format => "json", :name => "errors"}]}
|
142
|
+
assert_equal expected, diff
|
143
|
+
end
|
144
|
+
end
|
145
|
+
end
|
146
|
+
end
|
@@ -72,9 +72,15 @@ class JobSanitizerTest < Minitest::Test
|
|
72
72
|
}
|
73
73
|
cleansed = RocketJobMissionControl::JobSanitizer.sanitize(properties, @job.class, @job, false)
|
74
74
|
assert_equal 1, @job.errors.count
|
75
|
-
|
76
|
-
|
77
|
-
|
75
|
+
if Rails.version.to_f >= 6.1
|
76
|
+
assert error = @job.errors.first
|
77
|
+
assert_equal error.attribute, :properties
|
78
|
+
assert error.message.include?("unexpected token"), error
|
79
|
+
else
|
80
|
+
assert error = @job.errors.first
|
81
|
+
assert_equal error.first, :properties
|
82
|
+
assert error.second.include?("unexpected token"), error
|
83
|
+
end
|
78
84
|
assert_equal({hash_field: "{ bad json }", string: "hello"}, cleansed)
|
79
85
|
end
|
80
86
|
|
data/test/test_helper.rb
CHANGED
@@ -1,21 +1,15 @@
|
|
1
1
|
ENV["RAILS_ENV"] ||= "test"
|
2
2
|
|
3
3
|
require "yaml"
|
4
|
-
require "
|
4
|
+
require "amazing_print"
|
5
5
|
require "rails/version"
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
require "minispec/rails"
|
11
|
-
else
|
12
|
-
require_relative "../rjmc4/config/environment"
|
13
|
-
require "minitest/autorun"
|
14
|
-
require "rails/test_help"
|
15
|
-
require "minitest/rails"
|
16
|
-
end
|
6
|
+
require_relative "../rjmc/config/environment"
|
7
|
+
require "minitest/autorun"
|
8
|
+
require "rails/test_help"
|
9
|
+
require "minispec/rails"
|
17
10
|
|
18
11
|
ActionController::TestCase
|
12
|
+
|
19
13
|
class ActionController::TestCase
|
20
14
|
include RocketJobMissionControl::Engine.routes.url_helpers
|
21
15
|
|
metadata
CHANGED
@@ -1,17 +1,17 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rocketjob_mission_control
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version:
|
4
|
+
version: 6.0.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Michael Cloutier
|
8
8
|
- Chris Lamb
|
9
9
|
- Jonathan Whittington
|
10
10
|
- Reid Morrison
|
11
|
-
autorequire:
|
11
|
+
autorequire:
|
12
12
|
bindir: bin
|
13
13
|
cert_chain: []
|
14
|
-
date:
|
14
|
+
date: 2021-09-20 00:00:00.000000000 Z
|
15
15
|
dependencies:
|
16
16
|
- !ruby/object:Gem::Dependency
|
17
17
|
name: access-granted
|
@@ -28,65 +28,64 @@ dependencies:
|
|
28
28
|
- !ruby/object:Gem::Version
|
29
29
|
version: '1.3'
|
30
30
|
- !ruby/object:Gem::Dependency
|
31
|
-
name:
|
31
|
+
name: railties
|
32
32
|
requirement: !ruby/object:Gem::Requirement
|
33
33
|
requirements:
|
34
34
|
- - ">="
|
35
35
|
- !ruby/object:Gem::Version
|
36
|
-
version: '0'
|
36
|
+
version: '5.0'
|
37
37
|
type: :runtime
|
38
38
|
prerelease: false
|
39
39
|
version_requirements: !ruby/object:Gem::Requirement
|
40
40
|
requirements:
|
41
41
|
- - ">="
|
42
42
|
- !ruby/object:Gem::Version
|
43
|
-
version: '0'
|
43
|
+
version: '5.0'
|
44
44
|
- !ruby/object:Gem::Dependency
|
45
|
-
name:
|
45
|
+
name: rocketjob
|
46
46
|
requirement: !ruby/object:Gem::Requirement
|
47
47
|
requirements:
|
48
|
-
- - "
|
48
|
+
- - "~>"
|
49
49
|
- !ruby/object:Gem::Version
|
50
|
-
version: '
|
50
|
+
version: '6.0'
|
51
51
|
type: :runtime
|
52
52
|
prerelease: false
|
53
53
|
version_requirements: !ruby/object:Gem::Requirement
|
54
54
|
requirements:
|
55
|
-
- - "
|
55
|
+
- - "~>"
|
56
56
|
- !ruby/object:Gem::Version
|
57
|
-
version: '
|
57
|
+
version: '6.0'
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
|
-
name:
|
59
|
+
name: amazing_print
|
60
60
|
requirement: !ruby/object:Gem::Requirement
|
61
61
|
requirements:
|
62
|
-
- - "
|
62
|
+
- - "~>"
|
63
63
|
- !ruby/object:Gem::Version
|
64
|
-
version:
|
64
|
+
version: '1.3'
|
65
65
|
type: :runtime
|
66
66
|
prerelease: false
|
67
67
|
version_requirements: !ruby/object:Gem::Requirement
|
68
68
|
requirements:
|
69
|
-
- - "
|
69
|
+
- - "~>"
|
70
70
|
- !ruby/object:Gem::Version
|
71
|
-
version:
|
71
|
+
version: '1.3'
|
72
72
|
- !ruby/object:Gem::Dependency
|
73
|
-
name:
|
73
|
+
name: turbolinks
|
74
74
|
requirement: !ruby/object:Gem::Requirement
|
75
75
|
requirements:
|
76
|
-
- - "
|
76
|
+
- - "~>"
|
77
77
|
- !ruby/object:Gem::Version
|
78
|
-
version: '
|
78
|
+
version: '5'
|
79
79
|
type: :runtime
|
80
80
|
prerelease: false
|
81
81
|
version_requirements: !ruby/object:Gem::Requirement
|
82
82
|
requirements:
|
83
|
-
- - "
|
83
|
+
- - "~>"
|
84
84
|
- !ruby/object:Gem::Version
|
85
|
-
version: '
|
85
|
+
version: '5'
|
86
86
|
description: Rocket Job Mission Control is the Web user interface to manage Rocket
|
87
87
|
Job.
|
88
88
|
email:
|
89
|
-
- support@rocketjob.io
|
90
89
|
executables: []
|
91
90
|
extensions: []
|
92
91
|
extra_rdoc_files: []
|
@@ -94,6 +93,12 @@ files:
|
|
94
93
|
- LICENSE.txt
|
95
94
|
- README.md
|
96
95
|
- Rakefile
|
96
|
+
- app/assets/config/manifest.js
|
97
|
+
- app/assets/fonts/glyphicons-halflings-regular.eot
|
98
|
+
- app/assets/fonts/glyphicons-halflings-regular.svg
|
99
|
+
- app/assets/fonts/glyphicons-halflings-regular.ttf
|
100
|
+
- app/assets/fonts/glyphicons-halflings-regular.woff
|
101
|
+
- app/assets/fonts/glyphicons-halflings-regular.woff2
|
97
102
|
- app/assets/fonts/webfonts/fa-brands-400.eot
|
98
103
|
- app/assets/fonts/webfonts/fa-brands-400.woff
|
99
104
|
- app/assets/fonts/webfonts/fa-brands-400.woff2
|
@@ -116,15 +121,25 @@ files:
|
|
116
121
|
- app/assets/images/rocket_job_mission_control/safari-pinned-tab.svg
|
117
122
|
- app/assets/javascripts/rocket_job_mission_control/application.js
|
118
123
|
- app/assets/javascripts/rocket_job_mission_control/base.js
|
119
|
-
- app/assets/javascripts/rocket_job_mission_control/
|
124
|
+
- app/assets/javascripts/rocket_job_mission_control/bootstrap.min.js
|
125
|
+
- app/assets/javascripts/rocket_job_mission_control/datatable_init.js
|
126
|
+
- app/assets/javascripts/rocket_job_mission_control/datatables.min.js
|
120
127
|
- app/assets/javascripts/rocket_job_mission_control/dirmon_entries.js
|
121
|
-
- app/assets/javascripts/rocket_job_mission_control/
|
122
|
-
- app/assets/
|
123
|
-
- app/assets/
|
124
|
-
- app/assets/
|
125
|
-
- app/assets/stylesheets/rocket_job_mission_control/
|
126
|
-
- app/assets/stylesheets/rocket_job_mission_control/
|
127
|
-
- app/assets/stylesheets/rocket_job_mission_control/
|
128
|
+
- app/assets/javascripts/rocket_job_mission_control/jquery-3.5.1.min.js
|
129
|
+
- app/assets/javascripts/rocket_job_mission_control/nested_fields.js
|
130
|
+
- app/assets/javascripts/rocket_job_mission_control/selectize.min.js
|
131
|
+
- app/assets/javascripts/rocket_job_mission_control/selectize_init.js
|
132
|
+
- app/assets/stylesheets/rocket_job_mission_control/application.css
|
133
|
+
- app/assets/stylesheets/rocket_job_mission_control/base.css
|
134
|
+
- app/assets/stylesheets/rocket_job_mission_control/bootstrap.min.css.erb
|
135
|
+
- app/assets/stylesheets/rocket_job_mission_control/bootstrap.min.css.map
|
136
|
+
- app/assets/stylesheets/rocket_job_mission_control/callout.css
|
137
|
+
- app/assets/stylesheets/rocket_job_mission_control/datatables.min.css
|
138
|
+
- app/assets/stylesheets/rocket_job_mission_control/fontawesome-all.min.css.erb
|
139
|
+
- app/assets/stylesheets/rocket_job_mission_control/jobs.css
|
140
|
+
- app/assets/stylesheets/rocket_job_mission_control/selectize.bootstrap3.css
|
141
|
+
- app/assets/stylesheets/rocket_job_mission_control/selectize.css
|
142
|
+
- app/assets/stylesheets/rocket_job_mission_control/worker_processes.css
|
128
143
|
- app/controllers/rocket_job_mission_control/active_workers_controller.rb
|
129
144
|
- app/controllers/rocket_job_mission_control/application_controller.rb
|
130
145
|
- app/controllers/rocket_job_mission_control/dirmon_entries_controller.rb
|
@@ -143,6 +158,7 @@ files:
|
|
143
158
|
- app/helpers/rocket_job_mission_control/slices_helper.rb
|
144
159
|
- app/models/rocket_job_mission_control/access_policy.rb
|
145
160
|
- app/models/rocket_job_mission_control/authorization.rb
|
161
|
+
- app/models/rocket_job_mission_control/dirmon_sanitizer.rb
|
146
162
|
- app/models/rocket_job_mission_control/job_sanitizer.rb
|
147
163
|
- app/models/rocket_job_mission_control/query.rb
|
148
164
|
- app/views/layouts/rocket_job_mission_control/application.html.erb
|
@@ -151,6 +167,10 @@ files:
|
|
151
167
|
- app/views/layouts/rocket_job_mission_control/partials/_sidebar.html.erb
|
152
168
|
- app/views/rocket_job_mission_control/active_workers/index.html.erb
|
153
169
|
- app/views/rocket_job_mission_control/dirmon_entries/_form.html.erb
|
170
|
+
- app/views/rocket_job_mission_control/dirmon_entries/_input_categories.html.erb
|
171
|
+
- app/views/rocket_job_mission_control/dirmon_entries/_input_category_fields.html.erb
|
172
|
+
- app/views/rocket_job_mission_control/dirmon_entries/_output_categories.html.erb
|
173
|
+
- app/views/rocket_job_mission_control/dirmon_entries/_output_category_fields.html.erb
|
154
174
|
- app/views/rocket_job_mission_control/dirmon_entries/_sidebar.html.erb
|
155
175
|
- app/views/rocket_job_mission_control/dirmon_entries/_status.html.erb
|
156
176
|
- app/views/rocket_job_mission_control/dirmon_entries/copy.html.erb
|
@@ -158,8 +178,17 @@ files:
|
|
158
178
|
- app/views/rocket_job_mission_control/dirmon_entries/index.html.erb
|
159
179
|
- app/views/rocket_job_mission_control/dirmon_entries/new.html.erb
|
160
180
|
- app/views/rocket_job_mission_control/dirmon_entries/show.html.erb
|
181
|
+
- app/views/rocket_job_mission_control/jobs/_attributes.html.erb
|
182
|
+
- app/views/rocket_job_mission_control/jobs/_dates.html.erb
|
183
|
+
- app/views/rocket_job_mission_control/jobs/_details.html.erb
|
184
|
+
- app/views/rocket_job_mission_control/jobs/_exception.html.erb
|
161
185
|
- app/views/rocket_job_mission_control/jobs/_exceptions.html.erb
|
186
|
+
- app/views/rocket_job_mission_control/jobs/_input_categories.html.erb
|
187
|
+
- app/views/rocket_job_mission_control/jobs/_input_category_fields.html.erb
|
188
|
+
- app/views/rocket_job_mission_control/jobs/_output_categories.html.erb
|
189
|
+
- app/views/rocket_job_mission_control/jobs/_output_category_fields.html.erb
|
162
190
|
- app/views/rocket_job_mission_control/jobs/_pagination.html.erb
|
191
|
+
- app/views/rocket_job_mission_control/jobs/_retryable.html.erb
|
163
192
|
- app/views/rocket_job_mission_control/jobs/_sidebar.html.erb
|
164
193
|
- app/views/rocket_job_mission_control/jobs/_status.html.erb
|
165
194
|
- app/views/rocket_job_mission_control/jobs/_view_slice_pagination.html.erb
|
@@ -188,25 +217,15 @@ files:
|
|
188
217
|
- test/helpers/rocket_job_mission_control/pagination_helper_test.rb
|
189
218
|
- test/helpers/rocket_job_mission_control/servers_helper_test.rb
|
190
219
|
- test/helpers/rocket_job_mission_control/slices_helper_test.rb
|
220
|
+
- test/models/rocket_job_mission_control/dirmon_sanitizer_test.rb
|
191
221
|
- test/models/rocket_job_mission_control/job_sanitizer_test.rb
|
192
222
|
- test/models/rocket_job_mission_control/query_test.rb
|
193
223
|
- test/test_helper.rb
|
194
|
-
|
195
|
-
- vendor/assets/javascripts/datatables.min.js
|
196
|
-
- vendor/assets/javascripts/microplugin.js
|
197
|
-
- vendor/assets/javascripts/selectize.js
|
198
|
-
- vendor/assets/javascripts/sifter.js
|
199
|
-
- vendor/assets/stylesheets/bootstrap.min.css
|
200
|
-
- vendor/assets/stylesheets/bootstrap.min.css.map
|
201
|
-
- vendor/assets/stylesheets/datatables.min.css
|
202
|
-
- vendor/assets/stylesheets/fontawesome-all.min.css.erb
|
203
|
-
- vendor/assets/stylesheets/selectize.bootstrap3.css
|
204
|
-
- vendor/assets/stylesheets/selectize.css
|
205
|
-
homepage: http://rocketjob.io
|
224
|
+
homepage: https://rocketjob.io
|
206
225
|
licenses:
|
207
226
|
- Apache-2.0
|
208
227
|
metadata: {}
|
209
|
-
post_install_message:
|
228
|
+
post_install_message:
|
210
229
|
rdoc_options: []
|
211
230
|
require_paths:
|
212
231
|
- lib
|
@@ -214,28 +233,29 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
214
233
|
requirements:
|
215
234
|
- - ">="
|
216
235
|
- !ruby/object:Gem::Version
|
217
|
-
version: '
|
236
|
+
version: '2.5'
|
218
237
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
219
238
|
requirements:
|
220
239
|
- - ">="
|
221
240
|
- !ruby/object:Gem::Version
|
222
241
|
version: '0'
|
223
242
|
requirements: []
|
224
|
-
rubygems_version: 3.
|
225
|
-
signing_key:
|
243
|
+
rubygems_version: 3.2.22
|
244
|
+
signing_key:
|
226
245
|
specification_version: 4
|
227
246
|
summary: Ruby's missing batch system.
|
228
247
|
test_files:
|
229
|
-
- test/models/rocket_job_mission_control/job_sanitizer_test.rb
|
230
|
-
- test/models/rocket_job_mission_control/query_test.rb
|
231
248
|
- test/compare_hashes.rb
|
232
|
-
- test/
|
233
|
-
- test/controllers/rocket_job_mission_control/jobs_controller_test.rb
|
249
|
+
- test/controllers/rocket_job_mission_control/application_controller_test.rb
|
234
250
|
- test/controllers/rocket_job_mission_control/dirmon_entries_controller_test.rb
|
251
|
+
- test/controllers/rocket_job_mission_control/jobs_controller_test.rb
|
235
252
|
- test/controllers/rocket_job_mission_control/servers_controller_test.rb
|
236
|
-
- test/controllers/rocket_job_mission_control/application_controller_test.rb
|
237
253
|
- test/helpers/rocket_job_mission_control/application_helper_test.rb
|
238
|
-
- test/helpers/rocket_job_mission_control/servers_helper_test.rb
|
239
254
|
- test/helpers/rocket_job_mission_control/jobs_helper_test.rb
|
240
|
-
- test/helpers/rocket_job_mission_control/slices_helper_test.rb
|
241
255
|
- test/helpers/rocket_job_mission_control/pagination_helper_test.rb
|
256
|
+
- test/helpers/rocket_job_mission_control/servers_helper_test.rb
|
257
|
+
- test/helpers/rocket_job_mission_control/slices_helper_test.rb
|
258
|
+
- test/models/rocket_job_mission_control/dirmon_sanitizer_test.rb
|
259
|
+
- test/models/rocket_job_mission_control/job_sanitizer_test.rb
|
260
|
+
- test/models/rocket_job_mission_control/query_test.rb
|
261
|
+
- test/test_helper.rb
|