Correct error handling for resource finding in controllers

Error handling for finding resources in controllers used a find_resource method. It was broken and was letting code pass-through after errors. In addition, cases for find methods for things other than simple IDs weren't handled. Replace it with an error handler in ApplicationController capturing RecordNotFound exceptions and returning the appropriate error pages (or JSON). Also, fix usages of find that should throw errors (using ActiveRecord methods ending with !) but didn't. Correspondly, fix all the tests that mocked the find_resource method, and correct expectations where needed. Signed-off-by: Daniel Miranda <danielkza2@gmail.com>

Correct error handling for resource finding in controllers
Error handling for finding resources in controllers used a find_resource method. It was broken and was letting code pass-through after errors. In addition, cases for find methods for things other than simple IDs weren't handled. Replace it with an error handler in ApplicationController capturing RecordNotFound exceptions and returning the appropriate error pages (or JSON). Also, fix usages of find that should throw errors (using ActiveRecord methods ending with !) but didn't. Correspondly, fix all the tests that mocked the find_resource method, and correct expectations where needed. Signed-off-by: Daniel Miranda <danielkza2@gmail.com>
Diego Camarinha
1 parent 6d763d65
Showing 25 changed files with 74 additions and 122 deletions Show diff stats
app/controllers/application_controller.rb
app/controllers/base_metric_configurations_controller.rb
app/controllers/concerns/metric_configurations_concern.rb
app/controllers/concerns/resource_finder.rb
app/controllers/kalibro_configurations_controller.rb
app/controllers/kalibro_ranges_controller.rb
app/controllers/metric_configurations_controller.rb
app/controllers/modules_controller.rb
app/controllers/projects_controller.rb
app/controllers/reading_groups_controller.rb
app/controllers/readings_controller.rb
app/controllers/repositories_controller.rb
app/helpers/metric_configurations_helper.rb
spec/controllers/base_metric_configurations_controller_spec.rb
spec/controllers/compound_metric_configurations_controller_spec.rb
spec/controllers/concerns/metric_configurations_concern_spec.rb
spec/controllers/concerns/resource_finder_spec.rb
spec/controllers/kalibro_configurations_controller_spec.rb
spec/controllers/kalibro_ranges_controller_spec.rb
spec/controllers/metric_configurations_controller_spec.rb
@@ -10,6 +10,9 @@ class ApplicationController &lt; ActionController::Base
   before_filter :configure_permitted_parameters, if: :devise_controller?
   before_filter :set_locale
+  rescue_from ActiveRecord::RecordNotFound, with: :not_found
+  rescue_from KalibroClient::Errors::RecordNotFound, with: :not_found
+
   class << self
     # This is necessary for correct devise routing with locales: https://github.com/plataformatec/devise/wiki/How-To:--Redirect-with-locale-after-authentication-failure
     def default_url_options
@@ -28,6 +31,13 @@ class ApplicationController &lt; ActionController::Base
   protected
+  def not_found(exception)
+    respond_to do |format|
+      format.html { render file: "#{Rails.root}/public/404", layout: false, status: :not_found }
+      format.json { head :not_found }
+    end
+  end
+
   # We don't have a way to test this unless we have the Devise controllers among our code.
   # Since creating the controllers looks wronger than not testing this two
   # lines. I think we can live without 100% of coverage
 include OwnershipAuthentication
 include MetricConfigurationsConcern
-include ResourceFinder
 class BaseMetricConfigurationsController < ApplicationController
   before_action :authenticate_user!, except: [:show, :index]
@@ -2,6 +2,6 @@ module MetricConfigurationsConcern
   extend ActiveSupport::Concern
   def set_metric_configuration
-    @metric_configuration = find_resource(MetricConfiguration, params[:id].to_i)
+    @metric_configuration = MetricConfiguration.find(params[:id].to_i)
   end
 end
@@ -1,15 +0,0 @@
-module ResourceFinder
-  extend ActiveSupport::Concern
-
-  def find_resource(klass, id)
-    begin
-      klass.find(id)
-    rescue KalibroClient::Errors::RecordNotFound
-      respond_to do |format|
-        format.html { render file: "#{Rails.root}/public/404", layout: false, status: :not_found }
-      end
-
-      return
-    end
-  end
-end
 \ No newline at end of file
 include OwnershipAuthentication
-include ResourceFinder
 class KalibroConfigurationsController < ApplicationController
   before_action :authenticate_user!, except: [:index, :show]
@@ -54,7 +53,7 @@ class KalibroConfigurationsController &lt; ApplicationController
   # DELETE /kalibro_configurations/1.json
   def destroy
     set_kalibro_configuration
-    current_user.kalibro_configuration_ownerships.find_by_kalibro_configuration_id(@kalibro_configuration.id).destroy
+    current_user.kalibro_configuration_ownerships.find_by_kalibro_configuration_id!(@kalibro_configuration.id).destroy
     @kalibro_configuration.destroy
     respond_to do |format|
       format.html { redirect_to kalibro_configurations_url }
@@ -66,7 +65,7 @@ class KalibroConfigurationsController &lt; ApplicationController
   private
   # Use callbacks to share common setup or constraints between actions.
   def set_kalibro_configuration
-    @kalibro_configuration = find_resource(KalibroConfiguration, params[:id].to_i)
+    @kalibro_configuration = KalibroConfiguration.find(params[:id].to_i)
   end
   # Never trust parameters from the scary internet, only allow the white list through.
 include OwnershipAuthentication
-include ResourceFinder
 class KalibroRangesController < ApplicationController
   before_action :authenticate_user!, except: [:show]
@@ -60,7 +59,8 @@ class KalibroRangesController &lt; ApplicationController
   end
   def format_metric_configuration_path(format, notice)
-    @metric_configuration = MetricConfiguration.find @kalibro_range.metric_configuration_id
+    @metric_configuration = MetricConfiguration.find(@kalibro_range.metric_configuration_id)
+
     if(@metric_configuration.metric.is_a? KalibroClient::Entities::Miscellaneous::CompoundMetric)
       format.html { redirect_to kalibro_configuration_compound_metric_configuration_path(
         @kalibro_configuration_id, @metric_configuration_id), notice: notice }
@@ -93,6 +93,6 @@ class KalibroRangesController &lt; ApplicationController
   end
   def set_kalibro_range
-    @kalibro_range = find_resource(KalibroRange, params[:id].to_i)
+    @kalibro_range = KalibroRange.find(params[:id].to_i)
   end
 end
@@ -7,6 +7,7 @@ class MetricConfigurationsController &lt; BaseMetricConfigurationsController
   def new
     super
+    # find_by_name throws an exception instead of returning nil, unlike ActiveRecord's API
     metric_configuration.metric = KalibroClient::Entities::Processor::MetricCollectorDetails.find_by_name(params[:metric_collector_name]).find_metric_by_code params[:metric_code]
   end
-include ResourceFinder
-
 class ModulesController < ApplicationController
   # POST /modules/1/metric_history
   def metric_history
