Merge pull request #5789 from svbergerem/unnecessary-on-home-page-steps

Remove unnecessary 'on the home page' steps

features/desktop/blocks_user.feature

@@ -9,12 +9,10 @@ Feature: Blocking a user from the stream
     And Alice has a post mentioning Bob
     And I sign in as "bob@bob.bob"
 
-
   Scenario: Blocking a user
-    When I am on the home page
     When I click on the first block button
     And I confirm the alert
-    And I am on the home page
+    And I go to the home page
     Then I should not see any posts in my stream
 
   Scenario: Blocking a user from the profile page

features/desktop/connects_users.feature

@@ -18,7 +18,7 @@ Feature: following and being followed
     And I am on "bob@bob.bob"'s page
     Then I should see "I am following you"
 
-    And I am on the home page
+    When I go to the home page
     Then I should not see "I am following you"
 
   Scenario: seeing public posts of someone you follow
@@ -28,7 +28,7 @@ Feature: following and being followed
     And I am on "alice@alice.alice"'s page
     Then I should see "I am ALICE"
 
-    When I am on the home page
+    When I go to the home page
     Then I should see "I am ALICE"
 
   Scenario: I follow a malicious user
@@ -47,24 +47,17 @@ Feature: following and being followed
   Scenario: seeing non-public posts of someone you follow who also follows you
     When I sign in as "alice@alice.alice"
     And I am on "bob@bob.bob"'s page
-
     And I add the person to my "Besties" aspect
     And I add the person to my "Unicorns" aspect
-
+    And I go to the home page
-    When I go to the home page
-
     Then I should have 1 contact in "Unicorns"
-    Then I should have 1 contact in "Besties"
+    And I should have 1 contact in "Besties"
 
-    When I am on the home page
+    When I click the publisher and post "I am following you back"
-    And I click the publisher and post "I am following you back"
+    And I sign out
-    Then I sign out
+    And I sign in as "bob@bob.bob"
-
-    When I sign in as "bob@bob.bob"
     Then I should have 1 contacts in "Besties"
-
+    And I should see "I am following you back"
-    When I am on the home page
-    Then I should see "I am following you back"
 
   Scenario: adding someone who follows you while creating a new aspect
     When I sign in as "alice@alice.alice"

features/desktop/donations.feature

@@ -12,5 +12,5 @@ Feature: donations
 
   Scenario: Bitcoin donations
     Given I have configured a Bitcoin address
-    And I am on the home page
+    And I go to the home page
     Then I should see the Bitcoin address

features/desktop/keyboard_navigation.feature

@@ -9,8 +9,7 @@ Feature: Keyboard navigation
     And I sign in as "bob@bob.bob"
 
   Scenario: navigate downwards
-    When I am on the home page
+    When I press the "J" key somewhere
-    And I press the "J" key somewhere
     Then post 1 should be highlighted
     And I should have navigated to the highlighted post
 
@@ -24,15 +23,13 @@ Feature: Keyboard navigation
     And I close the publisher
 
   Scenario: navigate upwards
-    When I am on the home page
+    When I scroll to post 3
-    And I scroll to post 3
+    And I press the "K" key somewhere
-    When I press the "K" key somewhere
     Then post 2 should be highlighted
     And I should have navigated to the highlighted post
 
   Scenario: expand the comment form in the main stream
-    When I am on the home page
+    Given the first comment field should be closed
-    Then the first comment field should be closed
     When I press the "J" key somewhere
     And I press the "C" key somewhere
     Then the first comment field should be open

features/desktop/likes.feature

@@ -14,9 +14,6 @@ Feature: Liking posts
     And I sign in as "alice@alice.alice"
 
   Scenario: Liking and unliking a post from the stream
-    When I am on the home page
-    Then I should see "Bob"
-    And I should see "I like unicorns"
     When I like the post "I like unicorns" in the stream
     Then I should see a ".likes" within "#main_stream .stream_element"
 
@@ -32,9 +29,7 @@ Feature: Liking posts
     Then I should not see a ".count" within "#single-post-interactions"
 
   Scenario: Someone likes my post
-    When I am on the home page
+    When I like the post "I like unicorns" in the stream
-    And I like the post "I like unicorns" in the stream
     And I sign out
     And I sign in as "bob@bob.bob"
-    And I am on the home page
     Then I should see a ".likes" within "#main_stream .stream_element"

features/desktop/manages_aspects.feature

