Merge pull request #4112 from marpo60/issues_4017_4107_fixes
close issues #4017 and 4107 by including jquery.textchange
This commit is contained in:
commit
15418eae67
6 changed files with 10 additions and 5 deletions
|
|
@ -99,6 +99,7 @@ by them self.
|
|||
|
||||
## Bug fixes
|
||||
|
||||
* Fix posting functionality on tags show view [#4017][#4107](https://github.com/diaspora/diaspora/issues/4017)(https://github.com/diaspora/diaspora/pull/4112)
|
||||
* Fix cancel button on getting_started confirmation box [#4073](https://github.com/diaspora/diaspora/issues/4073)
|
||||
* Reset comment box height after posting a comment. [#4030](https://github.com/diaspora/diaspora/issues/4030)
|
||||
* Fade long tag names. [#3899](https://github.com/diaspora/diaspora/issues/3899)
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
//= require ./publisher/services
|
||||
//= require ./publisher/aspects_selector
|
||||
//= require ./publisher/getting_started
|
||||
//= require jquery.textchange
|
||||
|
||||
app.views.Publisher = Backbone.View.extend(_.extend(
|
||||
app.views.PublisherServices,
|
||||
|
|
|
|||
|
|
@ -3,6 +3,5 @@
|
|||
* the COPYRIGHT file.
|
||||
*/
|
||||
|
||||
//= require jquery.textchange
|
||||
//= require aspect-edit-pane
|
||||
//= require fileuploader-custom
|
||||
//= require fileuploader-custom
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@
|
|||
//= require aspect-edit-pane
|
||||
//= require fileuploader-custom
|
||||
//= require jquery.autoSuggest.custom
|
||||
//= require jquery.textchange
|
||||
|
|
@ -2,7 +2,6 @@
|
|||
-# licensed under the Affero General Public License version 3 or later. See
|
||||
-# the COPYRIGHT file.
|
||||
|
||||
|
||||
- content_for :page_title do
|
||||
- if @stream.tag_name
|
||||
= @stream.display_tag_name
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ Feature: posting
|
|||
|
||||
Scenario: can post a message from the tag page
|
||||
Then I should see "#boss" within "#publisher"
|
||||
And I post a status with the text "#boss from the tag page"
|
||||
And I post "#boss from the tag page"
|
||||
And I search for "#boss"
|
||||
Then I should see "#boss from the tag page"
|
||||
|
||||
|
|
@ -29,6 +29,12 @@ Feature: posting
|
|||
And I follow "#boss"
|
||||
Then I should see "I am da #boss" within "body"
|
||||
|
||||
Scenario: see a tag that I am following and I post over there
|
||||
When I go to the home page
|
||||
And I follow "#boss"
|
||||
And I post "#boss from the #boss tag page"
|
||||
Then I should see "#boss from the #boss tag page" within "body"
|
||||
|
||||
Scenario: can stop following a tag from the tag page
|
||||
When I press "Following #boss"
|
||||
And I go to the followed tags stream page
|
||||
|
|
|
|||
Loading…
Reference in a new issue