Skip to content

Commit 7ca90f9

Browse files
authored
Merge pull request sidekiq-cron#280 from ondrejbartas/revert-246-empty-file
Revert "Check its an hash on load from hash to avoid errors"
2 parents 409f11e + 0e2328c commit 7ca90f9

File tree

2 files changed

+0
-16
lines changed

2 files changed

+0
-16
lines changed

lib/sidekiq/cron/job.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ def active_job_message
150150
# }
151151
#
152152
def self.load_from_hash hash
153-
return [] unless hash.is_a?(Hash)
154153
array = hash.inject([]) do |out,(key, job)|
155154
job['name'] = key
156155
out << job
@@ -161,7 +160,6 @@ def self.load_from_hash hash
161160
# like to {#load_from_hash}
162161
# If exists old jobs in redis but removed from args, destroy old jobs
163162
def self.load_from_hash! hash
164-
return [] unless hash.is_a?(Hash)
165163
destroy_removed_jobs(hash.keys)
166164
load_from_hash(hash)
167165
end

test/unit/job_test.rb

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -955,20 +955,6 @@
955955
assert_equal out.size, 0, "should have no errors"
956956
assert_equal Sidekiq::Cron::Job.all.size, 2, "Should have 2 jobs after load"
957957
end
958-
959-
describe 'errors' do
960-
describe 'not a hash' do
961-
before do
962-
@jobs_hash = YAML.load_file('/dev/null') # => false
963-
end
964-
965-
it 'do not create jobs and do not fail' do
966-
assert_equal Sidekiq::Cron::Job.all.size, 0, "Should have 0 jobs before load"
967-
out = Sidekiq::Cron::Job.load_from_hash! @jobs_hash
968-
assert_equal out.size, 0, "should have no errors"
969-
end
970-
end
971-
end
972958
end
973959

974960
describe "from array" do

0 commit comments

Comments
 (0)