From 69e224e49d8e4ea62aac78ca5274abece7b54f29 Mon Sep 17 00:00:00 2001 From: Andrew Cantino Date: Sat, 13 Feb 2016 11:00:44 -0800 Subject: [PATCH] Avoid raising an error on missing credential, validation should catch it --- app/concerns/liquid_interpolatable.rb | 4 +--- spec/support/shared_examples/liquid_interpolatable.rb | 7 ++++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/concerns/liquid_interpolatable.rb b/app/concerns/liquid_interpolatable.rb index a3cc08d2e7..6cf46db099 100644 --- a/app/concerns/liquid_interpolatable.rb +++ b/app/concerns/liquid_interpolatable.rb @@ -299,9 +299,7 @@ def initialize(tag_name, name, tokens) end def render(context) - credential = context.registers[:agent].credential(@credential_name) - raise "No user credential named '#{@credential_name}' defined" if credential.nil? - credential + context.registers[:agent].credential(@credential_name) end end diff --git a/spec/support/shared_examples/liquid_interpolatable.rb b/spec/support/shared_examples/liquid_interpolatable.rb index b8ac3cdddb..cb0c7c1bf1 100644 --- a/spec/support/shared_examples/liquid_interpolatable.rb +++ b/spec/support/shared_examples/liquid_interpolatable.rb @@ -91,10 +91,11 @@ expect(@checker.interpolate_string("{% credential aws_key %}", {})).to eq('2222222222-jane') end - it "should raise an exception for undefined credentials" do + it "should not raise an exception for undefined credentials" do expect { - @checker.interpolate_string("{% credential unknown %}", {}) - }.to raise_error(/No user credential named/) + result = @checker.interpolate_string("{% credential unknown %}", {}) + expect(result).to eq('') + }.not_to raise_error end end