canvas_sync 0.17.0.beta1 → 0.17.0.beta6

data/spec/job_batching/batch_spec.rb

@@ -182,12 +182,12 @@ RSpec.describe CanvasSync::JobBatches::Batch do
     context 'complete' do
       before { batch.on(:complete, Object) }
       # before { batch.increment_job_queue(bid) }
-      before { batch.jobs do TestWorker.perform_async end }
-      before { CanvasSync::JobBatches::Batch.process_failed_job(bid, 'failed-job-id') }
+      # before { batch.jobs do TestWorker.perform_async end }
+      # before { CanvasSync::JobBatches::Batch.process_failed_job(bid, 'failed-job-id') }
 
       it 'tries to call complete callback' do
         expect(CanvasSync::JobBatches::Batch).to receive(:enqueue_callbacks).with(:complete, bid)
-        CanvasSync::JobBatches::Batch.process_successful_job(bid, 'failed-job-id')
+        CanvasSync::JobBatches::Batch.process_failed_job(bid, 'failed-job-id')
       end
     end
 
@@ -199,6 +199,15 @@ RSpec.describe CanvasSync::JobBatches::Batch do
         CanvasSync::JobBatches::Batch.process_successful_job(bid, jid)
       end
 
+      it 'tries to call success callback after a previous failure' do
+        expect(CanvasSync::JobBatches::Batch).to receive(:enqueue_callbacks).with(:complete, bid).ordered
+        CanvasSync::JobBatches::Batch.process_failed_job(bid, jid)
+
+        expect(CanvasSync::JobBatches::Batch).to receive(:enqueue_callbacks).with(:complete, bid).ordered
+        expect(CanvasSync::JobBatches::Batch).to receive(:enqueue_callbacks).with(:success, bid).ordered
+        CanvasSync::JobBatches::Batch.process_successful_job(bid, jid)
+      end
+
       it 'cleanups redis key' do
         CanvasSync::JobBatches::Batch.process_successful_job(bid, jid)
         expect(CanvasSync::JobBatches::Batch.redis { |r| r.get("BID-#{bid}-pending") }.to_i).to eq(0)

data/spec/job_batching/flow_spec.rb

@@ -2,19 +2,16 @@ require 'spec_helper'
 
 class WorkerA < BatchTestJobBase
   def perform
-    puts 'A'
   end
 end
 
 class WorkerB < BatchTestJobBase
   def perform
-    puts 'B'
   end
 end
 
 class WorkerC < BatchTestJobBase
   def perform
-    puts 'C'
   end
 end
 

data/spec/spec_helper.rb

@@ -19,6 +19,13 @@ Sidekiq::Testing.fake!
 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|

data/spec/support/fixtures/reports/provisioning_csv_unzipped/courses.csv

@@ -0,0 +1,3 @@
+canvas_course_id,course_id,integration_id,short_name,long_name,canvas_account_id,account_id,canvas_term_id,term_id,status,start_date,end_date,course_format,created_by_sis
+1,course_sis_id_1,,C1,Course #1,1,,1,term_sis_id_1,active,2017-03-27T15:53:18-06:00,2017-04-27T06:21:18-06:00,,FALSE
+2,course_sis_id_2,,C2,Course #2,1,,1,term_sis_id_2,unpublished,2017-03-27T15:53:18-06:00,2017-04-27T06:21:18-06:00,,FALSE

data/spec/support/fixtures/reports/provisioning_csv_unzipped/users.csv

@@ -0,0 +1,4 @@
+canvas_user_id,user_id,integration_id,authentication_provider_id,login_id,first_name,last_name,full_name,sortable_name,short_name,email,status,created_by_sis
+1,sis_id_1,,123,spiderdude1337,Patches,the Spider,Patches the Spider,"the Spider, Patches",,poorbastard@yharnam.com,active,FALSE
+2,sis_id_2,,1234,retireddude109,Hunter,Djura,Hunter Djura,"Djura, Hunter",,dreamer@yharnam.com,active,FALSE
+2,sis_id_2,,1234,retireddude110,Hunter,Djura,Hunter Djura,"Djura, Hunter",,dreamer@yharnam.com,active,FALSE

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canvas_sync
 version: !ruby/object:Gem::Version
-  version: 0.17.0.beta1
+  version: 0.17.0.beta6
 platform: ruby
 authors:
 - Nate Collings
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-20 00:00:00.000000000 Z
+date: 2020-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -280,14 +280,14 @@ dependencies:
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
@@ -346,7 +346,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - ncollings@instructure.com
 executables: []
@@ -576,6 +576,9 @@ files:
 - spec/dummy/db/migrate/20200416214248_create_group_memberships.rb
 - spec/dummy/db/migrate/20201016181346_create_pseudonyms.rb
 - spec/dummy/db/schema.rb
+- spec/dummy/db/test.sqlite3
+- spec/dummy/log/development.log
+- spec/dummy/log/test.log
 - spec/factories/account_factory.rb
 - spec/factories/admin_factory.rb
 - spec/factories/assignment_factory.rb
@@ -620,6 +623,8 @@ files:
 - spec/support/fixtures/reports/group_memberships.csv
 - spec/support/fixtures/reports/groups.csv
 - spec/support/fixtures/reports/provisioning_csv
+- spec/support/fixtures/reports/provisioning_csv_unzipped/courses.csv
+- spec/support/fixtures/reports/provisioning_csv_unzipped/users.csv
 - spec/support/fixtures/reports/sections.csv
 - spec/support/fixtures/reports/submissions.csv
 - spec/support/fixtures/reports/users.csv
@@ -627,7 +632,7 @@ files:
 homepage: https://instructure.com
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -642,9 +647,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Gem for generating Canvas models and migrations and syncing data from Canvas
 test_files:
@@ -765,6 +769,9 @@ test_files:
 - spec/dummy/db/migrate/20200416214248_create_group_memberships.rb
 - spec/dummy/db/migrate/20201016181346_create_pseudonyms.rb
 - spec/dummy/db/schema.rb
+- spec/dummy/db/test.sqlite3
+- spec/dummy/log/development.log
+- spec/dummy/log/test.log
 - spec/factories/account_factory.rb
 - spec/factories/admin_factory.rb
 - spec/factories/assignment_factory.rb
@@ -809,6 +816,8 @@ test_files:
 - spec/support/fixtures/reports/group_memberships.csv
 - spec/support/fixtures/reports/groups.csv
 - spec/support/fixtures/reports/provisioning_csv
+- spec/support/fixtures/reports/provisioning_csv_unzipped/courses.csv
+- spec/support/fixtures/reports/provisioning_csv_unzipped/users.csv
 - spec/support/fixtures/reports/sections.csv
 - spec/support/fixtures/reports/submissions.csv
 - spec/support/fixtures/reports/users.csv