-    @module_result = find_resource(ModuleResult, params[:id].to_i)
+    @module_result = ModuleResult.find(params[:id].to_i)
     @container = params[:container]
     @metric_name = params[:metric_name]
   end
   # POST /modules/1/tree
   def load_module_tree
-    @root_module_result = find_resource(ModuleResult, params[:id].to_i)
+    @root_module_result = ModuleResult.find(params[:id].to_i)
   end
-end
 \ No newline at end of file
+end
 include OwnershipAuthentication
-include ResourceFinder
 class ProjectsController < ApplicationController
   before_action :authenticate_user!,
@@ -55,7 +54,7 @@ class ProjectsController &lt; ApplicationController
   # DELETE /project/1.json
   def destroy
     set_project
-    current_user.project_attributes.find_by_project_id(@project.id).destroy
+    current_user.project_attributes.find_by_project_id!(@project.id).destroy
     @project.destroy
     respond_to do |format|
       format.html { redirect_to projects_url }
@@ -66,7 +65,7 @@ class ProjectsController &lt; ApplicationController
   private
   # Use callbacks to share common setup or constraints between actions.
   def set_project
-    @project = find_resource(Project, params[:id].to_i)
+    @project = Project.find(params[:id].to_i)
   end
   # Never trust parameters from the scary internet, only allow the white list through.
 include OwnershipAuthentication
-include ResourceFinder
 class ReadingGroupsController < ApplicationController
   before_action :authenticate_user!, except: [:index, :show]
@@ -45,7 +44,7 @@ class ReadingGroupsController &lt; ApplicationController
   # DELETE /reading_group/1
   # DELETE /reading_group/1.json
   def destroy
-    current_user.reading_group_ownerships.find_by_reading_group_id(@reading_group.id).destroy
+    current_user.reading_group_ownerships.find_by_reading_group_id!(@reading_group.id).destroy
     @reading_group.destroy
     respond_to do |format|
       format.html { redirect_to reading_groups_url }
@@ -57,7 +56,7 @@ class ReadingGroupsController &lt; ApplicationController
   # Use callbacks to share common setup or constraints between actions.
   def set_reading_group
-    @reading_group = find_resource(ReadingGroup, params[:id].to_i)
+    @reading_group = ReadingGroup.find(params[:id].to_i)
   end
   # Never trust parameters from the scary internet, only allow the white list through.
 include OwnershipAuthentication
-include ResourceFinder
 class ReadingsController < ApplicationController
   before_action :authenticate_user!, except: [:index]
@@ -71,6 +70,6 @@ class ReadingsController &lt; ApplicationController
   end
   def set_reading
-    @reading = find_resource(Reading, params[:id].to_i)
+    @reading = Reading.find(params[:id].to_i)
   end
 end
 include OwnershipAuthentication
-include ResourceFinder
 class RepositoriesController < ApplicationController
   before_action :authenticate_user!, except: [:show, :state, :state_with_date]
@@ -101,11 +100,13 @@ private
   # Use callbacks to share common setup or constraints between actions.
   def set_repository
-    @repository = find_resource(Repository, params[:id].to_i)
+    @repository = Repository.find(params[:id].to_i)
   end
   def set_kalibro_configuration
-    @kalibro_configuration = KalibroConfiguration.find(@repository.kalibro_configuration_id)
+    if @repository
+      @kalibro_configuration = KalibroConfiguration.find(@repository.kalibro_configuration_id)
+    end
   end
   # Never trust parameters from the scary internet, only allow the white list through.
@@ -14,6 +14,7 @@ module MetricConfigurationsHelper
   end
   def supported_metrics_of(metric_collector_name)
+    # find_by_name throws an exception instead of returning nil, unlike ActiveRecord's API
     KalibroClient::Entities::Processor::MetricCollectorDetails.find_by_name(metric_collector_name).supported_metrics
   end
 end
@@ -117,7 +117,7 @@ describe InheritsFromBaseMetricConfigurationsController, :type =&gt; :controller do
     context 'with a valid metric_configuration' do
       before :each do
         ReadingGroup.expects(:find).with(metric_configuration.reading_group_id).returns(reading_group)
-        subject.expects(:find_resource).with(MetricConfiguration, metric_configuration.id).returns(metric_configuration)
+        MetricConfiguration.expects(:find).with(metric_configuration.id).returns(metric_configuration)
         metric_configuration.expects(:kalibro_ranges).returns([kalibro_range])
         get :show, kalibro_configuration_id: metric_configuration.kalibro_configuration_id.to_s, id: metric_configuration.id
@@ -74,7 +74,7 @@ describe CompoundMetricConfigurationsController, :type =&gt; :controller do
     before :each do
       ReadingGroup.expects(:find).with(compound_metric_configuration.reading_group_id).returns(reading_group)
-      subject.expects(:find_resource).with(MetricConfiguration, compound_metric_configuration.id).returns(compound_metric_configuration)
+      MetricConfiguration.expects(:find).with(compound_metric_configuration.id).returns(compound_metric_configuration)
       compound_metric_configuration.expects(:kalibro_ranges).returns([kalibro_range])
       get :show, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id.to_s, id: compound_metric_configuration.id
@@ -94,7 +94,7 @@ describe CompoundMetricConfigurationsController, :type =&gt; :controller do
       context 'when the user owns the compound metric configuration' do
         before :each do
           subject.expects(:metric_configuration_owner?).returns(true)
-          subject.expects(:find_resource).with(MetricConfiguration, compound_metric_configuration.id).returns(compound_metric_configuration)
+          MetricConfiguration.expects(:find).with(compound_metric_configuration.id).returns(compound_metric_configuration)
           MetricConfiguration.expects(:metric_configurations_of).with(kalibro_configuration.id).returns([compound_metric_configuration])
           get :edit, id: compound_metric_configuration.id, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id.to_s
         end
@@ -138,7 +138,7 @@ describe CompoundMetricConfigurationsController, :type =&gt; :controller do
         context 'with valid fields' do
           before :each do
-            subject.expects(:find_resource).with(MetricConfiguration, compound_metric_configuration.id).returns(compound_metric_configuration)
+            MetricConfiguration.expects(:find).with(compound_metric_configuration.id).returns(compound_metric_configuration)
             MetricConfiguration.any_instance.expects(:update).with(metric_configuration_params).returns(true)
             post :update, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id, id: compound_metric_configuration.id, metric_configuration: metric_configuration_params
@@ -150,7 +150,7 @@ describe CompoundMetricConfigurationsController, :type =&gt; :controller do
         context 'with an invalid field' do
           before :each do
-            subject.expects(:find_resource).with(MetricConfiguration, compound_metric_configuration.id).returns(compound_metric_configuration)
+            MetricConfiguration.expects(:find).with(compound_metric_configuration.id).returns(compound_metric_configuration)
             MetricConfiguration.expects(:metric_configurations_of).with(kalibro_configuration.id).returns([compound_metric_configuration])
             MetricConfiguration.any_instance.expects(:update).with(metric_configuration_params).returns(false)
