Update MetricConfiguration controllers' tests

- Fix usage of MetricConfiguration models converted directly to hashes as parameters. It didn't reflect how they are actually sent and omitted some necessary parameters like metric_collector_name and metric_name/metric_code, which are now passed. - Fix KalibroConfigurations not being searched by the controller methods. We must be sure they exist, and fail with a 404 if they don't instead of failing only in one of the ownership testing methods. - Update the expectations for cache cleaning to include both Hotspot and Tree MetricConfigurations Signed off by: Daniel Miranda <danielkza2@gmail.com>

Update MetricConfiguration controllers' tests
- Fix usage of MetricConfiguration models converted directly to hashes as parameters. It didn't reflect how they are actually sent and omitted some necessary parameters like metric_collector_name and metric_name/metric_code, which are now passed. - Fix KalibroConfigurations not being searched by the controller methods. We must be sure they exist, and fail with a 404 if they don't instead of failing only in one of the ownership testing methods. - Update the expectations for cache cleaning to include both Hotspot and Tree MetricConfigurations Signed off by: Daniel Miranda <danielkza2@gmail.com>
Heitor · Rafael Manzo
1 parent 987ca379
Showing 3 changed files with 48 additions and 23 deletions Show diff stats
spec/controllers/compound_metric_configurations_controller_spec.rb
spec/controllers/hotspot_metric_configuration_controller_spec.rb
spec/controllers/metric_configurations_controller_spec.rb
@@ -11,6 +11,7 @@ describe CompoundMetricConfigurationsController, :type =&gt; :controller do
     context 'when the current user owns the kalibro configuration' do
       let!(:metric_configuration) { FactoryGirl.build(:metric_configuration) }
       before :each do
+        KalibroConfiguration.expects(:find).with(kalibro_configuration.id).returns kalibro_configuration
         subject.expects(:kalibro_configuration_owner?).returns true
         MetricConfiguration.expects(:metric_configurations_of).with(kalibro_configuration.id).returns([metric_configuration])
         get :new, kalibro_configuration_id: kalibro_configuration.id
@@ -31,24 +32,24 @@ describe CompoundMetricConfigurationsController, :type =&gt; :controller do
   end
   describe 'create' do
-    let!(:metric_configuration_params) { FactoryGirl.build(:metric_configuration).to_hash }
-    let!(:metric_params) { FactoryGirl.build(:metric).to_hash }
-    let(:compound_metric_configuration) { FactoryGirl.build(:compound_metric_configuration) }
+    let(:compound_metric_configuration) { FactoryGirl.build(:compound_metric_configuration, reading_group_id: 1) }
+    let!(:metric_configuration_params) { compound_metric_configuration.to_hash }
     before do
       sign_in FactoryGirl.create(:user)
-      metric_configuration_params["metric"] = metric_params
     end
     context 'when the current user owns the reading group' do
       before :each do
+        KalibroConfiguration.expects(:find).with(kalibro_configuration.id).returns kalibro_configuration
         subject.expects(:kalibro_configuration_owner?).returns true
-        Rails.cache.expects(:delete).with("#{kalibro_configuration.id}_tree_metric_configurations")
       end
       context 'with valid fields' do
         before :each do
           MetricConfiguration.any_instance.expects(:save).returns(true)
+          Rails.cache.expects(:delete).with("#{kalibro_configuration.id}_tree_metric_configurations")
+          Rails.cache.expects(:delete).with("#{kalibro_configuration.id}_hotspot_metric_configurations")
           post :create, kalibro_configuration_id: kalibro_configuration.id, metric_configuration: metric_configuration_params
         end
@@ -59,7 +60,6 @@ describe CompoundMetricConfigurationsController, :type =&gt; :controller do
       context 'with invalid fields' do
         before :each do
           MetricConfiguration.any_instance.expects(:save).returns(false)
