From 4e9610599bc549607732a9e11dc971998fce296e Mon Sep 17 00:00:00 2001 From: Collin McNeese Date: Wed, 21 Dec 2022 09:40:18 -0600 Subject: [PATCH 1/2] provider update for label parsing Signed-off-by: Collin McNeese --- lib/models/provider.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/models/provider.rb b/lib/models/provider.rb index 6b2e94b..0802dba 100644 --- a/lib/models/provider.rb +++ b/lib/models/provider.rb @@ -18,8 +18,7 @@ class Provider }.freeze def initialize(labels) - labels = labels.tr("\n", "").delete_prefix("[").delete_suffix("]").split(",").map(&:strip) - providers = labels.select { |label| PROVIDER_MAP.key?(label) } + providers = JSON.parse(labels).select { |label| PROVIDER_MAP.key?(label) } raise "One provider must be selected" if providers.empty? raise "Only one provider can be selected" unless providers.one? From c5358cec7d9b91ed36945235d3f571246a69bb1a Mon Sep 17 00:00:00 2001 From: Collin McNeese Date: Wed, 21 Dec 2022 09:52:36 -0600 Subject: [PATCH 2/2] fixes provider_spec to match real data input format Signed-off-by: Collin McNeese --- spec/models/provider_spec.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/spec/models/provider_spec.rb b/spec/models/provider_spec.rb index edd7572..6d49ee3 100644 --- a/spec/models/provider_spec.rb +++ b/spec/models/provider_spec.rb @@ -20,8 +20,8 @@ RSpec.describe Provider do let(:labels) do <<~LABELS [ - jenkins, - azure-devops + "jenkins", + "azure-devops" ] LABELS end @@ -33,7 +33,7 @@ RSpec.describe Provider do let(:labels) do <<~LABELS [ - something-unsupported + "something-unsupported" ] LABELS end @@ -45,7 +45,7 @@ RSpec.describe Provider do let(:labels) do <<~LABELS [ - jenkins + "jenkins" ] LABELS end @@ -59,7 +59,7 @@ RSpec.describe Provider do let(:labels) do <<~LABELS [ - gitlab + "gitlab" ] LABELS end @@ -73,7 +73,7 @@ RSpec.describe Provider do let(:labels) do <<~LABELS [ - travis-ci + "travis-ci" ] LABELS end @@ -87,7 +87,7 @@ RSpec.describe Provider do let(:labels) do <<~LABELS [ - azure-devops + "azure-devops" ] LABELS end