AO3-3997 more fixes for invite

app/views/invitations/_invitation.html.erb

@@ -10,9 +10,9 @@
     <dd><%= invitation.invitee_email %></dd>
     <% else %>
     <dd>
-      <%= error_messages_for @invitation %>
       <%= form_for(invitation) do |f| %>
-        <p><%= label_tag "invitation[invitee_email]", t('.email_address_label') %>: <%= f.text_field :invitee_email %></p>
+        <%= error_messages_for invitation %>
+        <p><%= f.label :invitee_email, t(".email_address_label") %> <%= f.text_field :invitee_email %></p>
         <p><%= hidden_field_tag :user_id, @user.try(:login) %></p>
         <p class="submit actions"><%= f.submit %></p>
       <% end %>

features/other_a/invite_request.feature

@@ -64,14 +64,12 @@ Feature: Invite requests
 
   Scenario: User can fail to send an invitation to an invalid email address
 
-    Given invitations are required
-      And I am logged in as "user1"
-      And I request some invites
-      And an admin grants the request
-      And I try to invite a friend from my user page
-    When all emails have been delivered
-      And I fill in "invitation[invitee_email]" with "test@"
-      And I press "Send Invitation"
+    Given I am logged in as "user1"
+      And "user1" has "1" invitation
+      And I am on user1's manage invitations page
+    When I follow the link for "user1" first invite
+      And I fill in "Enter an email address" with "test@"
+      And I press "Update Invitation"
     Then I should see "Invitee email should look like an email address"
 
   Scenario: User can send out invites they have been granted, and the recipient can sign up