-          MetricConfiguration.expects(:metric_configurations_of).with(kalibro_configuration.id).returns([compound_metric_configuration])
           post :create, kalibro_configuration_id: kalibro_configuration.id, metric_configuration: metric_configuration_params
         end
@@ -74,6 +74,7 @@ describe CompoundMetricConfigurationsController, :type =&gt; :controller do
     let(:kalibro_range) { FactoryGirl.build(:kalibro_range) }
     before :each do
+      KalibroConfiguration.expects(:find).with(kalibro_configuration.id).returns kalibro_configuration
       ReadingGroup.expects(:find).with(compound_metric_configuration.reading_group_id).returns(reading_group)
       MetricConfiguration.expects(:find).with(compound_metric_configuration.id).returns(compound_metric_configuration)
       compound_metric_configuration.expects(:kalibro_ranges).returns([kalibro_range])
@@ -94,6 +95,7 @@ describe CompoundMetricConfigurationsController, :type =&gt; :controller do
       context 'when the user owns the compound metric configuration' do
         before :each do
+          KalibroConfiguration.expects(:find).with(kalibro_configuration.id).returns kalibro_configuration
           subject.expects(:metric_configuration_owner?).returns(true)
           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])
@@ -125,7 +127,14 @@ describe CompoundMetricConfigurationsController, :type =&gt; :controller do
   describe 'update' do
     let(:compound_metric_configuration) { FactoryGirl.build(:compound_metric_configuration_with_id) }
-    let(:metric_configuration_params) { Hash[FactoryGirl.attributes_for(:compound_metric_configuration_with_id).map { |k,v| [k.to_s, v.to_s] }] } #FIXME: Mocha is creating the expectations with strings, but FactoryGirl returns everything with sybols and integers
+    # Exclude the parameters that come in the URL (as the ones in the body will always be ignored)
+    let(:metric_configuration_params) { compound_metric_configuration.to_hash.except('id', 'kalibro_configuration_id', 'type') }
+    # Exclude the reading group id since it is set beforehand and not in the update params
+    let(:update_params) do
+      params = metric_configuration_params.except('reading_group_id')
+      params['metric'].except!('type')
+      params
+    end
     context 'when the user is logged in' do
       before do
@@ -134,14 +143,16 @@ describe CompoundMetricConfigurationsController, :type =&gt; :controller do
       context 'when user owns the metric configuration' do
         before :each do
+          KalibroConfiguration.expects(:find).with(kalibro_configuration.id).returns kalibro_configuration
+          MetricConfiguration.expects(:find).with(compound_metric_configuration.id).returns(compound_metric_configuration)
           subject.expects(:metric_configuration_owner?).returns true
-          Rails.cache.expects(:delete).with("#{kalibro_configuration.id}_tree_metric_configurations")
         end
         context 'with valid fields' do
           before :each do
-            MetricConfiguration.expects(:find).with(compound_metric_configuration.id).returns(compound_metric_configuration)
-            MetricConfiguration.any_instance.expects(:update).with(metric_configuration_params).returns(true)
+            MetricConfiguration.any_instance.expects(:update).with(update_params).returns(true)
+            Rails.cache.expects(:delete).with("#{kalibro_configuration.id}_tree_metric_configurations")
+            Rails.cache.expects(:delete).with("#{kalibro_configuration.id}_hotspot_metric_configurations")
             post :update, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id, id: compound_metric_configuration.id, metric_configuration: metric_configuration_params
           end
@@ -152,9 +163,7 @@ describe CompoundMetricConfigurationsController, :type =&gt; :controller do
         context 'with an invalid field' do
           before :each do
-            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)
+            MetricConfiguration.any_instance.expects(:update).with(update_params).returns(false)
             post :update, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id, id: compound_metric_configuration.id, metric_configuration: metric_configuration_params
           end
@@ -2,6 +2,7 @@ require &#39;rails_helper&#39;
 describe HotspotMetricConfigurationsController, :type => :controller do
   let(:kalibro_configuration) { FactoryGirl.build(:kalibro_configuration, :with_id) }
