AO3-3245 - Update tests and move. Reduce owner check in controller. Update translation key

Author: strictlyNDN

app/controllers/works_controller.rb

@@ -244,8 +244,8 @@ def new
     @unposted = current_user.unposted_work
 
     # Check if collection is closed and user doesn't have permission to post
-    if @collection&.closed? && !@collection&.user_is_owner?(current_user) && !@collection&.user_is_maintainer?(current_user)
-      flash[:error] = t(".closed_collection_error", collection_title: @collection.title)
+    if @collection&.closed? && !@collection&.user_is_maintainer?(current_user)
+      flash[:error] = t(".closed_collection", collection_title: @collection.title)
       redirect_to collection_path(@collection) and return
     end
 

config/locales/controllers/en.yml

@@ -305,7 +305,7 @@ en:
     edit_tags:
       page_title: Edit Work Tags
     new:
-      closed_collection_error: Sorry, the collection %{collection_title} is closed, new works cannot be added to it.
+      closed_collection: Sorry, the collection %{collection_title} is closed. New works cannot be added to it.
     show:
       page_title:
         unrevealed: Mystery Work

spec/controllers/works/default_rails_actions_spec.rb

@@ -195,6 +195,60 @@ def call_with_params(params)
       it_redirects_to_simple(user_path(banned_user))
       expect(flash[:error]).to include("Your account has been banned.")
     end
+
+    context "when collection is closed" do
+      let(:collection) { create(:collection, title: "Excalibur", collection_preference: create(:collection_preference, closed: true)) }
+      let(:user) { create(:user) }
+
+      before { fake_login_known_user(user) }
+
+      it "redirects to collection page with error for non-maintainers" do
+        get :new, params: { collection_id: collection.name }
+        it_redirects_to_with_error(collection_path(collection), "Sorry, the collection Excalibur is closed. New works cannot be added to it.")
+      end
+    end
+
+    context "when collection is closed but user is owner" do
+      let(:user) { create(:user) }
+      let(:collection) { create(:collection, title: "Excalibur", collection_preference: create(:collection_preference, closed: true)) }
+      let!(:participant) { collection.collection_participants.create(pseud: user.default_pseud, participant_role: CollectionParticipant::OWNER) }
+
+      before do
+        fake_login_known_user(user)
+      end
+
+      it "allows access to new work form" do
+        get :new, params: { collection_id: collection.name }
+        expect(response).to render_template("new")
+      end
+    end
+
+    context "when collection is closed but user is maintainer" do
+      let(:user) { create(:user) }
+      let(:collection) { create(:collection, title: "Excalibur", collection_preference: create(:collection_preference, closed: true)) }
+      let!(:participant) { collection.collection_participants.create(pseud: user.default_pseud, participant_role: CollectionParticipant::MODERATOR) }
+
+      before do
+        fake_login_known_user(user)
+      end
+
+      it "allows access to new work form" do
+        get :new, params: { collection_id: collection.name }
+        expect(response).to render_template("new")
+      end
+    end
+
+    context "when collection is open" do
+      let(:collection) { create(:collection, title: "Excalibur", collection_preference: create(:collection_preference, closed: false)) }
+      let(:user) { create(:user) }
+
+      before { fake_login_known_user(user) }
+
+      it "allows access to new work form" do
+        get :new, params: { collection_id: collection.name }
+        expect(response).to render_template("new")
+      end
+    end
   end
 
   describe "create" do

spec/controllers/works/works_controller_spec.rb

@@ -6,62 +6,6 @@
   include LoginMacros
   include RedirectExpectationHelper
 
-  describe "GET #new" do
-    context "when collection is closed" do
-      let(:collection) { create(:collection, title: "Excalibur", collection_preference: create(:collection_preference, closed: true)) }
-      let(:user) { create(:user) }
-
-      before { fake_login_known_user(user) }
-
-      it "redirects to collection page with error for non-maintainers" do
-        get :new, params: { collection_id: collection.name }
-        it_redirects_to_with_error(collection_path(collection), "Sorry, the collection Excalibur is closed, new works cannot be added to it.")
-      end
-    end
-
-    context "when collection is closed but user is owner" do
-      let(:user) { create(:user) }
-      let(:collection) { create(:collection, title: "Excalibur", collection_preference: create(:collection_preference, closed: true)) }
-
-      before do
-        fake_login_known_user(user)
-        collection.collection_participants.create(pseud: user.default_pseud, participant_role: CollectionParticipant::OWNER)
-      end
-
-      it "allows access to new work form" do
-        get :new, params: { collection_id: collection.name }
-        expect(response).to render_template("new")
-      end
-    end
-
-    context "when collection is closed but user is maintainer" do
-      let(:user) { create(:user) }
-      let(:collection) { create(:collection, title: "Excalibur", collection_preference: create(:collection_preference, closed: true)) }
-
-      before do
-        fake_login_known_user(user)
-        collection.collection_participants.create(pseud: user.default_pseud, participant_role: CollectionParticipant::MODERATOR)
-      end
-
-      it "allows access to new work form" do
-        get :new, params: { collection_id: collection.name }
-        expect(response).to render_template("new")
-      end
-    end
-
-    context "when collection is open" do
-      let(:collection) { create(:collection, title: "Excalibur", collection_preference: create(:collection_preference, closed: false)) }
-      let(:user) { create(:user) }
-
-      before { fake_login_known_user(user) }
-
-      it "allows access to new work form" do
-        get :new, params: { collection_id: collection.name }
-        expect(response).to render_template("new")
-      end
-    end
-  end
-
   describe "GET #navigate" do
     context "denies access for work that isn't visible to user" do
       subject { get :navigate, params: { id: work.id } }