@@ -6,7 +6,7 @@ describe MetricConfigurationsConcern, type: :controller do
     let! (:metric_configurations_controller) { MetricConfigurationsController.new }
     before :each do
-      metric_configurations_controller.expects(:find_resource).with(MetricConfiguration, metric_configuration.id).returns(metric_configuration)
+      MetricConfiguration.expects(:find).with(metric_configuration.id).returns(metric_configuration)
       metric_configurations_controller.params = {id: metric_configuration.id}
     end
@@ -14,4 +14,4 @@ describe MetricConfigurationsConcern, type: :controller do
       metric_configurations_controller.set_metric_configuration
     end
   end
-end
 \ No newline at end of file
+end
@@ -1,39 +0,0 @@
-require 'rails_helper'
-
-describe ResourceFinder, type: :controller do
-  describe 'find_resource' do
-    let(:klass) { mock('Resource') }
-    let(:id) { 1 }
-    let!(:projects_controller) {ProjectsController.new}
-
-    before do
-      projects_controller.extend(ResourceFinder)
-    end
-
-    context 'when the resource exists' do
-      let!(:resource) { mock('resource') }
-
-      before :each do
-        klass.expects(:find).with(id).returns(resource)
-      end
-
-      it 'is expect to return the resource' do
-        expect(projects_controller.find_resource(klass, id)).to eq(resource)
-      end
-    end
-
-    context 'when the resource does not exists' do
-      before :each do
-        klass.expects(:find).with(id).raises(KalibroClient::Errors::RecordNotFound)
-      end
-
-      # FIXME: this is not the best test, but it it's the closest we can think of
-      #        full coverage is achieved through projects_controller_spec.rb
-      it 'is expected to render the 404 page' do
-        projects_controller.expects(:respond_to)
-
-        projects_controller.find_resource(klass, id)
-      end
-    end
-  end
-end
 \ No newline at end of file
@@ -65,7 +65,7 @@ describe KalibroConfigurationsController, :type =&gt; :controller do
     before :each do
       kalibro_configuration.expects(:metric_configurations).returns(metric_configuration)
-      subject.expects(:find_resource).with(KalibroConfiguration, kalibro_configuration.id).returns(kalibro_configuration)
+      KalibroConfiguration.expects(:find).with(kalibro_configuration.id).returns(kalibro_configuration)
       get :show, :id => kalibro_configuration.id
     end
@@ -96,11 +96,11 @@ describe KalibroConfigurationsController, :type =&gt; :controller do
           #Those two mocks looks the same but they are necessary since params[:id] is a String and @configuration.id is an Integer :(
           @ownerships.expects(:find_by_kalibro_configuration_id).with("#{@subject.id}").returns(@ownership)
-          @ownerships.expects(:find_by_kalibro_configuration_id).with(@subject.id).returns(@ownership)
+          @ownerships.expects(:find_by_kalibro_configuration_id!).with(@subject.id).returns(@ownership)
           User.any_instance.expects(:kalibro_configuration_ownerships).at_least_once.returns(@ownerships)
-          subject.expects(:find_resource).with(KalibroConfiguration, @subject.id).returns(@subject)
+          KalibroConfiguration.expects(:find).with(@subject.id).returns(@subject)
           delete :destroy, :id => @subject.id
         end
@@ -160,7 +160,7 @@ describe KalibroConfigurationsController, :type =&gt; :controller do
       context 'when the user owns the kalibro_configuration' do
         before :each do
-          subject.expects(:find_resource).with(KalibroConfiguration, @subject.id).returns(@subject)
+          KalibroConfiguration.expects(:find).with(@subject.id).returns(@subject)
           @ownerships.expects(:find_by_kalibro_configuration_id).with("#{@subject.id}").returns(@ownership)
           get :edit, :id => @subject.id
@@ -215,7 +215,7 @@ describe KalibroConfigurationsController, :type =&gt; :controller do
         context 'with valid fields' do
           before :each do
-            subject.expects(:find_resource).with(KalibroConfiguration, kalibro_configuration.id).returns(kalibro_configuration)
+            KalibroConfiguration.expects(:find).with(kalibro_configuration.id).returns(kalibro_configuration)
             KalibroConfiguration.any_instance.expects(:update).with(kalibro_configuration_params).returns(true)
           end
@@ -240,7 +240,7 @@ describe KalibroConfigurationsController, :type =&gt; :controller do
         context 'with an invalid field' do
           before :each do
-            subject.expects(:find_resource).with(KalibroConfiguration, kalibro_configuration.id).returns(kalibro_configuration)
+            KalibroConfiguration.expects(:find).with(kalibro_configuration.id).returns(kalibro_configuration)
             KalibroConfiguration.any_instance.expects(:update).with(kalibro_configuration_params).returns(false)
             post :update, :id => kalibro_configuration.id, :kalibro_configuration => kalibro_configuration_params
@@ -97,7 +97,7 @@ describe KalibroRangesController, :type =&gt; :controller do
         before :each do
           subject.expects(:metric_configuration_owner?).returns true
           kalibro_range.expects(:destroy)
-          subject.expects(:find_resource).with(KalibroRange, kalibro_range.id).returns(kalibro_range)
+          KalibroRange.expects(:find).with(kalibro_range.id).returns(kalibro_range)
           MetricConfiguration.expects(:find).with(kalibro_range.metric_configuration_id).returns(metric_configuration)
           delete :destroy, id: kalibro_range.id, metric_configuration_id: metric_configuration.id, kalibro_configuration_id: metric_configuration.kalibro_configuration_id
@@ -114,7 +114,7 @@ describe KalibroRangesController, :type =&gt; :controller do
         before :each do
           subject.expects(:metric_configuration_owner?).returns true
           new_kalibro_range.expects(:destroy)
-          subject.expects(:find_resource).with(KalibroRange, new_kalibro_range.id).returns(new_kalibro_range)
+          KalibroRange.expects(:find).with(new_kalibro_range.id).returns(new_kalibro_range)
           MetricConfiguration.expects(:find).with(new_kalibro_range.metric_configuration_id).returns(compound_metric_configuration)
           delete :destroy, id: new_kalibro_range.id, metric_configuration_id: compound_metric_configuration.id, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id
@@ -156,7 +156,7 @@ describe KalibroRangesController, :type =&gt; :controller do
       context 'when the user owns the kalibro range' do
         before :each do
           subject.expects(:metric_configuration_owner?).returns true
-          subject.expects(:find_resource).with(KalibroRange, kalibro_range.id).returns(kalibro_range)
+          KalibroRange.expects(:find).with(kalibro_range.id).returns(kalibro_range)
           MetricConfiguration.expects(:find).with(metric_configuration.id).returns(metric_configuration)
           Reading.expects(:readings_of).with(metric_configuration.reading_group_id).returns([reading])
           get :edit, id: kalibro_range.id, kalibro_configuration_id: metric_configuration.kalibro_configuration_id, metric_configuration_id: metric_configuration.id
