Unverified Commit 8e5d2f5c authored by flaburgan's avatar flaburgan Committed by Steffen van Bergerem
Browse files

Add links to the aspects and followed tags page on mobile 

closes #7265
parent 8709d74c

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
* Fix background color of year on notifications page with dark theme [#7263](https://github.com/diaspora/diaspora/pull/7263)



## Features

* Add links to the aspects and followed tags pages on mobile [#7265](https://github.com/diaspora/diaspora/pull/7265)



# 0.6.2.0

app/views/layouts/_drawer.mobile.haml

+2 −0
Original line number Diff line number Diff line
@@ -15,12 +15,14 @@ 
        = link_to t("streams.aspects.title"), "#"

      %li.no-border.hide

        %ul

          %li= link_to t("streams.aspects.all"), aspects_stream_path

          - current_user.aspects.each do |aspect|

            %li= link_to aspect.name, aspects_stream_path(a_ids: [aspect.id])

      %li#followed_tags

        = link_to t("streams.followed_tag.title"), "#"

      %li.no-border.hide

        %ul

          %li= link_to t("streams.followed_tag.all"), followed_tags_stream_path

          - current_user.followed_tags.each do |tag|

            %li= tag_link(tag)

          - if current_user.followed_tags.length > 0

config/locales/diaspora/en.yml

+2 −0
Original line number Diff line number Diff line
@@ -1135,6 +1135,7 @@ en: 
      title: "#Followed tags"

      add_a_tag: "Add a tag"

      follow: "Follow"

      all: "All tags"



    tags:

      title: "Posts tagged: %{tags}"
@@ -1147,6 +1148,7 @@ en: 


    aspects:

      title: "My aspects"

      all: "All aspects"



    activity:

      title: "My activity"

features/mobile/drawer.feature

+19 −5
Original line number Diff line number Diff line
@@ -56,14 +56,28 @@ Feature: Navigate between pages using the header menu and the drawer 
    And I click on "@Mentions" in the drawer

    Then I should be on the mentioned stream page



  Scenario: navigate to my aspects page

  Scenario: navigate to aspects pages

    Given "bob@bob.bob" has a public post with text "bob's text"

    Given I have a limited post with text "Hi you!" in the aspect "Besties"

    When I open the drawer

    And I click on "My aspects" in the drawer

    And I click on "Besties" in the drawer

    Then I should see "bob's text" within "#main_stream"

    And I click on "All aspects" in the drawer

    Then I should be on the aspects page

    And I should see "Hi you!" within "#main_stream"

    When I open the drawer

    And I click on "My aspects" in the drawer

    And I click on "Unicorns" in the drawer

    And I should not see "Hi you!" within "#main_stream"



  Scenario: navigate to the followed tags page

    When I follow the "boss" tag

    And I go to the stream page

    And I open the drawer

    And I click on "#Followed tags" in the drawer

    And I click on "All tags" in the drawer

    Then I should be on the followed tags stream page



  Scenario: navigate to the boss tag page

    When I follow the "boss" tag

    And I go to the stream page

    And I open the drawer

features/step_definitions/posts_steps.rb

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ Then /^I should not be able to submit the publisher$/ do 
  expect(publisher_submittable?).to be false

end



Given /^I have a limited post with text "([^\"]*)" in the aspect "([^"]*)"$/ do |text, aspect_name|

  @me.post :status_message, text: text, to: @me.aspects.where(name: aspect_name).first.id

end



Given /^"([^"]*)" has a public post with text "([^"]*)"$/ do |email, text|

  user = User.find_by_email(email)

  user.post(:status_message, :text => text, :public => true, :to => user.aspect_ids)