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

Fixed removing images from publisher on the profile and tags pages

Browse source
This commit is contained in:
movilla 2013-02-21 22:19:24 +01:00
parent abaf7f9a27
commit e0d0d0f668
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -9,6 +9,7 @@
* exec foreman in ./script/server to replace the process so that we can Ctrl+C it again. * exec foreman in ./script/server to replace the process so that we can Ctrl+C it again.
* Include our custom fileuploader on the mobile site too. [#3994](https://github.com/diaspora/diaspora/pull/3994) * Include our custom fileuploader on the mobile site too. [#3994](https://github.com/diaspora/diaspora/pull/3994)
* Move custom splash page logic into the controller [#3991](https://github.com/diaspora/diaspora/issues/3991) * Move custom splash page logic into the controller [#3991](https://github.com/diaspora/diaspora/issues/3991)
* Fixed removing images from publisher on the profile and tags pages. [#3995](https://github.com/diaspora/diaspora/pull/3995)
# 0.0.3.0 # 0.0.3.0

2
app/views/photos/_new_photo.haml
View file

@ -65,7 +65,7 @@
$('.x').bind('click', function(){ $('.x').bind('click', function(){
var photo = $(this).closest('.publisher_photo'); var photo = $(this).closest('.publisher_photo');
photo.addClass("dim"); photo.addClass("dim");
$.ajax({url: "photos/" + photo.children('img').attr('data-id'), $.ajax({url: "/photos/" + photo.children('img').attr('data-id'),
dataType: 'json', dataType: 'json',
type: 'DELETE', type: 'DELETE',
success: function() { success: function() {

13
features/posts_from_profile_page.feature
View file

@ -7,13 +7,13 @@ Feature: posting from own profile page
Given I am on the home page Given I am on the home page
And a user with username "alice" And a user with username "alice"
When I sign in as "alice@alice.alice" When I sign in as "alice@alice.alice"
Given I have following aspects: Given I have following aspects:
| Family | | Family |
| Work | | Work |
Given I am on "alice@alice.alice"'s page
Scenario: posting some text Scenario: posting some text
Given I am on "alice@alice.alice"'s page Given I expand the publisher
And I have turned off jQuery effects And I have turned off jQuery effects
And I append "I want to understand people" to the publisher And I append "I want to understand people" to the publisher
And I select "Family" on the aspect dropdown And I select "Family" on the aspect dropdown
@ -45,3 +45,12 @@ Feature: posting from own profile page
When I am on the home page When I am on the home page
Then I should see a "img" within ".stream_element div.photo_attachments" Then I should see a "img" within ".stream_element div.photo_attachments"
And I should see "who am I?" within ".stream_element" And I should see "who am I?" within ".stream_element"
Scenario: back out of posting a photo-only post
Given I expand the publisher
And I have turned off jQuery effects
When I attach the file "spec/fixtures/button.png" to hidden element "file" within "#file-upload"
And I wait for the ajax to finish
And I click to delete the first uploaded photo
And I wait for the ajax to finish
Then I should not see an uploaded image within the photo drop zone