From 18794d7f90be6b6e19a0162cd55abdede5c902ae Mon Sep 17 00:00:00 2001 From: Heitor Reis Date: Tue, 27 Jan 2015 12:01:46 -0200 Subject: [PATCH] [WIP] Fixing prezento's unit tests according to the new kalibro client gem --- app/controllers/base_metric_configurations_controller.rb | 5 +---- app/controllers/compound_metric_configurations_controller.rb | 8 ++++---- app/controllers/metric_configurations_controller.rb | 19 ++++++++----------- app/controllers/readings_controller.rb | 10 ++-------- app/controllers/repositories_controller.rb | 2 +- app/helpers/kalibro_configurations_helper.rb | 4 ++-- app/helpers/metric_configurations_helper.rb | 4 ++-- app/models/module_result.rb | 2 +- spec/controllers/base_metric_configurations_controller_spec.rb | 5 ++--- spec/controllers/compound_metric_configurations_controller_spec.rb | 18 +++++++++--------- spec/controllers/metric_configurations_controller_spec.rb | 38 +++++++++++++++++++------------------- spec/controllers/mezuro_ranges_controller_spec.rb | 32 ++++++++++++++++---------------- spec/controllers/readings_controller_spec.rb | 14 +++++++------- spec/factories/kalibro_modules.rb | 6 ++++++ spec/factories/metric_collectors.rb | 2 +- spec/factories/metric_configurations.rb | 13 ++++--------- spec/factories/metric_configurations_snapshot.rb | 26 -------------------------- spec/factories/metric_results.rb | 2 +- spec/factories/metrics.rb | 10 ++++++---- spec/factories/module_results.rb | 4 ++-- spec/factories/modules.rb | 6 ------ spec/factories/processings.rb | 5 ++--- spec/factories/ranges_snapshot.rb | 2 +- spec/factories/repositories.rb | 8 ++++---- spec/helpers/metric_configurations_helper_spec.rb | 4 ++-- spec/helpers/mezuro_configurations_helper_spec.rb | 16 ++++++++-------- spec/helpers/processings_helper_spec.rb | 8 ++++---- spec/models/module_result_spec.rb | 6 +++--- 28 files changed, 118 insertions(+), 161 deletions(-) create mode 100644 spec/factories/kalibro_modules.rb delete mode 100644 spec/factories/metric_configurations_snapshot.rb delete mode 100644 spec/factories/modules.rb diff --git a/app/controllers/base_metric_configurations_controller.rb b/app/controllers/base_metric_configurations_controller.rb index ac1f9d6..281d6f5 100644 --- a/app/controllers/base_metric_configurations_controller.rb +++ b/app/controllers/base_metric_configurations_controller.rb @@ -10,14 +10,12 @@ class BaseMetricConfigurationsController < ApplicationController def new update_metric_configuration(MetricConfiguration.new) - metric_configuration.configuration_id = params[:kalibro_configuration_id].to_i end def show if metric_configuration @reading_group = ReadingGroup.find(metric_configuration.reading_group_id) @mezuro_ranges = metric_configuration.kalibro_ranges - metric_configuration.configuration_id = params[:kalibro_configuration_id].to_i else raise NotImplementedError end @@ -25,7 +23,6 @@ class BaseMetricConfigurationsController < ApplicationController def create update_metric_configuration(MetricConfiguration.new(metric_configuration_params)) - metric_configuration.configuration_id = params[:kalibro_configuration_id].to_i end protected @@ -43,4 +40,4 @@ class BaseMetricConfigurationsController < ApplicationController def metric_configuration_params params[:metric_configuration] end -end \ No newline at end of file +end diff --git a/app/controllers/compound_metric_configurations_controller.rb b/app/controllers/compound_metric_configurations_controller.rb index ed692d0..e339211 100644 --- a/app/controllers/compound_metric_configurations_controller.rb +++ b/app/controllers/compound_metric_configurations_controller.rb @@ -17,19 +17,19 @@ class CompoundMetricConfigurationsController < BaseMetricConfigurationsControlle def edit @compound_metric_configuration = @metric_configuration - @compound_metric_configuration.configuration_id = params[:kalibro_configuration_id].to_i + @compound_metric_configuration.kalibro_configuration_id = params[:kalibro_configuration_id].to_i end def update respond_to do |format| edit if @compound_metric_configuration.update(metric_configuration_params) - format.html { redirect_to kalibro_configuration_path(@compound_metric_configuration.configuration_id), notice: 'Compound Metric Configuration was successfully updated.' } + format.html { redirect_to kalibro_configuration_path(@compound_metric_configuration.kalibro_configuration_id), notice: 'Compound Metric Configuration was successfully updated.' } format.json { head :no_content } else failed_action(format, 'edit') end - Rails.cache.delete("#{@compound_metric_configuration.configuration_id}_metric_configurations") + Rails.cache.delete("#{@compound_metric_configuration.kalibro_configuration_id}_metric_configurations") end end @@ -62,7 +62,7 @@ class CompoundMetricConfigurationsController < BaseMetricConfigurationsControlle #Code extracted from create action def create_and_redir(format) if @compound_metric_configuration.save - format.html { redirect_to kalibro_configuration_path(@compound_metric_configuration.configuration_id), notice: 'Compound Metric Configuration was successfully created.' } + format.html { redirect_to kalibro_configuration_path(@compound_metric_configuration.kalibro_configuration_id), notice: 'Compound Metric Configuration was successfully created.' } else failed_action(format, 'new') end diff --git a/app/controllers/metric_configurations_controller.rb b/app/controllers/metric_configurations_controller.rb index 479a0a8..15376e9 100644 --- a/app/controllers/metric_configurations_controller.rb +++ b/app/controllers/metric_configurations_controller.rb @@ -2,20 +2,17 @@ class MetricConfigurationsController < BaseMetricConfigurationsController def choose_metric @kalibro_configuration = KalibroConfiguration.find(params[:kalibro_configuration_id].to_i) @metric_configuration_id = params[:metric_configuration_id].to_i - @metric_collectors_names = KalibroClient::Processor::MetricCollector.all_names + @metric_collectors_names = KalibroClient::Entities::Processor::MetricCollectorDetails.all_names end def new super - metric_configuration.metric_collector_name = params[:metric_collector_name] - metric_configuration.metric = KalibroClient::Processor::MetricCollector.find(params[:metric_collector_name]).metric params[:metric_code] + metric_configuration.metric = KalibroClient::Entities::Processor::MetricCollectorDetails.find(params[:metric_collector_name]).metric params[:metric_code] end def create super - @metric_configuration.metric = KalibroClient::Processor::MetricCollector.find(params[:metric_collector_name]).metric params[:metric_name] - @metric_configuration.metric_collector_name = params[:metric_collector_name] - @metric_configuration.code = @metric_configuration.metric.code + @metric_configuration.metric = KalibroClient::Entities::Processor::MetricCollectorDetails.find(params[:metric_collector_name]).metric params[:metric_name] respond_to do |format| create_and_redir(format) end @@ -25,16 +22,16 @@ class MetricConfigurationsController < BaseMetricConfigurationsController def edit #FIXME: set the configuration id just once! @kalibro_configuration_id = params[:kalibro_configuration_id] - @metric_configuration.configuration_id = @kalibro_configuration_id + @metric_configuration.kalibro_configuration_id = @kalibro_configuration_id end def update respond_to do |format| - @metric_configuration.configuration_id = params[:kalibro_configuration_id] + @metric_configuration.kalibro_configuration_id = params[:kalibro_configuration_id] if @metric_configuration.update(metric_configuration_params) - format.html { redirect_to(kalibro_configuration_path(@metric_configuration.configuration_id), notice: 'Metric Configuration was successfully updated.') } + format.html { redirect_to(kalibro_configuration_path(@metric_configuration.kalibro_configuration_id), notice: 'Metric Configuration was successfully updated.') } format.json { head :no_content } - Rails.cache.delete("#{@metric_configuration.configuration_id}_metric_configurations") + Rails.cache.delete("#{@metric_configuration.kalibro_configuration_id}_metric_configurations") else failed_action(format, 'edit') end @@ -73,7 +70,7 @@ class MetricConfigurationsController < BaseMetricConfigurationsController #Code extracted from create action def create_and_redir(format) if @metric_configuration.save - format.html { redirect_to kalibro_configuration_path(@metric_configuration.configuration_id), notice: 'Metric Configuration was successfully created.' } + format.html { redirect_to kalibro_configuration_path(@metric_configuration.kalibro_configuration_id), notice: 'Metric Configuration was successfully created.' } else failed_action(format, 'new') end diff --git a/app/controllers/readings_controller.rb b/app/controllers/readings_controller.rb index 359ae0a..6c89b09 100644 --- a/app/controllers/readings_controller.rb +++ b/app/controllers/readings_controller.rb @@ -8,13 +8,11 @@ class ReadingsController < ApplicationController before_action :set_reading, only: [:edit, :update, :destroy] def new - @reading_group_id = params[:reading_group_id] @reading = Reading.new end def create @reading = Reading.new(reading_params) - @reading.group_id = params[:reading_group_id].to_i respond_to do |format| create_and_redir(format) end @@ -22,16 +20,14 @@ class ReadingsController < ApplicationController # GET /readings/1/edit def edit - @reading_group_id = params[:reading_group_id] end # PUT /reading_groups/1/readings/1 # PUT /reading_groups/1/readings/1.json def update - @reading.group_id = params[:reading_group_id].to_i respond_to do |format| if @reading.update(reading_params) - format.html { redirect_to(reading_group_path(params[:reading_group_id].to_i), notice: 'Reading was successfully updated.') } + format.html { redirect_to(reading_group_path(@reading.reading_group_id), notice: 'Reading was successfully updated.') } format.json { head :no_content } else failed_action(format, 'edit') @@ -58,8 +54,6 @@ class ReadingsController < ApplicationController # Duplicated code on create and update actions extracted here def failed_action(format, destiny_action) - @reading_group_id = params[:reading_group_id] - format.html { render action: destiny_action } format.json { render json: @reading.errors, status: :unprocessable_entity } end @@ -67,7 +61,7 @@ class ReadingsController < ApplicationController # Code extracted from create action def create_and_redir(format) if @reading.save - format.html { redirect_to reading_group_path(@reading.group_id), notice: 'Reading was successfully created.' } + format.html { redirect_to reading_group_path(@reading.reading_group_id), notice: 'Reading was successfully created.' } else failed_action(format, 'new') end diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 4b8123d..fc0e09c 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -109,7 +109,7 @@ private end def set_kalibro_configuration - @kalibro_configuration = KalibroConfiguration.find(@repository.configuration_id) + @kalibro_configuration = KalibroConfiguration.find(@repository.kalibro_configuration_id) end # Never trust parameters from the scary internet, only allow the white list through. diff --git a/app/helpers/kalibro_configurations_helper.rb b/app/helpers/kalibro_configurations_helper.rb index b013100..89c1687 100644 --- a/app/helpers/kalibro_configurations_helper.rb +++ b/app/helpers/kalibro_configurations_helper.rb @@ -4,7 +4,7 @@ module KalibroConfigurationsHelper end def link_to_edit_form(metric_configuration, kalibro_configuration_id) - if (metric_configuration.metric.compound) + if (metric_configuration.metric.is_a? KalibroClient::Entities::Miscellaneous::CompoundMetric) link_to('Edit', edit_kalibro_configuration_compound_metric_configuration_path(kalibro_configuration_id, metric_configuration.id), class: 'btn btn-info') else link_to('Edit', edit_kalibro_configuration_metric_configuration_path(kalibro_configuration_id, metric_configuration.id), class: 'btn btn-info') @@ -12,7 +12,7 @@ module KalibroConfigurationsHelper end def link_to_show_page(metric_configuration, kalibro_configuration_id) - if (metric_configuration.metric.compound) + if (metric_configuration.metric.is_a? KalibroClient::Entities::Miscellaneous::CompoundMetric) link_to('Show', kalibro_configuration_compound_metric_configuration_path(kalibro_configuration_id, metric_configuration.id), class: 'btn btn-info') else link_to('Show', kalibro_configuration_metric_configuration_path(kalibro_configuration_id, metric_configuration.id), class: 'btn btn-info') diff --git a/app/helpers/metric_configurations_helper.rb b/app/helpers/metric_configurations_helper.rb index 87dd045..8ce40ce 100644 --- a/app/helpers/metric_configurations_helper.rb +++ b/app/helpers/metric_configurations_helper.rb @@ -10,11 +10,11 @@ module MetricConfigurationsHelper def native_metrics_of(kalibro_configuration_id) MetricConfiguration.metric_configurations_of(kalibro_configuration_id).map do |metric_configuration| - [ metric_configuration.code, metric_configuration.metric.name ] + [ metric_configuration.metric.code, metric_configuration.metric.name ] end end def supported_metrics_of(metric_collector_name) - KalibroClient::Processor::MetricCollector.find(metric_collector_name).supported_metrics + KalibroClient::Processor::MetricCollectorDetails.find(metric_collector_name).supported_metrics end end diff --git a/app/models/module_result.rb b/app/models/module_result.rb index 3d17d58..53ec3fb 100644 --- a/app/models/module_result.rb +++ b/app/models/module_result.rb @@ -13,6 +13,6 @@ class ModuleResult < KalibroClient::Entities::Processor::ModuleResult private def find_grade_by_metric_name(metric_results, name) - metric_results.each { |metric_result| return metric_result.value if metric_result.metric_configuration.metric_snapshot.name == name } + metric_results.each { |metric_result| return metric_result.value if metric_result.metric_configuration.metric.name == name } end end diff --git a/spec/controllers/base_metric_configurations_controller_spec.rb b/spec/controllers/base_metric_configurations_controller_spec.rb index ba73ca8..8133a43 100644 --- a/spec/controllers/base_metric_configurations_controller_spec.rb +++ b/spec/controllers/base_metric_configurations_controller_spec.rb @@ -86,8 +86,7 @@ describe InheritsFromBaseMetricConfigurationsController, :type => :controller do end describe 'create' do - let!(:metric_configuration_params) { Hash[FactoryGirl.attributes_for(:metric_configuration).map { |k,v| [k.to_s, v.to_s] }] } #FIXME: Mocha is creating the expectations with strings, but FactoryGirl returns everything with symbols and integers - let!(:metric_params) { Hash[FactoryGirl.attributes_for(:metric).map { |k,v| [k.to_s, v.to_s] }] } #FIXME: Mocha is creating the expectations with strings, but FactoryGirl returns everything with symbols and integers + let!(:metric_configuration_params) { FactoryGirl.build(:metric_configuration, metric: FactoryGirl.build(:metric)).to_hash } let(:metric_collector) { FactoryGirl.build(:metric_collector) } before :each do @@ -121,7 +120,7 @@ describe InheritsFromBaseMetricConfigurationsController, :type => :controller do subject.expects(:find_resource).with(MetricConfiguration, metric_configuration.id).returns(metric_configuration) metric_configuration.expects(:kalibro_ranges).returns([mezuro_range]) - get :show, kalibro_configuration_id: metric_configuration.configuration_id.to_s, id: metric_configuration.id + get :show, kalibro_configuration_id: metric_configuration.kalibro_configuration_id.to_s, id: metric_configuration.id end it { expect(subject.mezuro_ranges).not_to be_nil} diff --git a/spec/controllers/compound_metric_configurations_controller_spec.rb b/spec/controllers/compound_metric_configurations_controller_spec.rb index 2135415..4fe3b3b 100644 --- a/spec/controllers/compound_metric_configurations_controller_spec.rb +++ b/spec/controllers/compound_metric_configurations_controller_spec.rb @@ -79,7 +79,7 @@ describe CompoundMetricConfigurationsController, :type => :controller do subject.expects(:find_resource).with(MetricConfiguration, compound_metric_configuration.id).returns(compound_metric_configuration) compound_metric_configuration.expects(:kalibro_ranges).returns([mezuro_range]) - get :show, kalibro_configuration_id: compound_metric_configuration.configuration_id.to_s, id: compound_metric_configuration.id + get :show, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id.to_s, id: compound_metric_configuration.id end it { is_expected.to render_template(:show) } @@ -98,7 +98,7 @@ describe CompoundMetricConfigurationsController, :type => :controller do subject.expects(:metric_configuration_owner?).returns(true) subject.expects(:find_resource).with(MetricConfiguration, 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.configuration_id.to_s + get :edit, id: compound_metric_configuration.id, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id.to_s end it { is_expected.to render_template(:edit) } @@ -106,7 +106,7 @@ describe CompoundMetricConfigurationsController, :type => :controller do context 'when the user does not own the compound metric configuration' do before do - get :edit, id: compound_metric_configuration.id, kalibro_configuration_id: compound_metric_configuration.configuration_id.to_s + get :edit, id: compound_metric_configuration.id, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id.to_s end it { is_expected.to redirect_to(kalibro_configurations_path(kalibro_configuration.id)) } @@ -117,7 +117,7 @@ describe CompoundMetricConfigurationsController, :type => :controller do context 'with no user logged in' do before :each do - get :edit, id: compound_metric_configuration.id, kalibro_configuration_id: compound_metric_configuration.configuration_id.to_s + get :edit, id: compound_metric_configuration.id, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id.to_s end it { is_expected.to redirect_to new_user_session_path } @@ -143,10 +143,10 @@ describe CompoundMetricConfigurationsController, :type => :controller do subject.expects(:find_resource).with(MetricConfiguration, 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.configuration_id, id: compound_metric_configuration.id, metric_configuration: metric_configuration_params + post :update, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id, id: compound_metric_configuration.id, metric_configuration: metric_configuration_params end - it { should redirect_to(kalibro_configuration_path(compound_metric_configuration.configuration_id)) } + it { should redirect_to(kalibro_configuration_path(compound_metric_configuration.kalibro_configuration_id)) } it { should respond_with(:redirect) } end @@ -156,7 +156,7 @@ describe CompoundMetricConfigurationsController, :type => :controller do MetricConfiguration.expects(:metric_configurations_of).with(kalibro_configuration.id).returns([compound_metric_configuration]) MetricConfiguration.any_instance.expects(:update).with(metric_configuration_params).returns(false) - post :update, kalibro_configuration_id: compound_metric_configuration.configuration_id, id: compound_metric_configuration.id, metric_configuration: metric_configuration_params + post :update, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id, id: compound_metric_configuration.id, metric_configuration: metric_configuration_params end it { should render_template(:edit) } @@ -165,10 +165,10 @@ describe CompoundMetricConfigurationsController, :type => :controller do context 'when the user does not own the reading' do before :each do - post :update, kalibro_configuration_id: compound_metric_configuration.configuration_id, id: compound_metric_configuration.id, metric_configuration: metric_configuration_params + post :update, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id, id: compound_metric_configuration.id, metric_configuration: metric_configuration_params end - it { should redirect_to kalibro_configurations_path(compound_metric_configuration.configuration_id) } + it { should redirect_to kalibro_configurations_path(compound_metric_configuration.kalibro_configuration_id) } end end end diff --git a/spec/controllers/metric_configurations_controller_spec.rb b/spec/controllers/metric_configurations_controller_spec.rb index 46da3b0..306065a 100644 --- a/spec/controllers/metric_configurations_controller_spec.rb +++ b/spec/controllers/metric_configurations_controller_spec.rb @@ -11,7 +11,7 @@ describe MetricConfigurationsController, :type => :controller do context 'when adding new metrics' do before :each do subject.expects(:kalibro_configuration_owner?).returns true - KalibroClient::Processor::MetricCollector.expects(:all_names).returns([metric_collector]) + 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 @@ -31,7 +31,7 @@ describe MetricConfigurationsController, :type => :controller do context 'when the current user owns the mezuro configuration' do before :each do subject.expects(:kalibro_configuration_owner?).returns true - KalibroClient::Processor::MetricCollector.expects(:find).with(metric_collector.name).returns(metric_collector) + KalibroClient::Entities::Processor::MetricCollectorDetails.expects(:find).with(metric_collector.name).returns(metric_collector) metric_collector.expects(:metric).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 end @@ -52,7 +52,7 @@ describe MetricConfigurationsController, :type => :controller do describe 'create' do let!(:metric_configuration) { FactoryGirl.build(:metric_configuration) } - let(:metric_configuration_params) { Hash[FactoryGirl.attributes_for(:metric_configuration).map { |k,v| [k.to_s, v.to_s] }] } #FIXME: Mocha is creating the expectations with strings, but FactoryGirl returns everything with symbols and integers + let(:metric_configuration_params) { metric_configuration.to_hash } let(:kalibro_configuration) { FactoryGirl.build(:kalibro_configuration) } let(:metric_collector) { FactoryGirl.build(:metric_collector) } @@ -68,7 +68,7 @@ describe MetricConfigurationsController, :type => :controller do context 'with valid fields' do before :each do MetricConfiguration.any_instance.expects(:save).returns(true) - KalibroClient::Processor::MetricCollector.expects(:find).with(metric_collector.name).returns(metric_collector) + KalibroClient::Entities::Processor::MetricCollectorDetails.expects(:find).with(metric_collector.name).returns(metric_collector) metric_collector.expects(:metric).with(metric_configuration.metric.name).returns(metric_configuration.metric) post :create, kalibro_configuration_id: kalibro_configuration.id, metric_configuration: metric_configuration_params, metric_collector_name: metric_collector.name, metric_name: metric_configuration.metric.name @@ -80,7 +80,7 @@ describe MetricConfigurationsController, :type => :controller do context 'with invalid fields' do before :each do MetricConfiguration.any_instance.expects(:save).returns(false) - KalibroClient::Processor::MetricCollector.expects(:find).with(metric_collector.name).returns(metric_collector) + KalibroClient::Entities::Processor::MetricCollectorDetails.expects(:find).with(metric_collector.name).returns(metric_collector) metric_collector.expects(:metric).with(metric_configuration.metric.name).returns(metric_configuration.metric) post :create, kalibro_configuration_id: kalibro_configuration.id, metric_configuration: metric_configuration_params, metric_collector_name: metric_collector.name, metric_name: metric_configuration.metric.name @@ -101,7 +101,7 @@ describe MetricConfigurationsController, :type => :controller do subject.expects(:find_resource).with(MetricConfiguration, metric_configuration.id).returns(metric_configuration) metric_configuration.expects(:kalibro_ranges).returns([mezuro_range]) - get :show, kalibro_configuration_id: metric_configuration.configuration_id.to_s, id: metric_configuration.id + get :show, kalibro_configuration_id: metric_configuration.kalibro_configuration_id.to_s, id: metric_configuration.id end it { is_expected.to render_template(:show) } @@ -119,7 +119,7 @@ describe MetricConfigurationsController, :type => :controller do before :each do subject.expects(:metric_configuration_owner?).returns(true) subject.expects(:find_resource).with(MetricConfiguration, metric_configuration.id).returns(metric_configuration) - get :edit, id: metric_configuration.id, kalibro_configuration_id: metric_configuration.configuration_id.to_s + get :edit, id: metric_configuration.id, kalibro_configuration_id: metric_configuration.kalibro_configuration_id.to_s end it { is_expected.to render_template(:edit) } @@ -127,10 +127,10 @@ describe MetricConfigurationsController, :type => :controller do context 'when the user does not own the metric configuration' do before do - get :edit, id: metric_configuration.id, kalibro_configuration_id: metric_configuration.configuration_id.to_s + get :edit, id: metric_configuration.id, kalibro_configuration_id: metric_configuration.kalibro_configuration_id.to_s end - it { is_expected.to redirect_to(kalibro_configurations_path(metric_configuration.configuration_id)) } + it { is_expected.to redirect_to(kalibro_configurations_path(metric_configuration.kalibro_configuration_id)) } it { is_expected.to respond_with(:redirect) } it { is_expected.to set_the_flash[:notice].to("You're not allowed to do this operation") } end @@ -138,7 +138,7 @@ describe MetricConfigurationsController, :type => :controller do context 'with no user logged in' do before :each do - get :edit, id: metric_configuration.id, kalibro_configuration_id: metric_configuration.configuration_id.to_s + get :edit, id: metric_configuration.id, kalibro_configuration_id: metric_configuration.kalibro_configuration_id.to_s end it { is_expected.to redirect_to new_user_session_path } @@ -164,10 +164,10 @@ describe MetricConfigurationsController, :type => :controller do subject.expects(:find_resource).with(MetricConfiguration, metric_configuration.id).returns(metric_configuration) MetricConfiguration.any_instance.expects(:update).with(metric_configuration_params).returns(true) - post :update, kalibro_configuration_id: metric_configuration.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 end - it { is_expected.to redirect_to(kalibro_configuration_path(metric_configuration.configuration_id)) } + it { is_expected.to redirect_to(kalibro_configuration_path(metric_configuration.kalibro_configuration_id)) } it { is_expected.to respond_with(:redirect) } end @@ -176,7 +176,7 @@ describe MetricConfigurationsController, :type => :controller do subject.expects(:find_resource).with(MetricConfiguration, metric_configuration.id).returns(metric_configuration) MetricConfiguration.any_instance.expects(:update).with(metric_configuration_params).returns(false) - post :update, kalibro_configuration_id: metric_configuration.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 end it { is_expected.to render_template(:edit) } @@ -185,10 +185,10 @@ describe MetricConfigurationsController, :type => :controller do context 'when the user does not own the reading' do before :each do - post :update, kalibro_configuration_id: metric_configuration.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 end - it { is_expected.to redirect_to kalibro_configurations_path(metric_configuration.configuration_id) } + it { is_expected.to redirect_to kalibro_configurations_path(metric_configuration.kalibro_configuration_id) } end end end @@ -208,19 +208,19 @@ describe MetricConfigurationsController, :type => :controller do metric_configuration.expects(:destroy) subject.expects(:find_resource).with(MetricConfiguration, metric_configuration.id).returns(metric_configuration) - delete :destroy, id: metric_configuration.id, kalibro_configuration_id: metric_configuration.configuration_id.to_s + delete :destroy, id: metric_configuration.id, kalibro_configuration_id: metric_configuration.kalibro_configuration_id.to_s end - it { is_expected.to redirect_to(kalibro_configuration_path(metric_configuration.configuration_id)) } + it { is_expected.to redirect_to(kalibro_configuration_path(metric_configuration.kalibro_configuration_id)) } it { is_expected.to respond_with(:redirect) } end context "when the user doesn't own the configuration" do before :each do - delete :destroy, id: metric_configuration.id, kalibro_configuration_id: metric_configuration.configuration_id.to_s + delete :destroy, id: metric_configuration.id, kalibro_configuration_id: metric_configuration.kalibro_configuration_id.to_s end - it { is_expected.to redirect_to(kalibro_configurations_path(metric_configuration.configuration_id)) } + it { is_expected.to redirect_to(kalibro_configurations_path(metric_configuration.kalibro_configuration_id)) } it { is_expected.to respond_with(:redirect) } end end diff --git a/spec/controllers/mezuro_ranges_controller_spec.rb b/spec/controllers/mezuro_ranges_controller_spec.rb index 082096f..7de455c 100644 --- a/spec/controllers/mezuro_ranges_controller_spec.rb +++ b/spec/controllers/mezuro_ranges_controller_spec.rb @@ -82,26 +82,26 @@ describe MezuroRangesController, :type => :controller do mezuro_range.expects(:destroy) subject.expects(:find_resource).with(MezuroRange, mezuro_range.id).returns(mezuro_range) - delete :destroy, id: mezuro_range.id.to_s, metric_configuration_id: metric_configuration.id.to_s, kalibro_configuration_id: metric_configuration.configuration_id.to_s + delete :destroy, id: mezuro_range.id.to_s, metric_configuration_id: metric_configuration.id.to_s, kalibro_configuration_id: metric_configuration.kalibro_configuration_id.to_s end - it { is_expected.to redirect_to(kalibro_configuration_metric_configuration_path(metric_configuration.configuration_id, metric_configuration.id)) } + it { is_expected.to redirect_to(kalibro_configuration_metric_configuration_path(metric_configuration.kalibro_configuration_id, metric_configuration.id)) } it { is_expected.to respond_with(:redirect) } end context "when the user doesn't own the metric configuration" do before :each do - delete :destroy, id: mezuro_range.id.to_s, metric_configuration_id: metric_configuration.id.to_s, kalibro_configuration_id: metric_configuration.configuration_id.to_s + delete :destroy, id: mezuro_range.id.to_s, metric_configuration_id: metric_configuration.id.to_s, kalibro_configuration_id: metric_configuration.kalibro_configuration_id.to_s end - it { is_expected.to redirect_to(kalibro_configurations_path(metric_configuration.configuration_id)) } + it { is_expected.to redirect_to(kalibro_configurations_path(metric_configuration.kalibro_configuration_id)) } it { is_expected.to respond_with(:redirect) } end end context 'with no User logged in' do before :each do - delete :destroy, id: mezuro_range.id.to_s, metric_configuration_id: metric_configuration.id.to_s, kalibro_configuration_id: metric_configuration.configuration_id.to_s + delete :destroy, id: mezuro_range.id.to_s, metric_configuration_id: metric_configuration.id.to_s, kalibro_configuration_id: metric_configuration.kalibro_configuration_id.to_s end it { is_expected.to redirect_to new_user_session_path } @@ -111,7 +111,7 @@ describe MezuroRangesController, :type => :controller do describe 'edit' do let(:metric_configuration) { FactoryGirl.build(:metric_configuration) } let(:mezuro_range) { FactoryGirl.build(:mezuro_range, id: 1, metric_configuration_id: metric_configuration.id) } - let(:reading) { FactoryGirl.build(:reading, group_id: metric_configuration.reading_group_id) } + let(:reading) { FactoryGirl.build(:reading, reading_group_id: metric_configuration.reading_group_id) } context 'with an User logged in' do before do @@ -124,7 +124,7 @@ describe MezuroRangesController, :type => :controller do subject.expects(:find_resource).with(MezuroRange, mezuro_range.id).returns(mezuro_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: mezuro_range.id, kalibro_configuration_id: metric_configuration.configuration_id, metric_configuration_id: metric_configuration.id + get :edit, id: mezuro_range.id, kalibro_configuration_id: metric_configuration.kalibro_configuration_id, metric_configuration_id: metric_configuration.id end it { is_expected.to render_template(:edit) } @@ -134,10 +134,10 @@ describe MezuroRangesController, :type => :controller do let!(:reading_group) { FactoryGirl.build(:reading_group, id: metric_configuration.reading_group_id) } before do - get :edit, id: mezuro_range.id, kalibro_configuration_id: metric_configuration.configuration_id, metric_configuration_id: metric_configuration.id + get :edit, id: mezuro_range.id, kalibro_configuration_id: metric_configuration.kalibro_configuration_id, metric_configuration_id: metric_configuration.id end - it { is_expected.to redirect_to(kalibro_configurations_url(metric_configuration.configuration_id)) } + it { is_expected.to redirect_to(kalibro_configurations_url(metric_configuration.kalibro_configuration_id)) } it { is_expected.to respond_with(:redirect) } it { is_expected.to set_the_flash[:notice].to("You're not allowed to do this operation") } end @@ -145,7 +145,7 @@ describe MezuroRangesController, :type => :controller do context 'with no user logged in' do before :each do - get :edit, id: mezuro_range.id, kalibro_configuration_id: metric_configuration.configuration_id, metric_configuration_id: metric_configuration.id + get :edit, id: mezuro_range.id, kalibro_configuration_id: metric_configuration.kalibro_configuration_id, metric_configuration_id: metric_configuration.id end it { is_expected.to redirect_to new_user_session_path } @@ -156,7 +156,7 @@ describe MezuroRangesController, :type => :controller do let(:metric_configuration) { FactoryGirl.build(:metric_configuration) } let(:mezuro_range) { FactoryGirl.build(:mezuro_range, id: 1, metric_configuration_id: metric_configuration.id) } let(:mezuro_range_params) { Hash[FactoryGirl.attributes_for(:mezuro_range).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 - let(:reading) { FactoryGirl.build(:reading, group_id: metric_configuration.reading_group_id) } + let(:reading) { FactoryGirl.build(:reading, reading_group_id: metric_configuration.reading_group_id) } context 'when the user is logged in' do before do @@ -173,10 +173,10 @@ describe MezuroRangesController, :type => :controller do subject.expects(:find_resource).with(MezuroRange, mezuro_range.id).returns(mezuro_range) MezuroRange.any_instance.expects(:update).with(mezuro_range_params).returns(true) - post :update, kalibro_configuration_id: metric_configuration.configuration_id, id: mezuro_range.id, metric_configuration_id: metric_configuration.id, mezuro_range: mezuro_range_params + post :update, kalibro_configuration_id: metric_configuration.kalibro_configuration_id, id: mezuro_range.id, metric_configuration_id: metric_configuration.id, mezuro_range: mezuro_range_params end - it { is_expected.to redirect_to(kalibro_configuration_metric_configuration_path(metric_configuration.configuration_id, metric_configuration.id)) } + it { is_expected.to redirect_to(kalibro_configuration_metric_configuration_path(metric_configuration.kalibro_configuration_id, metric_configuration.id)) } it { is_expected.to respond_with(:redirect) } end @@ -187,7 +187,7 @@ describe MezuroRangesController, :type => :controller do MetricConfiguration.expects(:find).with(metric_configuration.id).returns(metric_configuration) Reading.expects(:readings_of).with(metric_configuration.reading_group_id).returns([reading]) - post :update, kalibro_configuration_id: metric_configuration.configuration_id, id: mezuro_range.id, metric_configuration_id: metric_configuration.id, mezuro_range: mezuro_range_params + post :update, kalibro_configuration_id: metric_configuration.kalibro_configuration_id, id: mezuro_range.id, metric_configuration_id: metric_configuration.id, mezuro_range: mezuro_range_params end it { is_expected.to render_template(:edit) } @@ -196,10 +196,10 @@ describe MezuroRangesController, :type => :controller do context 'when the user does not own the mezuro range' do before :each do - post :update, kalibro_configuration_id: metric_configuration.configuration_id, id: mezuro_range.id, metric_configuration_id: metric_configuration.id, mezuro_range: mezuro_range_params + post :update, kalibro_configuration_id: metric_configuration.kalibro_configuration_id, id: mezuro_range.id, metric_configuration_id: metric_configuration.id, mezuro_range: mezuro_range_params end - it { is_expected.to redirect_to kalibro_configurations_path(metric_configuration.configuration_id) } + it { is_expected.to redirect_to kalibro_configurations_path(metric_configuration.kalibro_configuration_id) } end end end diff --git a/spec/controllers/readings_controller_spec.rb b/spec/controllers/readings_controller_spec.rb index 8e2591d..ddebd12 100644 --- a/spec/controllers/readings_controller_spec.rb +++ b/spec/controllers/readings_controller_spec.rb @@ -102,7 +102,7 @@ describe ReadingsController, :type => :controller do end describe 'update' do - let(:reading) { FactoryGirl.build(:reading) } + let(:reading) { FactoryGirl.build(:reading, reading_group_id: reading_group.id) } let(:reading_params) { Hash[FactoryGirl.attributes_for(:reading).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 context 'when the user is logged in' do @@ -171,30 +171,30 @@ describe ReadingsController, :type => :controller do reading.expects(:destroy) subject.expects(:find_resource).with(Reading, reading.id).returns(reading) - delete :destroy, id: reading.id, reading_group_id: reading.group_id.to_s + delete :destroy, id: reading.id, reading_group_id: reading.reading_group_id.to_s end - it { is_expected.to redirect_to(reading_group_path(reading.group_id)) } + it { is_expected.to redirect_to(reading_group_path(reading.reading_group_id)) } it { is_expected.to respond_with(:redirect) } end context "when the user doesn't own the reading group" do before :each do - delete :destroy, id: reading.id, reading_group_id: reading.group_id.to_s + delete :destroy, id: reading.id, reading_group_id: reading.reading_group_id.to_s end - it { is_expected.to redirect_to(reading_group_path(reading.group_id)) } + it { is_expected.to redirect_to(reading_group_path(reading.reading_group_id)) } it { is_expected.to respond_with(:redirect) } end end context 'with no User logged in' do before :each do - delete :destroy, id: reading.id, reading_group_id: reading.group_id.to_s + delete :destroy, id: reading.id, reading_group_id: reading.reading_group_id.to_s end it { is_expected.to redirect_to new_user_session_path } end end -end \ No newline at end of file +end diff --git a/spec/factories/kalibro_modules.rb b/spec/factories/kalibro_modules.rb new file mode 100644 index 0000000..266a94e --- /dev/null +++ b/spec/factories/kalibro_modules.rb @@ -0,0 +1,6 @@ +FactoryGirl.define do + factory :kalibro_module, class: KalibroClient::Entities::Processor::KalibroModule do + name 'Qt-Calculator' + granlrty 'APPLICATION' + end +end diff --git a/spec/factories/metric_collectors.rb b/spec/factories/metric_collectors.rb index aea7603..1c5d31f 100644 --- a/spec/factories/metric_collectors.rb +++ b/spec/factories/metric_collectors.rb @@ -2,7 +2,7 @@ FactoryGirl.define do factory :metric_collector, class: KalibroClient::Entities::Processor::MetricCollectorDetails do name 'Analizo' description 'A metric collector' - supported_metrics { { "total_abstract_classes" => FactoryGirl.build(:metric), "loc" => FactoryGirl.build(:loc)} } + supported_metrics { { "total_abstract_classes" => FactoryGirl.build(:metric).to_hash, "loc" => FactoryGirl.build(:loc).to_hash} } initialize_with { new({"name" => name, "description" => description, "supported_metrics" => supported_metrics}) } end diff --git a/spec/factories/metric_configurations.rb b/spec/factories/metric_configurations.rb index ce35ade..bbce743 100644 --- a/spec/factories/metric_configurations.rb +++ b/spec/factories/metric_configurations.rb @@ -1,9 +1,7 @@ FactoryGirl.define do factory :metric_configuration, class: MetricConfiguration do id 1 - code 'total_abstract_classes' - metric {FactoryGirl.build(:metric)} - metric_collector_name "Analizo" + metric {FactoryGirl.build(:metric, code: 'total_abstract_classes')} weight 1 aggregation_form "AVERAGE" reading_group_id 1 @@ -12,19 +10,16 @@ FactoryGirl.define do factory :compound_metric_configuration, class: MetricConfiguration do id 1 - code 'compound' - metric { FactoryGirl.build(:compound_metric, script: 'native*2;') } + metric { FactoryGirl.build(:compound_metric, script: 'native*2;', code: 'compound') } weight 1 aggregation_form "AVERAGE" reading_group_id 1 kalibro_configuration_id 1 end - factory :metric_configuration_with_snapshot, class: MetricConfiguration do + factory :another_metric_configuration, class: MetricConfiguration do id 1 - code 'total_modules' - metric_snapshot {FactoryGirl.build(:metric)} - metric_collector_name "Analizo" + metric {FactoryGirl.build(:metric, code: 'total_modules')} weight 1 aggregation_form "MEDIAN" reading_group_id 1 diff --git a/spec/factories/metric_configurations_snapshot.rb b/spec/factories/metric_configurations_snapshot.rb deleted file mode 100644 index ec7a8d4..0000000 --- a/spec/factories/metric_configurations_snapshot.rb +++ /dev/null @@ -1,26 +0,0 @@ -# This file is part of KalibroEntities -# Copyright (C) 2013 it's respectives authors (please see the AUTHORS file) -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -FactoryGirl.define do - factory :metric_configuration_snapshot, class: KalibroClient::Entities::Configurations::MetricSnapshot do - code "code" - weight "1.0" - aggregation_form 'AVERAGE' - metric {FactoryGirl.build(:metric)} - metric_collector_name "Analizo" - range {FactoryGirl.build(:range_snapshot)} - end -end diff --git a/spec/factories/metric_results.rb b/spec/factories/metric_results.rb index 582b454..4f14154 100644 --- a/spec/factories/metric_results.rb +++ b/spec/factories/metric_results.rb @@ -17,7 +17,7 @@ FactoryGirl.define do factory :metric_result, class: KalibroClient::Entities::Processor::MetricResult do id "42" - self.configuration { FactoryGirl.build(:metric_configuration) } + metric_configuration { FactoryGirl.build(:metric_configuration) } value "10.0" aggregated_value "21" end diff --git a/spec/factories/metrics.rb b/spec/factories/metrics.rb index c090b25..c0ea929 100644 --- a/spec/factories/metrics.rb +++ b/spec/factories/metrics.rb @@ -1,31 +1,33 @@ FactoryGirl.define do - factory :metric, class: KalibroClient::Entities::Processor::NativeMetric do + factory :metric, class: KalibroClient::Entities::Miscellaneous::NativeMetric do name "Total Abstract Classes" code "total_abstract_classes" scope "SOFTWARE" description nil languages { [:C] } + metric_collector_name "Analizo" initialize_with { new(name, code, scope, description, languages) } end - factory :loc, class: KalibroClient::Entities::Processor::NativeMetric do + factory :loc, class: KalibroClient::Entities::Miscellaneous::NativeMetric do name "Lines of Code" code "loc" scope "CLASS" description nil languages { [:C] } + metric_collector_name "Analizo" initialize_with { new(name, code, scope, description, languages) } end - factory :compound_metric, class: KalibroClient::Entities::Processor::CompoundMetric do + factory :compound_metric, class: KalibroClient::Entities::Miscellaneous::CompoundMetric do name "Compound" code "compound" scope "CLASS" description nil script "" - initialize_with { new(name, code, scope, description, script) } + initialize_with { new(name, code, scope, script) } end end diff --git a/spec/factories/module_results.rb b/spec/factories/module_results.rb index 562e02b..fb83be6 100644 --- a/spec/factories/module_results.rb +++ b/spec/factories/module_results.rb @@ -1,7 +1,7 @@ FactoryGirl.define do factory :module_result, class: ModuleResult do id 42 - self.module { FactoryGirl.build(:module) } + kalibro_module { FactoryGirl.build(:kalibro_module) } grade 10.0 parent_id 21 height 6 @@ -9,7 +9,7 @@ FactoryGirl.define do factory :root_module_result, class: ModuleResult do id 21 - self.module { FactoryGirl.build(:module) } + kalibro_module { FactoryGirl.build(:kalibro_module) } grade 6.0 parent_id nil height 1 diff --git a/spec/factories/modules.rb b/spec/factories/modules.rb deleted file mode 100644 index 736a862..0000000 --- a/spec/factories/modules.rb +++ /dev/null @@ -1,6 +0,0 @@ -FactoryGirl.define do - factory :module, class: KalibroClient::Entities::Processor::KalibroModule do - name 'Qt-Calculator' - granularity 'APPLICATION' - end -end diff --git a/spec/factories/processings.rb b/spec/factories/processings.rb index e257a48..9a1b913 100644 --- a/spec/factories/processings.rb +++ b/spec/factories/processings.rb @@ -3,8 +3,7 @@ FactoryGirl.define do id "31" date "2011-10-20T18:26:43.151+00:00" state "READY" - process_time {[FactoryGirl.build(:process_time)]} - results_root_id "13" + root_module_result_id "13" trait :errored do state "ERROR" @@ -12,4 +11,4 @@ FactoryGirl.define do factory :errored_processing, traits: [:errored] end -end \ No newline at end of file +end diff --git a/spec/factories/ranges_snapshot.rb b/spec/factories/ranges_snapshot.rb index 03bfecd..183a1d9 100644 --- a/spec/factories/ranges_snapshot.rb +++ b/spec/factories/ranges_snapshot.rb @@ -15,7 +15,7 @@ # along with this program. If not, see . FactoryGirl.define do - factory :range_snapshot, class: KalibroClient::Entities::Configurations::KalibroRange do + factory :range_snapshot, class: KalibroClient::Entities::Configurations::RangeSnapshot do beginning 1.1 self.end 5.1 label "Snapshot" diff --git a/spec/factories/repositories.rb b/spec/factories/repositories.rb index 091326d..41b2115 100644 --- a/spec/factories/repositories.rb +++ b/spec/factories/repositories.rb @@ -19,10 +19,10 @@ FactoryGirl.define do name "SBKing" description "A simple calculator" license "GPLv3" - process_period 1 - type "GIT" + period 1 + scm_type "GIT" address "https://git.gitorious.org/sbking/sbking.git" - configuration_id 1 + kalibro_configuration_id 1 project_id 1 send_email "test@test.com" end @@ -30,4 +30,4 @@ FactoryGirl.define do factory :another_repository, parent: :repository do id 2 end -end \ No newline at end of file +end diff --git a/spec/helpers/metric_configurations_helper_spec.rb b/spec/helpers/metric_configurations_helper_spec.rb index 9c450a7..4d85143 100644 --- a/spec/helpers/metric_configurations_helper_spec.rb +++ b/spec/helpers/metric_configurations_helper_spec.rb @@ -24,11 +24,11 @@ describe MetricConfigurationsHelper, :type => :helper do let! (:metric_configuration) { FactoryGirl.build(:metric_configuration) } before :each do - MetricConfiguration.expects(:metric_configurations_of).with(metric_configuration.configuration_id).returns([metric_configuration]) + MetricConfiguration.expects(:metric_configurations_of).with(metric_configuration.kalibro_configuration_id).returns([metric_configuration]) end it 'should return a pair with the metric configuration code and metric name' do - expect(helper.native_metrics_of(metric_configuration.configuration_id)).to eq [[metric_configuration.code, metric_configuration.metric.name]] + expect(helper.native_metrics_of(metric_configuration.kalibro_configuration_id)).to eq [[metric_configuration.metric.code, metric_configuration.metric.name]] end end end diff --git a/spec/helpers/mezuro_configurations_helper_spec.rb b/spec/helpers/mezuro_configurations_helper_spec.rb index 527f2c4..ea93678 100644 --- a/spec/helpers/mezuro_configurations_helper_spec.rb +++ b/spec/helpers/mezuro_configurations_helper_spec.rb @@ -45,32 +45,32 @@ describe KalibroConfigurationsHelper, :type => :helper do describe 'link to edit form' do context 'when the metric is native' do let(:metric_configuration) { FactoryGirl.build(:metric_configuration) } - let(:response_link) {"Edit"} + let(:response_link) {"Edit"} - it { expect(helper.link_to_edit_form(metric_configuration, metric_configuration.configuration_id)).to eq(response_link) } + it { expect(helper.link_to_edit_form(metric_configuration, metric_configuration.kalibro_configuration_id)).to eq(response_link) } end context 'when the metric is compound' do let(:compound_metric_configuration) { FactoryGirl.build(:compound_metric_configuration) } - let(:response_link) {"Edit"} + let(:response_link) {"Edit"} - it { expect(helper.link_to_edit_form(compound_metric_configuration, compound_metric_configuration.configuration_id)).to eq(response_link) } + it { expect(helper.link_to_edit_form(compound_metric_configuration, compound_metric_configuration.kalibro_configuration_id)).to eq(response_link) } end end describe 'link to show page' do context 'when the metric is native' do let(:metric_configuration) { FactoryGirl.build(:metric_configuration) } - let(:response_link) {"Show"} + let(:response_link) {"Show"} - it { expect(helper.link_to_show_page(metric_configuration, metric_configuration.configuration_id)).to eq(response_link) } + it { expect(helper.link_to_show_page(metric_configuration, metric_configuration.kalibro_configuration_id)).to eq(response_link) } end context 'when the metric is compound' do let(:compound_metric_configuration) { FactoryGirl.build(:compound_metric_configuration) } - let(:response_link) {"Show"} + let(:response_link) {"Show"} - it { expect(helper.link_to_show_page(compound_metric_configuration, compound_metric_configuration.configuration_id)).to eq(response_link) } + it { expect(helper.link_to_show_page(compound_metric_configuration, compound_metric_configuration.kalibro_configuration_id)).to eq(response_link) } end end end diff --git a/spec/helpers/processings_helper_spec.rb b/spec/helpers/processings_helper_spec.rb index 72b751d..eb80256 100644 --- a/spec/helpers/processings_helper_spec.rb +++ b/spec/helpers/processings_helper_spec.rb @@ -14,15 +14,15 @@ describe ProcessingsHelper, :type => :helper do end describe 'find_range_snapshot' do - let(:metric_configuration_snapshot) { FactoryGirl.build(:metric_configuration_snapshot)} - let(:metric_result) { FactoryGirl.build(:metric_result, {value: 6.0, configuration: metric_configuration_snapshot})} + let(:metric_configuration) { FactoryGirl.build(:metric_configuration)} + let(:metric_result) { FactoryGirl.build(:metric_result, {value: 6.0, metric_configuration: metric_configuration})} let(:range_snapshot_1_to_5) { FactoryGirl.build(:range_snapshot, {beginning: 1.0, end: 5.0}) } let(:range_snapshot_5dot1_to_10) { FactoryGirl.build(:range_snapshot, {beginning: 5.1, end: 10.0}) } let(:range_snapshot_10dot1_to_15) { FactoryGirl.build(:range_snapshot, {beginning: 10.1, end: 15.0}) } before :each do - metric_result.expects(:metric_configuration).returns(metric_result.configuration) - metric_configuration_snapshot.expects(:kalibro_ranges). + metric_result.expects(:metric_configuration).returns(metric_result.metric_configuration) + metric_configuration.expects(:kalibro_ranges). returns([range_snapshot_1_to_5, range_snapshot_5dot1_to_10, range_snapshot_10dot1_to_15]) diff --git a/spec/models/module_result_spec.rb b/spec/models/module_result_spec.rb index 028eda4..925db53 100644 --- a/spec/models/module_result_spec.rb +++ b/spec/models/module_result_spec.rb @@ -6,20 +6,20 @@ describe ModuleResult, :type => :model do describe 'metric_history' do let(:date_module_result) {FactoryGirl.build(:date_module_result)} - let(:metric_result) { FactoryGirl.build(:metric_result, configuration: FactoryGirl.build(:metric_configuration_with_snapshot)) } + let!(:metric_result) { FactoryGirl.build(:metric_result, metric_configuration: FactoryGirl.build(:another_metric_configuration)) } let(:processing) {FactoryGirl.build(:processing)} let(:repository) {FactoryGirl.build(:repository)} before :each do subject.expects(:processing).returns(processing) - metric_result.expects(:metric_configuration).returns(metric_result.configuration) + metric_result.expects(:metric_configuration).returns(metric_result.metric_configuration) processing.expects(:repository).returns(repository) repository.expects(:module_result_history_of).with(subject).returns([date_module_result]) ModuleResult.any_instance.expects(:metric_results).returns([metric_result]) end it 'should return the history for the given metric name' do - expect(subject.metric_history(metric_result.configuration.metric_snapshot.name)).to eq({date_module_result.date => metric_result.value}) + expect(subject.metric_history(metric_result.metric_configuration.metric.name)).to eq({date_module_result.date => metric_result.value}) end end end -- libgit2 0.21.2