Merge branch 'stable' into develop

Changelog.md

@@ -97,6 +97,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
 * 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
 

app/assets/javascripts/app/router.js

@@ -27,6 +27,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",

app/controllers/streams_controller.rb

@@ -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" }
 

app/views/streams/main_stream.html.haml

@@ -41,6 +41,8 @@
           = render "aspects/aspect_listings", stream: @stream
         %li.followed-tags-sidebar
           = render "tags/followed_tags_listings"
+        %li{data: {stream: "public"}}
+          = link_to t("streams.public.title"), public_stream_path, rel: "backbone", class: "hoverable"
 
     .col-md-6
       #aspect_stream_container.stream_container

features/desktop/public_stream.feature

@@ -0,0 +1,30 @@
+@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"

spec/controllers/streams_controller_spec.rb

@@ -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