@@ -205,7 +205,7 @@ describe KalibroRangesController, :type =&gt; :controller do
         context 'with valid fields' do
           before :each do
-            subject.expects(:find_resource).with(KalibroRange, kalibro_range.id).returns(kalibro_range)
+            KalibroRange.expects(:find).with(kalibro_range.id).returns(kalibro_range)
             KalibroRange.any_instance.expects(:update).with(kalibro_range_params).returns(true)
             MetricConfiguration.expects(:find).with(kalibro_range.metric_configuration_id).returns(metric_configuration)
@@ -221,7 +221,7 @@ describe KalibroRangesController, :type =&gt; :controller do
           let(:new_kalibro_range) { FactoryGirl.build(:kalibro_range_with_id, metric_configuration_id: compound_metric_configuration.id) }
           before :each do
-            subject.expects(:find_resource).with(KalibroRange, new_kalibro_range.id).returns(new_kalibro_range)
+            KalibroRange.expects(:find).with(new_kalibro_range.id).returns(new_kalibro_range)
             KalibroRange.any_instance.expects(:update).with(new_kalibro_range.to_hash).returns(true)
             MetricConfiguration.expects(:find).with(new_kalibro_range.metric_configuration_id).returns(compound_metric_configuration)
@@ -234,7 +234,7 @@ describe KalibroRangesController, :type =&gt; :controller do
         context 'with an invalid field' do
           before :each do
-            subject.expects(:find_resource).with(KalibroRange, kalibro_range.id).returns(kalibro_range)
+            KalibroRange.expects(:find).with(kalibro_range.id).returns(kalibro_range)
             KalibroRange.any_instance.expects(:update).with(kalibro_range_params).returns(false)
             MetricConfiguration.expects(:find).with(metric_configuration.id).returns(metric_configuration)
             Reading.expects(:readings_of).with(metric_configuration.reading_group_id).returns([reading])
@@ -97,7 +97,7 @@ describe MetricConfigurationsController, :type =&gt; :controller do
     before :each do
       ReadingGroup.expects(:find).with(metric_configuration.reading_group_id).returns(reading_group)
-      subject.expects(:find_resource).with(MetricConfiguration, metric_configuration.id).returns(metric_configuration)
+      MetricConfiguration.expects(:find).with(metric_configuration.id).returns(metric_configuration)
       metric_configuration.expects(:kalibro_ranges).returns([kalibro_range])
       get :show, kalibro_configuration_id: metric_configuration.kalibro_configuration_id.to_s, id: metric_configuration.id
@@ -117,7 +117,7 @@ describe MetricConfigurationsController, :type =&gt; :controller do
       context 'when the user owns the metric configuration' do
         before :each do
           subject.expects(:metric_configuration_owner?).returns(true)
-          subject.expects(:find_resource).with(MetricConfiguration, metric_configuration.id).returns(metric_configuration)
+          MetricConfiguration.expects(:find).with(metric_configuration.id).returns(metric_configuration)
           get :edit, id: metric_configuration.id, kalibro_configuration_id: metric_configuration.kalibro_configuration_id.to_s
         end
@@ -160,7 +160,7 @@ describe MetricConfigurationsController, :type =&gt; :controller do
         context 'with valid fields' do
           before :each do
-            subject.expects(:find_resource).with(MetricConfiguration, metric_configuration.id).returns(metric_configuration)
+            MetricConfiguration.expects(:find).with(metric_configuration.id).returns(metric_configuration)
             MetricConfiguration.any_instance.expects(:update).with(metric_configuration_params).returns(true)
             post :update, kalibro_configuration_id: metric_configuration.kalibro_configuration_id, id: metric_configuration.id, metric_configuration: metric_configuration_params
@@ -172,7 +172,7 @@ describe MetricConfigurationsController, :type =&gt; :controller do
         context 'with an invalid field' do
           before :each do
-            subject.expects(:find_resource).with(MetricConfiguration, metric_configuration.id).returns(metric_configuration)
+            MetricConfiguration.expects(:find).with(metric_configuration.id).returns(metric_configuration)
             MetricConfiguration.any_instance.expects(:update).with(metric_configuration_params).returns(false)
             post :update, kalibro_configuration_id: metric_configuration.kalibro_configuration_id, id: metric_configuration.id, metric_configuration: metric_configuration_params
@@ -205,7 +205,7 @@ describe MetricConfigurationsController, :type =&gt; :controller do
         before :each do
           subject.expects(:metric_configuration_owner?).returns true
           metric_configuration.expects(:destroy)
-          subject.expects(:find_resource).with(MetricConfiguration, metric_configuration.id).returns(metric_configuration)
+          MetricConfiguration.expects(:find).with(metric_configuration.id).returns(metric_configuration)
           delete :destroy, id: metric_configuration.id, kalibro_configuration_id: metric_configuration.kalibro_configuration_id.to_s
         end
@@ -3,7 +3,7 @@ require &#39;rails_helper&#39;
 describe ModulesController, :type => :controller do
   describe "load_module_tree" do
     before :each do
-      subject.expects(:find_resource).with(ModuleResult, 42).returns(FactoryGirl.build(:module_result))
+      ModuleResult.expects(:find).with(42).returns(FactoryGirl.build(:module_result))
       post :load_module_tree, id: 42, format: :js
     end
@@ -20,7 +20,7 @@ describe ModulesController, :type =&gt; :controller do
     let! (:module_result){ FactoryGirl.build(:module_result) }
     before :each do
-      subject.expects(:find_resource).with(ModuleResult, module_result.id).returns(module_result)
+      ModuleResult.expects(:find).with(module_result.id).returns(module_result)
       subject.expire_fragment("#{module_result.id}_#{metric_name}")
       xhr :get, :metric_history, {id: module_result.id, metric_name: metric_name, module_id: module_id}
@@ -65,7 +65,7 @@ describe ProjectsController, :type =&gt; :controller do
     context 'when the project exists' do
       let(:repository) { FactoryGirl.build(:repository) }
       before :each do
-        subject.expects(:find_resource).with(Project, project.id).returns(project)
+        Project.expects(:find).with(project.id).returns(project)
         project.expects(:repositories).returns(repository)
         get :show, :id => project.id
       end
@@ -102,11 +102,11 @@ describe ProjectsController, :type =&gt; :controller do
           #Those two mocks looks the same but they are necessary since params[:id] is a String and @project.id is an Integer :(
           @attributes.expects(:find_by_project_id).with("#{@subject.id}").returns(@project_attributes)
-          @attributes.expects(:find_by_project_id).with(@subject.id).returns(@project_attributes)
+          @attributes.expects(:find_by_project_id!).with(@subject.id).returns(@project_attributes)
           User.any_instance.expects(:project_attributes).at_least_once.returns(@attributes)
-          subject.expects(:find_resource).with(Project, @subject.id).returns(@subject)
+          Project.expects(:find).with(@subject.id).returns(@subject)
           delete :destroy, :id => @subject.id
         end
@@ -168,7 +168,7 @@ describe ProjectsController, :type =&gt; :controller do
       context 'when the user owns the project' do
         before :each do
