Test params assignment and redirect

DFE-Digital · Mar 10, 2024 · 9ea473a · 9ea473a
1 parent 34010a2
commit 9ea473a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/app/controllers/schools/users_controller.rb b/app/controllers/schools/users_controller.rb
@@ -12,9 +12,8 @@ def new
 
     def create
       @user_invite = DFESignInAPI::UserInvite.new(user_params)
+      # @user_invite.organisation_id = DFESignInAPI::Organisation.new(current_user.sub, current_school.urn).current_organisation_id
       # redirect_to root_path
-      # @user_invite.organisation_id = DFESignInAPI::Organisation.new(current_user.sub,
-      #   current_school.urn).current_organisation_id
 
       if params[:confirmed] == 'true'
         if @user_invite.valid?
@@ -29,14 +28,14 @@ def create
     end
 
     def show
-      @user_invite = DFESignInAPI::UserInvite.new(user_params)
+      # @user_invite = DFESignInAPI::UserInvite.new(user_params)
       render :show
     end
 
   private
 
     def user_params
-      params.require(:user_invite).permit(:email, :firstname, :lastname, :organisation_id)
+      params.require(:schools_dfe_sign_in_api_user_invite).permit(:email, :firstname, :lastname, :organisation_id)
     end
   end
 end
diff --git a/app/services/schools/dfe_sign_in_api/user_invite.rb b/app/services/schools/dfe_sign_in_api/user_invite.rb
@@ -20,12 +20,6 @@ def invite_user
         @response ||= response
       end
 
-      def full_name
-        return nil unless first_name && last_name
-
-        [firstname, lastname].map(&:presence).join(' ')
-      end
-
     private
 
       def response

diff --git a/app/views/schools/users/show.html.erb b/app/views/schools/users/show.html.erb
@@ -14,7 +14,7 @@
               First name
             </dt>
             <dd class="govuk-summary-list__value">
-              <%= @user.firstname %>
+              <%= @user_invite.firstname %>
             </dd>
           </div>
 
@@ -23,7 +23,7 @@
               Last name
             </dt>
             <dd class="govuk-summary-list__value">
-              <%= @user.lastname %>
+              <%= @user_invite.lastname %>
             </dd>
           </div>
 
@@ -32,7 +32,7 @@
               Email address
             </dt>
             <dd class="govuk-summary-list__value">
-              <%= @user.email %>
+              <%= @user_invite.email %>
             </dd>
           </div>
           <%= hidden_field_tag :confirmed, true %>