Expand publications controller tests, clarify #show

.ruby-gemset

@@ -1 +1 @@
-aaec
+aaec

app/controllers/publications_controller.rb

@@ -111,12 +111,14 @@ def index
   end
 
   def show
+    return unless session[:admin]
+
     resource = controller_name.singularize
     resource_instance = instance_variable_get("@#{resource}")
 
     raise ActiveRecord::RecordNotFound unless resource_instance
 
-    @submitter = helpers.find_submitter(resource_instance.id) if session[:admin]
+    @submitter = helpers.find_submitter(resource_instance.id)
   end
 
   def new

spec/controllers/publications_controller/publications_controller_show_spec.rb

@@ -11,7 +11,9 @@
 # need to define it here.
 RSpec.describe BooksController, type: :controller do
   let(:submitter) { FactoryBot.create(:submitter) }
+  let(:another_submitter) { FactoryBot.create(:submitter) }
   let(:book) { FactoryBot.create(:book, submitter_id: submitter.id.to_s) }
+  let(:another_book) { FactoryBot.create(:book, submitter_id: another_submitter.id.to_s) }
 
   before do
     book
@@ -44,13 +46,13 @@
     end
 
     context 'as a submitter' do
-      context 'who owns the book' do
-        before do
-          session[:admin] = nil
-          book
-          login_as_submitter_of(book)
-        end
+      before do
+        session[:admin] = nil
+        book
+        login_as_submitter_of(book)
+      end
 
+      context 'who owns the book' do
         it 'does not set @submitter' do
           get :show, params: { id: book.id }
           expect(assigns(:submitter)).to be_nil
@@ -61,6 +63,13 @@
           expect(response).to render_template(:show)
         end
       end
+
+      context 'who does not own the book' do
+        it 'raises a 404 not found error and does not set submitter' do
+          expect { get :show, params: { id: another_book.id } }.to raise_error(ActiveRecord::RecordNotFound)
+          expect(assigns(:submitter)).to be_nil
+        end
+      end
     end
   end
 end

spec/controllers/publications_controller/publications_controller_update_spec.rb

@@ -92,8 +92,9 @@
 
       context 'and the book does not belong to the submitter' do
         it 'does not update the requested book and raises a 404 error' do
-          expect {
-            put :update, params: { id: already_created_book_by_another_submitter.id, book: new_attributes }}
+          expect do
+            put :update, params: { id: already_created_book_by_another_submitter.id, book: new_attributes }
+          end
             .to raise_error(ActiveRecord::RecordNotFound)
 
           already_created_book_by_another_submitter.reload