From 37f4a6a1c5a3bb8f9c24474600ac521eb46c59c3 Mon Sep 17 00:00:00 2001 From: James Williams Date: Thu, 16 Apr 2015 09:24:18 -0600 Subject: [PATCH] spec: more fragile plugins spec fixes refs #CNVS-19842 Change-Id: Ia7748aa1ce10add55486dcd629bd6a3d4cef97c9 Reviewed-on: https://gerrit.instructure.com/52343 Tested-by: Jenkins Reviewed-by: Dan Minkevitch Product-Review: Dan Minkevitch QA-Review: James Williams --- spec/integration/security_spec.rb | 10 ++++++---- spec/migrations/set_account_lti_opaque_ids_spec.rb | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/spec/integration/security_spec.rb b/spec/integration/security_spec.rb index 52eb317696c..14a8ae33427 100644 --- a/spec/integration/security_spec.rb +++ b/spec/integration/security_spec.rb @@ -521,8 +521,9 @@ describe "security" do expect(session[:become_user_id]).to be_nil expect(assigns['current_user'].id).to eq @admin.id expect(assigns['real_current_user']).to be_nil - expect(PageView.last.user_id).to eq @admin.id - expect(PageView.last.real_user_id).to be_nil + pv1 = PageView.last + expect(pv1.user_id).to eq @admin.id + expect(pv1.real_user_id).to be_nil post "/users/#{@student.id}/masquerade" assert_response 302 @@ -533,8 +534,9 @@ describe "security" do expect(session[:become_user_id]).to eq @student.id.to_s expect(assigns['current_user'].id).to eq @student.id expect(assigns['real_current_user'].id).to eq @admin.id - expect(PageView.last.user_id).to eq @student.id - expect(PageView.last.real_user_id).to eq @admin.id + pv2 = PageView.all.detect{|pv| pv != pv1} + expect(pv2.user_id).to eq @student.id + expect(pv2.real_user_id).to eq @admin.id end it "should remember the destination with an intervening auth" do diff --git a/spec/migrations/set_account_lti_opaque_ids_spec.rb b/spec/migrations/set_account_lti_opaque_ids_spec.rb index 51d6563bc15..a80ad6acb27 100644 --- a/spec/migrations/set_account_lti_opaque_ids_spec.rb +++ b/spec/migrations/set_account_lti_opaque_ids_spec.rb @@ -22,7 +22,7 @@ require 'lib/data_fixup/set_account_lti_opaque_ids.rb' describe 'DataFixup::SetAccountLtiOpaqueIds' do describe "up" do it "should work" do - root_account = Account.default + root_account = Account.create! original_guid = root_account.lti_guid expect(original_guid).not_to be_empty