-          subject.expects(:find_resource).with(Project, @subject.id).returns(@subject)
+          Project.expects(:find).with(@subject.id).returns(@subject)
           @attributes.expects(:find_by_project_id).with("#{@subject.id}").returns(@attribute)
           get :edit, :id => @subject.id
@@ -224,7 +224,7 @@ describe ProjectsController, :type =&gt; :controller do
         context 'with valid fields' do
           before :each do
-            subject.expects(:find_resource).with(Project, @subject.id).returns(@subject)
+            Project.expects(:find).with(@subject.id).returns(@subject)
             Project.any_instance.expects(:update).with(@subject_params).returns(true)
             @project_attributes.expects(:update).with(image_url: @subject_params[:image_url]).returns(true)
             @subject.expects(:attributes).returns(@project_attributes)
@@ -251,7 +251,7 @@ describe ProjectsController, :type =&gt; :controller do
         context 'with an invalid field' do
           before :each do
-            subject.expects(:find_resource).with(Project, @subject.id).returns(@subject)
+            Project.expects(:find).with(@subject.id).returns(@subject)
             Project.any_instance.expects(:update).with(@subject_params).returns(false)
             post :update, :id => @subject.id, :project => @subject_params
@@ -62,7 +62,7 @@ describe ReadingGroupsController, :type =&gt; :controller do
     let!(:reading_group) { FactoryGirl.build(:reading_group_with_id) }
     let(:reading) { FactoryGirl.build(:reading_with_id) }
     before :each do
-      subject.expects(:find_resource).with(ReadingGroup, reading_group.id).returns(reading_group)
+      ReadingGroup.expects(:find).with(reading_group.id).returns(reading_group)
       get :show, :id => reading_group.id
     end
@@ -89,11 +89,11 @@ describe ReadingGroupsController, :type =&gt; :controller do
           #Those two mocks looks the same but they are necessary since params[:id] is a String and @ReadingGroup.id is an Integer :(
           @ownerships.expects(:find_by_reading_group_id).with("#{@subject.id}").returns(@ownership)
-          @ownerships.expects(:find_by_reading_group_id).with(@subject.id).returns(@ownership)
+          @ownerships.expects(:find_by_reading_group_id!).with(@subject.id).returns(@ownership)
           User.any_instance.expects(:reading_group_ownerships).at_least_once.returns(@ownerships)
-          subject.expects(:find_resource).with(ReadingGroup, @subject.id).returns(@subject)
+          ReadingGroup.expects(:find).with(@subject.id).returns(@subject)
           delete :destroy, :id => @subject.id
         end
@@ -153,7 +153,7 @@ describe ReadingGroupsController, :type =&gt; :controller do
       context 'when the user owns the reading group' do
         before :each do
-          subject.expects(:find_resource).with(ReadingGroup, @subject.id).returns(@subject)
+          ReadingGroup.expects(:find).with(@subject.id).returns(@subject)
           @ownerships.expects(:find_by_reading_group_id).with("#{@subject.id}").returns(@ownership)
           get :edit, :id => @subject.id
@@ -210,7 +210,7 @@ describe ReadingGroupsController, :type =&gt; :controller do
         context 'with valid fields' do
           before :each do
-            subject.expects(:find_resource).with(ReadingGroup, @subject.id).returns(@subject)
+            ReadingGroup.expects(:find).with(@subject.id).returns(@subject)
             ReadingGroup.any_instance.expects(:update).with(@subject_params).returns(true)
           end
@@ -235,7 +235,7 @@ describe ReadingGroupsController, :type =&gt; :controller do
         context 'with an invalid field' do
           before :each do
-            subject.expects(:find_resource).with(ReadingGroup, @subject.id).returns(@subject)
+            ReadingGroup.expects(:find).with(@subject.id).returns(@subject)
             ReadingGroup.any_instance.expects(:update).with(@subject_params).returns(false)
             post :update, :id => @subject.id, :reading_group => @subject_params
@@ -74,7 +74,7 @@ describe ReadingsController, :type =&gt; :controller do
       context 'when the user owns the reading' do
         before :each do
           subject.expects(:reading_owner?).returns true
-          subject.expects(:find_resource).with(Reading, reading.id).returns(reading)
+          Reading.expects(:find).with(reading.id).returns(reading)
           get :edit, id: reading.id, reading_group_id: reading_group.id.to_s
         end
@@ -117,7 +117,7 @@ describe ReadingsController, :type =&gt; :controller do
         context 'with valid fields' do
           before :each do
-            subject.expects(:find_resource).with(Reading, reading.id).returns(reading)
+            Reading.expects(:find).with(reading.id).returns(reading)
             Reading.any_instance.expects(:update).with(reading_params).returns(true)
             post :update, reading_group_id: reading_group.id, id: reading.id, reading: reading_params
@@ -129,7 +129,7 @@ describe ReadingsController, :type =&gt; :controller do
         context 'with an invalid field' do
           before :each do
-            subject.expects(:find_resource).with(Reading, reading.id).returns(reading)
+            Reading.expects(:find).with(reading.id).returns(reading)
             Reading.any_instance.expects(:update).with(reading_params).returns(false)
             post :update, reading_group_id: reading_group.id, id: reading.id, reading: reading_params
@@ -169,7 +169,7 @@ describe ReadingsController, :type =&gt; :controller do
         before :each do
           subject.expects(:reading_owner?).returns true
           reading.expects(:destroy)
-          subject.expects(:find_resource).with(Reading, reading.id).returns(reading)
+          Reading.expects(:find).with(reading.id).returns(reading)
           delete :destroy, id: reading.id, reading_group_id: reading.reading_group_id.to_s
         end
@@ -94,7 +94,7 @@ describe RepositoriesController, :type =&gt; :controller do
         processing = FactoryGirl.build(:processing)
         KalibroConfiguration.expects(:find).with(repository.id).returns(FactoryGirl.build(:kalibro_configuration_with_id))
-        subject.expects(:find_resource).with(Repository, repository.id).returns(repository)
+        Repository.expects(:find).with(repository.id).returns(repository)
         get :show, id: repository.id.to_s, project_id: project.id.to_s
       end
@@ -108,7 +108,7 @@ describe RepositoriesController, :type =&gt; :controller do
         processing = FactoryGirl.build(:processing)
         KalibroConfiguration.expects(:find).with(repository.id).returns(FactoryGirl.build(:kalibro_configuration_with_id))
-        subject.expects(:find_resource).with(Repository, repository.id).returns(repository)
+        Repository.expects(:find).with(repository.id).returns(repository)
         get :show, id: repository.id.to_s, project_id: project.id.to_s
       end
1	include OwnershipAuthentication	1	include OwnershipAuthentication
2	include MetricConfigurationsConcern	2	include MetricConfigurationsConcern
3	-include ResourceFinder
4		3
5	class BaseMetricConfigurationsController < ApplicationController	4	class BaseMetricConfigurationsController < ApplicationController
6	before_action :authenticate_user!, except: [:show, :index]	5	before_action :authenticate_user!, except: [:show, :index]
	@@ -2,6 +2,6 @@ module MetricConfigurationsConcern		@@ -2,6 +2,6 @@ module MetricConfigurationsConcern
