From 099f2f63f9bef2288cec21bab5613fe4a49294d2 Mon Sep 17 00:00:00 2001 From: Cody Cutrer Date: Thu, 21 Oct 2021 16:02:48 -0600 Subject: [PATCH] spec: ensure sis export report includes suspended users closes FOO-2415 Change-Id: Ibc277a371d0acde1b10de9d4601294d700be5505 Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/276562 Tested-by: Service Cloud Jenkins Reviewed-by: Simon Williams QA-Review: Cody Cutrer Product-Review: Cody Cutrer --- .../spec_canvas/sis_provisioning_reports_spec.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gems/plugins/account_reports/spec_canvas/sis_provisioning_reports_spec.rb b/gems/plugins/account_reports/spec_canvas/sis_provisioning_reports_spec.rb index 6337d9c7d7b..f36fca7980e 100644 --- a/gems/plugins/account_reports/spec_canvas/sis_provisioning_reports_spec.rb +++ b/gems/plugins/account_reports/spec_canvas/sis_provisioning_reports_spec.rb @@ -57,6 +57,9 @@ describe "Default Account Reports" do @user8 = user_with_pseudonym(:active_all => true, :username => 'steve@apple.com', :name => 'Steve Jobs', :account => @account) @user8.destroy + @user9 = user_with_pseudonym(:active_all => true, :username => 'tim@apple.com', + :name => 'Tim Cook', :account => @account) + @user9.pseudonym.update!(workflow_state: 'suspended') end def create_an_account @@ -332,7 +335,7 @@ describe "Default Account Reports" do name_parts = User.name_parts(user.sortable_name, likely_already_surname_first: true) first_name = name_parts[0] last_name = name_parts[1] - state = user.workflow_state == 'registered' ? 'active' : user.workflow_state + state = pseudonym.workflow_state @report ||= AccountReports::SisExporter.new(@account.account_reports.new(user: @admin), {}) row = case format when 'sis' @@ -449,8 +452,8 @@ describe "Default Account Reports" do headers = parsed.shift expect(headers).to eq user_headers(format: 'provisioning') - expect(parsed.length).to eq 6 - expect(parsed).to eq([@user6, @user7, @user1, @user2, @user3, @user4].map { |u| expected_user(u, format: 'provisioning') }) + expect(parsed.length).to eq 7 + expect(parsed).to eq([@user6, @user7, @user9, @user1, @user2, @user3, @user4].map { |u| expected_user(u, format: 'provisioning') }) end it "runs provisioning report including deleted users for course" do