nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next-minor' into develop

Browse source
This commit is contained in:
Benjamin Neff 2017-03-28 19:55:48 +02:00
commit 6a5c34535d
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
features/desktop/invitations.feature
View file

@ -46,7 +46,8 @@ Feature: Invitations
And I fill in the following: And I fill in the following:
| email_inviter_emails | alex@example.com | | email_inviter_emails | alex@example.com |
And I press "Send an invitation" And I press "Send an invitation"
Then I should have 1 Devise email delivery Then I should see a flash message indicating success
And I should have 1 Devise email delivery
And I should not see "change your notification settings" in the last sent email And I should not see "change your notification settings" in the last sent email
Scenario: sends an invitation from the stream Scenario: sends an invitation from the stream
@ -56,7 +57,8 @@ Feature: Invitations
And I fill in the following: And I fill in the following:
| email_inviter_emails | alex@example.com | | email_inviter_emails | alex@example.com |
And I press "Send an invitation" And I press "Send an invitation"
Then I should have 1 Devise email delivery Then I should see a flash message indicating success
And I should have 1 Devise email delivery
And I should not see "change your notification settings" in the last sent email And I should not see "change your notification settings" in the last sent email
Scenario: sends an invitation from the people search page Scenario: sends an invitation from the people search page

3
features/mobile/reshare.feature
View file

@ -36,8 +36,7 @@ Feature: resharing from the mobile
And I am on "alice@alice.alice"'s page And I am on "alice@alice.alice"'s page
And I click to delete the first post And I click to delete the first post
And I log out And I log out
And I toggle the mobile view And I sign in as "bob@bob.bob" on the mobile website
And I sign in as "bob@bob.bob"
Then I should see "Original post deleted by author" within ".reshare" Then I should see "Original post deleted by author" within ".reshare"
And I log out And I log out
And I sign in as "eve@eve.eve" on the mobile website And I sign in as "eve@eve.eve" on the mobile website