fix the build
This commit is contained in:
parent
d36da2a266
commit
49bee9bf19
5 changed files with 9 additions and 10 deletions
|
|
@ -23,7 +23,11 @@
|
|||
= render 'aspects/no_contacts_message'
|
||||
|
||||
#main_stream.stream{:data => {:guids => stream.aspect_ids.join(',')}}
|
||||
- if stream.posts.length > 0
|
||||
- if defined?(no_posts) && no_posts
|
||||
#pagination
|
||||
=link_to(t('more'), next_page_path(:ajax_stream => true), :class => 'paginate')
|
||||
|
||||
- elsif stream.posts.length > 0
|
||||
= render 'shared/stream', :posts => stream.posts
|
||||
#pagination
|
||||
=link_to(t('more'), next_page_path, :class => 'paginate')
|
||||
|
|
|
|||
|
|
@ -26,12 +26,7 @@
|
|||
|
||||
.span-13.append-1
|
||||
#aspect_stream_container.stream_container
|
||||
|
||||
= render 'shared/publisher', :selected_aspects => @stream.aspects, :aspect_ids => @stream.aspect_ids, :for_all_aspects => @stream.for_all_aspects?, :aspect => @stream.aspect
|
||||
#main_stream.stream{:data => {:guids => @stream.aspect_ids.join(',')}}
|
||||
#pagination
|
||||
=link_to(t('more'), next_page_path(:ajax_stream => true), :class => 'paginate')
|
||||
/= render 'aspects/aspect_stream', :stream => @stream
|
||||
= render 'aspects/aspect_stream', :stream => @stream, :no_posts => true
|
||||
|
||||
.span-5.rightBar.last
|
||||
= render 'aspects/selected_contacts', :stream => @stream
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
-# licensed under the Affero General Public License version 3 or later. See
|
||||
-# the COPYRIGHT file.
|
||||
|
||||
|
||||
= render :partial => 'shared/stream_element',
|
||||
:collection => posts,
|
||||
:as => :post,
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ Feature: following and being followed
|
|||
Given I sign in as "alice@alice.alice"
|
||||
And I am on "bob@bob.bob"'s page
|
||||
|
||||
Then I should see "Add to aspect"
|
||||
Then I should see "Add contact"
|
||||
And I should not see "Mention"
|
||||
And I should not see "Message"
|
||||
|
||||
|
|
|
|||
|
|
@ -41,7 +41,8 @@ Feature: infinite scroll
|
|||
Then I should see "No more"
|
||||
|
||||
Scenario: on the main stream post created time
|
||||
When I follow "posted"
|
||||
When I wait for the ajax to finish
|
||||
And I follow "posted"
|
||||
Then I should see 15 posts
|
||||
And I should see "alice - 15 - #seeded"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue