Permalink
Browse files

Fixed removing images from publisher on the profile and tags pages

  • Loading branch information...
1 parent ee0d7b2 commit bfa8b92c57a1213ae76db222073756b1f089d5c7 @movilla movilla committed with jhass Feb 21, 2013
Showing with 13 additions and 3 deletions.
  1. +1 −0 Changelog.md
  2. +1 −1 app/views/photos/_new_photo.haml
  3. +11 −2 features/posts_from_profile_page.feature
View
@@ -9,6 +9,7 @@
* 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)
* 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
@@ -65,7 +65,7 @@
$('.x').bind('click', function(){
var photo = $(this).closest('.publisher_photo');
photo.addClass("dim");
- $.ajax({url: "photos/" + photo.children('img').attr('data-id'),
+ $.ajax({url: "/photos/" + photo.children('img').attr('data-id'),
dataType: 'json',
type: 'DELETE',
success: function() {
@@ -7,13 +7,13 @@ Feature: posting from own profile page
Given I am on the home page
And a user with username "alice"
When I sign in as "alice@alice.alice"
-
Given I have following aspects:
| Family |
| Work |
+ Given I am on "alice@alice.alice"'s page
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 append "I want to understand people" to the publisher
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
Then I should see a "img" within ".stream_element div.photo_attachments"
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

0 comments on commit bfa8b92

Please sign in to comment.