Refactor reshare feature

features/reshare.feature

@@ -2,31 +2,31 @@
 Feature: public repost
   In order to make Diaspora more viral
   As a User
-  I want to reshare my friends post
+  I want to reshare my friend's post
 
   Background:
     Given a user named "Bob Jones" with email "bob@bob.bob"
     And a user named "Alice Smith" with email "alice@alice.alice"
     And a user with email "bob@bob.bob" is connected with "alice@alice.alice"
 
-
-  Scenario: does not show the reshare button on my own posts
-    And "bob@bob.bob" has a non public post with text "reshare this!"
+  Scenario: I don't see the reshare button on my own posts
+    Given "bob@bob.bob" has a public post with text "reshare this!"
+    And "bob@bob.bob" has a non public post with text "but don't reshare this."
     And I sign in as "bob@bob.bob"
     Then I should not see "Reshare" 
 
-  Scenario: does not show a reshare button on other private pots
-    And "bob@bob.bob" has a non public post with text "reshare this!"
+  Scenario: I don't see the reshare button on other people's private pots
+    Given "bob@bob.bob" has a non public post with text "don't reshare this."
     And I sign in as "alice@alice.alice"
     Then I should not see "Reshare" 
 
-  Scenario: does shows the reshare button on my own posts
-    And "bob@bob.bob" has a public post with text "reshare this!"
+  Scenario: I see the reshare button on my contact's public posts
+    Given "bob@bob.bob" has a public post with text "reshare this!"
     And I sign in as "alice@alice.alice"
     Then I should see "Reshare" 
 
-  Scenario: shows up on the profile page
-    And "bob@bob.bob" has a public post with text "reshare this!"
+  Scenario: When I reshare, it shows up on my profile page
+    Given "bob@bob.bob" has a public post with text "reshare this!"
     And I sign in as "alice@alice.alice"
 
     And I preemptively confirm the alert
@@ -34,13 +34,13 @@ Feature: public repost
     And I wait for the ajax to finish
     And I wait for 2 seconds
 
-    And I am on "alice@alice.alice"'s page
+    When I am on "alice@alice.alice"'s page
     Then I should see "reshare this!" 
     Then I should see a ".reshare"
     And I should see "Bob" 
 
-  Scenario: shows up on the aspects page
-    And "bob@bob.bob" has a public post with text "reshare this!"
+  Scenario: When I reshare, it shows up in my stream
+    Given "bob@bob.bob" has a public post with text "reshare this!"
     And I sign in as "alice@alice.alice"
     And I preemptively confirm the alert
     And I follow "Reshare"
@@ -53,8 +53,8 @@ Feature: public repost
     Then I should see a ".reshare"
     And I should see "Bob" 
 
-  Scenario: can be retracted
-    And "bob@bob.bob" has a public post with text "reshare this!"
+  Scenario: I can delete a post that has been reshared 
+    Given "bob@bob.bob" has a public post with text "reshare this!"
     And I sign in as "alice@alice.alice"
     And I preemptively confirm the alert
     And I follow "Reshare"
@@ -62,37 +62,34 @@ Feature: public repost
 
     And I go to the home page
     Then I should see a ".reshare"
-    And I follow "Your Aspects"
+
+    When I follow "Your Aspects"
     Then I should see "reshare this!" 
     Then I should see a ".reshare"
     And I should see "Bob" 
 
-    And I go to the destroy user session page
+    When I go to the destroy user session page
     And I sign in as "bob@bob.bob"
-
     And The user deletes their first post
-
     And I go to the destroy user session page
     And I sign in as "alice@alice.alice"
 
-    And I go to the home page
+    When I go to the home page
     Then I should see "Original post deleted by author"
 
-  Scenario: Keeps track of the number of reshares
-    And "bob@bob.bob" has a public post with text "reshare this!"
+  Scenario: I can see the number of reshares
+    Given "bob@bob.bob" has a public post with text "reshare this!"
     And I sign in as "alice@alice.alice"
     And I preemptively confirm the alert
     And I follow "Reshare"
     And I wait for the ajax to finish
 
-    And I go to the home page
+    When I go to the home page
     Then I should see a ".reshare"
-    And I follow "Your Aspects"
+    When I follow "Your Aspects"
     Then I should see "reshare this!" 
-    Then I should see a ".reshare"
+    And I should see a ".reshare"
     And I should see "Bob" 
-    And I go to the home page
-
-    And I should see "1 reshare"
 
-  Scenario: Can have text
+    When I go to the home page
+    Then I should see "1 reshare"