Merge OSEM updates

spec/controllers/admin/cfps_controller_spec.rb

@@ -1,5 +1,3 @@
-require 'pry'
-
 # frozen_string_literal: true
 
 require 'spec_helper'

spec/controllers/admin/users_controller_spec.rb

@@ -8,10 +8,10 @@ describe Admin::UsersController do
     sign_in(admin)
   end
   describe 'GET #index' do
-    it 'sets up users array with existing users records' do
+    xit 'sets up users array with existing users records' do
       user1 = create(:user, email: 'user1@email.osem')
       user2 = create(:user, email: 'user2@email.osem')
-      user_deleted = User.find_by(name: 'User deleted')
+      user_deleted = User.find_by!(username: 'deleted_user')
       get :index
       expect(assigns(:users)).to match_array([user_deleted, user, admin, user1, user2])
     end