Merge branch 'main' into core-981-style-privacy-policy

Author: mwvolo

.github/workflows/tests.yml

@@ -68,7 +68,6 @@ jobs:
 
       - name: Test
         id: test
-        continue-on-error: true
         run: |
           bin/rake parallel:create parallel:load_schema parallel:seed --trace
           WORKERS=4 bin/rake parallel:spec

app/controllers/admin/users_controller.rb

@@ -21,9 +21,11 @@ def search
     def update
       User.transaction do
         was_administrator = @user.is_administrator
+        old_updated_at = @user.updated_at
 
         respond_to do |format|
           if change_user_password && add_email_to_user && change_salesforce_contact && update_user
+            @user.touch if @user.updated_at == old_updated_at
             security_log :user_updated_by_admin, user_id: params[:id], username: @user.username,
                                                 user_params: request.filtered_parameters['user']
 

spec/controllers/contact_infos_controller_spec.rb

@@ -66,16 +66,6 @@
       expect(EmailAddress.find_by_value(@email.value).verified).to be_falsey
     end
 
-    # TODO: let's get this on dev and see the 500 - I can't reproduce
-    xit "returns error if code doesn't match" do
-      get(:confirm, params: { code: 'abcd' })
-      #byebug
-      expect(response.code).to eq('400')
-      expect(response.body).to have_no_missing_translations
-      expect(response.body).to have_content(t :"contact_infos.confirm.verification_code_not_found")
-      expect(EmailAddress.find_by_value(@email.value).verified).to be_falsey
-    end
-
     it "returns success if code matches" do
       get(:confirm, params: { code: @email.confirmation_code })
       expect(response).to be_successful

spec/controllers/newflow/educator_signup_controller_spec.rb

@@ -163,10 +163,6 @@ module Newflow
       end
     end
 
-    describe 'GET #educator_sheerid_form' do
-      it 'requires a logged in user'
-    end
-
     describe 'POST #sheerid_webhook' do
       let(:handler) { EducatorSignup::SheeridWebhook }
 
@@ -194,17 +190,5 @@ module Newflow
         end
       end
     end
-
-    describe 'GET #educator_profile_form' do
-      it 'renders'
-    end
-
-    describe 'POST #educator_complete' do
-      it ''
-    end
-
-    describe 'POST #educator_verify_email_by_pin' do
-      it ''
-    end
   end
 end

spec/controllers/newflow/login_controller_spec.rb

@@ -118,27 +118,10 @@ module Newflow
 
           context 'when educator is NOT profile complete' do
             before { user.update!(is_profile_complete: false) }
-
-            it 'saves incomplete educator in the session' do
-              # expect_any_instance_of(described_class).to receive(:save_incomplete_educator).with(user).once.and_call_original
-              post('login', params: params)
-              # expect(assigns(:current_incomplete_educator)).to eq(user)
-            end
-
             it 'does a redirect' do
               post('login', params: params)
               expect(response).to have_http_status(:redirect)
             end
-
-            it 'creates a security log' do
-              skip 'todo – maybe'
-
-              expect {
-                post('login', params: params)
-              }.to change {
-                SecurityLog.where(event_type: :educator_resumed_signup_flow).count
-              }
-            end
           end
         end
       end

spec/controllers/newflow/password_management_controller_spec.rb

@@ -102,10 +102,6 @@ module Newflow
       end
     end
 
-    describe 'POST #create_password' do
-      it 'creates a password for logged in user'
-    end
-
     describe 'GET #change_password_form' do
       context 'success - when valid token' do
         let(:params) do
@@ -130,14 +126,6 @@ module Newflow
           get('change_password_form', params: params)
           expect(response.status).to eq(200)
         end
-
-        xit 'creates a security log' do
-          expect {
-            get('change_password_form', params: params)
-          }.to change {
-            SecurityLog.where(event_type: :help_requested).count
-          }
-        end
       end
 
       context 'failure - when invalid token' do

spec/controllers/newflow/signup_controller_spec.rb

@@ -9,14 +9,6 @@ module Newflow
       end
     end
 
-    describe 'GET #change_signup_email_form' do
-      it 'assigns the email instance variable'
-    end
-
-    describe 'GET #verify_email_by_code' do
-      it ''
-    end
-
     describe 'GET #signup_done' do
       before do
         user = FactoryBot.create(:user)

spec/controllers/newflow/student_signup_controller_spec.rb

@@ -160,9 +160,5 @@ module Newflow
         expect(response.status).to eq(302)
       end
     end
-
-    describe 'POST #student_verify_email_by_pin' do
-      it ''
-    end
   end
 end