2	extend ActiveSupport::Concern	2	extend ActiveSupport::Concern
3		3
4	def set_metric_configuration	4	def set_metric_configuration
5	- @metric_configuration = find_resource(MetricConfiguration, params[:id].to_i)	5	+ @metric_configuration = MetricConfiguration.find(params[:id].to_i)
6	end	6	end
7	end	7	end
	@@ -1,15 +0,0 @@		@@ -1,15 +0,0 @@
1	-module ResourceFinder
2	- extend ActiveSupport::Concern
3	-
4	- def find_resource(klass, id)
5	- begin
6	- klass.find(id)
7	- rescue KalibroClient::Errors::RecordNotFound
8	- respond_to do \|format\|
9	- format.html { render file: "#{Rails.root}/public/404", layout: false, status: :not_found }
10	- end
11	-
12	- return
13	- end
14	- end
15	-end
16	\ No newline at end of file	0	\ No newline at end of file
	@@ -7,6 +7,7 @@ class MetricConfigurationsController < BaseMetricConfigurationsController		@@ -7,6 +7,7 @@ class MetricConfigurationsController < BaseMetricConfigurationsController
7		7
8	def new	8	def new
9	super	9	super
		10	+ # find_by_name throws an exception instead of returning nil, unlike ActiveRecord's API
10	metric_configuration.metric = KalibroClient::Entities::Processor::MetricCollectorDetails.find_by_name(params[:metric_collector_name]).find_metric_by_code params[:metric_code]	11	metric_configuration.metric = KalibroClient::Entities::Processor::MetricCollectorDetails.find_by_name(params[:metric_collector_name]).find_metric_by_code params[:metric_code]
11	end	12	end
12		13
	@@ -14,6 +14,7 @@ module MetricConfigurationsHelper		@@ -14,6 +14,7 @@ module MetricConfigurationsHelper
14	end	14	end
15		15
16	def supported_metrics_of(metric_collector_name)	16	def supported_metrics_of(metric_collector_name)
		17	+ # find_by_name throws an exception instead of returning nil, unlike ActiveRecord's API
17	KalibroClient::Entities::Processor::MetricCollectorDetails.find_by_name(metric_collector_name).supported_metrics	18	KalibroClient::Entities::Processor::MetricCollectorDetails.find_by_name(metric_collector_name).supported_metrics
18	end	19	end
19	end	20	end
	@@ -117,7 +117,7 @@ describe InheritsFromBaseMetricConfigurationsController, :type => :controller do		@@ -117,7 +117,7 @@ describe InheritsFromBaseMetricConfigurationsController, :type => :controller do
117	context 'with a valid metric_configuration' do	117	context 'with a valid metric_configuration' do
118	before :each do	118	before :each do
119	ReadingGroup.expects(:find).with(metric_configuration.reading_group_id).returns(reading_group)	119	ReadingGroup.expects(:find).with(metric_configuration.reading_group_id).returns(reading_group)
120	- subject.expects(:find_resource).with(MetricConfiguration, metric_configuration.id).returns(metric_configuration)	120	+ MetricConfiguration.expects(:find).with(metric_configuration.id).returns(metric_configuration)
121	metric_configuration.expects(:kalibro_ranges).returns([kalibro_range])	121	metric_configuration.expects(:kalibro_ranges).returns([kalibro_range])
122		122
123	get :show, kalibro_configuration_id: metric_configuration.kalibro_configuration_id.to_s, id: metric_configuration.id	123	get :show, kalibro_configuration_id: metric_configuration.kalibro_configuration_id.to_s, id: metric_configuration.id
	@@ -74,7 +74,7 @@ describe CompoundMetricConfigurationsController, :type => :controller do		@@ -74,7 +74,7 @@ describe CompoundMetricConfigurationsController, :type => :controller do
74		74
75	before :each do	75	before :each do
76	ReadingGroup.expects(:find).with(compound_metric_configuration.reading_group_id).returns(reading_group)	76	ReadingGroup.expects(:find).with(compound_metric_configuration.reading_group_id).returns(reading_group)
77	- subject.expects(:find_resource).with(MetricConfiguration, compound_metric_configuration.id).returns(compound_metric_configuration)	77	+ MetricConfiguration.expects(:find).with(compound_metric_configuration.id).returns(compound_metric_configuration)
78	compound_metric_configuration.expects(:kalibro_ranges).returns([kalibro_range])	78	compound_metric_configuration.expects(:kalibro_ranges).returns([kalibro_range])
79		79
80	get :show, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id.to_s, id: compound_metric_configuration.id	80	get :show, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id.to_s, id: compound_metric_configuration.id
	@@ -94,7 +94,7 @@ describe CompoundMetricConfigurationsController, :type => :controller do		@@ -94,7 +94,7 @@ describe CompoundMetricConfigurationsController, :type => :controller do
94	context 'when the user owns the compound metric configuration' do	94	context 'when the user owns the compound metric configuration' do
95	before :each do	95	before :each do
96	subject.expects(:metric_configuration_owner?).returns(true)	96	subject.expects(:metric_configuration_owner?).returns(true)
97	- subject.expects(:find_resource).with(MetricConfiguration, compound_metric_configuration.id).returns(compound_metric_configuration)	97	+ MetricConfiguration.expects(:find).with(compound_metric_configuration.id).returns(compound_metric_configuration)
98	MetricConfiguration.expects(:metric_configurations_of).with(kalibro_configuration.id).returns([compound_metric_configuration])	98	MetricConfiguration.expects(:metric_configurations_of).with(kalibro_configuration.id).returns([compound_metric_configuration])
99	get :edit, id: compound_metric_configuration.id, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id.to_s	99	get :edit, id: compound_metric_configuration.id, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id.to_s
100	end	100	end
	@@ -138,7 +138,7 @@ describe CompoundMetricConfigurationsController, :type => :controller do		@@ -138,7 +138,7 @@ describe CompoundMetricConfigurationsController, :type => :controller do
138		138
139	context 'with valid fields' do	139	context 'with valid fields' do
140	before :each do	140	before :each do
141	- subject.expects(:find_resource).with(MetricConfiguration, compound_metric_configuration.id).returns(compound_metric_configuration)	141	+ MetricConfiguration.expects(:find).with(compound_metric_configuration.id).returns(compound_metric_configuration)
142	MetricConfiguration.any_instance.expects(:update).with(metric_configuration_params).returns(true)	142	MetricConfiguration.any_instance.expects(:update).with(metric_configuration_params).returns(true)
143		143
144	post :update, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id, id: compound_metric_configuration.id, metric_configuration: metric_configuration_params	144	post :update, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id, id: compound_metric_configuration.id, metric_configuration: metric_configuration_params
	@@ -150,7 +150,7 @@ describe CompoundMetricConfigurationsController, :type => :controller do		@@ -150,7 +150,7 @@ describe CompoundMetricConfigurationsController, :type => :controller do
