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

fixing invitations modal visibility issue

Browse source 
closes #7191
This commit is contained in:
Justin Ramos 2016-11-17 13:19:11 +00:00 committed by Steffen van Bergerem
parent 37b34237b9
commit c7a0b053fa
No known key found for this signature in database
GPG key ID: 315C9787D548DC6B
3 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -9,6 +9,7 @@
* Fix fetching comments after fetching likes [#7167](https://github.com/diaspora/diaspora/pull/7167) * Fix fetching comments after fetching likes [#7167](https://github.com/diaspora/diaspora/pull/7167)
* Hide 'reshare' button on already reshared posts [#7169](https://github.com/diaspora/diaspora/pull/7169) * Hide 'reshare' button on already reshared posts [#7169](https://github.com/diaspora/diaspora/pull/7169)
* Only reload profile header when changing aspect memberships [#7183](https://github.com/diaspora/diaspora/pull/7183) * Only reload profile header when changing aspect memberships [#7183](https://github.com/diaspora/diaspora/pull/7183)
* Fix visiblity on invitation modal when opening it from the stream [#7191](https://github.com/diaspora/diaspora/pull/7191)
## Features ## Features
* Show spinner when loading comments in the stream [#7170](https://github.com/diaspora/diaspora/pull/7170) * Show spinner when loading comments in the stream [#7170](https://github.com/diaspora/diaspora/pull/7170)

9
app/views/shared/_invitations.haml
View file

@ -3,7 +3,8 @@
.invitations-link.btn.btn-link#invitations-button{"data-toggle" => "modal"} .invitations-link.btn.btn-link#invitations-button{"data-toggle" => "modal"}
= t(".by_email") = t(".by_email")
= render "shared/modal", - content_for :after_content do
path: new_user_invitation_path, = render "shared/modal",
id: "invitationsModal", path: new_user_invitation_path,
title: t("invitations.new.invite_someone_to_join") id: "invitationsModal",
title: t("invitations.new.invite_someone_to_join")

11
features/desktop/invitations.feature
View file

@ -39,7 +39,7 @@ Feature: Invitations
And I click on selector "#invitations-button" And I click on selector "#invitations-button"
Then I should see one less invite Then I should see one less invite
Scenario: sends an invitation Scenario: sends an invitation from the sidebar
When I sign in as "alice@alice.alice" When I sign in as "alice@alice.alice"
And I click on "Invite your friends" navbar title And I click on "Invite your friends" navbar title
And I click on selector "#invitations-button" And I click on selector "#invitations-button"
@ -49,6 +49,15 @@ Feature: Invitations
Then I should have 1 Devise email delivery Then 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
When I sign in as "alice@alice.alice"
And I press the first "a.invitations-link" within "#no_contacts"
And I fill in the following:
| email_inviter_emails | alex@example.com |
And I press "Send an invitation"
Then I should have 1 Devise email delivery
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
When I sign in as "alice@alice.alice" When I sign in as "alice@alice.alice"
And I search for "test" And I search for "test"