@@ -65,8 +65,6 @@ Feature: User manages contacts
   Scenario: clicking on the contacts link in the header with zero contacts directs a user to the featured users page
     Given I am signed in
     And I have 0 contacts
-    And I am on the home page
-
     And I click on my name in the header
     When I follow "Contacts"
     Then I should see "Community spotlight" within ".span9"
@@ -74,8 +72,6 @@ Feature: User manages contacts
   Scenario: clicking on the contacts link in the header with contacts does not send a user to the featured users page
     Given I am signed in
     And I have 2 contacts
-    And I am on the home page
-
     And I click on my name in the header
     When I follow "Contacts"
     Then I should not see "Community spotlight" within ".span9"

features/desktop/mentions.feature

@@ -12,7 +12,6 @@ Feature: Mentions
     And a user with email "bob@bob.bob" is connected with "alice@alice.alice"
     And Alice has a post mentioning Bob
     When I sign in as "alice@alice.alice"
-    And I am on the home page
     And I follow "Bob Jones"
     Then I should see "Bob Jones"
 
@@ -23,7 +22,6 @@ Feature: Mentions
       | Alice Smith  | alice@alice.alice |
     And a user with email "bob@bob.bob" is connected with "alice@alice.alice"
     When I sign in as "alice@alice.alice"
-    And I am on the home page
     And I expand the publisher
     When I fill in the following:
       | status_message_fake_text  | @Bo  |

features/desktop/mentions_from_profile_page.feature

@@ -5,21 +5,19 @@ Feature: mentioning a contact from their profile page
     I want to mention someone more cool than the average bear
 
     Background:
-      Given I am on the home page
+      Given following users exist:
-      And following users exist:
         | username   |
         | bob        |
         | alice      |
 
-      When I sign in as "bob@bob.bob"
       And a user with username "bob" is connected with "alice"
+      And I sign in as "bob@bob.bob"
       And I have following aspects:
         | PostingTo            |
         | NotPostingThingsHere |
       And I have user with username "alice" in an aspect called "PostingTo"
       And I have user with username "alice" in an aspect called "NotPostingThingsHere"
-
+      And I go to the home page
-      And I am on the home page
 
     Scenario: mentioning while posting to all aspects
       Given I am on "alice@alice.alice"'s page

features/desktop/oembed.feature

@@ -9,8 +9,7 @@ Feature: oembed
       | username    | email             |
       | Alice Smith | alice@alice.alice |
     And I have several oEmbed data in cache
-    When I sign in as "alice@alice.alice"
+    And I sign in as "alice@alice.alice"
-    And I am on the home page
 
   Scenario: Post a secure video link
     Given I expand the publisher

features/desktop/photo_lightbox.feature

@@ -1,13 +1,9 @@
 @javascript
 Feature: viewing the photo lightbox
   Background:
-    Given I am on the home page
+    Given a user with username "bob"
-    And a user with username "bob"
+    And I sign in as "bob@bob.bob"
-
+    And I expand the publisher
-    When I sign in as "bob@bob.bob"
-    And I am on the home page
-
-    Given I expand the publisher
     And I attach the file "spec/fixtures/button.png" to hidden "file" within "#file-upload"
     And I fill in the following:
         | status_message_fake_text    | Look at this dog    |

features/desktop/post_preview.feature

@@ -11,7 +11,6 @@ Feature: preview posts in the stream
         | Alice Smith  | alice@alice.alice |
       And a user with email "bob@bob.bob" is connected with "alice@alice.alice"
       When I sign in as "bob@bob.bob"
-      And I am on the home page
       Then I should not see any posts in my stream
 
     Scenario: preview and post a text-only message

features/desktop/post_with_a_poll.feature

@@ -6,7 +6,6 @@ Feature: posting with a poll
         | username   |
         | bob        |
       And I sign in as "bob@bob.bob"
-      And I am on the home page
 
     Scenario: expanding the publisher
       Given "#poll_creator_container" is hidden

features/desktop/posts_from_main_page.feature

@@ -9,14 +9,14 @@ Feature: posting from the main page
         | username   |
         | bob        |
         | alice      |
-      And I sign in as "bob@bob.bob"
       And a user with username "bob" is connected with "alice"
-      Given I have following aspects:
+      And I sign in as "bob@bob.bob"
+      And I have following aspects:
         | PostingTo            |
         | NotPostingThingsHere |
       And I have user with username "alice" in an aspect called "PostingTo"
       And I have user with username "alice" in an aspect called "NotPostingThingsHere"
