Fixed ReadingsController before_filter order

Rafael Manzo
1 parent 4f2de802
Showing 2 changed files with 1 additions and 7 deletions Show diff stats
app/controllers/readings_controller.rb
spec/controllers/readings_controller_spec.rb
@@ -2,9 +2,9 @@ include OwnershipAuthentication
 class ReadingsController < ApplicationController
   before_action :authenticate_user!, except: [:index]
-  before_action :set_reading, only: [:edit, :update, :destroy]
   before_action :reading_owner?, except: [:new, :create]
   before_action :reading_group_owner?, only: [:new, :create]
+  before_action :set_reading, only: [:edit, :update, :destroy]
   def new
     @reading_group_id = params[:reading_group_id]
@@ -83,8 +83,6 @@ describe ReadingsController do
       context 'when the user does not own the reading' do
         before do
-          Reading.expects(:find).at_least_once.with(reading.id).returns(reading)
-
           get :edit, id: reading.id, reading_group_id: reading_group.id.to_s
         end
@@ -143,8 +141,6 @@ describe ReadingsController do
       context 'when the user does not own the reading' do
         before :each do
-          Reading.expects(:find).at_least_once.with(reading.id).returns(reading)
-
           post :update, reading_group_id: reading_group.id, id: reading.id, reading: reading_params
         end
@@ -184,8 +180,6 @@ describe ReadingsController do
       context "when the user doesn't own the reading group" do
         before :each do
-          Reading.expects(:find).at_least_once.with(reading.id).returns(reading)
-
           delete :destroy, id: reading.id, reading_group_id: reading.group_id.to_s
         end