+
   describe 'create' do
     let!(:metric_configuration) { FactoryGirl.build(:hotspot_metric_configuration) }
     let(:metric_configuration_params) { metric_configuration.to_hash }
@@ -13,6 +14,7 @@ describe HotspotMetricConfigurationsController, :type =&gt; :controller do
     context 'when the current user owns the metric configuration' do
       before :each do
+        KalibroConfiguration.expects(:find).with(kalibro_configuration.id).returns kalibro_configuration
         subject.expects(:kalibro_configuration_owner?).returns true
       end
@@ -2,6 +2,7 @@ require &#39;rails_helper&#39;
 describe MetricConfigurationsController, :type => :controller do
   let(:kalibro_configuration) { FactoryGirl.build(:kalibro_configuration, :with_id) }
+
   describe 'choose_metric' do
     let(:metric_collector) { FactoryGirl.build(:metric_collector) }
     before :each do
@@ -10,9 +11,9 @@ describe MetricConfigurationsController, :type =&gt; :controller do
     context 'when adding new metrics' do
       before :each do
+        KalibroConfiguration.expects(:find).with(kalibro_configuration.id).returns kalibro_configuration
         subject.expects(:kalibro_configuration_owner?).returns true
         KalibroClient::Entities::Processor::MetricCollectorDetails.expects(:all_names).returns([metric_collector])
-        KalibroConfiguration.expects(:find).with(kalibro_configuration.id).returns(kalibro_configuration)
         get :choose_metric, kalibro_configuration_id: kalibro_configuration.id
       end
@@ -33,11 +34,12 @@ describe MetricConfigurationsController, :type =&gt; :controller do
     context 'when the current user owns the kalibro configuration' do
       before :each do
+        KalibroConfiguration.expects(:find).with(kalibro_configuration.id).returns kalibro_configuration
         ReadingGroup.expects(:public_or_owned_by_user).with(user).returns(reading_groups)
         subject.expects(:kalibro_configuration_owner?).returns true
         KalibroClient::Entities::Processor::MetricCollectorDetails.expects(:find_by_name).with(metric_collector.name).returns(metric_collector)
-        metric_collector.expects(:find_metric_by_code).with(native_metric.code).returns(native_metric)
-        post :new, kalibro_configuration_id: kalibro_configuration.id, metric_code: native_metric.code, metric_collector_name: metric_collector.name
+        metric_collector.expects(:find_metric_by_name).with(native_metric.name).returns(native_metric)
+        get :new, kalibro_configuration_id: kalibro_configuration.id, metric_name: native_metric.name, metric_collector_name: metric_collector.name
       end
       it { is_expected.to respond_with(:success) }
@@ -65,6 +67,7 @@ describe MetricConfigurationsController, :type =&gt; :controller do
     context 'when the current user owns the metric configuration' do
       before :each do
+        KalibroConfiguration.expects(:find).with(kalibro_configuration.id).returns kalibro_configuration
         subject.expects(:kalibro_configuration_owner?).returns true
       end
@@ -100,6 +103,7 @@ describe MetricConfigurationsController, :type =&gt; :controller do
     let(:kalibro_range) { FactoryGirl.build(:kalibro_range) }
     before :each do
+      KalibroConfiguration.expects(:find).with(kalibro_configuration.id).returns kalibro_configuration
       ReadingGroup.expects(:find).with(metric_configuration.reading_group_id).returns(reading_group)
       MetricConfiguration.expects(:find).with(metric_configuration.id).returns(metric_configuration)
       metric_configuration.expects(:kalibro_ranges).returns([kalibro_range])
@@ -122,6 +126,7 @@ describe MetricConfigurationsController, :type =&gt; :controller do
       context 'when the user owns the metric configuration' do
         before :each do
+          KalibroConfiguration.expects(:find).with(kalibro_configuration.id).returns kalibro_configuration
           ReadingGroup.expects(:public_or_owned_by_user).with(user).returns(reading_groups)
           subject.expects(:metric_configuration_owner?).returns(true)
           MetricConfiguration.expects(:find).with(metric_configuration.id).returns(metric_configuration)
