wip following tags
This commit is contained in:
parent
956a86b401
commit
77d28b4117
2 changed files with 20 additions and 19 deletions
|
|
@ -18,11 +18,24 @@
|
|||
- content_for :body_class do
|
||||
= "tags_show"
|
||||
|
||||
.span-24.last
|
||||
%h1.tag
|
||||
= "##{params[:name]}"
|
||||
.span-6
|
||||
%h3
|
||||
= t('people', :count => @people_count)
|
||||
|
||||
.side_stream.stream
|
||||
= render :partial => 'people/index', :locals => {:people => @people}
|
||||
|
||||
.span-15.last
|
||||
.stream_container
|
||||
#author_info
|
||||
- if user_signed_in? && current_user.person != @person
|
||||
.right
|
||||
= button_to "Follow ##{params[:name]}", :class => "button"
|
||||
%h2
|
||||
= "##{params[:name]}"
|
||||
|
||||
%hr
|
||||
|
||||
.span-13
|
||||
#main_stream.stream
|
||||
- if @posts.length > 0
|
||||
= render 'shared/stream', :posts => @posts
|
||||
|
|
@ -31,9 +44,3 @@
|
|||
- else
|
||||
= t('.nobody_talking', :tag => "##{params[:name]}")
|
||||
|
||||
.prepend-2.span-9.last
|
||||
%h3
|
||||
= t('people', :count => @people_count)
|
||||
|
||||
.side_stream.stream
|
||||
= render :partial => 'people/index', :locals => {:people => @people}
|
||||
|
|
|
|||
|
|
@ -8,18 +8,12 @@ Feature: posting
|
|||
Given a user with username "bob"
|
||||
And a user with username "alice"
|
||||
When I sign in as "bob@bob.bob"
|
||||
And I have an aspect called "PostTo"
|
||||
And I have an aspect called "DidntPostTo"
|
||||
And I have user with username "alice" in an aspect called "PostTo"
|
||||
And I have user with username "alice" in an aspect called "DidntPostTo"
|
||||
|
||||
And I am on the home page
|
||||
|
||||
|
||||
Scenario: see a tag that I am following
|
||||
Given I am on the home page
|
||||
And I expand the publisher
|
||||
And I fill in "status_message_fake_text" with "I am #bob"
|
||||
Given I expand the publisher
|
||||
And I fill in "status_message_fake_text" with "I am ALICE"
|
||||
And I press the first ".public_icon" within "#publisher"
|
||||
And I press "Share"
|
||||
And I go to the destroy user session page
|
||||
|
|
@ -28,7 +22,7 @@ Feature: posting
|
|||
And I search for "#alice"
|
||||
And I press "Follow #alice"
|
||||
And I go to the home page
|
||||
And I press on "#alice"
|
||||
And I press "#alice"
|
||||
Then I should see "I am #alice"
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue