From 1daafa6278581d6556d53ce70c27a2de46ada063 Mon Sep 17 00:00:00 2001 From: Rafael Reggiani Manzo Date: Fri, 12 Feb 2016 19:28:21 -0200 Subject: [PATCH] Fix KalibroModule factories --- app/helpers/kalibro_modules_helper.rb | 2 +- spec/factories/kalibro_modules.rb | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/helpers/kalibro_modules_helper.rb b/app/helpers/kalibro_modules_helper.rb index 35e0826..d2cacf8 100644 --- a/app/helpers/kalibro_modules_helper.rb +++ b/app/helpers/kalibro_modules_helper.rb @@ -17,7 +17,7 @@ module KalibroModulesHelper if (a.kalibro_module.granularity == b.kalibro_module.granularity) a.kalibro_module.name <=> b.kalibro_module.name else - (ComparableGranularity.new(b.kalibro_module.granularity.to_sym) <=> ComparableGranularity.new(a.kalibro_module.granularity.to_sym)) + (ComparableGranularity.new(b.kalibro_module.granularity.type) <=> ComparableGranularity.new(a.kalibro_module.granularity.type)) end end end diff --git a/spec/factories/kalibro_modules.rb b/spec/factories/kalibro_modules.rb index fe1cbce..eeb8907 100644 --- a/spec/factories/kalibro_modules.rb +++ b/spec/factories/kalibro_modules.rb @@ -1,27 +1,29 @@ FactoryGirl.define do factory :kalibro_module, class: KalibroClient::Entities::Processor::KalibroModule do name 'Qt-Calculator' - granularity 'SOFTWARE' + granularity { {'type' => 'SOFTWARE'} } trait :package do - granularity 'PACKAGE' + granularity { {'type' => 'PACKAGE'} } end trait :class do - granularity 'CLASS' + granularity { {'type' => 'CLASS'} } end trait :function do - granularity 'FUNCTION' + granularity { {'type' => 'FUNCTION'} } end trait :method do - granularity 'METHOD' + granularity { {'type' => 'METHOD'} } end factory :kalibro_module_package, traits: [:package] factory :kalibro_module_class, traits: [:class] factory :kalibro_module_function, traits: [:function] factory :kalibro_module_method, traits: [:method] + + initialize_with { KalibroClient::Entities::Processor::KalibroModule.new({granularity: granularity, name: name}.stringify_keys) } end end -- libgit2 0.21.2