150		150
151	context 'with an invalid field' do	151	context 'with an invalid field' do
152	before :each do	152	before :each do
153	- subject.expects(:find_resource).with(MetricConfiguration, compound_metric_configuration.id).returns(compound_metric_configuration)	153	+ MetricConfiguration.expects(:find).with(compound_metric_configuration.id).returns(compound_metric_configuration)
154	MetricConfiguration.expects(:metric_configurations_of).with(kalibro_configuration.id).returns([compound_metric_configuration])	154	MetricConfiguration.expects(:metric_configurations_of).with(kalibro_configuration.id).returns([compound_metric_configuration])
155	MetricConfiguration.any_instance.expects(:update).with(metric_configuration_params).returns(false)	155	MetricConfiguration.any_instance.expects(:update).with(metric_configuration_params).returns(false)
156		156
	@@ -1,39 +0,0 @@		@@ -1,39 +0,0 @@
1	-require 'rails_helper'
2	-
3	-describe ResourceFinder, type: :controller do
4	- describe 'find_resource' do
5	- let(:klass) { mock('Resource') }
6	- let(:id) { 1 }
7	- let!(:projects_controller) {ProjectsController.new}
8	-
9	- before do
10	- projects_controller.extend(ResourceFinder)
11	- end
12	-
13	- context 'when the resource exists' do
14	- let!(:resource) { mock('resource') }
15	-
16	- before :each do
17	- klass.expects(:find).with(id).returns(resource)
18	- end
19	-
20	- it 'is expect to return the resource' do
21	- expect(projects_controller.find_resource(klass, id)).to eq(resource)
22	- end
23	- end
24	-
25	- context 'when the resource does not exists' do
26	- before :each do
27	- klass.expects(:find).with(id).raises(KalibroClient::Errors::RecordNotFound)
28	- end
29	-
30	- # FIXME: this is not the best test, but it it's the closest we can think of
31	- # full coverage is achieved through projects_controller_spec.rb
32	- it 'is expected to render the 404 page' do
33	- projects_controller.expects(:respond_to)
34	-
35	- projects_controller.find_resource(klass, id)
36	- end
37	- end
38	- end
39	-end
40	\ No newline at end of file	0	\ No newline at end of file
	@@ -65,7 +65,7 @@ describe KalibroConfigurationsController, :type => :controller do		@@ -65,7 +65,7 @@ describe KalibroConfigurationsController, :type => :controller do
65		65
66	before :each do	66	before :each do
67	kalibro_configuration.expects(:metric_configurations).returns(metric_configuration)	67	kalibro_configuration.expects(:metric_configurations).returns(metric_configuration)
68	- subject.expects(:find_resource).with(KalibroConfiguration, kalibro_configuration.id).returns(kalibro_configuration)	68	+ KalibroConfiguration.expects(:find).with(kalibro_configuration.id).returns(kalibro_configuration)
69		69
70	get :show, :id => kalibro_configuration.id	70	get :show, :id => kalibro_configuration.id
71	end	71	end
	@@ -96,11 +96,11 @@ describe KalibroConfigurationsController, :type => :controller do		@@ -96,11 +96,11 @@ describe KalibroConfigurationsController, :type => :controller do
96		96
97	#Those two mocks looks the same but they are necessary since params[:id] is a String and @configuration.id is an Integer :(	97	#Those two mocks looks the same but they are necessary since params[:id] is a String and @configuration.id is an Integer :(
98	@ownerships.expects(:find_by_kalibro_configuration_id).with("#{@subject.id}").returns(@ownership)	98	@ownerships.expects(:find_by_kalibro_configuration_id).with("#{@subject.id}").returns(@ownership)
99	- @ownerships.expects(:find_by_kalibro_configuration_id).with(@subject.id).returns(@ownership)	99	+ @ownerships.expects(:find_by_kalibro_configuration_id!).with(@subject.id).returns(@ownership)
100		100
101	User.any_instance.expects(:kalibro_configuration_ownerships).at_least_once.returns(@ownerships)	101	User.any_instance.expects(:kalibro_configuration_ownerships).at_least_once.returns(@ownerships)
102		102
103	- subject.expects(:find_resource).with(KalibroConfiguration, @subject.id).returns(@subject)	103	+ KalibroConfiguration.expects(:find).with(@subject.id).returns(@subject)
104	delete :destroy, :id => @subject.id	104	delete :destroy, :id => @subject.id
105	end	105	end
106		106
	@@ -160,7 +160,7 @@ describe KalibroConfigurationsController, :type => :controller do		@@ -160,7 +160,7 @@ describe KalibroConfigurationsController, :type => :controller do
160		160
161	context 'when the user owns the kalibro_configuration' do	161	context 'when the user owns the kalibro_configuration' do
162	before :each do	162	before :each do
163	- subject.expects(:find_resource).with(KalibroConfiguration, @subject.id).returns(@subject)	163	+ KalibroConfiguration.expects(:find).with(@subject.id).returns(@subject)
164	@ownerships.expects(:find_by_kalibro_configuration_id).with("#{@subject.id}").returns(@ownership)	164	@ownerships.expects(:find_by_kalibro_configuration_id).with("#{@subject.id}").returns(@ownership)
165		165
166	get :edit, :id => @subject.id	166	get :edit, :id => @subject.id
	@@ -215,7 +215,7 @@ describe KalibroConfigurationsController, :type => :controller do		@@ -215,7 +215,7 @@ describe KalibroConfigurationsController, :type => :controller do
215		215
216	context 'with valid fields' do	216	context 'with valid fields' do
217	before :each do	217	before :each do
218	- subject.expects(:find_resource).with(KalibroConfiguration, kalibro_configuration.id).returns(kalibro_configuration)	218	+ KalibroConfiguration.expects(:find).with(kalibro_configuration.id).returns(kalibro_configuration)
219	KalibroConfiguration.any_instance.expects(:update).with(kalibro_configuration_params).returns(true)	219	KalibroConfiguration.any_instance.expects(:update).with(kalibro_configuration_params).returns(true)
220	end	220	end
221		221
	@@ -240,7 +240,7 @@ describe KalibroConfigurationsController, :type => :controller do		@@ -240,7 +240,7 @@ describe KalibroConfigurationsController, :type => :controller do
240		240
241	context 'with an invalid field' do	241	context 'with an invalid field' do
242	before :each do	242	before :each do
243	- subject.expects(:find_resource).with(KalibroConfiguration, kalibro_configuration.id).returns(kalibro_configuration)	243	+ KalibroConfiguration.expects(:find).with(kalibro_configuration.id).returns(kalibro_configuration)
244	KalibroConfiguration.any_instance.expects(:update).with(kalibro_configuration_params).returns(false)	244	KalibroConfiguration.any_instance.expects(:update).with(kalibro_configuration_params).returns(false)
245		245
246	post :update, :id => kalibro_configuration.id, :kalibro_configuration => kalibro_configuration_params	246	post :update, :id => kalibro_configuration.id, :kalibro_configuration => kalibro_configuration_params
	@@ -97,7 +97,7 @@ describe KalibroRangesController, :type => :controller do		@@ -97,7 +97,7 @@ describe KalibroRangesController, :type => :controller do
