canvas_sync 0.17.3.beta3 → 0.17.6.beta1

data/spec/job_batching/batch_spec.rb

@@ -227,6 +227,34 @@ RSpec.describe CanvasSync::JobBatches::Batch do
         end
       end
 
+      it 'delays triggering callbacks if keep_open is set' do
+        ActiveJob::Base.queue_adapter = :sidekiq
+        CanvasSync::JobBatches::Batch::Callback.worker_class = CanvasSync::JobBatches::Sidekiq::SidekiqCallbackWorker
+
+        callback_instance = double('SampleCallback')
+        expect(SampleCallback).to receive(:new).at_least(1).times.and_return(callback_instance)
+        expect(callback_instance).not_to receive(:on_complete)
+        expect(callback_instance).not_to receive(:on_success)
+
+        batch.on(:complete, SampleCallback)
+        batch.on(:success, SampleCallback)
+        batch.keep_open!
+
+        Sidekiq::Testing.inline! do
+          CanvasSync::JobBatches::Batch.process_failed_job(bid, jid)
+          CanvasSync::JobBatches::Batch.process_successful_job(bid, jid)
+        end
+
+        RSpec::Mocks.space.proxy_for(callback_instance).reset
+
+        expect(callback_instance).to receive(:on_complete)
+        expect(callback_instance).to receive(:on_success)
+
+        Sidekiq::Testing.inline! do
+          batch.let_close!
+        end
+      end
+
       it 'triggers callbacks as expected' do
         ActiveJob::Base.queue_adapter = :sidekiq
         CanvasSync::JobBatches::Batch.redis { |r| r.hset("BID-#{bid}", 'pending', 0) }
@@ -272,7 +300,6 @@ RSpec.describe CanvasSync::JobBatches::Batch do
   end
 
   describe '#increment_job_queue' do
-    let(:bid) { 'BID' }
     let(:batch) { CanvasSync::JobBatches::Batch.new }
 
     it 'increments pending' do

data/spec/job_batching/context_hash_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+RSpec.describe CanvasSync::JobBatches::ContextHash do
+
+  class ContextedJob < BatchTestJobBase
+    def perform
+      was_performed(batch_context.flatten)
+    end
+
+    def was_performed(*args); end
+
+    def self.callback_perform(*args)
+      perform_later
+    end
+  end
+
+  it "works with first-level jobs" do
+    ActiveJob::Base.queue_adapter = :sidekiq
+    b = CanvasSync::JobBatches::Batch.new
+    b.context = { hello: 'world' }
+    expect_any_instance_of(ContextedJob).to receive(:was_performed).with({ 'hello' => 'world' })
+    b.jobs do
+      ContextedJob.perform_later
+    end
+    Sidekiq::Worker.drain_all
+  end
+
+  it "works with nested-batch jobs" do
+    ActiveJob::Base.queue_adapter = :sidekiq
+    b = CanvasSync::JobBatches::Batch.new
+    b.context = { hello: 'world', foo: 'bar' }
+    expect_any_instance_of(ContextedJob).to receive(:was_performed).with({ 'hello' => 'world', 'foo' => 'baz', 'some' => 'other' })
+    b.jobs do
+      b2 = CanvasSync::JobBatches::Batch.new
+      b2.context = { some: 'other', foo: 'baz' }
+      b2.jobs do
+        ContextedJob.perform_later
+      end
+    end
+    Sidekiq::Worker.drain_all
+  end
+
+  it 'works with a callback batch' do
+    ActiveJob::Base.queue_adapter = :sidekiq
+    b = CanvasSync::JobBatches::Batch.new
+    b.context = { hello: 'world' }
+    b.on(:success, "ContextedJob.callback_perform")
+    expect_any_instance_of(ContextedJob).to receive(:was_performed).with({ 'hello' => 'world' })
+    b.jobs do
+      BatchTestJobBase.perform_later
+    end
+    Sidekiq::Worker.drain_all
+  end
+end

