canvas_sync 0.17.23.beta7 → 0.17.26.beta1

data/spec/job_batching/batch_aware_job_spec.rb

@@ -66,10 +66,10 @@ RSpec.describe CanvasSync::JobBatches::BatchAwareJob do
       let(:bid) { 'SAMPLEBID' }
 
       before do
-        Thread.current[:batch] = CanvasSync::JobBatches::Batch.new(bid)
-        Thread.current[:batch].instance_variable_set(:@open, true)
+        Thread.current[CanvasSync::JobBatches::CURRENT_BATCH_THREAD_KEY] = CanvasSync::JobBatches::Batch.new(bid)
+        Thread.current[CanvasSync::JobBatches::CURRENT_BATCH_THREAD_KEY].instance_variable_set(:@open, true)
       end
-      after { Thread.current[:batch] = nil }
+      after { Thread.current[CanvasSync::JobBatches::CURRENT_BATCH_THREAD_KEY] = nil }
 
       it 'yields' do
         expect {

data/spec/job_batching/batch_spec.rb

@@ -70,7 +70,7 @@ RSpec.describe CanvasSync::JobBatches::Batch do
     it 'sets Thread.current bid' do
       batch = CanvasSync::JobBatches::Batch.new
       batch.jobs do
-        expect(Thread.current[:batch]).to eq(batch)
+        expect(Thread.current[CanvasSync::JobBatches::CURRENT_BATCH_THREAD_KEY]).to eq(batch)
       end
     end
   end
@@ -453,4 +453,43 @@ RSpec.describe CanvasSync::JobBatches::Batch do
       end
     end
   end
+
+  describe '.redis' do
+    it 'returns the same connection if called when nested' do
+      CanvasSync::JobBatches::Batch.redis do |r1|
+        CanvasSync::JobBatches::Batch.redis do |r2|
+          expect(r1).to be r2
+        end
+      end
+    end
+
+    it 'returns a RedisProxy object if no block is given' do
+      expect(CanvasSync::JobBatches::Batch.redis).to be_a(CanvasSync::JobBatches::Batch::RedisProxy)
+    end
+
+    describe 'RedisProxy' do
+      let!(:proxy) { CanvasSync::JobBatches::Batch.redis }
+
+      it 'calls Batch.redis with a block' do
+        expect(CanvasSync::JobBatches::Batch).to receive(:redis) do |&block|
+          expect(block).to be_a Proc
+        end
+        proxy.sadd('KEY', 5)
+      end
+
+      describe '#multi' do
+        it 'works with 1 arity' do
+          proxy.multi do |r|
+            r.sadd('KEY', 5)
+          end
+        end
+
+        it 'works with 0 arity' do
+          proxy.multi do
+            proxy.sadd('KEY', 5)
+          end
+        end
+      end
+    end
+  end
 end

data/spec/job_batching/sidekiq_spec.rb

@@ -57,8 +57,8 @@ RSpec.describe CanvasSync::JobBatches::Sidekiq do
     context 'when in batch' do
       let(:bid) { 'SAMPLEBID' }
       let(:jid) { 'SAMPLEJID' }
-      before { Thread.current[:batch] = CanvasSync::JobBatches::Batch.new(bid) }
-      after { Thread.current[:batch] = nil }
+      before { Thread.current[CanvasSync::JobBatches::CURRENT_BATCH_THREAD_KEY] = CanvasSync::JobBatches::Batch.new(bid) }
+      after { Thread.current[CanvasSync::JobBatches::CURRENT_BATCH_THREAD_KEY] = nil }
 
       it 'yields' do
         yielded = false

data/spec/support/fixtures/reports/xlist.csv

@@ -1,2 +1,2 @@
 canvas_xlist_course_id,xlist_course_id,canvas_section_id,section_id,status,canvas_nonxlist_course_id,nonxlist_course_id
-1,sis_course_1,2,sis_section_2,active,2,sis_course_2
+2,sis_course_1,2,sis_section_2,active,3,sis_course_3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canvas_sync
 version: !ruby/object:Gem::Version
-  version: 0.17.23.beta7
+  version: 0.17.26.beta1
 platform: ruby
 authors:
 - Nate Collings
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-11 00:00:00.000000000 Z
+date: 2021-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -476,6 +476,7 @@ files:
 - lib/canvas_sync/jobs/sync_simple_table_job.rb
 - lib/canvas_sync/jobs/sync_submissions_job.rb
 - lib/canvas_sync/jobs/sync_terms_job.rb
+- lib/canvas_sync/jobs/term_batches_job.rb
 - lib/canvas_sync/misc_helper.rb
 - lib/canvas_sync/processors/assignment_groups_processor.rb
 - lib/canvas_sync/processors/assignments_processor.rb