@@ -137,7 +142,6 @@ describe MetricConfigurationsController, :type =&gt; :controller do
         end
         it { is_expected.to redirect_to(kalibro_configurations_path(id: metric_configuration.kalibro_configuration_id)) }
-        it { is_expected.to respond_with(:redirect) }
         it { is_expected.to set_flash[:notice].to("You're not allowed to do this operation") }
       end
     end
@@ -153,7 +157,8 @@ describe MetricConfigurationsController, :type =&gt; :controller do
   describe 'update' do
     let(:metric_configuration) { FactoryGirl.build(:metric_configuration_with_id) }
-    let(:metric_configuration_params) { metric_configuration.to_hash }
+    let(:metric_configuration_params) { metric_configuration.to_hash.except('id', 'metric')  }
+    let(:update_params) { metric_configuration_params.except('kalibro_configuration_id', 'reading_group_id') }
     context 'when the user is logged in' do
       before do
@@ -162,15 +167,20 @@ describe MetricConfigurationsController, :type =&gt; :controller do
       context 'when user owns the metric configuration' do
         before :each do
+          KalibroConfiguration.expects(:find).with(kalibro_configuration.id).returns kalibro_configuration
           subject.expects(:metric_configuration_owner?).returns true
         end
         context 'with valid fields' do
           before :each do
             MetricConfiguration.expects(:find).with(metric_configuration.id).returns(metric_configuration)
-            MetricConfiguration.any_instance.expects(:update).with(metric_configuration_params).returns(true)
+            MetricConfiguration.any_instance.expects(:update).with(update_params).returns(true)
-            post :update, kalibro_configuration_id: metric_configuration.kalibro_configuration_id, id: metric_configuration.id, metric_configuration: metric_configuration_params
+            post :update,
+              kalibro_configuration_id: metric_configuration.kalibro_configuration_id, id: metric_configuration.id,
+              metric_configuration: metric_configuration_params,
+              metric_collector_name: metric_configuration.metric.metric_collector_name,
+              metric_code: metric_configuration.metric.code
           end
           it { is_expected.to redirect_to(kalibro_configuration_path(id: metric_configuration.kalibro_configuration_id)) }
@@ -180,9 +190,13 @@ describe MetricConfigurationsController, :type =&gt; :controller do
         context 'with an invalid field' do
           before :each do
             MetricConfiguration.expects(:find).with(metric_configuration.id).returns(metric_configuration)
-            MetricConfiguration.any_instance.expects(:update).with(metric_configuration_params).returns(false)
+            MetricConfiguration.any_instance.expects(:update).with(update_params).returns(false)
-            post :update, kalibro_configuration_id: metric_configuration.kalibro_configuration_id, id: metric_configuration.id, metric_configuration: metric_configuration_params
+            post :update,
+              kalibro_configuration_id: metric_configuration.kalibro_configuration_id, id: metric_configuration.id,
+              metric_configuration: metric_configuration_params,
+              metric_collector_name: metric_configuration.metric.metric_collector_name,
+              metric_code: metric_configuration.metric.code
           end
           it { is_expected.to render_template(:edit) }
@@ -199,7 +213,6 @@ describe MetricConfigurationsController, :type =&gt; :controller do
     end
   end
-
   describe 'destroy' do
     let(:metric_configuration) { FactoryGirl.build(:metric_configuration_with_id) }
@@ -210,6 +223,7 @@ describe MetricConfigurationsController, :type =&gt; :controller do
       context 'when the user owns the configuration' do
         before :each do
+          KalibroConfiguration.expects(:find).with(kalibro_configuration.id).returns kalibro_configuration
           subject.expects(:metric_configuration_owner?).returns true
           metric_configuration.expects(:destroy)
           MetricConfiguration.expects(:find).with(metric_configuration.id).returns(metric_configuration)