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

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Jonne Haß 2016-02-01 11:27:06 +01:00
commit 1832c2956e
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/users/_edit.haml
View file

@ -197,7 +197,7 @@
- if current_user.exporting_photos - if current_user.exporting_photos
.export-in-progress= t(".export_photos_in_progress") .export-in-progress= t(".export_photos_in_progress")
- elsif current_user.exported_photos_file.present? - elsif current_user.exported_photos_file.present?
= link_to t(".request_export_photos_update"), export_photos_user_path, = link_to t(".request_export_photos_update"), export_photos_user_path, method: :post,
class: "btn btn-default btn-block" class: "btn btn-default btn-block"
.small-horizontal-spacer .small-horizontal-spacer
= link_to t(".download_export_photos"), download_photos_user_path, class: "btn btn-success btn-block" = link_to t(".download_export_photos"), download_photos_user_path, class: "btn btn-success btn-block"

10
features/desktop/download_photos.feature
View file

@ -10,6 +10,16 @@ Feature: Download Photos
Then I should see a flash message indicating success Then I should see a flash message indicating success
And I should see a flash message containing "We are currently processing your photos" And I should see a flash message containing "We are currently processing your photos"
Scenario: Refresh my photos
Given I am signed in
When I did request my photos
And I click on my name in the header
When I follow "Settings"
Then I should be on my account settings page
When I follow "Refresh my photos"
Then I should see a flash message indicating success
And I should see a flash message containing "We are currently processing your photos"
Scenario: Download my photos Scenario: Download my photos
Given I am signed in Given I am signed in
When I did request my photos When I did request my photos