diff --git a/features/connects_users.feature b/features/connects_users.feature index 09d0138e108467358fc417a21f478d5650cd5d6e..cedcb1dd97037c92ed26b4db87071f0ec6512742 100644 --- a/features/connects_users.feature +++ b/features/connects_users.feature @@ -86,8 +86,7 @@ Feature: following and being followed When I sign in as "bob@bob.bob" And I am on "alice@alice.alice"'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 @@ -95,8 +94,7 @@ Feature: following and being followed And I am on "bob@bob.bob"'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 "alice@alice.alice" @@ -108,6 +106,4 @@ Feature: following and being followed And I wait for the ajax to finish When I go to "bob@bob.bob"'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" \ No newline at end of file diff --git a/features/not_safe_for_work.feature b/features/not_safe_for_work.feature index 55a67180464b23d4a6431232211741fef6297111..bb2e2e3a4d10ade0689cb448b8856985913548b1 100644 --- a/features/not_safe_for_work.feature +++ b/features/not_safe_for_work.feature @@ -29,8 +29,7 @@ Scenario: Toggling nsfw state And I sign in as "laura@officeworkers.com" 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 "tommy@pr0nking.com" diff --git a/features/posts_from_main_page.feature b/features/posts_from_main_page.feature index a031b2b8e8cd4b194abfea3aaf29b0efc1402149..5aff07c444dffa469716d835c694ba1be42cb177 100644 --- a/features/posts_from_main_page.feature +++ b/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