data/spec/job_batching/status_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 RSpec.describe CanvasSync::JobBatches::Batch::Status do
-  let(:bid) { 'BID' }
-  let(:batch) { CanvasSync::JobBatches::Batch.new(bid) }
+  let(:batch) { CanvasSync::JobBatches::Batch.new() }
+  let(:bid) { batch.bid }
   subject { described_class.new(bid) }
 
   describe '#join' do
@@ -51,7 +51,7 @@ RSpec.describe CanvasSync::JobBatches::Batch::Status do
     end
 
     context 'when with error' do
-      before { CanvasSync::JobBatches::Batch.process_failed_job(bid, 'jid123') }
+      before { batch.jobs{}; CanvasSync::JobBatches::Batch.process_failed_job(bid, 'jid123') }
 
       it 'returns array with failed jids' do
         expect(subject.failure_info).to eq(['jid123'])

data/spec/spec_helper.rb

@@ -15,17 +15,13 @@ require 'pry-nav'
 
 require 'sidekiq/testing'
 Sidekiq::Testing.fake!
+Sidekiq::Testing.server_middleware do |chain|
+  chain.add CanvasSync::JobBatches::Sidekiq::ServerMiddleware
+end
 
 require 'fakeredis/rspec'
 Dir[File.dirname(__FILE__) + "/job_batching/support/**/*.rb"].each {|f| require f }
 
-# Fix an issue with fakeredis with Redis >=4.2
-class Redis::Connection::Memory
-  def exists(*keys)
-    keys.count { |key| data.key?(key) }
-  end
-end
-
 ActiveRecord::Migration.maintain_test_schema!
 
 RSpec.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canvas_sync
 version: !ruby/object:Gem::Version
-  version: 0.17.3.beta3
+  version: 0.17.6.beta1
 platform: ruby
 authors:
 - Nate Collings
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-16 00:00:00.000000000 Z
+date: 2020-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -234,20 +234,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: fakeredis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -436,6 +422,14 @@ files:
 - lib/canvas_sync/job_batches/redis_model.rb
 - lib/canvas_sync/job_batches/redis_script.rb
 - lib/canvas_sync/job_batches/sidekiq.rb
+- lib/canvas_sync/job_batches/sidekiq/web.rb
+- lib/canvas_sync/job_batches/sidekiq/web/helpers.rb
+- lib/canvas_sync/job_batches/sidekiq/web/views/_batches_table.erb
+- lib/canvas_sync/job_batches/sidekiq/web/views/_pagination.erb
+- lib/canvas_sync/job_batches/sidekiq/web/views/batch.erb
+- lib/canvas_sync/job_batches/sidekiq/web/views/batches.erb
+- lib/canvas_sync/job_batches/sidekiq/web/views/pool.erb
+- lib/canvas_sync/job_batches/sidekiq/web/views/pools.erb
 - lib/canvas_sync/job_batches/status.rb
 - lib/canvas_sync/jobs/begin_sync_chain_job.rb
 - lib/canvas_sync/jobs/report_checker.rb
@@ -602,6 +596,7 @@ files:
 - spec/job_batching/batch_aware_job_spec.rb
 - spec/job_batching/batch_spec.rb
 - spec/job_batching/callback_spec.rb
+- spec/job_batching/context_hash_spec.rb
 - spec/job_batching/flow_spec.rb
 - spec/job_batching/integration/fail_then_succeed.rb
 - spec/job_batching/integration/integration.rb
@@ -795,6 +790,7 @@ test_files:
 - spec/job_batching/batch_aware_job_spec.rb
 - spec/job_batching/batch_spec.rb
 - spec/job_batching/callback_spec.rb
+- spec/job_batching/context_hash_spec.rb
 - spec/job_batching/flow_spec.rb
 - spec/job_batching/integration/fail_then_succeed.rb
 - spec/job_batching/integration/integration.rb