From 40903bd9f783e56dddc38ecbf3ffb0ff8f862888 Mon Sep 17 00:00:00 2001 From: Heitor Reis Date: Fri, 5 Dec 2014 15:52:49 -0200 Subject: [PATCH] [WIP] Fixing more tests for kalibro client integration --- Gemfile.lock | 6 +++--- app/controllers/metric_configurations_controller.rb | 6 +++--- spec/controllers/metric_configurations_controller_spec.rb | 8 ++++---- spec/factories/metric_collectors.rb | 4 ++-- spec/factories/metric_configurations.rb | 2 +- spec/factories/metrics.rb | 6 ++---- 6 files changed, 15 insertions(+), 17 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ffcb956..5fee213 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/mezuro/kalibro_client - revision: 1a4ef5f0ea168a6d91d1e86866f906ffccf59cad + revision: e8367929a341a2eaf16599a858972703151a8967 specs: kalibro_client (0.0.1) activeresource (~> 4.0.0) @@ -165,7 +165,7 @@ GEM net-scp (1.2.1) net-ssh (>= 2.6.5) net-ssh (2.9.1) - netrc (0.8.0) + netrc (0.9.0) nokogiri (1.6.5) mini_portile (~> 0.6.0) orm_adapter (0.5.0) @@ -195,7 +195,7 @@ GEM activesupport (= 4.1.6) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.4.0) + rake (10.4.2) rdoc (4.1.2) json (~> 1.4) ref (1.0.5) diff --git a/app/controllers/metric_configurations_controller.rb b/app/controllers/metric_configurations_controller.rb index 4c43416..e0a0a25 100644 --- a/app/controllers/metric_configurations_controller.rb +++ b/app/controllers/metric_configurations_controller.rb @@ -2,18 +2,18 @@ class MetricConfigurationsController < BaseMetricConfigurationsController def choose_metric @mezuro_configuration_id = params[:mezuro_configuration_id].to_i @metric_configuration_id = params[:metric_configuration_id].to_i - @metric_collectors = KalibroGatekeeperClient::Entities::MetricCollector.all + @metric_collectors = KalibroClient::Processor::MetricCollector.all end def new super metric_configuration.metric_collector_name = params[:metric_collector_name] - metric_configuration.metric = KalibroGatekeeperClient::Entities::MetricCollector.find_by_name(params[:metric_collector_name]).metric params[:metric_name] + metric_configuration.metric = KalibroClient::Processor::MetricCollector.find_by_name(params[:metric_collector_name]).metric params[:metric_name] end def create super - @metric_configuration.metric = KalibroGatekeeperClient::Entities::MetricCollector.find_by_name(params[:metric_collector_name]).metric params[:metric_name] + @metric_configuration.metric = KalibroClient::Processor::MetricCollector.find_by_name(params[:metric_collector_name]).metric params[:metric_name] @metric_configuration.metric_collector_name = params[:metric_collector_name] @metric_configuration.code = @metric_configuration.metric.code respond_to do |format| diff --git a/spec/controllers/metric_configurations_controller_spec.rb b/spec/controllers/metric_configurations_controller_spec.rb index 6e1c8f1..253078c 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(:mezuro_configuration_owner?).returns true - KalibroGatekeeperClient::Entities::MetricCollector.expects(:all).returns([metric_collector]) + KalibroClient::Processor::MetricCollector.expects(:all).returns([metric_collector]) get :choose_metric, mezuro_configuration_id: mezuro_configuration.id end @@ -29,7 +29,7 @@ describe MetricConfigurationsController, :type => :controller do context 'when the current user owns the mezuro configuration' do before :each do subject.expects(:mezuro_configuration_owner?).returns true - KalibroGatekeeperClient::Entities::MetricCollector.expects(:find_by_name).with(metric_collector.name).returns(metric_collector) + KalibroClient::Processor::MetricCollector.expects(:find_by_name).with(metric_collector.name).returns(metric_collector) post :new, mezuro_configuration_id: mezuro_configuration.id, metric_name: "Lines of Code", metric_collector_name: metric_collector.name end @@ -65,7 +65,7 @@ describe MetricConfigurationsController, :type => :controller do context 'with valid fields' do before :each do MetricConfiguration.any_instance.expects(:save).returns(true) - KalibroGatekeeperClient::Entities::MetricCollector.expects(:find_by_name).with(metric_collector.name).returns(metric_collector) + KalibroClient::Processor::MetricCollector.expects(:find_by_name).with(metric_collector.name).returns(metric_collector) metric_collector.expects(:metric).with(metric_configuration.metric.name).returns(metric_configuration.metric) post :create, mezuro_configuration_id: mezuro_configuration.id, metric_configuration: metric_configuration_params, metric_collector_name: metric_collector.name, metric_name: metric_configuration.metric.name @@ -77,7 +77,7 @@ describe MetricConfigurationsController, :type => :controller do context 'with invalid fields' do before :each do MetricConfiguration.any_instance.expects(:save).returns(false) - KalibroGatekeeperClient::Entities::MetricCollector.expects(:find_by_name).with(metric_collector.name).returns(metric_collector) + KalibroClient::Processor::MetricCollector.expects(:find_by_name).with(metric_collector.name).returns(metric_collector) metric_collector.expects(:metric).with(metric_configuration.metric.name).returns(metric_configuration.metric) post :create, mezuro_configuration_id: mezuro_configuration.id, metric_configuration: metric_configuration_params, metric_collector_name: metric_collector.name, metric_name: metric_configuration.metric.name diff --git a/spec/factories/metric_collectors.rb b/spec/factories/metric_collectors.rb index 7a5644c..2cea391 100644 --- a/spec/factories/metric_collectors.rb +++ b/spec/factories/metric_collectors.rb @@ -1,6 +1,6 @@ FactoryGirl.define do - factory :metric_collector, class: MetricCollector do + factory :metric_collector, class: KalibroClient::Processor::MetricCollector do name 'Analizo' - supported_metrics { { "total_abstract_classes" => FactoryGirl.build(:metric).to_hash, "loc" => FactoryGirl.build(:loc).to_hash } } + supported_metrics { { "total_abstract_classes" => FactoryGirl.build(:metric), "loc" => FactoryGirl.build(:loc)} } end end diff --git a/spec/factories/metric_configurations.rb b/spec/factories/metric_configurations.rb index 3696e1b..e64aadf 100644 --- a/spec/factories/metric_configurations.rb +++ b/spec/factories/metric_configurations.rb @@ -13,7 +13,7 @@ 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;') } weight 1 aggregation_form "AVERAGE" reading_group_id 1 diff --git a/spec/factories/metrics.rb b/spec/factories/metrics.rb index 7efbb40..4758868 100644 --- a/spec/factories/metrics.rb +++ b/spec/factories/metrics.rb @@ -19,15 +19,13 @@ FactoryGirl.define do initialize_with { new(compound, name, code, scope) } end - factory :compound_metric, class: KalibroClient::Processor::Metric do + factory :compound_metric, class: KalibroClient::Processor::CompoundMetric do name "Compound" code "compound" - compound true scope "CLASS" description nil script "" - language ["C", "CPP", "JAVA"] - initialize_with { new(compound, name, code, scope) } + initialize_with { new(name, code, scope, script) } end end -- libgit2 0.21.2