Merge pull request diaspora#3498 from devendram/cukes-refactoring

merging multiple consecutive "I (should|should not) see" lines into one

features/connects_users.feature

@@ -86,17 +86,15 @@ Feature: following and being followed
     When I sign in as "[email protected]"
     And I am on "[email protected]"'s page
 
-    Then I should see "Besties"
-    Then I should see "Mention"
+    Then I should see "Besties" and "Mention"  
     Then I should not see "Message" within "#profile"
 
   Scenario: interacting with the profile page of someone who follows you but who you do not follow
     Given I sign in as "[email protected]"
     And I am on "[email protected]"'s page
 
     Then I should see "Add contact"
-    Then I should not see "Mention" within "#profile"
-    Then I should not see "Message" within "#profile"
+    Then I should not see "Mention" and "Message" within "#profile"
 
   Scenario: interacting with the profile page of someone you follow who also follows you
     Given I sign in as "[email protected]"
@@ -108,6 +106,4 @@ Feature: following and being followed
     And I wait for the ajax to finish
 
     When I go to "[email protected]"'s page
-    Then I should see "All Aspects"
-    And I should see "Mention"
-    And I should see "Message"
+    Then I should see "All Aspects" and "Mention" and "Message"

features/not_safe_for_work.feature

@@ -29,8 +29,7 @@ Scenario: Toggling nsfw state
   And I sign in as "[email protected]"
   Then I should not see "I love 0bj3ction4bl3 c0nt3nt!"
   When I toggle nsfw posts
-  Then I should see "I love 0bj3ction4bl3 c0nt3nt!"
-  And I should see "Sexy Senators Gone Wild!"
+  Then I should see "I love 0bj3ction4bl3 c0nt3nt!" and "Sexy Senators Gone Wild!"
 
   #cookies
   #When I refresh the page
@@ -39,8 +38,7 @@ Scenario: Toggling nsfw state
 
   #hiding
   When I toggle nsfw posts
-  Then I should not see "I love 0bj3ction4bl3 c0nt3nt!"
-  And I should not see "Sexy Senators Gone Wild!"
+  Then I should not see "I love 0bj3ction4bl3 c0nt3nt!" and "Sexy Senators Gone Wild!"
 
 Scenario: Resharing an nsfw post
   Given a nsfw user with email "[email protected]"

features/posts_from_main_page.feature

@@ -174,16 +174,14 @@ Feature: posting from the main page
 
       And I am on the aspects page
       And I select only "PostingTo" aspect
-      Then I should see "I am eating a yogurt"
-      Then I should see "And cornflakes also"
+      Then I should see "I am eating a yogurt" and "And cornflakes also"
       When I am on the aspects page
       And I select only "Besties" aspect
       Then I should not see "I am eating a yogurt"
       Then I should see "And cornflakes also"
       When I am on the aspects page
       And I select only "NotPostingThingsHere" aspect
-      Then I should not see "I am eating a yogurt"
-      Then I should not see "And cornflakes also"
+      Then I should not see "I am eating a yogurt" and "And cornflakes also"
 
     # (NOTE) make this a jasmine spec
     Scenario: reject deletion one of my posts