From b7620dc1ac1dcbb0999cc279019f068afd197671 Mon Sep 17 00:00:00 2001 From: pixelred Date: Fri, 1 Dec 2017 17:55:31 -0800 Subject: [PATCH 01/12] AO3-4560 rename work posting buttons (to be less confusing) --- app/views/works/_standard_form.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/works/_standard_form.html.erb b/app/views/works/_standard_form.html.erb index 5a9cb85fda0..25adc0af168 100644 --- a/app/views/works/_standard_form.html.erb +++ b/app/views/works/_standard_form.html.erb @@ -329,14 +329,14 @@ <% end %> - diff --git a/app/views/works/preview.html.erb b/app/views/works/preview.html.erb index 22abfe25d22..cb4811c9ca5 100755 --- a/app/views/works/preview.html.erb +++ b/app/views/works/preview.html.erb @@ -55,7 +55,7 @@ data: { disable_with: ts("Please wait...") } %>
  • - <%= submit_tag ts("Save Without Posting"), name: "save_button" %> + <%= submit_tag ts("Save As Draft"), name: "save_button" %>
    • <% end %>
  • <%= submit_tag ts("Edit"), name: "edit_button" %>
    • diff --git a/app/views/works/preview_tags.html.erb b/app/views/works/preview_tags.html.erb index e33bca30281..7dc887cecf7 100644 --- a/app/views/works/preview_tags.html.erb +++ b/app/views/works/preview_tags.html.erb @@ -36,7 +36,7 @@ <%= submit_tag ts('Update'), name: 'update_button' %> <% else %> <%= submit_tag ts('Post'), name: 'post_button' %> - <%= submit_tag ts('Save Without Posting'), name: 'save_button' %> + <%= submit_tag ts('Save As Draft'), name: 'save_button' %> <% end %> <%= submit_tag ts('Edit'), name: 'edit_button' %> <%= submit_tag ts('Cancel'), name: 'cancel_button' %> diff --git a/features/admins/admin_works.feature b/features/admins/admin_works.feature index 90e74fc6c9d..4a91a3098f3 100644 --- a/features/admins/admin_works.feature +++ b/features/admins/admin_works.feature @@ -88,7 +88,7 @@ Feature: Admin Actions for Works and Bookmarks And I fill in "Additional Tags" with "Admin-Added Freeform" And I uncheck "M/M" And I check "Other" - When I press "Post Without Preview" + When I press "Post" Then I should not see "User-Added Fandom" And I should see "Admin-Added Fandom" And I should not see "User-Added Freeform" @@ -218,7 +218,7 @@ Feature: Admin Actions for Works and Bookmarks And I follow "Edit Tags and Language" Then I should see "Edit Work Tags and Language for " When I select "Deutsch" from "Choose a language" - And I press "Post Without Preview" + And I press "Post" Then I should see "Deutsch" And I should not see "English" diff --git a/features/collections/collectible_multiple_collections.feature b/features/collections/collectible_multiple_collections.feature index e6da01b3d0e..ae69122c1d5 100644 --- a/features/collections/collectible_multiple_collections.feature +++ b/features/collections/collectible_multiple_collections.feature @@ -16,10 +16,10 @@ Feature: Collectible items in multiple collections Then I should see "You have submitted your work to the moderated collection 'ModeratedCollection2'." And I should see "It will not become a part of the collection until it has been approved by a moderator." When I follow "Edit" - And I press "Post Without Preview" + And I press "Post" Then I should see "Work was successfully updated. You have submitted your work to moderated collections (ModeratedCollection, ModeratedCollection2). It will not become a part of those collections until it has been approved by a moderator." - Scenario: Add my work to both moderated and unmoderated collections by editing + Scenario: Add my work to both moderated and unmoderated collections by editing the work Given I have the moderated collection "ModeratedCollection" And I have the collection "UnModeratedCollection" @@ -32,11 +32,10 @@ Feature: Collectible items in multiple collections # remove it from the original collection by replacing the text in the # field And I fill in "Post to Collections / Challenges" with "ModeratedCollection, UnModeratedCollection" - And I press "Post Without Preview" + And I press "Post" Then I should see "Work was successfully updated. You have submitted your work to the moderated collection 'ModeratedCollection'. It will not become a part of the collection until it has been approved by a moderator." And I should see "UnModeratedCollection" When I go to "UnModeratedCollection" collection's page Then I should see "RandomWork" When I go to "ModeratedCollection" collection's page Then I should not see "RandomWork" - diff --git a/features/collections/collection_anonymity.feature b/features/collections/collection_anonymity.feature index 3329c949fdc..d6a41e4e2ce 100755 --- a/features/collections/collection_anonymity.feature +++ b/features/collections/collection_anonymity.feature @@ -8,7 +8,7 @@ Feature: Collection Given I have the hidden collection "Hidden Treasury" When I am logged in as "first_user" And I set up the draft "Old Snippet" in collection "Hidden Treasury" - And I press "Preview" + And I press "Preview" Then I should see "Collections: Hidden Treasury" And I should see "Draft was successfully created." When I press "Post" @@ -21,7 +21,7 @@ Feature: Collection Then the work "Old Snippet" should be hidden from me When I am logged out Then the work "Old Snippet" should be hidden from me - + Scenario: The moderator can reveal all the works in a hidden collection Given I have the hidden collection "Hidden Treasury" And "second_user" subscribes to author "first_user" @@ -48,7 +48,7 @@ Feature: Collection When I view the collection "Hidden Treasury" Then I should see "New Snippet" And I should not see "Mystery Work" - + Scenario: The moderator can reveal a single work in a hidden collection Given I have the hidden collection "Hidden Treasury" And "second_user" subscribes to author "first_user" @@ -80,7 +80,7 @@ Feature: Collection And the work "Second Snippet" should be hidden from me When I view the collection "Hidden Treasury" Then I should see "First Snippet" - + Scenario: Bookmarks for hidden works should not reveal the work to others Given I have the hidden collection "Hidden Treasury" And I am logged in as "first_user" @@ -97,7 +97,7 @@ Feature: Collection And I go to the bookmarks page Then I should not see "Mystery Work" And I should see "Hiding Work" - + Scenario: The authors in an anonymous collection should only be visible to themselves and admins Given I have the anonymous collection "Anonymous Hugs" And I am logged in as "first_user" @@ -118,7 +118,7 @@ Feature: Collection When I view the approved collection items page for "Anonymous Hugs" Then I should see "Old Snippet" And I should see "first_user" - + Scenario: Bookmarks should not reveal the authors of anonymous works Given I have the anonymous collection "Anonymous Hugs" And I am logged in as "first_user" @@ -134,7 +134,7 @@ Feature: Collection Given I have the anonymous collection "Anonymous Hugs" And "second_user" subscribes to author "first_user" And the user "third_user" exists and is activated - And all emails have been delivered + And all emails have been delivered When I am logged in as "first_user" And I post the work "Old Snippet" to the collection "Anonymous Hugs" as a gift for "third_user" Then "third_user" should be emailed @@ -202,7 +202,7 @@ Feature: Collection Then the work "Hiding Work" should be visible on the "New series" series page And the series "New series" should be visible on the "Hiding Work" work page And the neighbors of "Hiding Work" in the "New series" series should link to it - + Scenario: Works should not be visible in series if anonymous Given I have the anonymous collection "Anon Treasury" And I am logged in as "first_user" @@ -238,7 +238,7 @@ Feature: Collection When I edit the work "Cone of Silence" And I follow "2" within "div#main.works-edit.region" And I add the co-author "Amos" - And I press "Post Without Preview" + And I press "Post" Then the author of "Cone of Silence" should be visible to me on the work page When I am logged out Then the author of "Cone of Silence" should be hidden from me diff --git a/features/collections/collection_navigation.feature b/features/collections/collection_navigation.feature index 7971820c461..bab58d95246 100644 --- a/features/collections/collection_navigation.feature +++ b/features/collections/collection_navigation.feature @@ -64,7 +64,7 @@ Feature: Basic collection navigation And I post the work "Sesame Street" in the collection "My ABCs" And I edit the work "Sesame Street" And I fill in "Fandoms" with "A League of Their Own, Merlin, Teen Wolf, The Borgias" - And I press "Post Without Preview" + And I press "Post" And I go to "My ABCs" collection's page And I follow "Fandoms (" Then "The Borgias" should appear before "A League of Their Own" @@ -76,7 +76,7 @@ Feature: Basic collection navigation And I have a canonical "TV Shows" fandom tag named "Steven's Universe" And I have a canonical "Movies" fandom tag named "High School Musical" When I am logged in as "Brian" with password "They called him Brian" - And I post the work "Stronger than you" with fandom "Steven's Universe" in the collection "We all sing together" + And I post the work "Stronger than you" with fandom "Steven's Universe" in the collection "We all sing together" And I post the work "Breaking Free" with fandom "High School Musical" in the collection "We all sing together" And I go to "We all sing together" collection's page And I follow "Fandoms (" diff --git a/features/importing/archivist.feature b/features/importing/archivist.feature index f608233b9ad..a11f9e8ef57 100644 --- a/features/importing/archivist.feature +++ b/features/importing/archivist.feature @@ -242,7 +242,7 @@ Feature: Archivist bulk imports Then I should see "We have notified the author(s) you imported works for. If any were missed, you can also add co-authors manually." When I press "Edit" And I fill in "work_collection_names" with "Club" - And I press "Post Without Preview" + And I press "Post" Then I should see "Story" And I should see "randomtestname" And I should see "Club" diff --git a/features/importing/work_import.feature b/features/importing/work_import.feature index d483bd0cef9..682c84cbc39 100644 --- a/features/importing/work_import.feature +++ b/features/importing/work_import.feature @@ -165,7 +165,7 @@ Feature: Import Works When I follow "Edit" And I follow "1" And I fill in "content" with "some extra content that is longer than before" - And I press "Post Without Preview" + And I press "Post" Then I should see "Words:11" # Scenario: Import works for others and have them automatically notified diff --git a/features/other_a/gift.feature b/features/other_a/gift.feature index 113595969db..37b329db024 100644 --- a/features/other_a/gift.feature +++ b/features/other_a/gift.feature @@ -19,7 +19,7 @@ Feature: Create Gifts Scenario: Giving a work as a gift when posting directly Given I give the work to "giftee1" - When I press "Post Without Preview" + When I press "Post" Then I should see "For giftee1" And "giftee1@foo.com" should be notified by email about their gift "GiftStory1" @@ -49,17 +49,17 @@ Feature: Create Gifts Scenario: Edit an existing work to add a recipient, then post directly - Given I press "Post Without Preview" + Given I press "Post" And I follow "Edit" And I give the work to "giftee1" - When I press "Post Without Preview" + When I press "Post" Then I should see "For giftee1" And "giftee1@foo.com" should be notified by email about their gift "GiftStory1" Scenario: Edit an existing work to add a recipient, then post after previewing - Given I press "Post Without Preview" + Given I press "Post" And I follow "Edit" And I give the work to "giftee1" When I press "Preview" @@ -77,10 +77,10 @@ Feature: Create Gifts Scenario: Give two gifts to the same recipient Given I give the work to "giftee1" - And I press "Post Without Preview" + And I press "Post" And I set up the draft "GiftStory2" And I give the work to "giftee1" - When I press "Post Without Preview" + When I press "Post" And I follow "giftee1" Then I should see "Gifts for giftee1" And I should see "GiftStory1" @@ -90,13 +90,13 @@ Feature: Create Gifts Scenario: Add another recipient to a posted gift Given I give the work to "giftee1" - And I press "Post Without Preview" + And I press "Post" And I should see "For giftee1" And "giftee1@foo.com" should be notified by email about their gift "GiftStory1" And all emails have been delivered And I follow "Edit" And I give the work to "giftee1, giftee2" - When I press "Post Without Preview" + When I press "Post" Then I should see "For giftee1, giftee2" And 0 emails should be delivered to "giftee1@foo.com" And "giftee2@foo.com" should be notified by email about their gift "GiftStory1" @@ -110,7 +110,7 @@ Feature: Create Gifts And 0 emails should be delivered to "giftee1@foo.com" And I press "Edit" And I give the work to "giftee1, giftee2" - When I press "Post Without Preview" + When I press "Post" Then I should see "For giftee1, giftee2" And "giftee1@foo.com" should be notified by email about their gift "GiftStory1" And "giftee2@foo.com" should be notified by email about their gift "GiftStory1" @@ -119,14 +119,14 @@ Feature: Create Gifts Scenario: Add two recipients, post, then remove one Given I give the work to "giftee1, giftee2" - And I press "Post Without Preview" + And I press "Post" And I should see "For giftee1, giftee2" And "giftee1@foo.com" should be notified by email about their gift "GiftStory1" And "giftee2@foo.com" should be notified by email about their gift "GiftStory1" And all emails have been delivered And I follow "Edit" And I give the work to "giftee1" - When I press "Post Without Preview" + When I press "Post" Then I should see "For giftee1" And I should not see "giftee2" And 0 emails should be delivered to "giftee1@foo.com" @@ -141,7 +141,7 @@ Feature: Create Gifts And 0 emails should be delivered And I press "Edit" And I give the work to "giftee1" - When I press "Post Without Preview" + When I press "Post" Then I should see "For giftee1" And I should not see "giftee2" And "giftee1@foo.com" should be notified by email about their gift "GiftStory1" @@ -151,13 +151,13 @@ Feature: Create Gifts Scenario: Edit a posted work to replace one recipient with another Given I give the work to "giftee1" - And I press "Post Without Preview" + And I press "Post" And I should see "For giftee1" And "giftee1@foo.com" should be notified by email about their gift "GiftStory1" And all emails have been delivered And I follow "Edit" And I give the work to "giftee2" - When I press "Post Without Preview" + When I press "Post" Then I should see "For giftee2" And I should not see "giftee1" And 0 emails should be delivered to "giftee1@foo.com" @@ -172,7 +172,7 @@ Feature: Create Gifts And 0 emails should be delivered And I press "Edit" And I give the work to "giftee2" - When I press "Post Without Preview" + When I press "Post" Then I should see "For giftee2" And I should not see "giftee1" And 0 emails should be delivered to "giftee1@foo.com" @@ -190,13 +190,13 @@ Feature: Create Gifts Then 1 email should be delivered to "giftee1" And the email should link to gifter's user url And the email should not contain "<a href="http://archiveofourown.org/users/gifter/pseuds/gifter"" - And the email should link to gifter2's user url + And the email should link to gifter2's user url And the email should not contain "<a href="http://archiveofourown.org/users/gifter2/pseuds/gifter2"" Scenario: A gift work should have an associations list Given I give the work to "associate" - When I press "Post Without Preview" + When I press "Post" Then I should find a list for associations And I should see "For associate" @@ -216,7 +216,7 @@ Feature: Create Gifts Then I should see "You cannot give a gift to the same user twice." And I should not see "For associate, associate2" And 0 emails should be delivered to "associate@foo.com" - + Scenario: A user should be able to refuse a gift Given I have given the work to "associate" @@ -238,9 +238,9 @@ Feature: Create Gifts When I view the work "GiftStory1" Then I should not see "For associate" And I should not see "For ." - + Scenario: A user should be able to re-accept a gift - + Given I have refused the work And I am on my gifts page And I follow "Refused Gifts" @@ -262,7 +262,7 @@ Feature: Create Gifts Then I should see "Refused As Gift: giftee1" Scenario: Can't remove a recipient who has refused the gift - + Given I have refused the work And I am logged in as "gifter" When I edit the work "GiftStory1" @@ -272,26 +272,26 @@ Feature: Create Gifts Then the gift for "giftee1" should still exist on "GiftStory1" Scenario: Opt to disable notifications, then receive a gift (with no collection) - + Given I am logged in as "giftee1" with password "something" And I set my preferences to turn off notification emails for gifts When I am logged in as "gifter" with password "something" And I post the work "QuietGift" as a gift for "giftee1, giftee2" Then 0 emails should be delivered to "giftee1@foo.com" - And "giftee2@foo.com" should be notified by email about their gift "QuietGift" - + And "giftee2@foo.com" should be notified by email about their gift "QuietGift" + Scenario: Opt to disable notifications, then receive a gift posted to a non-hidden collection - + Given I am logged in as "giftee1" with password "something" And I set my preferences to turn off notification emails for gifts And I have the collection "Open Skies" When I am logged in as "gifter" with password "something" And I post the work "QuietGift" in the collection "Open Skies" as a gift for "giftee1, giftee2" Then 0 emails should be delivered to "giftee1@foo.com" - And "giftee2@foo.com" should be notified by email about their gift "QuietGift" - + And "giftee2@foo.com" should be notified by email about their gift "QuietGift" + Scenario: Opt to disable notifications, then receive a gift posted to a hidden collection and later revealed - + Given I am logged in as "giftee1" with password "something" And I set my preferences to turn off notification emails for gifts And I have the hidden collection "Hidden Treasures" @@ -299,5 +299,4 @@ Feature: Create Gifts And I post the work "QuietGift" in the collection "Hidden Treasures" as a gift for "giftee1, giftee2" And I reveal works for "Hidden Treasures" Then 0 emails should be delivered to "giftee1@foo.com" - And "giftee2@foo.com" should be notified by email about their gift "QuietGift" - + And "giftee2@foo.com" should be notified by email about their gift "QuietGift" diff --git a/features/other_a/page_title.feature b/features/other_a/page_title.feature index 95c30c38d6a..bcd7f5b46d7 100644 --- a/features/other_a/page_title.feature +++ b/features/other_a/page_title.feature @@ -27,7 +27,7 @@ Scenario: Page title should change when tags are edited Then the page title should include "Stargate" When I edit the work "New Story" And I fill in "Fandoms" with "Harry Potter" - And I press "Post Without Preview" + And I press "Post" When I view the work "New Story" Then the page title should include "Harry Potter" And the page title should not include "Stargate" diff --git a/features/other_a/reading.feature b/features/other_a/reading.feature index aff676299ad..1f182569258 100644 --- a/features/other_a/reading.feature +++ b/features/other_a/reading.feature @@ -11,7 +11,7 @@ Feature: Reading count And I should not see "History" within "div#dashboard" When I go to second_reader's reading page Then I should see "History" within "div#dashboard" - + Scenario: Read a work several times, counts show on reading history increment the count whenever you reread a story also updates the date @@ -42,7 +42,7 @@ Feature: Reading count When I go to fandomer's reading page Then I should see "some work" And I should see "Viewed once" - And I should see "Last viewed: 25 May 2010" + And I should see "Last viewed: 25 May 2010" When I follow "Preferences" And I uncheck "Turn on Viewing History" And I press "Update" @@ -238,7 +238,7 @@ Feature: Reading count When I am logged in as "editor" with password "password" And I edit the work "Some Work V1" And I fill in "Work Title" with "Some Work V2" - And I press "Post Without Preview" + And I press "Post" And I am logged out When I am logged in as "reader" with password "password" And I go to the homepage diff --git a/features/other_b/series.feature b/features/other_b/series.feature index e47f36a38cc..4e32b6909b9 100644 --- a/features/other_b/series.feature +++ b/features/other_b/series.feature @@ -8,7 +8,7 @@ Feature: Create and Edit Series Given I am logged in as "author" And I set up the draft "Sweetie Belle" When I fill in "work_series_attributes_title" with "Ponies" - When I press "Post Without Preview" + When I press "Post" Then I should see "Part 1 of the Ponies series" within "div#series" And I should see "Part 1 of the Ponies series" within "dd.series" When I view the series "Ponies" @@ -19,7 +19,7 @@ Feature: Create and Edit Series And I post the work "Sweetie Belle" as part of a series "Ponies" And I set up the draft "Starsong" When I select "Ponies" from "work_series_attributes_id" - And I press "Post Without Preview" + And I press "Post" Then I should see "Part 2 of the Ponies series" within "div#series" And I should see "Part 2 of the Ponies series" within "dd.series" When I view the series "Ponies" @@ -34,7 +34,7 @@ Feature: Create and Edit Series Then I should not see "Rainbow Dash" When I edit the work "Rainbow Dash" And I select "Ponies" from "work_series_attributes_id" - And I press "Post Without Preview" + And I press "Post" Then I should see "Part 2 of the Ponies series" within "div#series" And I should see "Part 2 of the Ponies series" within "dd.series" When I view the series "Ponies" @@ -99,7 +99,7 @@ Feature: Create and Edit Series And I add the pseud "Pointless Pseud" And I set up the draft "Sweetie Belle" using the pseud "Pointless Pseud" When I fill in "work_series_attributes_title" with "Ponies" - And I press "Post Without Preview" + And I press "Post" Then I should see "Pointless Pseud" And I should see "Part 1 of the Ponies series" within "div#series" And I should see "Part 1 of the Ponies series" within "dd.series" @@ -111,7 +111,7 @@ Feature: Create and Edit Series And I add the pseud "Pointless Pseud" And I post the work "Sweetie Belle" as part of a series "Ponies" using the pseud "Pointless Pseud" When I set up the draft "Starsong" as part of a series "Ponies" using the pseud "Pointless Pseud" - And I press "Post Without Preview" + And I press "Post" Then I should see "Pointless Pseud" And I should see "Part 2 of the Ponies series" When I view the series "Ponies" @@ -127,7 +127,7 @@ Feature: Create and Edit Series Then I should not see "Rainbow Dash" When I edit the work "Rainbow Dash" And I select "Ponies" from "work_series_attributes_id" - And I press "Post Without Preview" + And I press "Post" Then I should see "Part 2 of the Ponies series" within "div#series" And I should see "Part 2 of the Ponies series" within "dd.series" When I view the series "Ponies" @@ -159,7 +159,7 @@ Feature: Create and Edit Series And "AO3-3847" is fixed # And I should see "Part 1 of the Many a Robot series" within "dd.series" - Scenario: Post Without Preview + Scenario: Post Given I am logged in as "whoever" with password "whatever" And I add the work "public" to series "be_public" When I follow "be_public" @@ -189,7 +189,7 @@ Feature: Create and Edit Series And I wait 1 second And I follow "Remove Me As Author" Then I should see "You have been removed as an author from the series and its works." - When "AO3-5083" is fixed + When "AO3-5083" is fixed # And "moon" should be the creator of the series "Ponies" # And "sun" should not be a creator on the series "Ponies" When I go to my works page diff --git a/features/other_b/series_lock.feature b/features/other_b/series_lock.feature index e9cf19fd909..c76c3b9278d 100644 --- a/features/other_b/series_lock.feature +++ b/features/other_b/series_lock.feature @@ -8,7 +8,7 @@ Feature: Locked and partially locked series Given I am logged in as "fandomer" And I set up the draft "Humbug" as part of a series "Antiholidays" And I lock the work - And I press "Post Without Preview" + And I press "Post" Then I should see "Part 1 of the Antiholidays series" When I go to fandomer's series page Then I should see "Antiholidays" diff --git a/features/other_b/subscriptions.feature b/features/other_b/subscriptions.feature index c0088828ee4..689d3ac85b9 100644 --- a/features/other_b/subscriptions.feature +++ b/features/other_b/subscriptions.feature @@ -92,7 +92,7 @@ And I follow "Add Chapter" And I fill in "Chapter Title" with "ICE CREAM CAKE" And I fill in "content" with "meltiiiinnngg" - And I press "Post Without Preview" + And I press "Post" And subscription notifications are sent Then 1 email should be delivered to "second_user@foo.com" And the email should contain "wip_author" @@ -107,7 +107,7 @@ And I set up the draft "Second Work" And I check "series-options-show" And I select "Awesome Series" from "work_series_attributes_id" - And I press "Post Without Preview" + And I press "Post" Then 0 emails should be delivered When subscription notifications are sent Then 1 email should be delivered to "second_user@foo.com" @@ -133,7 +133,7 @@ And the email should contain "A FOURTH" Scenario: different types of subscriptions are listed separately on a user's subscription page - + When I am logged in as "second_user" And "second_user" subscribes to author "third_user" And "second_user" subscribes to work "Awesome Story" @@ -162,7 +162,7 @@ And I should not see "third_user" Scenario: Subscribe to a multi-chapter work should redirect you back to the chapter you were viewing - + When I am logged in as "first_user" And I post the work "Multi Chapter Work" And a chapter is added to "Multi Chapter Work" diff --git a/features/other_b/subscriptions_fandoms.feature b/features/other_b/subscriptions_fandoms.feature index 796a8e9e1b9..064e85f4566 100644 --- a/features/other_b/subscriptions_fandoms.feature +++ b/features/other_b/subscriptions_fandoms.feature @@ -14,9 +14,9 @@ Feature: Subscriptions # When I follow "RSS Feed" # Then I should not see "My Work Title" # And I should not see "Stargate SG-1" - + Scenario: Subscribe to a test fandom when there are works in it - + When I am logged in as "author" And I post a work "My Work Title" with category "F/F" When I am logged in as "reader" @@ -27,7 +27,7 @@ Feature: Subscriptions And I should see "Stargate SG-1" Scenario: Subscribe to a non-test fandom - + When I am logged in as "author" And I post a work "My Work Title" with category "Multi" When I am logged in as "reader" @@ -35,7 +35,7 @@ Feature: Subscriptions Then I should not see "RSS Feed" Scenario: Mystery work is not shown in feed - + Given basic tags And I am logged in as "myname2" Given I have a hidden collection "Hidden Treasury" with name "hidden_treasury" @@ -44,7 +44,7 @@ Feature: Subscriptions And I edit the work "Old Snippet" And I fill in "Post to Collections / Challenges" with "hidden_treasury" And I check "F/F" - And I press "Post Without Preview" + And I press "Post" Then I should see "This work is part of an ongoing challenge and will be revealed soon! You can find details here: Hidden Treasury" When I am logged in as "author" And I post a work "My Work Title" with category "F/F" @@ -56,7 +56,7 @@ Feature: Subscriptions @disable_caching Scenario: Author of anonymous work is not shown in feed - + Given basic tags And I am logged in as "myname2" Given I have an anonymous collection "Hidden Treasury" with name "hidden_treasury" @@ -65,7 +65,7 @@ Feature: Subscriptions And I edit the work "Old Snippet" And I fill in "Post to Collections / Challenges" with "hidden_treasury" And I check "F/F" - And I press "Post Without Preview" + And I press "Post" And all search indexes are updated Then I should see "Anonymous" And I should see "Collections: Hidden Treasury" @@ -78,7 +78,7 @@ Feature: Subscriptions And I should see "author" Scenario: A user can see a feed for non canonical tags - + Given I am logged in as "author" And I post the work "Glorious" with fandom "SGA" When I view the "SGA" works feed diff --git a/features/prompt_memes_b/challenge_promptmeme_posting_fills.feature b/features/prompt_memes_b/challenge_promptmeme_posting_fills.feature index f5a7e268bd5..74ef223a6ba 100755 --- a/features/prompt_memes_b/challenge_promptmeme_posting_fills.feature +++ b/features/prompt_memes_b/challenge_promptmeme_posting_fills.feature @@ -37,7 +37,7 @@ Feature: Prompt Meme Challenge And I fill in "Work Title" with "Kinky Story" And I fill in "content" with "Story written for your kinks, oh mystery reader!" Given all emails have been delivered - And I press "Post Without Preview" + And I press "Post" Then I should see "Kinky Story" And I should find a list for associations And I should see "In response to a prompt by Anonymous in the promptcollection collection" @@ -45,7 +45,7 @@ Feature: Prompt Meme Challenge # TODO: when work_anonymous is implemented, test that the prompt filler can be anon too Scenario: Fulfilling a claim ticks the right boxes automatically - + Given I have Battle 12 prompt meme fully set up When I am logged in as "myname1" When I sign up for Battle 12 with combination B @@ -54,9 +54,9 @@ Feature: Prompt Meme Challenge When I start to fulfill my claim Then the "Battle 12" checkbox should be checked And the "Battle 12" checkbox should not be disabled - + Scenario: User can fulfill a claim - + Given I have Battle 12 prompt meme fully set up When I am logged in as "myname1" When I sign up for Battle 12 with combination B @@ -64,9 +64,9 @@ Feature: Prompt Meme Challenge And I claim a prompt from "Battle 12" When I fulfill my claim Then my claim should be fulfilled - + Scenario: User can fulfill a claim to their own prompt - + Given I have Battle 12 prompt meme fully set up When I am logged in as "myname1" And I sign up for Battle 12 with combination B @@ -75,7 +75,7 @@ Feature: Prompt Meme Challenge Then my claim should be fulfilled Scenario: Fulfilled claim shows correctly on my claims - + Given I have Battle 12 prompt meme fully set up When I am logged in as "myname1" When I sign up for Battle 12 with combination B @@ -88,9 +88,9 @@ Feature: Prompt Meme Challenge Then I should see "Fulfilled Story" # TODO: should I? It's not there at all And I should not see "Not yet posted" - + Scenario: Claims count should be correct, shows fulfilled claims as well - + Given I have Battle 12 prompt meme fully set up When I am logged in as "myname1" When I sign up for Battle 12 with combination B @@ -103,9 +103,9 @@ Feature: Prompt Meme Challenge When I follow "Claims" And I follow "Fulfilled Claims" Then I should see "Fulfilled Story" - + Scenario: Claim shows as fulfilled to another user - + Given I have Battle 12 prompt meme fully set up When I am logged in as "myname1" When I sign up for Battle 12 with combination B @@ -138,9 +138,9 @@ Feature: Prompt Meme Challenge # Then I should see "Claimed by: myname4" # And I should see "Claimed by: mod1" # And I should not see "Claimed by: (Anonymous)" - + Scenario: Fulfilled claims are hidden from user - + Given I have Battle 12 prompt meme fully set up Given everyone has signed up for Battle 12 When I am logged in as "myname4" @@ -157,7 +157,7 @@ Feature: Prompt Meme Challenge And I should see "Fulfilled Story by Anonymous" within "div.work h4" Scenario: Sign-up can be deleted after response has been posted - + Given I have Battle 12 prompt meme fully set up When I am logged in as "myname1" When I sign up for Battle 12 with combination B @@ -176,7 +176,7 @@ Feature: Prompt Meme Challenge And I view the work "Fulfilled Story" Then I should see "This work is part of an ongoing challenge and will be revealed soon! You can find details here: Battle 12" And I should see "Stargate Atlantis" - + Scenario: Prompt can be removed after response has been posted and still show properly on the work which fulfilled it Given I have Battle 12 prompt meme fully set up @@ -196,7 +196,7 @@ Feature: Prompt Meme Challenge And I should see "Stargate Atlantis" Scenario: User can fulfill the same claim twice - + Given I have Battle 12 prompt meme fully set up When I am logged in as "myname1" When I sign up for Battle 12 with combination B @@ -208,9 +208,9 @@ Feature: Prompt Meme Challenge And I should see "Second Story" And I should see "In response to a prompt by Anonymous" And I should see "Collections: Battle 12" - + Scenario: User edits existing work to fulfill claim - + Given I have Battle 12 prompt meme fully set up When I am logged in as "myname1" When I sign up for Battle 12 with combination B @@ -220,16 +220,16 @@ Feature: Prompt Meme Challenge And I should not see "Battle 12" And I edit the work "Existing Story" And I check "random SGA love in Battle 12 (Anonymous)" - And I press "Post Without Preview" + And I press "Post" Then I should see "Battle 12" Then I should see "Existing Story" And I should see "This work is part of an ongoing challenge" When I reveal works for "Battle 12" When I view the work "Existing Story" And I should not see "This work is part of an ongoing challenge" - + Scenario: User edits existing work in another collection to fulfill claim - + Given I have Battle 12 prompt meme fully set up And I have a collection "Othercoll" When I am logged in as "myname1" @@ -239,12 +239,12 @@ Feature: Prompt Meme Challenge And I post the work "Existing Story" in the collection "Othercoll" And I edit the work "Existing Story" And I check "random SGA love in Battle 12 (Anonymous)" - And I press "Post Without Preview" + And I press "Post" Then I should see "Battle 12" And I should see "Othercoll" Scenario: Fulfill a claim by editing an existing work - + Given I have Battle 12 prompt meme fully set up And everyone has signed up for Battle 12 When I close signups for "Battle 12" @@ -269,7 +269,7 @@ Feature: Prompt Meme Challenge And I should see "In response to a prompt by" Then I should see "Collections:" And I should see "Battle 12" - + # claim is fulfilled on collection page When I go to "Battle 12" collection's page And I follow "Prompts" @@ -277,7 +277,7 @@ Feature: Prompt Meme Challenge And I should see "Fulfilled By" Scenario: When draft is posted, claim is fulfilled and posted to collection - + Given I have Battle 12 prompt meme fully set up When I am logged in as "myname2" And I sign up for Battle 12 with combination B @@ -310,7 +310,7 @@ Feature: Prompt Meme Challenge And I should not see "draft" Scenario: Make another claim and then fulfill from the post new form (New Work) - + Given I have Battle 12 prompt meme fully set up Given everyone has signed up for Battle 12 When I close signups for "Battle 12" @@ -341,7 +341,7 @@ Feature: Prompt Meme Challenge Then I should see "draft" Scenario: Fulfilled claims show as fulfilled to another user - + Given I have Battle 12 prompt meme fully set up Given everyone has signed up for Battle 12 When I am logged in as "myname4" @@ -371,8 +371,8 @@ Feature: Prompt Meme Challenge When I am logged in as "myname2" And I claim a prompt from "Battle 12" And I start to fulfill my claim with "Co-authored Fill" - And I add the co-author "myname3" - When I press "Post Without Preview" + And I add the co-author "myname3" + When I press "Post" Then 1 email should be delivered to "myname3" And the email should contain "You have been listed as a co-creator on the following work" And the email should not contain "translation missing" @@ -386,7 +386,7 @@ Feature: Prompt Meme Challenge And the email should not contain "<a href="http://archiveofourown.org/users/myname3/pseuds/myname3"" Scenario: check that completed ficlet is unrevealed - + Given I have Battle 12 prompt meme fully set up Given everyone has signed up for Battle 12 When mod fulfills claim @@ -405,7 +405,7 @@ Feature: Prompt Meme Challenge When I am logged in as "mod1" When I claim a prompt from "Battle 12" When I am on my user page - Then I should see "Claims (1)" + Then I should see "Claims (1)" When I follow "Claims" Then I should see "My Claims" And I should see "canon SGA love by myname4 in Battle 12" within "div#main.challenge_claims-index h4" @@ -420,7 +420,7 @@ Feature: Prompt Meme Challenge Then I should see "Work was successfully posted" Scenario: Mod can complete a claim - + Given I have Battle 12 prompt meme fully set up Given everyone has signed up for Battle 12 When I am logged in as "mod1" @@ -438,7 +438,7 @@ Feature: Prompt Meme Challenge And I should see "Anonymous" within "div.work h4" Scenario: Fic shows what prompt it is fulfilling when mod views it - + Given I have Battle 12 prompt meme fully set up Given everyone has signed up for Battle 12 When I am logged in as "mod1" diff --git a/features/prompt_memes_c/challenge_promptmeme_claims.feature b/features/prompt_memes_c/challenge_promptmeme_claims.feature index 29b0b998b4d..91c3e6d22db 100644 --- a/features/prompt_memes_c/challenge_promptmeme_claims.feature +++ b/features/prompt_memes_c/challenge_promptmeme_claims.feature @@ -3,9 +3,9 @@ Feature: Prompt Meme Challenge In order to have an archive full of works As a humble user I want to create a prompt meme and post to it - + Scenario: Claim two prompts by the same person in one challenge - + Given I have Battle 12 prompt meme fully set up When I am logged in as "myname2" When I sign up for Battle 12 with combination B @@ -22,9 +22,9 @@ Feature: Prompt Meme Challenge And I should find a checkbox "random SGA love in Battle 12 (Anonymous)" And the "High School AU SG1 in Battle 12 (Anonymous)" checkbox should not be checked And the "random SGA love in Battle 12 (Anonymous)" checkbox should be checked - + Scenario: Claim two prompts by different people in one challenge - + Given I have single-prompt prompt meme fully set up When I am logged in as "sgafan" And I sign up for "Battle 12" with combination SGA @@ -38,9 +38,9 @@ Feature: Prompt Meme Challenge # TODO: check that they are not intermittent anymore And the "SGA love in Battle 12 (sgafan)" checkbox should not be checked And the "SG1 love in Battle 12 (sg1fan)" checkbox should be checked - + Scenario: Claim two prompts by the same person in one challenge, one is anon - + Given I have Battle 12 prompt meme fully set up When I am logged in as "myname2" When I sign up for Battle 12 @@ -54,7 +54,7 @@ Feature: Prompt Meme Challenge And I should find a checkbox "crack in Battle 12 (myname2)" And the "Untitled Prompt in Battle 12 (Anonymous)" checkbox should be checked And the "crack in Battle 12 (myname2)" checkbox should not be checked - + Scenario: User claims two prompts in one challenge and fulfills one of them # TODO: When SPRs get merged, make this check that 'prompt' is a link # and that it shows the correct prompt, or whatever @@ -75,9 +75,9 @@ Feature: Prompt Meme Challenge And I press "Post" When I view the work "Fulfilled Story" Then I should see "Stargate Atlantis" - + Scenario: User claims two prompts in one challenge and fufills both of them at once - + Given I have Battle 12 prompt meme fully set up When I am logged in as "myname2" When I sign up for Battle 12 @@ -95,12 +95,12 @@ Feature: Prompt Meme Challenge # fandoms are not filled in automatically anymore, so we check that both prompts are marked as filled by having one anon and one non-anon Then I should see "In response to a prompt by Anonymous" And I should see "In response to a prompt by myname2" - + Scenario: User claims two prompts in different challenges and fulfills both of them at once # TODO - + Scenario: Sign up for several challenges and see Sign-ups are sorted - + Given I have Battle 12 prompt meme fully set up When I set up a basic promptmeme "Battle 13" When I set up an anon promptmeme "Battle 14" with name "anonmeme" @@ -111,9 +111,9 @@ Feature: Prompt Meme Challenge When I am on my user page And I follow "Sign-ups" # TODO - + Scenario: User is participating in a prompt meme and a gift exchange at once, clicks "Post to fulfill" on the prompt meme and sees the right boxes ticked - + Given I have created the gift exchange "My Gift Exchange" And I open signups for "My Gift Exchange" And everyone has signed up for the gift exchange "My Gift Exchange" @@ -128,9 +128,9 @@ Feature: Prompt Meme Challenge And the "My Gift Exchange (myname2)" checkbox should not be checked And the "canon SGA love in Battle 12 (myname4)" checkbox should not be disabled And the "My Gift Exchange (myname2)" checkbox should not be disabled - + Scenario: User posts to fulfill direct from Post New (New Work) - + Given I have Battle 12 prompt meme fully set up And everyone has signed up for Battle 12 When I am logged in as "myname3" @@ -138,7 +138,7 @@ Feature: Prompt Meme Challenge And I follow "New Work" Then the "canon SGA love in Battle 12 (myname4)" checkbox should not be checked And the "canon SGA love in Battle 12 (myname4)" checkbox should not be disabled - + Scenario: User is participating in a prompt meme and a gift exchange at once, clicks "Post to fulfill" on the prompt meme and then changes their mind and fulfills the gift exchange instead Given I have Battle 12 prompt meme fully set up @@ -154,21 +154,21 @@ Feature: Prompt Meme Challenge When I check "My Gift Exchange (myname2)" And I uncheck "canon SGA love in Battle 12 (myname4)" And I fill in "Post to Collections / Challenges" with "" - And I press "Post Without Preview" + And I press "Post" Then I should see "My Gift Exchange" And I should not see "Battle 12" And I should not see "This work is part of an ongoing challenge and will be revealed soon! You can find details here: My Gift Exchange" Scenario: Mod can claim a prompt like an ordinary user - + Given I have Battle 12 prompt meme fully set up Given everyone has signed up for Battle 12 When I am logged in as "mod1" When I claim a prompt from "Battle 12" Then I should see "New claim made." - + Scenario: Mod can still see anonymous claims after signup is closed - + Given I have Battle 12 prompt meme fully set up Given everyone has signed up for Battle 12 When I am logged in as "myname4" @@ -188,7 +188,7 @@ Feature: Prompt Meme Challenge # TODO: Find a way to construct the link to a claim show page for someone who shouldn't be able to see it Scenario: Mod can reveal challenge - + Given I have Battle 12 prompt meme fully set up When I close signups for "Battle 12" When I go to "Battle 12" collection's page @@ -196,9 +196,9 @@ Feature: Prompt Meme Challenge And I uncheck "This collection is unrevealed" And I press "Update" Then I should see "Collection was successfully updated" - + Scenario: Revealing challenge sends out emails - + Given I have Battle 12 prompt meme fully set up Given everyone has signed up for Battle 12 When I am logged in as "myname4" @@ -213,7 +213,7 @@ Feature: Prompt Meme Challenge And 2 emails should be delivered Scenario: Story is anon when challenge is revealed - + Given I have standard challenge tags setup Given I have Battle 12 prompt meme fully set up Given everyone has signed up for Battle 12 @@ -231,9 +231,9 @@ Feature: Prompt Meme Challenge And I should see "Collections: Battle 12" And I should see "Anonymous" within ".byline" And I should not see "mod1" within ".byline" - + Scenario: Authors can be revealed - + Given I have Battle 12 prompt meme fully set up Given everyone has signed up for Battle 12 When I am logged in as "myname4" @@ -245,9 +245,9 @@ Feature: Prompt Meme Challenge When I reveal the "Battle 12" challenge When I reveal the authors of the "Battle 12" challenge Then I should see "Collection was successfully updated" - + Scenario: Revealing authors doesn't send emails - + Given I have Battle 12 prompt meme fully set up Given everyone has signed up for Battle 12 When I am logged in as "myname4" @@ -261,9 +261,9 @@ Feature: Prompt Meme Challenge When I reveal the authors of the "Battle 12" challenge Then I should see "Collection was successfully updated" Then 0 emails should be delivered - + Scenario: When challenge is revealed-authors, user can see claims - + Given I have Battle 12 prompt meme fully set up Given everyone has signed up for Battle 12 When I am logged in as "myname4" @@ -282,7 +282,7 @@ Feature: Prompt Meme Challenge And I should see "Fulfilled Story-thing by mod1" within "div.work" Scenario: Anon prompts stay anon on claims index even if challenge is revealed - + Given I have Battle 12 prompt meme fully set up When I am logged in as "myname4" When I sign up for Battle 12 with combination B @@ -296,9 +296,9 @@ Feature: Prompt Meme Challenge And I follow "Prompts (" Then I should see "by Anonymous" And I should not see "by myname4" - + Scenario: Check that anon prompts are still anon on the prompts page after challenge is revealed - + Given I have Battle 12 prompt meme fully set up When I am logged in as "myname4" When I sign up for Battle 12 with combination B @@ -312,9 +312,9 @@ Feature: Prompt Meme Challenge Then I should see "random SGA love by Anonymous" Then I should see "Fulfilled Story by myname2" Then I should see "High School AU SG1 by Anonymous " - + Scenario: Check that anon prompts are still anon on user claims index after challenge is revealed - + Given I have Battle 12 prompt meme fully set up When I am logged in as "myname4" When I sign up for Battle 12 with combination B @@ -329,10 +329,10 @@ Feature: Prompt Meme Challenge # note that user Claims page currently only shows unfulfilled claims Then I should not see "myname4" And I should see "Anonymous" - + Scenario: Check that anon prompts are still anon on claims show after challenge is revealed # note that only mod can see claims show now - users don't get linked to it - + Given I have Battle 12 prompt meme fully set up When I am logged in as "myname4" When I sign up for Battle 12 with combination B @@ -347,12 +347,12 @@ Feature: Prompt Meme Challenge And I follow "Anonymous" Then I should not see "myname4" And I should see "Anonymous" - + Scenario: check that anon prompts are still anon on the fulfilling work # TODO Scenario: work left in draft so claim is not yet totally fulfilled - + Given I have Battle 12 prompt meme fully set up Given an anon has signed up for Battle 12 When I close signups for "Battle 12" @@ -376,12 +376,12 @@ Feature: Prompt Meme Challenge # we can use. Then use the 'Restore From Last Unposted Draft?' button When I follow "Fulfill" And I follow "Restore From Last Unposted Draft?" - When I press "Post Without Preview" + When I press "Post" And I should see "Work was successfully posted." Then I should see "Fulfilled Story" Scenario: Download prompt CSV from signups page - + Given I am logged in as "mod1" And I have standard challenge tags setup And I create Battle 12 promptmeme @@ -391,7 +391,7 @@ Feature: Prompt Meme Challenge Scenario: Can't download prompt CSV from requests page # it's aimed at users, not mods - + Given I have Battle 12 prompt meme fully set up And everyone has signed up for Battle 12 And I am logged in as "mod1" diff --git a/features/prompt_memes_c/challenge_promptmeme_deletion.feature b/features/prompt_memes_c/challenge_promptmeme_deletion.feature index 70ab36ad6dd..b9c33e8191e 100644 --- a/features/prompt_memes_c/challenge_promptmeme_deletion.feature +++ b/features/prompt_memes_c/challenge_promptmeme_deletion.feature @@ -47,7 +47,7 @@ Feature: Prompt Meme Challenge And I should not see "Delete Prompt" And I should see "Delete Sign-up" - Scenario: User can't delete prompt if they don't have more than the minimum + Scenario: User can't delete prompt if they don't have more than the minimum number required by the meme Given I am logged in as "myname1" @@ -100,7 +100,7 @@ Feature: Prompt Meme Challenge Then I should not see "In response to a prompt" And I should see "Battle 12" - Scenario: When user deletes signup, the work creator can edit the work + Scenario: When user deletes signup, the work creator can edit the work normally Given "myname1" has signed up for Battle 12 with combination A @@ -109,7 +109,7 @@ Feature: Prompt Meme Challenge When I am logged in as "myname2" And I edit the work "Fulfilled Story" And I fill in "Additional Tags" with "My New Tag" - And I press "Post Without Preview" + And I press "Post" Then I should see "Work was successfully updated." And I should see "My New Tag" @@ -148,7 +148,7 @@ Feature: Prompt Meme Challenge Then I should see "Challenge Sign-ups for myname1" And I should not see "Battle 12" - Scenario: A user can still access their Claims page after a prompt meme they + Scenario: A user can still access their Claims page after a prompt meme they had a fulfilled claim in has been deleted Given everyone has signed up for Battle 12 @@ -160,7 +160,7 @@ Feature: Prompt Meme Challenge When I follow "Fulfilled Claims" Then I should not see "Battle 12" - Scenario: The prompt line should not show on claim fills after the prompt meme + Scenario: The prompt line should not show on claim fills after the prompt meme has been deleted Given everyone has signed up for Battle 12 diff --git a/features/step_definitions/series_steps.rb b/features/step_definitions/series_steps.rb index 606f85c0dae..15805839686 100644 --- a/features/step_definitions/series_steps.rb +++ b/features/step_definitions/series_steps.rb @@ -27,13 +27,13 @@ select(pseud, from: "work_author_attributes_ids_") end step %{I add the series "#{series_title}"} - click_button("Post Without Preview") + click_button("Post") end When /^I add the draft "([^\"]*)" to series "([^\"]*)"$/ do |work_title, series_title| step %{I edit the work "#{work_title}"} step %{I add the series "#{series_title}"} - click_button("Save Without Posting") + click_button("Save As Draft") end When /^I add the work "([^\"]*)" to "(\d+)" series "([^\"]*)"$/ do |work_title, count, series_title| @@ -52,7 +52,7 @@ step "I edit the work \"#{work_title}\"" check("series-options-show") fill_in("work_series_attributes_title", with: series_title + i.to_s) - click_button("Post Without Preview") + click_button("Post") end end diff --git a/features/step_definitions/work_steps.rb b/features/step_definitions/work_steps.rb index c39cee8f07c..2df1e6fb1c0 100644 --- a/features/step_definitions/work_steps.rb +++ b/features/step_definitions/work_steps.rb @@ -70,7 +70,7 @@ else # Note: this will match the above regexp and work just fine even if all the options are blank! step %{I set up the draft "#{title}" with fandom "#{fandom}" with character "#{character}" with second character "#{character2}" with freeform "#{freeform}" with second freeform "#{freeform2}" with category "#{category}" in collection "#{collection}" as a gift to "#{recipient}" as part of a series "#{series}" with relationship "#{relationship}" using the pseud "#{pseud}"} - click_button("Post Without Preview") + click_button("Post") end Work.tire.index.refresh Tag.write_redis_to_database @@ -118,7 +118,7 @@ (n_chapters.to_i - 1).times do |i| step %{I follow "Add Chapter"} fill_in("content", with: "Yet another chapter.") - click_button("Post Without Preview") + click_button("Post") end step %{I am logged out} n_comments ||= 0 @@ -501,7 +501,7 @@ Tag.write_redis_to_database end When /^I post the work without preview$/ do - click_button "Post Without Preview" + click_button "Post" Work.tire.index.refresh Tag.write_redis_to_database end @@ -541,7 +541,7 @@ step %{the user "#{recipient}" exists and is activated} visit edit_work_path(Work.find_by(title: work_title)) fill_in("work_recipients", with: "#{recipient}") - click_button("Post Without Preview") + click_button("Post") end When /^I add the beginning notes "([^"]*)"$/ do |notes| diff --git a/features/works/chapter_edit.feature b/features/works/chapter_edit.feature index 92c5d3d339d..01495f5ad44 100755 --- a/features/works/chapter_edit.feature +++ b/features/works/chapter_edit.feature @@ -175,7 +175,7 @@ Feature: Edit chapters Then I should see "This is a draft chapter in a posted work. It will be kept unless the work is deleted." When I press "Edit" And I fill in "content" with "Even more awesomely epic context. Plus bonus epicness" - And I press "Post Without Preview" + And I press "Post" Then I should see "Chapter was successfully posted." And I should not see "This chapter is a draft and hasn't been posted yet!" @@ -198,15 +198,15 @@ Feature: Edit chapters Scenario: Create a work and add a draft chapter, edit the draft chapter, and save changes to the draft chapter without previewing or posting Given basic tags - And I am logged in as "moose" with password "muffin" + And I am logged in as "moose" with password "muffin" When I go to the new work page Then I should see "Post New Work" And I select "General Audiences" from "Rating" And I check "No Archive Warnings Apply" And I fill in "Fandoms" with "If You Give an X a Y" And I fill in "Work Title" with "If You Give Users a Draft Feature" - And I fill in "content" with "They will expect it to work." - And I press "Post Without Preview" + And I fill in "content" with "They will expect it to work." + And I press "Post" When I should see "Work was successfully posted." And I should see "They will expect it to work." When I follow "Add Chapter" @@ -216,7 +216,7 @@ Feature: Edit chapters And I should see "And then they will request more features for it." When I press "Edit" And I fill in "content" with "And then they will request more features for it. Like the ability to save easily." - And I press "Save Without Posting" + And I press "Save As Draft" Then I should see "Chapter was successfully updated." And I should see "This chapter is a draft and hasn't been posted yet!" And I should see "Like the ability to save easily." @@ -230,20 +230,20 @@ Feature: Edit chapters And I select "1" from "work_chapter_attributes_published_at_3i" And I select "January" from "work_chapter_attributes_published_at_2i" And I select "1990" from "work_chapter_attributes_published_at_1i" - And I press "Post Without Preview" + And I press "Post" Then I should see "Published:1990-01-01" When I follow "Add Chapter" And I fill in "content" with "this is my second chapter" And I set the publication date to today And I press "Preview" And I should see "This is a draft" - And I press "Save Without Posting" + And I press "Save As Draft" Then I should not see Updated today And I should not see Completed today And I should not see "Updated" within ".work.meta .stats" And I should not see "Completed" within ".work.meta .stats" When I follow "Edit Chapter" - And I press "Post Without Preview" + And I press "Post" Then I should see Completed today @@ -256,11 +256,11 @@ Feature: Edit chapters When I follow "Add Chapter" And I fill in "content" with "this is my second chapter" And I set the publication date to today - And I press "Post Without Preview" + And I press "Post" Then I should see Completed today When I follow "Edit" And I fill in "work_wip_length" with "?" - And I press "Post Without Preview" + And I press "Post" Then I should see Updated today When I post the work "A Whole New Work" And I go to the works page @@ -269,7 +269,7 @@ Feature: Edit chapters When I follow "Add Chapter" And I fill in "content" with "this is my third chapter" And I set the publication date to today - And I press "Post Without Preview" + And I press "Post" And I go to the works page Then "First work" should appear before "A Whole New Work" @@ -401,7 +401,7 @@ Feature: Edit chapters Then I should see "Chapter 1" And I should see "Chapter by originalposter" When I follow "Edit Chapter" - And "AO3-4699" is fixed + And "AO3-4699" is fixed # Then I should not see "You're not allowed to use that pseud." When I fill in "content" with "opsfriend was here" And I post the chapter @@ -478,7 +478,7 @@ Feature: Edit chapters And I post the work "Futuristic" And a chapter is set up for "Futuristic" When I select "30" from "chapter[published_at(3i)]" - And I press "Post Without Preview" + And I press "Post" Then I should see "Publication date can't be in the future." When I jump in our Delorean and return to the present diff --git a/features/works/work_create.feature b/features/works/work_create.feature index 8239956040b..45f71ca80e7 100755 --- a/features/works/work_create.feature +++ b/features/works/work_create.feature @@ -29,7 +29,7 @@ Feature: Create Works Given I am logged in as "newbie" When I set up the draft "All Hell Breaks Loose" And I fill in "content" with "Bad things happen, etc." - And I press "Post Without Preview" + And I press "Post" Then I should see "Work was successfully posted." And I should see "Bad things happen, etc." When I go to the works page @@ -41,7 +41,7 @@ Feature: Create Works When I set up the draft "All Hell Breaks Loose" And I unselect "newbie" from "Creator/Pseud(s)" And I select "Pointless Pseud" from "Creator/Pseud(s)" - And I press "Post Without Preview" + And I press "Post" Then I should see "Work was successfully posted." When I go to the works page Then I should see "All Hell Breaks Loose" @@ -235,7 +235,7 @@ Feature: Create Works Given I am logged in When I set up the draft "02138" And I fill in "Fandoms" with "Supernatural, Smallville" - When I press "Post Without Preview" + When I press "Post" Then I should see "Work was successfully posted." And I should see "Supernatural" And I should see "Smallville" @@ -244,7 +244,7 @@ Feature: Create Works Scenario: test for < and > in title Given I am logged in When I set up the draft "4 > 3 and 2 < 5" - When I press "Post Without Preview" + When I press "Post" Then I should see "Work was successfully posted." And I should see "4 > 3 and 2 < 5" within "h2.title" @@ -254,7 +254,7 @@ Feature: Create Works When I follow "Add Chapter" And I fill in "Chapter Title" with "This is my second chapter" And I fill in "content" with "Let's write another story" - And I press "Post Without Preview" + And I press "Post" Then I should see "Chapter 2: This is my second chapter" And I should see "Chapter has been posted!" And I should not see "This is a preview" @@ -288,11 +288,11 @@ Feature: Create Works And I fill in "Fandoms" with "Dallas" And I fill in "Work Title" with "I Shot J.R.: Kristin's Story" And I fill in "content" with "It wasn't my fault, you know." - And I press "Post Without Preview" + And I press "Post" Then I should see "We couldn't save this work" And I should see "Please add all required tags. Warning is missing." When I check "No Archive Warnings Apply" - And I press "Post Without Preview" + And I press "Post" Then I should see "Work was successfully posted." And I should see "No Archive Warnings Apply" And I should not see "Author Chose Not To Use Archive Warnings" @@ -307,7 +307,7 @@ Feature: Create Works And I fill in the basic work information for "All Hell Breaks Loose" And I check "Add co-creators?" And I fill in "pseud_byline" with "Me" - And I press "Post Without Preview" + And I press "Post" Then I should see "There's more than one user with the pseud Me. Please choose the one you want:" And I select "myself" from "work[author_attributes][ambiguous_pseuds][]" And I press "Preview" @@ -323,7 +323,7 @@ Feature: Create Works And I set up a draft "Futuristic" When I check "Set a different publication date" And I select "30" from "work[chapter_attributes][published_at(3i)]" - And I press "Post Without Preview" + And I press "Post" Then I should see "Publication date can't be in the future." When I jump in our Delorean and return to the present diff --git a/features/works/work_download.feature b/features/works/work_download.feature index f22490148ce..a8da8d911b2 100644 --- a/features/works/work_download.feature +++ b/features/works/work_download.feature @@ -31,7 +31,7 @@ Feature: Download a work """ "Has double quotes" """ - When I press "Post Without Preview" + When I press "Post" And I follow "MOBI" # Then... When I go to the work page with title "Has double quotes" @@ -52,7 +52,7 @@ Feature: Download a work """ Первый_маг """ - When I press "Post Without Preview" + When I press "Post" # TODO: Think about whether we can invent a better name than this Then I should see the text with tags "_.mobi" When I follow "MOBI" @@ -75,7 +75,7 @@ Feature: Download a work """ Has curly’d quotes """ - When I press "Post Without Preview" + When I press "Post" And I follow "MOBI" # Then... When I go to the work page with title Has curly’d quotes @@ -89,7 +89,7 @@ Feature: Download a work # Then... @wip - Scenario: Download works with curly and straight quotes and accented + Scenario: Download works with curly and straight quotes and accented characters in the title doesn't bomb Given I set up the draft "Title I'll Replace In A Sec" @@ -97,7 +97,7 @@ Feature: Download a work """ "Hàs curly’d quotes" """ - When I press "Post Without Preview" + When I press "Post" And I follow "MOBI" # Then... When I go to the work page with title "Hàs curly’d quotes" @@ -112,7 +112,7 @@ Feature: Download a work @wip Scenario: Download chaptered works doesn't bomb - + Given the chaptered work "Epic Novel" When I view the work "Epic Novel" And I follow "HTML" @@ -136,7 +136,7 @@ Feature: Download a work """ ♥ and é Türkçe Karakterler başlıkta nasıl görünüyor """ - When I press "Post Without Preview" + When I press "Post" And I follow "MOBI" # Then... When I go to the work page with title ♥ and é Türkçe Karakterler başlıkta nasıl görünüyor @@ -151,7 +151,7 @@ Feature: Download a work """ à ø something """ - When I press "Post Without Preview" + When I press "Post" And I follow "MOBI" # Then... When I go to the work page with title à ø something diff --git a/features/works/work_drafts.feature b/features/works/work_drafts.feature index 6d04ba1a36c..bf802d665fd 100644 --- a/features/works/work_drafts.feature +++ b/features/works/work_drafts.feature @@ -7,7 +7,7 @@ Feature: Work Drafts When the draft "scotts draft" And I press "Cancel" Then I should see "The work was not posted. It will be saved here in your drafts for one month, then deleted from the Archive." - + Scenario: Creating a work draft, editing it, and saving the changes without posting or previewing and then double check that it is saved and I didn't get the success message erroneously Given basic tags And I am logged in as "persnickety" with password "editingisfun" @@ -17,13 +17,13 @@ Feature: Work Drafts And I check "No Archive Warnings Apply" And I fill in "Fandoms" with "MASH (TV)" And I fill in "Work Title" with "Draft Dodging" - And I fill in "content" with "Klinger lay under his porch." + And I fill in "content" with "Klinger lay under his porch." And I press "Preview" Then I should see "Draft was successfully created. It will be automatically deleted on" When I press "Edit" Then I should see "Edit Work" And I fill in "content" with "Klinger, in Uncle Gus's Aunt Gussie dress, lay under his porch." - And I press "Save Without Posting" + And I press "Save As Draft" Then I should see "This work is a draft and has not been posted." And I should see "Klinger, in Uncle Gus's Aunt Gussie dress, lay under his porch." When I am on persnickety's works page @@ -53,10 +53,10 @@ Feature: Work Drafts When the purge_old_drafts rake task is run And I reload the page Then I should see "Drafts (1)" - + Scenario: Drafts cannot be found by search Given I am logged in as "drafter" with password "something" - And the draft "draft to post" + And the draft "draft to post" Given the work indexes are updated When I fill in "site_search" with "draft" And I press "Search" @@ -64,7 +64,7 @@ Feature: Work Drafts Scenario: Posting drafts from drafts page Given I am logged in as "drafter" with password "something" - And the draft "draft to post" + And the draft "draft to post" When I am on drafter's works page Then I should see "Drafts (1)" When I follow "Drafts (1)" @@ -75,10 +75,10 @@ Feature: Work Drafts Then I should see "draft to post" And I should see "drafter" And I should not see "Preview" - + Scenario: Deleting drafts from drafts page Given I am logged in as "drafter" with password "something" - And the draft "draft to delete" + And the draft "draft to delete" When I am on drafter's works page Then I should see "Drafts (1)" When I follow "Drafts (1)" @@ -90,7 +90,7 @@ Feature: Work Drafts And I should not see "Orphan Work Instead" When I press "Yes, Delete Draft" Then I should see "Your work draft to delete was deleted" - + Scenario: Saving changes to an existing draft without posting and then double check that it is saved and I didn't get the success message erroneously Given I am logged in as "drafty" with password "breezeinhere" And the draft "Windbag" @@ -102,7 +102,7 @@ Feature: Work Drafts When I follow "Edit" Then I should see "Edit Work" When I fill in "content" with "My draft has changed!" - And I press "Save Without Posting" + And I press "Save As Draft" Then I should see "This work is a draft and has not been posted" And I should see "My draft has changed!" When I am on drafty's works page @@ -117,7 +117,7 @@ Feature: Work Drafts And the draft "Walking Into Mordor" When I edit the draft "Walking Into Mordor" And I press "Preview" - Then I should see "Please post your work or save without posting if you want to keep them." + Then I should see "Please post your work or Save As Draft if you want to keep them." Scenario: A chaptered draft should be able to have beginning and end notes, and it should display them. Given I am logged in as "composer" @@ -125,7 +125,7 @@ Feature: Work Drafts When I edit the draft "Epic in Progress" And I add the beginning notes "Some beginning notes." And I add the end notes "Some end notes." - And I press "Save Without Posting" + And I press "Save As Draft" Then I should see "Some beginning notes." And I should see "See the end of the work for more notes." When I follow "more notes" diff --git a/features/works/work_edit.feature b/features/works/work_edit.feature index b0627e44f7c..95527ec5286 100644 --- a/features/works/work_edit.feature +++ b/features/works/work_edit.feature @@ -13,13 +13,13 @@ Feature: Edit Works And all search indexes are updated # This isn't my work When I view the work "fourth" - Then I should not see "Edit" + Then I should not see "Edit" When I am on testuser's works page # These are my works and should all have edit links on the blurbs Then I should see "Edit" When I follow "First work" # This is my individual work and should have an edit link on the show page - Then I should see "first fandom" + Then I should see "first fandom" And I should see "Edit" # make sure this tag isn't on before we add it And I should not see "new tag" @@ -75,7 +75,7 @@ Feature: Edit Works And I follow "Edit" And I select "testy" from "work_author_attributes_ids_" And I unselect "testuser" from "work_author_attributes_ids_" - And I press "Post Without Preview" + And I press "Post" Then I should see "testy" And I should not see "testuser," @@ -110,10 +110,10 @@ Feature: Edit Works And I am logged out When I am logged in as "Scott" And I edit the work "Murder by Numbers" - And I press "Post Without Preview" + And I press "Post" And I should see "Work was successfully updated" Then I should not see "You have submitted your work to the moderated collection 'Digital Hoarders 2013'. It will not become a part of the collection until it has been approved by a moderator." - + Scenario: Previewing edits to a posted work should not refer to the work as a draft Given I am logged in as "editor" And I post the work "Load of Typos" @@ -157,7 +157,7 @@ Feature: Edit Works And I should see "Coauthor's Work Skin" within "#work_work_skin_id" And I should not see "Random User's Work Skin" within "#work_work_skin_id" When I select "Coauthor's Work Skin" from "Select Work Skin" - And I press "Post Without Preview" + And I press "Post" Then I should see "Work was successfully updated" Scenario: A work cannot be edited to remove its fandom @@ -166,7 +166,7 @@ Feature: Edit Works And I post the work "Work 1" with fandom "testing" When I edit the work "Work 1" And I fill in "Fandoms" with "" - And I press "Post Without Preview" + And I press "Post" Then I should see "Sorry! We couldn't save this work because:Please add all required tags. Fandom is missing." Scenario: User can cancel editing a work diff --git a/features/works/work_edit_tags.feature b/features/works/work_edit_tags.feature index 725487a1467..f0bea61729e 100644 --- a/features/works/work_edit_tags.feature +++ b/features/works/work_edit_tags.feature @@ -23,15 +23,15 @@ Feature: Edit tags on a work When I follow "Edit Tags" Then I should see "Edit Work Tags for " And I should see "Testerwork" - And I should not see "Save Without Posting" + And I should not see "Save As Draft" When I fill in "Fandoms" with "Stargate SG-1, Hana Yori Dango" And I fill in "Additional Tags" with "Alternate Universe" - And I press "Post Without Preview" + And I press "Post" Then I should see "Stargate SG-1" And I should see "Hana Yori Dango" And I should see "Alternate Universe" And I should see "Work was successfully updated" - + Scenario: Edit tags on a draft Given I am logged in as "imit" with password "tagyoure" And the draft "Freeze Tag" @@ -44,13 +44,13 @@ Feature: Edit tags on a work Then I should see "Edit Work Tags" When I fill in "Fandoms" with "Games, Anthropomorphic" And I fill in "Additional Tags" with "The cooler version of tag" - And I press "Save Without Posting" + And I press "Save As Draft" Then I should see "Tags were successfully updated" And I should see "This work is a draft and has not been posted" And I should see "Games" And I should see "Anthropomorphic" And I should see "The cooler version of tag" - + Scenario: Ampersands and angle brackets should display in work titles on Edit Tags page Given I have loaded the fixtures And I am logged in as "testuser2" with password "testuser2" @@ -71,7 +71,7 @@ Feature: Edit tags on a work And I view the work "Work 1" And I follow "Edit Tags" When I fill in "Fandoms" with "" - And I press "Post Without Preview" + And I press "Post" Then I should see "Sorry! We couldn't save this work because:Please add all required tags. Fandom is missing." Scenario: User can cancel editing a work's tags diff --git a/features/works/work_related.feature b/features/works/work_related.feature index 95ffb0e3bc2..f8e30fe0d4a 100644 --- a/features/works/work_related.feature +++ b/features/works/work_related.feature @@ -107,7 +107,7 @@ Scenario: Translation, related work, and parent work links appear in the right p When I am logged in as "inspiration" And I edit the work "Worldbuilding" And I list the work "Parent Work" as inspiration - And I press "Post Without Preview" + And I press "Post" And a chapter is added to "Worldbuilding" And a draft chapter is added to "Worldbuilding" When I view the work "Worldbuilding" @@ -392,13 +392,13 @@ Scenario: When a user is notified that a co-authored work has been inspired by a Given I am logged in And I set up a draft "Inspired" When I list a series as inspiration - And I press "Post Without Preview" + And I press "Post" Then I should see "Only a link to a work can be listed as an inspiration." - Scenario: When using a URL on the site to cite a parent work, the URL must be + Scenario: When using a URL on the site to cite a parent work, the URL must be for a work that exists Given I am logged in And I set up a draft "Inspired" When I list a nonexistent work as inspiration - And I press "Post Without Preview" + And I press "Post" Then I should see "The work you listed as an inspiration does not seem to exist." From 20f0e0a7dc9af9687cb734471711310f46c23a1d Mon Sep 17 00:00:00 2001 From: ko Date: Mon, 15 Oct 2018 03:51:46 -0700 Subject: [PATCH 03/12] AO4-4560 pull from master and make the same edits to testing steps that werent on my branch --- features/other_a/gift.feature | 12 ++++++------ features/other_b/bookmark_indexing.feature | 8 ++++---- features/search/people_search.feature | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/features/other_a/gift.feature b/features/other_a/gift.feature index 1e66c6fbd44..de3cce3c99d 100644 --- a/features/other_a/gift.feature +++ b/features/other_a/gift.feature @@ -23,16 +23,16 @@ Feature: Create Gifts Scenario: Gifts page for recipient should show recipient's gifts When I give the work to "giftee1" - And I press "Post Without Preview" + And I press "Post" And I go to the gifts page for the recipient giftee1 Then I should see "GiftStory1 by gifter for giftee1" Scenario: Gifts page for recipient when logged out should show recipient's gifts if visible to all When I give the work to "giftee1" - And I press "Post Without Preview" + And I press "Post" And I set up the draft "GiftStory2" as a gift to "giftee1" And I lock the work - And I press "Post Without Preview" + And I press "Post" And I log out And I go to the gifts page for the recipient giftee1 Then I should see "GiftStory1 by gifter for giftee1" @@ -40,16 +40,16 @@ Feature: Create Gifts Scenario: Gifts page for pseud recipient should show pseud's gifts Given I give the work to "g1" - And I press "Post Without Preview" + And I press "Post" When I go to the gifts page for the recipient g1 Then I should see "GiftStory1 by gifter for g1" Scenario: Gifts page for recipient when logged out should show gifts visible to all When I give the work to "g1" - And I press "Post Without Preview" + And I press "Post" And I set up the draft "GiftStory2" as a gift to "g1" And I lock the work - And I press "Post Without Preview" + And I press "Post" And I log out When I go to the gifts page for the recipient g1 Then I should see "GiftStory1 by gifter for g1" diff --git a/features/other_b/bookmark_indexing.feature b/features/other_b/bookmark_indexing.feature index 8c622fd9200..e9e9fd01b9e 100644 --- a/features/other_b/bookmark_indexing.feature +++ b/features/other_b/bookmark_indexing.feature @@ -46,13 +46,13 @@ Feature: Bookmark Indexing And I bookmark the series "Series" When I edit the work "Work" And I fill in "Additional Tags" with "New Tag" - And I press "Post Without Preview" + And I press "Post" And all indexing jobs have been run And I go to the bookmarks tagged "New Tag" Then the 1st bookmark result should contain "Series" When I edit the work "Work" And I fill in "Additional Tags" with "" - And I press "Post Without Preview" + And I press "Post" And all indexing jobs have been run And I go to the bookmarks tagged "New Tag" Then I should not see "Series" @@ -100,7 +100,7 @@ Feature: Bookmark Indexing Then I should see "BookmarkedExternalWork" And I should see "BookmarkedSeries" - Scenario: A bookmark of an external work should show on a tag's bookmark + Scenario: A bookmark of an external work should show on a tag's bookmark listing once the tag is made canonical Given basic tags And I am logged in as "bookmarker" @@ -109,7 +109,7 @@ Feature: Bookmark Indexing And I go to the bookmarks tagged "Mikki Mendoza" Then I should see "Outside Story" - Scenario: New bookmarks of external works should appear in the bookmark listings for its tag's existing metatag, and removing the tag should remove the bookmark from both the tag's and metatag's bookmark listings + Scenario: New bookmarks of external works should appear in the bookmark listings for its tag's existing metatag, and removing the tag should remove the bookmark from both the tag's and metatag's bookmark listings Given basic tags And a canonical character "Ann" And a canonical character "Ann Ewing" diff --git a/features/search/people_search.feature b/features/search/people_search.feature index de56e448ad8..0ef1a2045b9 100644 --- a/features/search/people_search.feature +++ b/features/search/people_search.feature @@ -47,7 +47,7 @@ Feature: Search pseuds And all indexing jobs have been run When I edit the work "Drabble Collection" And I fill in "Fandom" with "MCU, Ghost Soup" - And I press "Post Without Preview" + And I press "Post" And all indexing jobs have been run And I go to the search people page And I fill in "Fandom" with "Ghost Soup" @@ -61,7 +61,7 @@ Feature: Search pseuds And all indexing jobs have been run When I edit the work "Drabble Collection" And I fill in "Fandom" with "MCU" - And I press "Post Without Preview" + And I press "Post" And all indexing jobs have been run And I go to the search people page And I fill in "Fandom" with "Ghost Soup" @@ -75,7 +75,7 @@ Feature: Search pseuds And all indexing jobs have been run When I edit the work "Drabble Collection" And I add the co-author "alice" - And I press "Post Without Preview" + And I press "Post" And all indexing jobs have been run And I go to the search people page And I fill in "Fandom" with "Ghost Soup" @@ -88,7 +88,7 @@ Feature: Search pseuds And I am logged in as "testuser" And I set up a draft "Drabble Collection" with fandom "Ghost Soup" And I add the co-author "alice" - And I press "Post Without Preview" + And I press "Post" And all indexing jobs have been run When I edit the work "Drabble Collection" And I follow "Remove Me As Author" From 3536a7cc9d00bd42d2505103034e09675b155505 Mon Sep 17 00:00:00 2001 From: ko Date: Mon, 15 Oct 2018 15:53:00 -0700 Subject: [PATCH 04/12] AO3-4560 one last failing test --- app/controllers/works_controller.rb | 2 +- features/works/work_drafts.feature | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 701747886ab..d7b9928bf2a 100755 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -381,7 +381,7 @@ def update # If this is a preview, display the preview preview_mode(:edit) do unless @work.posted? - flash[:notice] = ts("Your changes have not been saved. Please post your work or save without posting if you want to keep them.") + flash[:notice] = ts("Your changes have not been saved. Please post your work or save as draft if you want to keep them.") end in_moderated_collection diff --git a/features/works/work_drafts.feature b/features/works/work_drafts.feature index db37ddbe528..25ec2c447e3 100644 --- a/features/works/work_drafts.feature +++ b/features/works/work_drafts.feature @@ -117,7 +117,7 @@ Feature: Work Drafts And the draft "Walking Into Mordor" When I edit the draft "Walking Into Mordor" And I press "Preview" - Then I should see "Please post your work or Save As Draft if you want to keep them." + Then I should see "Please post your work or save as draft if you want to keep them." Scenario: A chaptered draft should be able to have beginning and end notes, and it should display them. Given I am logged in as "composer" From 1fd0663263d267eb79bb756b1b0e623ac57d40ab Mon Sep 17 00:00:00 2001 From: niconicosette Date: Sun, 21 Jul 2019 14:18:00 -0500 Subject: [PATCH 05/12] AO3-4560 change "post without preview" to "post" --- features/collections/collection_anonymity.feature | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/features/collections/collection_anonymity.feature b/features/collections/collection_anonymity.feature index 4da61f7f2c3..426749413aa 100755 --- a/features/collections/collection_anonymity.feature +++ b/features/collections/collection_anonymity.feature @@ -444,12 +444,12 @@ Feature: Collection When I am logged in as "creator" And I set up the draft "Secret Work" And I fill in "Collections" with "Anonymizing,Fluffy" - And I press "Post Without Preview" + And I press "Post" And I go to my works page Then I should not see "Secret Work" When I edit the work "Secret Work" And I fill in "Collections" with "Holidays,Fluffy" - And I press "Post Without Preview" + And I press "Post" And I go to my works page Then I should see "Secret Work" From e60968ecf696e2dcb2fb33722a56a7c457fb5a9a Mon Sep 17 00:00:00 2001 From: niconicosette Date: Sun, 21 Jul 2019 14:22:12 -0500 Subject: [PATCH 06/12] AO3-4560 change "post without preview" to "post" in features/other_a/parser.feature --- features/other_a/parser.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/other_a/parser.feature b/features/other_a/parser.feature index 14be1b2c13c..5578cf2669a 100644 --- a/features/other_a/parser.feature +++ b/features/other_a/parser.feature @@ -49,7 +49,7 @@ Feature: Parsing HTML And the "Notes" field should contain "note" And the "End Notes" field should contain "keep-me" And the "content" field should contain "size-10" - When I press "Post Without Preview" + When I press "Post" Then I should see "Work was successfully posted." And I should see the image "src" text "britney.gif" From 467206f7ee4cf1198b4527f779fd04d7c5a25418 Mon Sep 17 00:00:00 2001 From: niconicosette Date: Sun, 21 Jul 2019 14:23:52 -0500 Subject: [PATCH 07/12] AO3-4560 change "post without preview" to "post --- features/works/work_download.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/works/work_download.feature b/features/works/work_download.feature index 54a21602f66..bd206eb487e 100644 --- a/features/works/work_download.feature +++ b/features/works/work_download.feature @@ -81,7 +81,7 @@ Feature: Download a work Given I am logged in And I set up the draft "Many Fandom Work" And I fill in "Fandoms" with "Fandom 1, Fandom 2, Fandom 3, Fandom 4" - And I press "Post Without Preview" + And I press "Post" When I am logged out And I view the work "Many Fandom Work" And I follow "HTML" From 7779ec9ca1b058b0b4f19c33d91b4fc4239b09c0 Mon Sep 17 00:00:00 2001 From: niconicosette Date: Sun, 21 Jul 2019 14:24:24 -0500 Subject: [PATCH 08/12] AO3-4560 change "post without preview" to "post" in features/works/work_download.feature From 69cb1e5be8221bc3b8bc4bf28bd4ff930126b61a Mon Sep 17 00:00:00 2001 From: niconicosette Date: Wed, 24 Jul 2019 16:21:02 -0500 Subject: [PATCH 09/12] AO3-4560 change notice to reflect new posting buttons --- app/controllers/works_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 499e122581e..e8626b500bc 100755 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -360,7 +360,7 @@ def update render :_choose_coauthor elsif params[:preview_button] || params[:cancel_coauthor_button] unless @work.posted? - flash[:notice] = ts("Your changes have not been saved. Please post your work or save without posting if you want to keep them.") + flash[:notice] = ts("Your changes have not been saved. Please post your work or save as draft if you want to keep them.") end in_moderated_collection From 2f4ff55404d392d4d60d582fc91dad9958e2b0d8 Mon Sep 17 00:00:00 2001 From: niconicosette Date: Wed, 24 Jul 2019 16:22:28 -0500 Subject: [PATCH 10/12] AO3-4560 change scenario to "save as draft" --- app/controllers/works_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index e8626b500bc..6599e71bb7b 100755 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -403,7 +403,7 @@ def update_tags Work.expire_work_tag_groups_id(@work.id) flash[:notice] = ts('Tags were successfully updated.') redirect_to(@work) - else # Post Without Preview + else # Save As Draft @work.posted = true @work.minor_version = @work.minor_version + 1 @work.save From cd1890d90a3384e8f73f7fa50cc0cc0dd974ac95 Mon Sep 17 00:00:00 2001 From: ko Date: Sun, 6 Oct 2019 20:19:13 -0500 Subject: [PATCH 11/12] AO3-4560 change button names in worksteps.rb, work_dates_edit.feature, and chapters_controller_spec.rb --- features/step_definitions/work_steps.rb | 4 ++-- features/works/work_dates_edit.feature | 4 ++-- spec/controllers/chapters_controller_spec.rb | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/features/step_definitions/work_steps.rb b/features/step_definitions/work_steps.rb index e31114d7595..688d240ee5b 100644 --- a/features/step_definitions/work_steps.rb +++ b/features/step_definitions/work_steps.rb @@ -15,7 +15,7 @@ fill_in("Work Title", with: title) fill_in("content", with: DEFAULT_CONTENT) end -# Here we set up a draft and can then post it as a draft, preview and post, post without preview, +# Here we set up a draft and can then post it as a draft, preview and post, post, # or fill in additional information on the work form. # Example: I set up the draft "Foo" # Example: I set up the draft "Foo" with fandom "Captain America" in the collection "MCU Stories" as a gift to "Bob" @@ -282,7 +282,7 @@ end When /^I post the work "([^"]*)" without preview$/ do |title| - # we now post without preview as our default test case + # we now post as our default test case step %{I post the work "#{title}"} end diff --git a/features/works/work_dates_edit.feature b/features/works/work_dates_edit.feature index e45b54831c7..b13475178ee 100644 --- a/features/works/work_dates_edit.feature +++ b/features/works/work_dates_edit.feature @@ -58,7 +58,7 @@ Feature: Edit Works Dates # And I should not see "this is my second chapter" # And I should see Updated today - # The entire work is backdated. Now, I want to edit chapter two to have a "Chapter Publication + # The entire work is backdated. Now, I want to edit chapter two to have a "Chapter Publication # Date" date set to January 16th, 2013. This should not affect the work's published date, but # the work's updated date should change to match the most recent chapter pub date # When I follow "Next Chapter" @@ -81,5 +81,5 @@ Feature: Edit Works Dates When I edit the work "Beauty and the Beast 2077" And I check "Set a different publication date" And I select "December" from "work_chapter_attributes_published_at_2i" - And I press "Post Without Preview" + And I press "Post" Then I should see "Sorry! We couldn't save this work because:Publication date can't be in the future." diff --git a/spec/controllers/chapters_controller_spec.rb b/spec/controllers/chapters_controller_spec.rb index 3a4261d7c8a..18b868d4f54 100644 --- a/spec/controllers/chapters_controller_spec.rb +++ b/spec/controllers/chapters_controller_spec.rb @@ -436,7 +436,7 @@ expect(assigns[:work].major_version).to eq(2) end - context "when the post without preview button is clicked" do + context "when the post button is clicked" do context "when the chapter and work are valid" do it "posts the chapter" do post :create, params: { work_id: work.id, chapter: @chapter_attributes, post_without_preview_button: true } @@ -670,7 +670,7 @@ end end - context "when the post without preview button is clicked" do + context "when the post button is clicked" do it "posts the chapter" do put :update, params: { work_id: work.id, id: work.chapters.first.id, chapter: @chapter_attributes, post_without_preview_button: true } expect(assigns[:chapter].posted).to be true From c19098ac78f6ee31ea8277930a92471c127dfc22 Mon Sep 17 00:00:00 2001 From: ko Date: Tue, 8 Oct 2019 20:58:29 -0500 Subject: [PATCH 12/12] AO3-4560 make the tests work --- features/works/work_edit.feature | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/features/works/work_edit.feature b/features/works/work_edit.feature index 2ba8f38e691..412dfff7061 100644 --- a/features/works/work_edit.feature +++ b/features/works/work_edit.feature @@ -75,8 +75,8 @@ Feature: Edit Works # Test changing pseuds on a work When I go to testuser's works page And I follow "Edit" - And I select "testy" from "work_author_attributes_ids_" - And I unselect "testuser" from "work_author_attributes_ids_" + And I select "testy" from "work_author_attributes_ids" + And I unselect "testuser" from "work_author_attributes_ids" And I press "Post" Then I should see "testy" And I should not see "testuser,"