97	before :each do	97	before :each do
98	subject.expects(:metric_configuration_owner?).returns true	98	subject.expects(:metric_configuration_owner?).returns true
99	kalibro_range.expects(:destroy)	99	kalibro_range.expects(:destroy)
100	- subject.expects(:find_resource).with(KalibroRange, kalibro_range.id).returns(kalibro_range)	100	+ KalibroRange.expects(:find).with(kalibro_range.id).returns(kalibro_range)
101	MetricConfiguration.expects(:find).with(kalibro_range.metric_configuration_id).returns(metric_configuration)	101	MetricConfiguration.expects(:find).with(kalibro_range.metric_configuration_id).returns(metric_configuration)
102		102
103	delete :destroy, id: kalibro_range.id, metric_configuration_id: metric_configuration.id, kalibro_configuration_id: metric_configuration.kalibro_configuration_id	103	delete :destroy, id: kalibro_range.id, metric_configuration_id: metric_configuration.id, kalibro_configuration_id: metric_configuration.kalibro_configuration_id
	@@ -114,7 +114,7 @@ describe KalibroRangesController, :type => :controller do		@@ -114,7 +114,7 @@ describe KalibroRangesController, :type => :controller do
114	before :each do	114	before :each do
115	subject.expects(:metric_configuration_owner?).returns true	115	subject.expects(:metric_configuration_owner?).returns true
116	new_kalibro_range.expects(:destroy)	116	new_kalibro_range.expects(:destroy)
117	- subject.expects(:find_resource).with(KalibroRange, new_kalibro_range.id).returns(new_kalibro_range)	117	+ KalibroRange.expects(:find).with(new_kalibro_range.id).returns(new_kalibro_range)
118	MetricConfiguration.expects(:find).with(new_kalibro_range.metric_configuration_id).returns(compound_metric_configuration)	118	MetricConfiguration.expects(:find).with(new_kalibro_range.metric_configuration_id).returns(compound_metric_configuration)
119		119
120	delete :destroy, id: new_kalibro_range.id, metric_configuration_id: compound_metric_configuration.id, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id	120	delete :destroy, id: new_kalibro_range.id, metric_configuration_id: compound_metric_configuration.id, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id
	@@ -156,7 +156,7 @@ describe KalibroRangesController, :type => :controller do		@@ -156,7 +156,7 @@ describe KalibroRangesController, :type => :controller do
156	context 'when the user owns the kalibro range' do	156	context 'when the user owns the kalibro range' do
157	before :each do	157	before :each do
158	subject.expects(:metric_configuration_owner?).returns true	158	subject.expects(:metric_configuration_owner?).returns true
159	- subject.expects(:find_resource).with(KalibroRange, kalibro_range.id).returns(kalibro_range)	159	+ KalibroRange.expects(:find).with(kalibro_range.id).returns(kalibro_range)
160	MetricConfiguration.expects(:find).with(metric_configuration.id).returns(metric_configuration)	160	MetricConfiguration.expects(:find).with(metric_configuration.id).returns(metric_configuration)
161	Reading.expects(:readings_of).with(metric_configuration.reading_group_id).returns([reading])	161	Reading.expects(:readings_of).with(metric_configuration.reading_group_id).returns([reading])
162	get :edit, id: kalibro_range.id, kalibro_configuration_id: metric_configuration.kalibro_configuration_id, metric_configuration_id: metric_configuration.id	162	get :edit, id: kalibro_range.id, kalibro_configuration_id: metric_configuration.kalibro_configuration_id, metric_configuration_id: metric_configuration.id
	@@ -205,7 +205,7 @@ describe KalibroRangesController, :type => :controller do		@@ -205,7 +205,7 @@ describe KalibroRangesController, :type => :controller do
205		205
206	context 'with valid fields' do	206	context 'with valid fields' do
207	before :each do	207	before :each do
208	- subject.expects(:find_resource).with(KalibroRange, kalibro_range.id).returns(kalibro_range)	208	+ KalibroRange.expects(:find).with(kalibro_range.id).returns(kalibro_range)
209	KalibroRange.any_instance.expects(:update).with(kalibro_range_params).returns(true)	209	KalibroRange.any_instance.expects(:update).with(kalibro_range_params).returns(true)
210	MetricConfiguration.expects(:find).with(kalibro_range.metric_configuration_id).returns(metric_configuration)	210	MetricConfiguration.expects(:find).with(kalibro_range.metric_configuration_id).returns(metric_configuration)
211		211
	@@ -221,7 +221,7 @@ describe KalibroRangesController, :type => :controller do		@@ -221,7 +221,7 @@ describe KalibroRangesController, :type => :controller do
221	let(:new_kalibro_range) { FactoryGirl.build(:kalibro_range_with_id, metric_configuration_id: compound_metric_configuration.id) }	221	let(:new_kalibro_range) { FactoryGirl.build(:kalibro_range_with_id, metric_configuration_id: compound_metric_configuration.id) }
222		222
223	before :each do	223	before :each do
224	- subject.expects(:find_resource).with(KalibroRange, new_kalibro_range.id).returns(new_kalibro_range)	224	+ KalibroRange.expects(:find).with(new_kalibro_range.id).returns(new_kalibro_range)
225	KalibroRange.any_instance.expects(:update).with(new_kalibro_range.to_hash).returns(true)	225	KalibroRange.any_instance.expects(:update).with(new_kalibro_range.to_hash).returns(true)
226	MetricConfiguration.expects(:find).with(new_kalibro_range.metric_configuration_id).returns(compound_metric_configuration)	226	MetricConfiguration.expects(:find).with(new_kalibro_range.metric_configuration_id).returns(compound_metric_configuration)
227		227
	@@ -234,7 +234,7 @@ describe KalibroRangesController, :type => :controller do		@@ -234,7 +234,7 @@ describe KalibroRangesController, :type => :controller do
234		234
235	context 'with an invalid field' do	235	context 'with an invalid field' do
236	before :each do	236	before :each do
237	- subject.expects(:find_resource).with(KalibroRange, kalibro_range.id).returns(kalibro_range)	237	+ KalibroRange.expects(:find).with(kalibro_range.id).returns(kalibro_range)
238	KalibroRange.any_instance.expects(:update).with(kalibro_range_params).returns(false)	238	KalibroRange.any_instance.expects(:update).with(kalibro_range_params).returns(false)
239	MetricConfiguration.expects(:find).with(metric_configuration.id).returns(metric_configuration)	239	MetricConfiguration.expects(:find).with(metric_configuration.id).returns(metric_configuration)
240	Reading.expects(:readings_of).with(metric_configuration.reading_group_id).returns([reading])	240	Reading.expects(:readings_of).with(metric_configuration.reading_group_id).returns([reading])