From 4f2de80281719ca5aa48adb2e711a79d40c9ebdb Mon Sep 17 00:00:00 2001 From: Rafael Reggiani Manzo Date: Wed, 26 Feb 2014 18:22:20 -0300 Subject: [PATCH] Fixed MetricConfigurationsController before_filter order --- app/controllers/metric_configurations_controller.rb | 2 +- spec/controllers/metric_configurations_controller_spec.rb | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/app/controllers/metric_configurations_controller.rb b/app/controllers/metric_configurations_controller.rb index a263dc2..edf0bfc 100644 --- a/app/controllers/metric_configurations_controller.rb +++ b/app/controllers/metric_configurations_controller.rb @@ -3,9 +3,9 @@ include MetricConfigurationsConcern class MetricConfigurationsController < ApplicationController before_action :authenticate_user!, except: [:show, :index] - before_action :set_metric_configuration, only: [:show, :edit, :update, :destroy] before_action :metric_configuration_owner?, only: [:edit, :update, :destroy] before_action :mezuro_configuration_owner?, only: [:new, :create, :choose_metric] + before_action :set_metric_configuration, only: [:show, :edit, :update, :destroy] def choose_metric @mezuro_configuration_id = params[:mezuro_configuration_id].to_i diff --git a/spec/controllers/metric_configurations_controller_spec.rb b/spec/controllers/metric_configurations_controller_spec.rb index e8091e9..dc0ab86 100644 --- a/spec/controllers/metric_configurations_controller_spec.rb +++ b/spec/controllers/metric_configurations_controller_spec.rb @@ -121,7 +121,6 @@ describe MetricConfigurationsController do context 'when the user does not own the metric configuration' do before do - MetricConfiguration.expects(:find).at_least_once.with(metric_configuration.id).returns(metric_configuration) get :edit, id: metric_configuration.id, mezuro_configuration_id: metric_configuration.configuration_id.to_s end @@ -180,8 +179,6 @@ describe MetricConfigurationsController do context 'when the user does not own the reading' do before :each do - MetricConfiguration.expects(:find).at_least_once.with(metric_configuration.id).returns(metric_configuration) - post :update, mezuro_configuration_id: metric_configuration.configuration_id, id: metric_configuration.id, metric_configuration: metric_configuration_params end @@ -214,8 +211,6 @@ describe MetricConfigurationsController do context "when the user doesn't own the configuration" do before :each do - MetricConfiguration.expects(:find).at_least_once.with(metric_configuration.id).returns(metric_configuration) - delete :destroy, id: metric_configuration.id, mezuro_configuration_id: metric_configuration.configuration_id.to_s end -- libgit2 0.21.2