Commit e0be1b49 authored by Steffen van Bergerem's avatar Steffen van Bergerem Committed by Jonne Haß

Add public stream

closes #6465
parent 058bcb43
......@@ -14,6 +14,7 @@
* Only post to the primary tumblr blog [#6386](https://github.com/diaspora/diaspora/pull/6386)
* Always show public photos on profile page [#6398](https://github.com/diaspora/diaspora/pull/6398)
* Expose Unicorn's pid option to our configuration system [#6411](https://github.com/diaspora/diaspora/pull/6411)
* Add stream of all public posts [#6465](https://github.com/diaspora/diaspora/pull/6465)
# 0.5.3.1
......
......@@ -24,6 +24,7 @@ app.Router = Backbone.Router.extend({
"commented": "stream",
"liked": "stream",
"mentions": "stream",
"public": "stream",
"followed_tags": "followed_tags",
"tags/:name": "followed_tags",
"people/:id/photos": "photos",
......
......@@ -5,7 +5,6 @@
class StreamsController < ApplicationController
before_action :authenticate_user!
before_action :save_selected_aspects, :only => :aspects
before_action :redirect_unless_admin, :only => :public
layout proc { request.format == :mobile ? "application" : "with_header" }
......
......@@ -39,6 +39,8 @@
= render "aspects/aspect_listings", stream: @stream
%li
= render "tags/followed_tags_listings"
%li{data: {stream: "public"}}
= link_to t("streams.public.title"), public_stream_path, rel: "backbone", class: "hoverable"
.span6
#aspect_stream_container.stream_container
......
@javascript
Feature: The public stream
Background:
Given following users exist:
| username | email |
| Alice Smith | alice@alice.alice |
| Bob Jones | bob@bob.bob |
| Eve Doe | eve@eve.eve |
And a user with email "alice@alice.alice" is connected with "bob@bob.bob"
And "bob@bob.bob" has a public post with text "Bob’s public post"
And "bob@bob.bob" has a non public post with text "Bob’s private post"
And "eve@eve.eve" has a public post with text "Eve’s public post"
Scenario: seeing public posts of someone you don't follow
When I sign in as "alice@alice.alice"
Then I should not see "Eve’s public post"
When I am on the public stream page
Then I should see "Eve’s public post"
Scenario: seeing public posts of someone you follow
When I sign in as "alice@alice.alice"
Then I should see "Bob’s public post"
When I am on the public stream page
Then I should see "Bob’s public post"
Scenario: not seeing private posts of someone you follow
When I sign in as "alice@alice.alice"
Then I should see "Bob’s private post"
When I am on the public stream page
Then I should not see "Bob’s private post"
......@@ -10,16 +10,10 @@ describe StreamsController, :type => :controller do
end
describe "#public" do
it 'will succeed if admin' do
Role.add_admin(alice.person)
it "succeeds" do
get :public
expect(response).to be_success
end
it 'will redirect if not' do
get :public
expect(response).to be_redirect
end
end
describe '#multi' do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment