Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AO3-4560 Rename work posting buttons #3441

Merged
merged 19 commits into from Oct 10, 2019
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
b7620dc
AO3-4560 rename work posting buttons (to be less confusing)
niconicosette Dec 2, 2017
47fe84e
A03-4560 change all leftover instances of Post Without Preview and Sa…
niconicosette Oct 15, 2018
b909b37
Merge branch 'master' into AO3-4560
niconicosette Oct 15, 2018
71995dd
update w master
niconicosette Oct 15, 2018
20f0e0a
AO4-4560 pull from master and make the same edits to testing steps th…
niconicosette Oct 15, 2018
895ace3
Merge branch 'AO3-4560' of https://github.com/pupupuri/otwarchive int…
niconicosette Oct 15, 2018
3536a7c
AO3-4560 one last failing test
niconicosette Oct 15, 2018
e323d84
Merge branch 'master' into AO3-4560
niconicosette Feb 10, 2019
c03f11d
Merge branch 'master' into AO3-4560
niconicosette Apr 15, 2019
1fd0663
AO3-4560 change "post without preview" to "post"
niconicosette Jul 21, 2019
e60968e
AO3-4560 change "post without preview" to "post" in features/other_a/…
niconicosette Jul 21, 2019
467206f
AO3-4560 change "post without preview" to "post
niconicosette Jul 21, 2019
7779ec9
AO3-4560 change "post without preview" to "post" in features/works/wo…
niconicosette Jul 21, 2019
69cb1e5
AO3-4560 change notice to reflect new posting buttons
niconicosette Jul 24, 2019
2f4ff55
AO3-4560 change scenario to "save as draft"
niconicosette Jul 24, 2019
0f1a88d
AO3-4560 resolve merge conflicts
niconicosette Oct 6, 2019
39f62a7
AO3-4560 resolve conflicts
niconicosette Oct 6, 2019
cd1890d
AO3-4560 change button names in worksteps.rb, work_dates_edit.feature…
niconicosette Oct 7, 2019
c19098a
AO3-4560 make the tests work
niconicosette Oct 9, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/views/chapters/_chapter_form.html.erb
Expand Up @@ -71,10 +71,10 @@
<legend><%= ts("Post Chapter") %></legend>
<ul class="actions">
<% unless @chapter.new_record? || @chapter.posted? %>
<li><%= submit_tag ts("Save Without Posting"), name: "save_button" %></li>
<li><%= submit_tag ts("Save As Draft"), name: "save_button" %></li>
<% end %>
<li><%= submit_tag ts("Preview"), name: "preview_button" %></li>
<li><%= submit_tag ts("Post Without Preview"), name: "post_without_preview_button", data: { disable_with: ts("Please wait...") } %></li>
<li><%= submit_tag ts("Post"), name: "post_without_preview_button", data: { disable_with: ts("Please wait...") } %></li>
<li><%= submit_tag ts("Cancel"), name: "cancel_button" %></li>
</ul>
</fieldset>
Expand Down
2 changes: 1 addition & 1 deletion app/views/chapters/preview.html.erb
Expand Up @@ -31,7 +31,7 @@
data: { disable_with: ts("Please wait...") } %>
</li>
<li>
<%= submit_tag ts("Save Without Posting"), name: "save_button" %>
<%= submit_tag ts("Save As Draft"), name: "save_button" %>
</li>
<% end %>
<li><%= submit_tag ts("Edit"), name: "edit_button" %></li>
Expand Down
4 changes: 2 additions & 2 deletions app/views/works/_standard_form.html.erb
Expand Up @@ -329,14 +329,14 @@
<ul class="actions">
<% unless @work.new_record? || @work.posted? %>
<li>
<%= submit_tag ts("Save Without Posting"), name: "save_button" %>
<%= submit_tag ts("Save As Draft"), name: "save_button" %>
</li>
<% end %>
<li>
<%= submit_tag ts("Preview"), name: "preview_button" %>
</li>
<li>
<%= submit_tag ts("Post Without Preview"), name: "post_button",
<%= submit_tag ts("Post"), name: "post_button",
data: { disable_with: ts("Please wait...") } %>
</li>
<li>
Expand Down
9 changes: 4 additions & 5 deletions app/views/works/edit_tags.html.erb
Expand Up @@ -11,7 +11,7 @@
<!--/descriptions-->

<!--main content-->
<%= form_for(@work, html: { id: "work-form", class: "verbose work post" }, url: { action: "update_tags" }) do |f| %>
<%= form_for(@work, html: { id: "work-form", class: "verbose work post" }, url: { action: "update_tags" }) do |f| %>
<p class="required notice">* <%= ts('Required information') %></p>

<%= render 'work_form_tags', include_blank: false %>
Expand All @@ -30,13 +30,12 @@
<legend><%= ts('Post Work') %></legend>
<ul class="actions">
<% unless @work.posted? %>
<li><%= submit_tag ts('Save Without Posting'), name: 'save_button' %></li>
<li><%= submit_tag ts('Save As Draft'), name: 'save_button' %></li>
<% end %>
<li><%= submit_tag ts('Preview'), name: 'preview_button' %></li>
<li><%= submit_tag ts('Post Without Preview'), name: 'update_button' %></li>
<li><%= submit_tag ts('Post'), name: 'update_button' %></li>
<li><%= submit_tag ts('Cancel'), name: 'cancel_button' %></li>
</ul>
</ul>
</fieldset>
<% end %>
<!--/content-->

2 changes: 1 addition & 1 deletion app/views/works/preview.html.erb
Expand Up @@ -55,7 +55,7 @@
data: { disable_with: ts("Please wait...") } %>
</li>
<li>
<%= submit_tag ts("Save Without Posting"), name: "save_button" %>
<%= submit_tag ts("Save As Draft"), name: "save_button" %>
</li>
<% end %>
<li><%= submit_tag ts("Edit"), name: "edit_button" %></li>
Expand Down
2 changes: 1 addition & 1 deletion app/views/works/preview_tags.html.erb
Expand Up @@ -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' %>
Expand Down
4 changes: 2 additions & 2 deletions features/admins/admin_works.feature
Expand Up @@ -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"
Expand Down Expand Up @@ -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"

Expand Down
7 changes: 3 additions & 4 deletions features/collections/collectible_multiple_collections.feature
Expand Up @@ -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"
Expand All @@ -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"

18 changes: 9 additions & 9 deletions features/collections/collection_anonymity.feature
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions features/collections/collection_navigation.feature
Expand Up @@ -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"
Expand All @@ -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 ("
Expand Down
2 changes: 1 addition & 1 deletion features/importing/archivist.feature
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion features/importing/work_import.feature
Expand Up @@ -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
Expand Down