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

Issue #6662: fix refresh my photos routing error

Browse source 
closes #6667
This commit is contained in:
Sayed Abdelhaleem 2016-02-01 10:55:36 +02:00 committed by Jonne Haß
parent 2f66c7c89a
commit fa97a5a5a2
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/views/users/edit.mobile.haml
View file

@ -167,9 +167,9 @@
= link_to t('.download_export'), download_profile_user_path, class: "btn btn-success" = link_to t('.download_export'), download_profile_user_path, class: "btn btn-success"
%h6 %h6
= t('.last_exported_at', timestamp: current_user.exported_at) = t('.last_exported_at', timestamp: current_user.exported_at)
= link_to t('.request_export_update'), export_profile_user_path, class: "btn" = link_to t('.request_export_update'), export_profile_user_path, class: "btn", method: :post
- else - else
= link_to t('.request_export'), export_profile_user_path, :class => "btn" = link_to t('.request_export'), export_profile_user_path, class: "btn", method: :post
%br %br
%br %br
- if current_user.exporting_photos - if current_user.exporting_photos
@ -178,9 +178,9 @@
= link_to t('.download_export_photos'), download_photos_user_path, class: "btn btn-success" = link_to t('.download_export_photos'), download_photos_user_path, class: "btn btn-success"
%h6 %h6
= t('.last_exported_at', timestamp: current_user.exported_photos_at) = t('.last_exported_at', timestamp: current_user.exported_photos_at)
= link_to t('.request_export_photos_update'), export_photos_user_path, class: "btn" = link_to t('.request_export_photos_update'), export_photos_user_path, class: "btn", method: :post
- else - else
= link_to t('.request_export_photos'), export_photos_user_path, :class => "btn" = link_to t('.request_export_photos'), export_photos_user_path, class: "btn", method: :post
%hr %hr
.span-5.last .span-5.last

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