Skip to content

Commit 101c60c

Browse files
committed
Fix tests
1 parent a5290a0 commit 101c60c

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

app/views/admin/admin_invitations/index.html.erb

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<p>
1717
<%= t(".send_to_email.description") %>
1818
<%= text_field_tag "invitation[invitee_email]",
19-
(@invitation.try(:invitee_email) || ""),
20-
title: t(".send_to_email.invite_by_email_title") %>
19+
(@invitation.try(:invitee_email) || ""),
20+
title: t(".send_to_email.invite_by_email_title") %>
2121
<span class="submit actions"><%= submit_tag t(".send_to_email.invite_user") %></span>
2222
</p>
2323
</fieldset>
@@ -47,8 +47,8 @@
4747
<dt><%= label_tag "invitation[user_group]", t(".grant_invites.users") %></dt>
4848
<dd>
4949
<%= select_tag "invitation[user_group]",
50-
options_for_select([t(".grant_invites.all"), t(".grant_invites.with_no_unused")],
51-
t(".grant_invites.all")) %>
50+
options_for_select([t(".grant_invites.all"), t(".grant_invites.with_no_unused")],
51+
t(".grant_invites.all")) %>
5252
</dd>
5353
<dt class="landmark"><%= t(".grant_invites.landmark_submit") %></dt>
5454
<dd class="submit actions"><%= submit_tag t(".grant_invites.generate_invitations") %></dd>

features/admins/admin_invitations.feature

+13-13
Original file line numberDiff line numberDiff line change
@@ -306,12 +306,12 @@ Feature: Admin Actions to Manage Invitations
306306
And "dax" has "2" invitations
307307
And I am logged in as an admin
308308
When I follow "Invite New Users"
309-
And I fill in "Enter a user name" with "dax"
310-
And I press "Go"
309+
And I fill in "Username" with "dax"
310+
And I press "Search" within "form.invitation.simple.search"
311311
Then I should see "copy and use"
312312
When I follow "Invite New Users"
313-
And I fill in "Enter an invite token" with "dax's" invite code
314-
And I press "Go"
313+
And I fill in "Invite token" with "dax's" invite code
314+
And I press "Search" within "form.invitation.simple.search"
315315
Then I should see "copy and use"
316316

317317
Scenario: An admin can find all invitations via email partial match
@@ -324,16 +324,16 @@ Feature: Admin Actions to Manage Invitations
324324
When I fill in "Number of people to invite" with "2"
325325
And I press "Invite from queue"
326326
Then I should see "2 people from the invite queue are being invited"
327-
When I fill in "Enter all or part of an email address" with "@"
328-
And I press "Go"
327+
When I fill in "All or part of an email address" with "@"
328+
And I press "Search" within "form.invitation.simple.search"
329329
Then I should see "[email protected]"
330330
And I should see "[email protected]"
331331

332332
Scenario: An admin can't find a invitation for a nonexistent user
333333
Given I am logged in as an admin
334334
And I follow "Invite New Users"
335-
When I fill in "Enter a user name" with "dax"
336-
And I press "Go"
335+
When I fill in "Username" with "dax"
336+
And I press "Search" within "form.invitation.simple.search"
337337
Then I should see "No results were found. Try another search"
338338
When I fill in "Enter a user name" with ""
339339
And I fill in "Enter all or part of an email address" with "[email protected]"
@@ -360,7 +360,7 @@ Feature: Admin Actions to Manage Invitations
360360
When I fill in "Number of people to invite" with "1"
361361
And press "Invite from queue"
362362
Then I should see "1 person from the invite queue is being invited"
363-
When I press "Go"
363+
When I press "Search" within "form.invitation.simple.search"
364364
And I fill in "Enter all or part of an email address" with "[email protected]"
365365
And I press "Go"
366366
Then I should see "Sender testadmin-support"
@@ -370,12 +370,12 @@ Feature: Admin Actions to Manage Invitations
370370
And "dax" has "2" invitations
371371
And I am logged in as a "support" admin
372372
When I follow "Invite New Users"
373-
And I fill in "Enter a user name" with "dax"
374-
And I press "Go"
373+
And I fill in "Username" with "dax"
374+
And I press "Search" within "form.invitation.simple.search"
375375
Then I should see "copy and use"
376376
When I follow "Invite New Users"
377-
And I fill in "Enter an invite token" with "dax's" invite code
378-
And I press "Go"
377+
And I fill in "Invite token" with "dax's" invite code
378+
And I press "Search" within "form.invitation.simple.search"
379379
Then I should see "copy and use"
380380
When I fill in "Enter an email address" with "[email protected]"
381381
And I press "Update Invitation"

features/other_a/invite_request.feature

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ Feature: Invite requests
151151
And I am logged in as a "support" admin
152152
When I follow "Invite New Users"
153153
And I fill in "invitation[user_name]" with "user1"
154-
And I press "Go"
154+
And I press "Search" within "form.invitation.simple.search"
155155
Then I should see "Token"
156156
When I follow "Delete"
157157
Then I should see "Invitation successfully destroyed"

0 commit comments

Comments
 (0)