-      And I am on the home page
+      And I go to the home page
 
     Scenario: expanding the publisher
       Given ".markdownIndications" is hidden

features/desktop/posts_from_profile_page.feature

@@ -4,13 +4,12 @@ Feature: posting from own profile page
     I want to post from my profile page
 
     Background:
-      Given I am on the home page
+      Given a user with username "alice"
-      And a user with username "alice"
+      And I sign in as "alice@alice.alice"
-      When I sign in as "alice@alice.alice"
+      And I have following aspects:
-      Given I have following aspects:
         | Family |
         | Work   |
-      Given I am on "alice@alice.alice"'s page
+      And I am on "alice@alice.alice"'s page
 
     Scenario: posting some text
       Given I expand the publisher
@@ -22,7 +21,7 @@ Feature: posting from own profile page
 
       Then I should see "I want to understand people"
 
-      When I am on the home page
+      When I go to the home page
       Then I should see "I want to understand people"
 
       When I am on the aspects page
@@ -39,7 +38,7 @@ Feature: posting from own profile page
       And I attach "spec/fixtures/button.png" to the publisher
       And I submit the publisher
 
-      When I am on the home page
+      When I go to the home page
       Then I should see a "img" within ".stream_element div.photo_attachments"
       And I should see "who am I?" within ".stream_element"
 

features/desktop/posts_from_tag_page.feature

@@ -4,20 +4,18 @@ Feature: Posting from the tag page
   I want to post from the tag page
 
     Background:
-      Given I am on the home page
+      Given a user with username "alice"
-      And a user with username "alice"
+      And I sign in as "alice@alice.alice"
-      When I sign in as "alice@alice.alice"
       And I am on the tag page for "cats"
 
     Scenario: posting some text
-      Given I expand the publisher
+      When I expand the publisher
       And I have turned off jQuery effects
       And I append "I like cats." to the publisher
       And I press "Share"
-
       Then "#cats I like cats." should be post 1
 
-      When I am on the home page
+      When I go to the home page
       Then "#cats I like cats." should be post 1
 
       When I am on the tag page for "cats"

features/desktop/show_more.feature

@@ -9,18 +9,14 @@ Feature: collapsing and expanding long posts
         | username |
         | bob      |
       And I sign in as "bob@bob.bob"
-      And I am on the home page
 
     Scenario: post a very long message
       Given I post an extremely long status message
       And I go to the home page
-      
       Then the post should be collapsed
 
     Scenario: expand a very long message
       Given I post an extremely long status message
       And I go to the home page
       And I expand the post
-
       Then the post should be expanded
-      

features/desktop/single_post_view_moderation.feature

@@ -6,9 +6,8 @@
       | username   |
       | bob        |
       | alice      |
-    And I sign in as "bob@bob.bob"
     And a user with username "bob" is connected with "alice"
-    And I am on the home page
+    And I sign in as "bob@bob.bob"
 
   Scenario: hide a contact's post
     Given I expand the publisher
@@ -60,7 +59,4 @@
     And I open the show page of the "Here is a post to test with" post
     And I click to delete the post
     And I confirm the alert
-    
     Then I should be on the stream page
-    
-    

features/desktop/stops_following_users.feature

@@ -15,27 +15,20 @@ Feature: Unfollowing
 
   Scenario: stop following someone while on their profile page
     When I am on "alice@alice.alice"'s page
-
     And I remove the person from my "Besties" aspect
-    And I am on the home page
+    And I go to the home page
-
+    Then I should have 0 contacts in "Besties"
-    Then I should have 0 contacts in "Besties"
+
-
+    When I sign out
-    Then I sign out
+    And I sign in as "alice@alice.alice"
-    When I sign in as "alice@alice.alice"
+    And I am on "bob@bob.bob"'s page
-    And I am on "bob@bob.bob"'s page
+    Then I should not see "is sharing with you."
-
+
-    Then I should not see "is sharing with you."
+  Scenario: stop following someone while on the contacts page
-
+    When I go to the contacts page
-  Scenario: stop following someone while on the contacts page
+    And I follow "Besties"
-    When I go to the home page
+    And I remove the first person from the aspect
-    And I go to the contacts page
+    And I follow "My contacts"
-
-    And I follow "Besties"
-
-    And I remove the first person from the aspect
-
-    When I follow "My contacts"
     Then I should have 0 contacts in "Besties"
 
     When I sign out